Various regalloc fixes and linking (#2673)

* some d_a_b TUs matching

* reworked d_a_b_ob enums

* d_a_b_oh seems to be linking fine

* d_a_b_oh actually not good (i think), but npc_zrc matching

* d_a_b_oh is indeed matching!

* d_a_cam_param linked

---------

Co-authored-by: hatal175 <hatal175@users.noreply.github.com>

10 files changed, 28 insertions, 108 deletions

diff --git a/include/d/actor/d_a_b_bq.h b/include/d/actor/d_a_b_bq.h
index 6eea070ba7..40aa09fe7b 100644
--- a/include/d/actor/d_a_b_bq.h
+++ b/include/d/actor/d_a_b_bq.h
@@ -13,7 +13,8 @@
  *
  * @details Forest Temple dungeon boss.
  *
- */
+*/
+
 class b_bq_class : public fopEn_enemy_c {
 public:
     /* 805B9B3C */ b_bq_class();
@@ -120,15 +121,4 @@ public:
 
 STATIC_ASSERT(sizeof(b_bq_class) == 0x13A0);
 
-class daB_BQ_HIO_c {
-public:
-    /* 805B356C */ daB_BQ_HIO_c();
-    /* 805B9FFC */ virtual ~daB_BQ_HIO_c() {}
-
-    /* 0x04 */ s8 field_0x4;
-    /* 0x08 */ f32 mModelSize;
-    /* 0x0C */ s16 mChanceTime;
-    /* 0x0E */ s16 mWaterSprayTime;
-};
-
 #endif /* D_A_B_BQ_H */
diff --git a/include/d/actor/d_a_b_gm.h b/include/d/actor/d_a_b_gm.h
index df65157daf..f153541772 100644
--- a/include/d/actor/d_a_b_gm.h
+++ b/include/d/actor/d_a_b_gm.h
@@ -114,34 +114,4 @@ public:
 
 STATIC_ASSERT(sizeof(b_gm_class) == 0x1d08);
 
-class daB_GM_HIO_c {
-public:
-    /* 805ED94C */ daB_GM_HIO_c();
-    /* 805F3E64 */ virtual ~daB_GM_HIO_c() {}
-
-    /* 0x04 */ s8 field_0x4;
-    /* 0x08 */ f32 model_size;
-    /* 0x0C */ f32 check_size;
-    /* 0x10 */ f32 dash_speed;
-    /* 0x14 */ f32 dash_anm_speed;
-    /* 0x18 */ f32 move_speed;
-    /* 0x1C */ f32 move_anm_speed;
-    /* 0x20 */ f32 wait_anm_speed;
-    /* 0x24 */ f32 range;
-    /* 0x28 */ s16 smoke_prim_R;
-    /* 0x2A */ s16 smoke_prim_G;
-    /* 0x2C */ s16 smoke_prim_B;
-    /* 0x2E */ s16 smoke_env_R;
-    /* 0x30 */ s16 smoke_env_G;
-    /* 0x32 */ s16 smoke_env_B;
-    /* 0x34 */ s16 smoke_alpha;
-    /* 0x36 */ s16 field_0x36;
-    /* 0x38 */ f32 smoke_blend;
-    /* 0x3C */ f32 bend_degree_1;
-    /* 0x40 */ f32 bend_degree_2;
-    /* 0x44 */ f32 bend_degree_3;
-    /* 0x48 */ u8 foot_pos_check;
-    /* 0x49 */ u8 eye_check;
-};
-
 #endif /* D_A_B_GM_H */
diff --git a/include/d/actor/d_a_b_ob.h b/include/d/actor/d_a_b_ob.h
index 9393333f2a..dbca8c5f35 100644
--- a/include/d/actor/d_a_b_ob.h
+++ b/include/d/actor/d_a_b_ob.h
@@ -23,22 +23,6 @@ enum b_ob_action {
     OB_ACTION_FISH_END,
 };
 
-enum b_oh_anm {
-    OB_ANM_APPEAR = 0x12,
-    OB_ANM_APPEAR_2,
-    OB_ANM_DEAD,
-    OB_ANM_EAT,
-    OB_ANM_EAT_2,
-    OB_ANM_LAST_DAMAGE,
-    OB_ANM_OPEN_MOUTH,
-    OB_ANM_OPEN_MOUTH_WAIT,
-    OB_ANM_SWALLOW,
-    OB_ANM_SWIM_WAIT,
-    OB_ANM_TENTACLE_END,
-    OB_ANM_THROWUP,
-    OB_ANM_WAIT,
-};
-
 struct ob_part_s {
     /* 0x00 */ mDoExt_McaMorf* mpMorf;
     /* 0x04 */ mDoExt_McaMorf* mpFinMorf;
@@ -70,7 +54,8 @@ struct ob_ke_s {
  *
  * @details Lakebed Temple dungeon boss. This is the core/body part of the boss.
  *
- */
+*/
+
 class b_ob_class : public fopEn_enemy_c {
 public:
     /* 0x05AC */ request_of_phase_process_class mPhase;
@@ -191,21 +176,4 @@ public:
 
 STATIC_ASSERT(sizeof(b_ob_class) == 0x5DE4);
 
-class daB_OB_HIO_c {
-public:
-public:
-    /* 8061056C */ daB_OB_HIO_c();
-    /* 8061A808 */ virtual ~daB_OB_HIO_c() {}
-
-    /* 0x04 */ s8 field_0x04;
-    /* 0x08 */ f32 mCoreSize;
-    /* 0x0C */ f32 mCoreMoveSpeed;
-    /* 0x10 */ f32 mBodySize;
-    /* 0x14 */ s16 mLightR;
-    /* 0x16 */ s16 mLightG;
-    /* 0x18 */ s16 mLightB;
-    /* 0x1C */ f32 mRange;
-};
-
-
 #endif /* D_A_B_OB_H */
diff --git a/include/d/actor/d_a_b_oh.h b/include/d/actor/d_a_b_oh.h
index 8a27c88f32..61e5221057 100644
--- a/include/d/actor/d_a_b_oh.h
+++ b/include/d/actor/d_a_b_oh.h
@@ -6,16 +6,6 @@
 #include "d/d_cc_d.h"
 #include "d/d_cc_uty.h"
 
-class daB_OH_HIO_c {
-public:
-    /* 8061B72C */ daB_OH_HIO_c();
-    /* 8061D93C */ virtual ~daB_OH_HIO_c() {}  // supposed to be inlined
-
-    /* 0x4 */ s8 field_0x4;
-    /* 0x8 */ f32 mModelSize;
-    /* 0xC */ f32 mLength;
-};
-
 enum b_oh_action {
     OH_ACTION_START,
     OH_ACTION_WAIT,
@@ -32,7 +22,8 @@ enum b_oh_action {
  *
  * @details Lakebed Temple dungeon boss. This is the head part of the boss.
  *
- */
+*/
+
 class b_oh_class : public fopEn_enemy_c {
 public:
     /* 0x05AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_npc_zra.h b/include/d/actor/d_a_npc_zra.h
index e27177f632..9b93e9bbee 100644
--- a/include/d/actor/d_a_npc_zra.h
+++ b/include/d/actor/d_a_npc_zra.h
@@ -11,7 +11,8 @@ class daNpc_zrA_HIO_c;
  *
  * @details
  *
- */
+*/
+
 class daNpc_zrA_Path_c : public daNpcF_Path_c {
 public:
     /* 80B7850C */ BOOL getDstPosDst2(cXyz, cXyz&);
diff --git a/include/d/actor/d_a_obj_carry.h b/include/d/actor/d_a_obj_carry.h
index 933c541d11..3caa64950d 100644
--- a/include/d/actor/d_a_obj_carry.h
+++ b/include/d/actor/d_a_obj_carry.h
@@ -257,7 +257,7 @@ public:
     /* 80479664 */ int CreateInitCall();
 
     s32 getType() { return mType; }
-    u32 getSwbit() { return fopAcM_GetParamBit(this, 6, 8); }
+    u8 getSwbit() { return fopAcM_GetParamBit(this, 6, 8); }
     u32 getSwbit2() { return fopAcM_GetParamBit(this, 14, 8); }
     s8 getRoomNo() { return fopAcM_GetParamBit(this, 0, 6); }
 
@@ -361,7 +361,7 @@ public:
     /* 0xDAA */ u8 field_0xdaa;
     /* 0xDAB */ u8 field_0xdab;
     /* 0xDAC */ bool field_0xdac;
-    /* 0xDAD */ u8 field_0xdad;
+    /* 0xDAD */ bool field_0xdad;
     /* 0xDAE */ u8 field_0xdae;
     /* 0xDAF */ u8 field_0xdaf;
     /* 0xDB0 */ u8 field_0xdb0;
diff --git a/include/d/actor/d_a_obj_gra2.h b/include/d/actor/d_a_obj_gra2.h
index d95df1d661..634a2fc368 100644
--- a/include/d/actor/d_a_obj_gra2.h
+++ b/include/d/actor/d_a_obj_gra2.h
@@ -92,9 +92,6 @@ public:
 
     class daObj_GrA_prtclMngr_c {
     public:
-        /* 80C04E14 */ ~daObj_GrA_prtclMngr_c() {}
-        /* 80C04E50 */ daObj_GrA_prtclMngr_c() {}
-
         /* 0x00 */ bool field_0x0;
         /* 0x04 */ cXyz field_0x4;
         /* 0x10 */ csXyz field_0x10;
diff --git a/include/d/actor/d_a_obj_master_sword.h b/include/d/actor/d_a_obj_master_sword.h
index 26158795d0..75eeb0eeea 100644
--- a/include/d/actor/d_a_obj_master_sword.h
+++ b/include/d/actor/d_a_obj_master_sword.h
@@ -18,7 +18,8 @@ struct daObjMasterSword_Attr_c {
  *
  * @details
  *
- */
+*/
+
 class daObjMasterSword_c : public fopAc_ac_c {
 public:
     enum Mode_e {
diff --git a/include/d/actor/d_a_obj_tks.h b/include/d/actor/d_a_obj_tks.h
index 559d698677..7d6973c832 100644
--- a/include/d/actor/d_a_obj_tks.h
+++ b/include/d/actor/d_a_obj_tks.h
@@ -27,7 +27,8 @@ public:
  *
  * @details
  *
- */
+*/
+
 class daObjTks_c : public daNpcF_c {
 public:
     /* 80D0F28C */ daObjTks_c();
@@ -49,18 +50,18 @@ public:
     /* 80D11228 */ void warp();
     /* 80D11CB4 */ inline void lookat();
 
-    /* 80D11670 */ virtual void setParam();
-    /* 80D116C8 */ virtual BOOL main();
-    /* 80D118E8 */ virtual BOOL ctrlBtk();
-    /* 80D10100 */ virtual void setMtx();
-    /* 80D119BC */ virtual void setAttnPos();
-    /* 80D10184 */ virtual bool setExpressionAnm(int, bool);
-    /* 80D102D0 */ virtual bool setExpressionBtp(int);
-    /* 80D106C8 */ virtual void setExpression(int, f32);
-    /* 80D11104 */ virtual void setMotionAnm(int, f32);
-    /* 80D103A4 */ virtual void setMotion(int, f32, int);
-    /* 80D11E94 */ virtual BOOL drawDbgInfo();
-    /* 80D11E9C */ virtual void drawOtherMdls();
+    /* 80D11670 */ virtual inline void setParam();
+    /* 80D116C8 */ virtual inline BOOL main();
+    /* 80D118E8 */ virtual inline BOOL ctrlBtk();
+    /* 80D10100 */ virtual inline void setMtx();
+    /* 80D119BC */ virtual inline void setAttnPos();
+    /* 80D10184 */ virtual inline bool setExpressionAnm(int, bool);
+    /* 80D102D0 */ virtual inline bool setExpressionBtp(int);
+    /* 80D106C8 */ virtual inline void setExpression(int, f32);
+    /* 80D11104 */ virtual inline void setMotionAnm(int, f32);
+    /* 80D103A4 */ virtual inline void setMotion(int, f32, int);
+    /* 80D11E94 */ virtual inline BOOL drawDbgInfo();
+    /* 80D11E9C */ virtual inline void drawOtherMdls();
 
     void calcSpringF(f32* param_0, f32 param_1, f32* param_2) {
         *param_2 = daObjTks_Param_c::m.spring_atten * (*param_2 + (daObjTks_Param_c::m.spring_factor * (*param_0 - param_1)));
diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h
index 200b58ec4e..a76449beb3 100644
--- a/include/d/actor/d_a_obj_waterPillar.h
+++ b/include/d/actor/d_a_obj_waterPillar.h
@@ -13,7 +13,8 @@
  *
  * @details Water columns that can carry broken stalactites (see d_a_obj_syrock)
  *
- */
+*/
+
 class daWtPillar_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
     daWtPillar_c();