Misc obj linkage (#2773)

6 files changed, 12 insertions, 50 deletions

diff --git a/include/d/actor/d_a_e_yd.h b/include/d/actor/d_a_e_yd.h
index f12d3dc3bb..188e435ba5 100644
--- a/include/d/actor/d_a_e_yd.h
+++ b/include/d/actor/d_a_e_yd.h
@@ -78,21 +78,5 @@ public:
 
 STATIC_ASSERT(sizeof(e_yd_class) == 0x126c);
 
-class daE_YD_HIO_c {
-public:
-    daE_YD_HIO_c();
-    virtual ~daE_YD_HIO_c() {}
-
-    /* 0x4 */ s8 field_0x4;
-    /* 0x8 */ f32 field_0x8;
-    /* 0xC */ f32 field_0xc;
-    /* 0x10 */ f32 field_0x10;
-    /* 0x14 */ s16 field_0x14;
-    /* 0x16 */ s16 field_0x16;
-    /* 0x18 */ u8 field_0x18;
-};
-
-STATIC_ASSERT(sizeof(daE_YD_HIO_c) == 0x1c);
-
 
 #endif /* D_A_E_YD_H */
diff --git a/include/d/actor/d_a_obj_flag3.h b/include/d/actor/d_a_obj_flag3.h
index f3e70d3d0f..0cace182d5 100644
--- a/include/d/actor/d_a_obj_flag3.h
+++ b/include/d/actor/d_a_obj_flag3.h
@@ -16,10 +16,10 @@ class FlagCloth2_c : public J3DPacket {
 public:
     /* 80BEEDE4 */ void execute();
     /* 80BEEF74 */ inline void calcFlagNormal(cXyz*, int);
-    static void initCcSphere(fopAc_ac_c*);
+    inline static void initCcSphere(fopAc_ac_c*);
     /* 80BEF278 */ inline cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
     /* 80BEF790 */ virtual ~FlagCloth2_c();
-    /* 80BEFD08 */ void initFlagPos(cXyz*, fopAc_ac_c*);
+    /* 80BEFD08 */ inline void initFlagPos(cXyz*, fopAc_ac_c*);
     /* 80BF00A0 */ virtual void draw();
     /* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }
 
@@ -89,7 +89,7 @@ public:
     /* 80BEED3C */ int execute();
     /* 80BEF700 */ ~daObjFlag3_c();
     /* 80BEF95C */ int create();
-    /* 80BEFBC4 */ void create_init();
+    /* 80BEFBC4 */ inline void create_init();
     inline int draw();
     inline void initBaseMtx();
 
diff --git a/include/d/actor/d_a_obj_lv6ChangeGate.h b/include/d/actor/d_a_obj_lv6ChangeGate.h
index f9a2986cc9..ee1d081fbc 100644
--- a/include/d/actor/d_a_obj_lv6ChangeGate.h
+++ b/include/d/actor/d_a_obj_lv6ChangeGate.h
@@ -62,17 +62,5 @@ public:
 
 STATIC_ASSERT(sizeof(daLv6ChangeGate_c) == 0x14dc);
 
-class daLv6ChangeGate_HIO_c : public fOpAcm_HIO_entry_c {
-public:
-    /* 80C70C4C */ daLv6ChangeGate_HIO_c();
-    /* 80C71EE8 */ virtual ~daLv6ChangeGate_HIO_c() {}
-
-    void genMessage(JORMContext*);
-
-    /* 0x4 */ f32 speed;
-    /* 0x8 */ f32 move_amount;
-    /* 0xC */ u8 unk_0xc;
-};
-
 
 #endif /* D_A_OBJ_LV6CHANGEGATE_H */
diff --git a/include/d/actor/d_a_obj_master_sword.h b/include/d/actor/d_a_obj_master_sword.h
index 75eeb0eeea..a8c54f4939 100644
--- a/include/d/actor/d_a_obj_master_sword.h
+++ b/include/d/actor/d_a_obj_master_sword.h
@@ -31,7 +31,7 @@ public:
     /* 80C90C50 */ static int createHeapCallBack(fopAc_ac_c* i_this);
     /* 80C90C70 */ int CreateHeap();
     /* 80C90DB8 */ int create();
-    /* 80C90F6C */ void create_init();
+    /* 80C90F6C */ inline void create_init();
     /* 80C91448 */ ~daObjMasterSword_c();
     /* 80C91714 */ int draw();
 
diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h
index a76449beb3..52849dbc57 100644
--- a/include/d/actor/d_a_obj_waterPillar.h
+++ b/include/d/actor/d_a_obj_waterPillar.h
@@ -17,8 +17,8 @@
 
 class daWtPillar_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
-    daWtPillar_c();
-    ~daWtPillar_c();
+    daWtPillar_c() : dEvLib_callback_c(this) {}
+    ~daWtPillar_c() {}
 
     /* 80D2C7B0 */ void setBaseMtx();
     /* 80D2C838 */ static int createHeapCallBack(fopAc_ac_c*);
@@ -84,10 +84,9 @@ private:
     /* 0x7DC */ dCcD_Stts mStts;
     /* 0x818 */ dCcD_Cps mCapsuleCollider;
     /* 0x95C */ dCcD_Cyl mCylinderCollider;
-    /* 0xA98 */ u8 pad0[0x3C];
-    /* 0xAD4 */ f32 mScaleX;    // Modified but never read; unused?
-    /* 0xAD8 */ u8 pad1[0x4];
-    /* 0xADC */ f32 mScaleZ;    // Modified but never read; unused?
+    /* 0xA98 */ u8 pad0[0x30];
+    /* 0xAC8 */ cXyz field_0xAC8;   // unused.
+    /* 0xAD4 */ cXyz mScale;    // Modified but never read; unused?
     /* 0xAE0 */ f32 mCurrentHeight;
     /* 0xAE4 */ cM3dGCpsS mCapsuleSource;
     /* 0xB00 */ u8 mAction;
diff --git a/include/d/actor/d_a_passer_mng.h b/include/d/actor/d_a_passer_mng.h
index 38b59ef857..706fd41de4 100644
--- a/include/d/actor/d_a_passer_mng.h
+++ b/include/d/actor/d_a_passer_mng.h
@@ -32,17 +32,11 @@ public:
     u8 getGroupNo() { return (shape_angle.x >> 8) & 0xff; }
 
     int getTimeHour() {
-        if (dKy_darkworld_check()) {
-            return dKy_getDarktime_hour();
-        } 
-        return dKy_getdaytime_hour();
+        return (dKy_darkworld_check()) ? dKy_getDarktime_hour() : dKy_getdaytime_hour();
     }
 
     int getTimeMinute() {
-        if (dKy_darkworld_check()) {
-            return dKy_getDarktime_minute();
-        } 
-        return dKy_getdaytime_minute();
+        return (dKy_darkworld_check()) ? dKy_getDarktime_minute() : dKy_getdaytime_minute();
     }
 
     int getTime() {
@@ -50,10 +44,7 @@ public:
     }
 
     int getDayOfWeek() {
-        if (dKy_darkworld_check()) {
-            return dKy_getDarktime_week();
-        }
-        return dKy_get_dayofweek();
+        return (dKy_darkworld_check()) ? dKy_getDarktime_week() : dKy_get_dayofweek();
     }
 
     int getChildNum() {