Improve various partially matched TUs (#2526)

6 files changed, 13 insertions, 12 deletions

diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h
index 43ae9226c2..6317065a31 100644
--- a/include/SSystem/SComponent/c_m3d_g_aab.h
+++ b/include/SSystem/SComponent/c_m3d_g_aab.h
@@ -26,9 +26,9 @@ public:
     void CalcCenter(cXyz*) const;
     void PlusR(f32);
     const cXyz* GetMaxP(void) const { return &mMax; }
-    const cXyz* GetMaxP(void) { return &mMax; }
+    cXyz* GetMaxP(void) { return &mMax; }
     const cXyz* GetMinP(void) const { return &mMin; }
-    const cXyz* GetMinP(void) { return &mMin; }
+    cXyz* GetMinP(void) { return &mMin; }
     const f32 GetMaxX(void) const { return mMax.x; }
     const f32 GetMaxY(void) const { return mMax.y; }
     const f32 GetMaxZ(void) const { return mMax.z; }
diff --git a/include/d/actor/d_a_obj_hbombkoya.h b/include/d/actor/d_a_obj_hbombkoya.h
index 6671e53276..6303b6d0a2 100644
--- a/include/d/actor/d_a_obj_hbombkoya.h
+++ b/include/d/actor/d_a_obj_hbombkoya.h
@@ -28,7 +28,7 @@ public:
 
     /* 80C1B878 */ int create1st();
     /* 80C1BB7C */ bool setParticle(u16*, int, PSetTbl*, int, int);
-    /* 80C1C474 */ virtual ~daObjHBombkoya_c();
+    /* 80C1C474 */ virtual ~daObjHBombkoya_c() {}
 
     /* 80C1B938 */ virtual int CreateHeap();
     /* 80C1B9CC */ virtual int Create();
diff --git a/include/d/actor/d_a_obj_ice_s.h b/include/d/actor/d_a_obj_ice_s.h
index c51e5dbd2a..fe816df2aa 100644
--- a/include/d/actor/d_a_obj_ice_s.h
+++ b/include/d/actor/d_a_obj_ice_s.h
@@ -60,7 +60,7 @@ STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644);
 class daOBJ_ICE_S_HIO_c {
 public:
     /* 80C209AC */ daOBJ_ICE_S_HIO_c();
-    /* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c();
+    /* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 field_0x8;
diff --git a/include/d/actor/d_a_obj_lp.h b/include/d/actor/d_a_obj_lp.h
index dcba5ac809..69657755ca 100644
--- a/include/d/actor/d_a_obj_lp.h
+++ b/include/d/actor/d_a_obj_lp.h
@@ -14,8 +14,8 @@
  
 struct wd_ss {
 public:
-    /* 80C559C8 */ ~wd_ss() {};
-    /* 80C55A04 */ wd_ss() {};
+    /* 80C559C8 */ ~wd_ss() {}
+    /* 80C55A04 */ wd_ss() {}
     
     /* 0x00 */ J3DModel* mpModel;
     /* 0x04 */ cXyz field_0x4;
@@ -31,15 +31,16 @@ public:
     /* 0x42 */ s16 field_0x42;
     /* 0x44 */ s16 field_0x44;
     /* 0x46 */ u8 field_0x46[0x4e - 0x46];
-    /* 0x4E */ u8 field_0x4e;
+    /* 0x4E */ s8 field_0x4e;
     /* 0x4F */ u8 field_0x4f;
     /* 0x50 */ int field_0x50;
 };
 
 STATIC_ASSERT(sizeof(wd_ss) == 0x54);
 
-class obj_lp_class : public fopAc_ac_c {
+class obj_lp_class {
 public:
+    /* 0x0000 */ fopAc_ac_c mActor;
     /* 0x0568 */ request_of_phase_process_class mPhase;
     /* 0x0570 */ u8 field_0x570;
     /* 0x0571 */ u8 field_0x571;
diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h
index de15710694..b7cdb98686 100644
--- a/include/d/actor/d_a_obj_lv4CandleDemoTag.h
+++ b/include/d/actor/d_a_obj_lv4CandleDemoTag.h
@@ -15,6 +15,7 @@
  */
 class dalv4CandleDemoTag_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
+    typedef void (dalv4CandleDemoTag_c::*procFunc)();
     dalv4CandleDemoTag_c() : dEvLib_callback_c(this) {}
 
     /* 80C5CA58 */ void setBaseMtx();
@@ -39,7 +40,7 @@ public:
     int getSwOK() { return shape_angle.x & 0xFF; }
     int getEventID() { return fopAcM_GetParamBit(this, 0x18, 8); }
 
-    /* 80C5D184 */ virtual ~dalv4CandleDemoTag_c();
+    /* 80C5D184 */ virtual ~dalv4CandleDemoTag_c() {}
     /* 80C5CF78 */ virtual bool eventStart();
 
 private:
@@ -56,7 +57,7 @@ STATIC_ASSERT(sizeof(dalv4CandleDemoTag_c) == 0x590);
 class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c {
 public:
     /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c();
-    /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c();
+    /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_rfHole.h b/include/d/actor/d_a_obj_rfHole.h
index 0bbdbb2dba..e195931d9d 100644
--- a/include/d/actor/d_a_obj_rfHole.h
+++ b/include/d/actor/d_a_obj_rfHole.h
@@ -28,7 +28,7 @@ public:
     /* 80CB8FF8 */ int create();
     /* 80CB9148 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
     /* 80CB9194 */ int playerAreaCheck();
-    /* 80CB940C */ int Execute(f32 (**)[3][4]);
+    /* 80CB940C */ int Execute(Mtx**);
     /* 80CB9464 */ void holeProc();
     /* 80CB9520 */ void init_modeWait();
     /* 80CB952C */ void modeWait();
@@ -50,7 +50,6 @@ private:
     /* 0x5AE */ u8 field_0x5ae;
     /* 0x5AF */ u8 field_0x5af;
     /* 0x5B0 */ s8 mRoofSoundOn;
-    /* 0x5B1 */ u8 field_0x5b1[0x5b4 - 0x5b1];
 };
 
 STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4);