Fix most vtable issues (#2706)

5 files changed, 12 insertions, 11 deletions

diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 8820f36b05..e29ddd0e17 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -31,9 +31,7 @@ public:
         mFrameMax = 0;
     }
     /* 80053C94 */ virtual ~J2DAnmBase() {}
-    // this is supposed to be inline, but doing so causes problems
-    // with where the vtable is placed in the final framework.dol
-    /* 800569B0 */ virtual void searchUpdateMaterialID(J2DScreen*);
+    /* 800569B0 */ virtual void searchUpdateMaterialID(J2DScreen*) {}
 
     s16 getFrameMax() const { return mFrameMax; }
     void setFrame(f32 frame) { mFrame = frame; }
@@ -158,7 +156,7 @@ public:
         mKind = KIND_TRANSFORM;
     }
     /* 80184370 */ virtual ~J2DAnmTransform() {}
-    /* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const; // {} (should be inline)
+    /* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const {}
 
     /* 0x10 */ f32* mScaleValues;
     /* 0x14 */ s16* mRotationValues;
diff --git a/include/d/actor/d_a_npc_fguard.h b/include/d/actor/d_a_npc_fguard.h
index 07f2de72ab..62070df13b 100644
--- a/include/d/actor/d_a_npc_fguard.h
+++ b/include/d/actor/d_a_npc_fguard.h
@@ -18,7 +18,7 @@ public:
     /* 809BA53C */ void initPosAngle(Vec&, s16);
     /* 809BA584 */ cPhs__Step create();
     /* 809BA730 */ void create_init();
-    /* 809BAA80 */ virtual ~daNpcFgd_c();
+    /* 809BAA80 */ inline virtual ~daNpcFgd_c();
 
     int getType() { return fopAcM_GetParam(this) & 0xFF; }
     int getObjNum() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
diff --git a/include/d/d_event_debug.h b/include/d/d_event_debug.h
index 5c8b8337ee..4c6a8776af 100644
--- a/include/d/d_event_debug.h
+++ b/include/d/d_event_debug.h
@@ -41,7 +41,7 @@ struct dEvDb_flag_base_c {
 
 struct dEvM_play_HIO_c : public JORReflexible {
     dEvM_play_HIO_c();
-    ~dEvM_play_HIO_c() {}
+    virtual ~dEvM_play_HIO_c() {}
 
     /* 0x04 */ s16 mTargetEvent;
     /* 0x06 */ s16 mEventIdx;
@@ -71,7 +71,7 @@ STATIC_ASSERT(sizeof(dEvM_play_HIO_c) == 0xC);
 
 struct dEvM_reg_HIO_c : public JORReflexible {
     dEvM_reg_HIO_c();
-    ~dEvM_reg_HIO_c() {}
+    virtual ~dEvM_reg_HIO_c() {}
 
     /* 0x04 */ dEvDb_flag_base_c* mFlagTables;
     /* 0x08 */ u8 field_0x008;
@@ -92,7 +92,7 @@ STATIC_ASSERT(sizeof(dEvM_reg_HIO_c) == 0xC);
 
 struct dEvM_bit_HIO_c : public JORReflexible {
     dEvM_bit_HIO_c();
-    ~dEvM_bit_HIO_c() {}
+    virtual ~dEvM_bit_HIO_c() {}
 
     /* 0x04 */ dEvDb_flag_base_c* mFlagTables;
     /* 0x08 */ u8 field_0x008;
@@ -113,6 +113,7 @@ STATIC_ASSERT(sizeof(dEvM_bit_HIO_c) == 0xC);
 
 struct dEvM_root_bit_HIO_c : public JORReflexible {
     dEvM_root_bit_HIO_c() {}
+    virtual ~dEvM_root_bit_HIO_c() {}
 
     dEvM_bit_HIO_c mBit[100];
     dEvDb_flag_base_c* mFlagTables;
@@ -124,6 +125,7 @@ STATIC_ASSERT(sizeof(dEvM_root_bit_HIO_c) == 0x4B8);
 
 struct dEvM_root_reg_HIO_c : public JORReflexible {
     dEvM_root_reg_HIO_c() {}
+    virtual ~dEvM_root_reg_HIO_c() {}
 
     dEvM_reg_HIO_c mReg[100];
     dEvDb_flag_base_c* mFlagTables;
@@ -135,7 +137,7 @@ STATIC_ASSERT(sizeof(dEvM_root_reg_HIO_c) == 0x4B8);
 
 struct dEvM_HIO_c : public JORReflexible {
     dEvM_HIO_c();
-    ~dEvM_HIO_c() {}
+    virtual ~dEvM_HIO_c() {}
 
     /* 0x004 */ s8 field_0x004;
     /* 0x005 */ u8 m_EVdata_output;
diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h
index 38808c21a5..ce5b3f1d20 100644
--- a/include/d/d_file_select.h
+++ b/include/d/d_file_select.h
@@ -125,6 +125,9 @@ public:
     /* 0x000D */ u8 field_0x000d;
     /* 0x000E */ u8 field_0x000e[2];
     /* 0x0010 */ float field_0x0010[3];
+#if VERSION == VERSION_GCN_PAL
+    u8 temp_padding[0x1D];
+#endif
     /* 0x001C */ u8 field_0x001c;
     /* 0x001D */ u8 field_0x001d;
     /* 0x001E */ u8 field_0x001e;
diff --git a/include/d/d_shop_system.h b/include/d/d_shop_system.h
index 049e0744ec..bc941e26d5 100644
--- a/include/d/d_shop_system.h
+++ b/include/d/d_shop_system.h
@@ -111,8 +111,6 @@ public:
     /* 8019AB84 */ bool checkRightTrigger(STControl*);
     /* 8019ABA8 */ bool dpdMove();
 
-    void dummyWeakOrder();  // fake, used to fix weak function order in d_shop_system.cpp
-
     /* 801974E4 */ virtual ~dShopSystem_c();
     /* 8019ACF0 */ virtual bool getResName2(int) { return false; }
     /* 8019ACE0 */ virtual int beforeStartSeqAction(dMsgFlow_c*, int) { return 1; }