d_a_obj_beamos / d_a_e_wb WIP (#2620)

* WIP

* daE_WB_Draw

* checkpoint

* more matches

* checkpoint

* fixes

* fix debug build

* fix daObjBm_c alignment

* fixes for luz

* fixes for hatal

* manual spacing changes

* run clang-format

* move header back

23 files changed, 211 insertions, 58 deletions

diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h
index 1b868992ae..4be03ad5ed 100644
--- a/include/d/actor/d_a_alink.h
+++ b/include/d/actor/d_a_alink.h
@@ -3639,6 +3639,9 @@ public:
     BOOL checkCanoeRideOwn(const fopAc_ac_c* param_0) const {
         return checkCanoeRide() && mRideAcKeep.getActorConst() == param_0;
     }
+    BOOL checkBoarRideOwn(const fopAc_ac_c* i_actorP) const { 
+        return checkBoarRide() && mRideAcKeep.getActorConst() == i_actorP;
+    }
     bool checkWolfDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); }
     bool checkWolfLieWaterIn() const { return mWaterY > current.pos.y + 20.5f; }
 
diff --git a/include/d/actor/d_a_b_gg.h b/include/d/actor/d_a_b_gg.h
index a269e6a323..6c35f5dd09 100644
--- a/include/d/actor/d_a_b_gg.h
+++ b/include/d/actor/d_a_b_gg.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-enemies
  * @class daB_GG_c
- * @brief Aeralfos
+ * @brief Aeralfos (Gargoyle)
  *
  * @details City in the Sky dungeon mini-boss.
  *
diff --git a/include/d/actor/d_a_e_bs.h b/include/d/actor/d_a_e_bs.h
index 7ed03eea64..6a6d5d65d9 100644
--- a/include/d/actor/d_a_e_bs.h
+++ b/include/d/actor/d_a_e_bs.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-enemies
  * @class e_bs_class
- * @brief Stalkin
+ * @brief Stalkin (Baby Stal)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_e_cr.h b/include/d/actor/d_a_e_cr.h
index f55a374655..85966add62 100644
--- a/include/d/actor/d_a_e_cr.h
+++ b/include/d/actor/d_a_e_cr.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-enemies
  * @class e_cr_class
- * @brief Bombskit
+ * @brief Bombskit (Crazy Runner)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_e_fm.h b/include/d/actor/d_a_e_fm.h
index 9a2ed1ee61..e4d949ff1c 100644
--- a/include/d/actor/d_a_e_fm.h
+++ b/include/d/actor/d_a_e_fm.h
@@ -38,7 +38,7 @@ struct chain_s {
 /**
  * @ingroup actors-enemies
  * @class e_fm_class
- * @brief Fyrus
+ * @brief Fyrus (Fire Man)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_e_gob.h b/include/d/actor/d_a_e_gob.h
index ff71e3cd4e..04b8137cd4 100644
--- a/include/d/actor/d_a_e_gob.h
+++ b/include/d/actor/d_a_e_gob.h
@@ -10,7 +10,7 @@
 /**
  * @ingroup actors-enemies
  * @class e_gob_class
- * @brief Dangoro
+ * @brief Dangoro (Goron Boss)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_e_is.h b/include/d/actor/d_a_e_is.h
index 24856c99a7..e82e6ef2fe 100644
--- a/include/d/actor/d_a_e_is.h
+++ b/include/d/actor/d_a_e_is.h
@@ -9,9 +9,10 @@
 /**
  * @ingroup actors-enemies
  * @class e_is_class
- * @brief Armos Titan
+ * @brief Armos Titan (Idelia Statue)
  * 
- * @details Armos Titans are enemies from early, unreleased versions of the game.
+ * @details Armos Titans are enemies from early, unreleased versions of the game. 
+ * The name Idelia Statue seems like it might be a reference to the anime Powered Armor Dorvack.
  * 
  */
 class e_is_class {
diff --git a/include/d/actor/d_a_e_kk.h b/include/d/actor/d_a_e_kk.h
index 350bf1e371..3b52ffac90 100644
--- a/include/d/actor/d_a_e_kk.h
+++ b/include/d/actor/d_a_e_kk.h
@@ -11,7 +11,7 @@
 /**
  * @ingroup actors-enemies
  * @class daE_KK_c
- * @brief Chilfos
+ * @brief Chilfos (Koori no Kenshi)
  *
  * @details Enemy - Ice Knight
  *
diff --git a/include/d/actor/d_a_e_mb.h b/include/d/actor/d_a_e_mb.h
index d72eef47a2..a26282caab 100644
--- a/include/d/actor/d_a_e_mb.h
+++ b/include/d/actor/d_a_e_mb.h
@@ -8,7 +8,7 @@
 /**
  * @ingroup actors-enemies
  * @class e_mb_class
- * @brief Ook (Diababa Fight)
+ * @brief Ook - Diababa Fight (Monkey Boomerang)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_e_rb.h b/include/d/actor/d_a_e_rb.h
index 8845e99567..8b1a3208bb 100644
--- a/include/d/actor/d_a_e_rb.h
+++ b/include/d/actor/d_a_e_rb.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-enemies
  * @class e_rb_class
- * @brief Leever
+ * @brief Leever (Riiba)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_e_rd.h b/include/d/actor/d_a_e_rd.h
index 4c76cdb026..d289c5f225 100644
--- a/include/d/actor/d_a_e_rd.h
+++ b/include/d/actor/d_a_e_rd.h
@@ -172,7 +172,7 @@ public:
     /* 0x1297 */ s8 field_0x1297;
     /* 0x1298 */ s8 field_0x1298;
     /* 0x1299 */ u8 field_0x1299;
-    /* 0x129A */ s8 field_0x129a;
+    /* 0x129A */ s8 mBossMode; // 1: Eldin Field, 2 Eldin Bridge, 3 Lake Hylia Bridge, 4 ???
     /* 0x129B */ u8 field_0x129b;
     /* 0x129C */ s8 field_0x129c;
     /* 0x12A0 */ int field_0x12a0;
diff --git a/include/d/actor/d_a_e_th.h b/include/d/actor/d_a_e_th.h
index 4fc7628753..a0ca9fb8ac 100644
--- a/include/d/actor/d_a_e_th.h
+++ b/include/d/actor/d_a_e_th.h
@@ -17,7 +17,7 @@ struct th_ke_s {
 /**
  * @ingroup actors-enemies
  * @class e_th_class
- * @brief Darkhammer
+ * @brief Darkhammer (Tekkyuuhei)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_e_wb.h b/include/d/actor/d_a_e_wb.h
index 56e15385e8..b903127a77 100644
--- a/include/d/actor/d_a_e_wb.h
+++ b/include/d/actor/d_a_e_wb.h
@@ -6,17 +6,68 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_cc_uty.h"
 
-enum daE_wb_ACT {
+// copypasta, fix when actual names known
+enum daE_WB_ANM {
+    ANM_APPEAR = 7,
+    ANM_ATTACK,
+    ANM_ATTACK_A,
+    ANM_ATTACK_B,
+    ANM_ATTACK_C,
+    ANM_BOMB_DAMAGE,
+    ANM_CORE_DAMAGE,
+    ANM_DAMAGE_WAIT,
+    ANM_DEAD,
+    ANM_LOOK_M,
+    ANM_NO_DAMAGE,
+    ANM_RETURN_01,
+    ANM_RETURN_02,
+    ANM_RUNAWAY,
+    ANM_TEST_MOTION,
+    ANM_TODOME,
+    ANM_WAIT_01,
+};
+
+enum daE_WB_ACT {
     /* 0x00 */ ACT_WAIT,
+    /* 0x01 */ ACT_WAIT2,
+    /* 0x04 */ ACT_RIDE = 0x04,
+    /* 0x05 */ ACT_F_WAIT,
+    /* 0x06 */ ACT_C_F_RUN,
+    /* 0x07 */ ACT_A_RUN,
+    /* 0x08 */ ACT_B_WAIT,
+    /* 0x09 */ ACT_B_WAIT2,
+    /* 0x0A */ ACT_B_RUN,
+    /* 0x0B */ ACT_B_RUN2,
+    /* 0x0F */ ACT_B_IKKI = 0x0F,
+    /* 0x10 */ ACT_B_IKKI_END,
+    /* 0x11 */ ACT_B_IKKI2,
+    /* 0x12 */ ACT_B_IKKI2_END,
+    /* 0x13 */ ACT_B_LV9_END,
     /* 0x15 */ ACT_S_DAMAGE = 0x15,
+    /* 0x16 */ ACT_DAMAGE,
+    /* 0x17 */ ACT_BG_DAMAGE,
+    /* 0x18 */ ACT_LR_DAMAGE,
+    /* 0x1E */ ACT_KIBA_START = 0x1E,
+    /* 0x1F */ ACT_KIBA_END,
+    /* 0x32 */ ACT_EVENT = 0x32,
     /* 0x65 */ ACT_PL_RIDE = 0x65,
-    /* 0x67 */ ACT_PL_RIDE_NOW = 0x67,
+    /* 0x66 */ ACT_PL_RIDE2,
+    /* 0x67 */ ACT_PL_RIDE_NOW,
+    /* 0x6E */ ACT_CRV_WAIT = 0x6E,
 };
 
+struct himo_s {
+    /* 807E1CCC */ ~himo_s();
+    /* 807E1D2C */ himo_s();
+
+    /* 0x0 */ cXyz field_0x0[16];
+};
+
+
 /**
  * @ingroup actors-enemies
  * @class e_wb_class
- * @brief Bullbo
+ * @brief Bullbo (Wild Boar)
  * 
  * @details 
  * 
@@ -49,19 +100,19 @@ public:
 
 public:
     /* 0x05AC */ request_of_phase_process_class mPhase;
-    /* 0x05B4 */ s16 field_0x5b4;
+    /* 0x05B4 */ s16 mActionMode;
     /* 0x05B8 */ char* mResName;
-    /* 0x05BC */ u8 field_0x5bc;
-    /* 0x05BD */ u8 field_0x5bd;
+    /* 0x05BC */ u8 mParam;
+    /* 0x05BD */ u8 mParam2;
     /* 0x05BE */ u8 field_0x5be;
     /* 0x05BF */ bool field_0x5bf;
     /* 0x05C0 */ u8 field_0x5c0;
     /* 0x05C4 */ cXyz field_0x5c4;
     /* 0x05D0 */ cXyz field_0x5d0;
-    /* 0x05DC */ s16 field_0x5dc;
+    /* 0x05DC */ s16 mAngleTarget;
     /* 0x05DE */ s16 field_0x5de;
     /* 0x05E0 */ mDoExt_McaMorfSO* mpModelMorf;
-    /* 0x05E4 */ f32 field_0x5e4;
+    /* 0x05E4 */ f32 mPlaySpeed;
     /* 0x05E8 */ int mAnmID;
     /* 0x05EC */ Z2CreatureRide mZ2Ride;
     /* 0x0688 */ int field_0x688;
@@ -69,13 +120,14 @@ public:
     /* 0x068E */ s16 field_0x68e;
     /* 0x0690 */ s16 mActionID;
     /* 0x0692 */ u16 field_0x692;
-    /* 0x0694 */ u32 field_0x694;
-    /* 0x0698 */ s16 field_0x698[4];
+    /* 0x0694 */ int mShadowKey;
+    /* 0x0698 */ s16 field_0x698;
+    /* 0x069A */ s16 field_0x69a;
+    /* 0x069C */ s16 field_0x69c;
+    /* 0x069E */ s16 field_0x69e;
     /* 0x06A0 */ s16 field_0x6a0;
     /* 0x06A2 */ u8 field_0x6a2[0x6ae - 0x6a2];
-    /* 0x06AE */ s16 field_0x6ae;
-    /* 0x06B0 */ s16 field_0x6b0;
-    /* 0x06B2 */ s16 field_0x6b2;
+    /* 0x06AE */ csXyz field_0x6ae;
     /* 0x06B4 */ u8 field_0x6b4[0x6b6 - 0x6b4];
     /* 0x06B6 */ s16 field_0x6b6;
     /* 0x06B8 */ u8 field_0x6b8[0x6ba - 0x6b8];
@@ -84,17 +136,22 @@ public:
     /* 0x06BD */ u8 field_0x6bd;
     /* 0x06BE */ u16 field_0x6be;
     /* 0x06C0 */ s8 field_0x6c0;
-    /* 0x06C4 */ cXyz field_0x6c4;
+    /* 0x06C4 */ f32 field_0x6c4;
+    /* 0x06C8 */ int mBPathIdx;     // The b_path indexer
+    /* 0x06CC */ int mBPathIdxIter; // The amount to change the b_path indexer by
     /* 0x06D0 */ s16 field_0x6d0;
-    /* 0x06D2 */ s16 field_0x6d2;
+    /* 0x06D2 */ s16 mTargetAngleStep;
     /* 0x06D4 */ s16 field_0x6d4;
     /* 0x06D6 */ s16 field_0x6d6;
-    /* 0x06D8 */ u8 field_0x6d8[0x6da - 0x6d8];
+    /* 0x06D8 */ s16 field_0x6d8;
     /* 0x06DA */ s16 field_0x6da;
     /* 0x06DC */ s16 field_0x6dc;
-    /* 0x06DE */ u8 field_0x6de[0x6e4 - 0x6de];
+    /* 0x06DE */ s16 field_0x6de;
+    /* 0x06E0 */ s16 field_0x6e0;
+    /* 0x06E2 */ s16 field_0x6e2;
     /* 0x06E4 */ u8 field_0x6e4;
-    /* 0x06E5 */ u8 field_0x6e5[0x79a - 0x6e5];
+    /* 0x06E5 */ u8 field_0x6e5[0x6ec - 0x6e5];
+    /* 0x06EC */ csXyz field_0x6ec[0x1d];
     /* 0x079A */ s16 field_0x79a;
     /* 0x079C */ u8 field_0x79c;
     /* 0x079D */ s8 field_0x79d;
@@ -107,7 +164,7 @@ public:
     /* 0x07A7 */ s8 field_0x7a7;
     /* 0x07A8 */ f32 field_0x7a8;
     /* 0x07AC */ dBgS_AcchCir field_0x7ac;
-    /* 0x07EC */ dBgS_Acch field_0x7ec;
+    /* 0x07EC */ dBgS_ObjAcch mAcch;
     /* 0x09C4 */ dCcD_Stts field_0x9c4;
     /* 0x0A00 */ dCcD_Sph field_0xa00[7];
     /* 0x1288 */ dCcD_Sph field_0x1288;
@@ -134,15 +191,13 @@ public:
     /* 0x142F */ s8 field_0x142f;
     /* 0x1430 */ s8 field_0x1430;
     /* 0x1432 */ s16 field_0x1432;
-    /* 0x1434 */ fpc_ProcID field_0x1434;  // Some actor ID
-    /* 0x1438 */ cXyz field_0x1438;
-    /* 0x1444 */ cXyz field_0x1444;
-    /* 0x1450 */ u8 field_0x1450[0x15d0 - 0x1450];
-    /* 0x15D0 */ mDoExt_3DlineMat1_c field_0x15d0;
-    /* 0x160C */ mDoExt_3DlineMat1_c field_0x160c;
+    /* 0x1434 */ fpc_ProcID field_0x1434;  // Rider actor ID?
+    /* 0x1438 */ cXyz field_0x1438[2];
+    /* 0x1450 */ himo_s field_0x1450[2];
+    /* 0x15D0 */ mDoExt_3DlineMat1_c field_0x15d0[2];
     /* 0x1648 */ mDoExt_3DlineMat1_c field_0x1648;
     /* 0x1684 */ f32 field_0x1684;
-    /* 0x1688 */ u8 field_0x1688;
+    /* 0x1688 */ s16 field_0x1688;
     /* 0x168A */ u16 field_0x168a;
     /* 0x168C */ f32 field_0x168c;
     /* 0x1690 */ f32 field_0x1690;
@@ -180,15 +235,39 @@ public:
 
 STATIC_ASSERT(sizeof(e_wb_class) == 0x17EC);
 
-struct himo_s {
-    /* 807E1CCC */ ~himo_s();
-    /* 807E1D2C */ himo_s();
-};
-
-class daE_WB_HIO_c {
+class daE_WB_HIO_c : public JORReflexible {
+public:
     /* 807D248C */ daE_WB_HIO_c();
-    /* 807E20DC */ ~daE_WB_HIO_c();
+    /* 807E20DC */ virtual ~daE_WB_HIO_c() {};
+    void genMessage(JORMContext*);
+
+    /* 0x00 */ // vtable
+    /* 0x04 */ s8 field_0x04;
+    /* 0x08 */ f32 mBaseSize;
+    /* 0x0C */ f32 mLeaderSizeRatio;
+    /* 0x10 */ f32 mMovementSpeed;
+    /* 0x14 */ f32 mMaxSpeed;
+    /* 0x18 */ f32 mCalvaryBattleMaxSpeed;
+    /* 0x1C */ f32 mNormalSpeedVi;
+    /* 0x20 */ f32 mMediumSpeedVi;
+    /* 0x24 */ f32 mMaxSpeedVi;
+    /* 0x28 */ f32 mLeaderWalkingSpeed;
+    /* 0x2C */ f32 mLeaderMaxSpeed;
+    /* 0x30 */ f32 mLeaderCalvaryBattleMaxSpeed;
+    /* 0x34 */ f32 mSingleRiderSpeed;
+    /* 0x38 */ f32 mPlayerRecognitionDistance;
+    /* 0x3C */ f32 mPlayerMountedMaxSpeed;
+    /* 0x40 */ f32 mPlayerMountedMotionPlaybackSpeed;
+    /* 0x44 */ s16 mPlayerMountedDashTime;
+    /* 0x48 */ f32 mSearchIgnoreDistance1;
+    /* 0x4C */ f32 mSearchIgnoreDistance2;
+    /* 0x50 */ f32 mGuidanceDisplayDistance1;
+    /* 0x54 */ f32 mGuidanceDisplayDistance2;
+    /* 0x58 */ u8 field_0x58;
+    /* 0x59 */ u8 mNoReins;
 };
 
+STATIC_ASSERT(sizeof(daE_WB_HIO_c) == 0x5C);
+
 
 #endif /* D_A_E_WB_H */
diff --git a/include/d/actor/d_a_e_yk.h b/include/d/actor/d_a_e_yk.h
index 5a4688ea5f..8357e21fc9 100644
--- a/include/d/actor/d_a_e_yk.h
+++ b/include/d/actor/d_a_e_yk.h
@@ -10,7 +10,7 @@
 
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
-#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
 #include "d/d_bg_s_acch.h"
 #include "d/d_cc_d.h"
 #include "d/d_cc_uty.h"
@@ -37,7 +37,7 @@ enum daE_YK_Action {
 /**
  * @ingroup actors-enemies
  * @class e_yk_class
- * @brief Twilight Keese
+ * @brief Twilight Keese (Yami Keese)
  * 
  * @details 
  * 
diff --git a/include/d/actor/d_a_npc_ks.h b/include/d/actor/d_a_npc_ks.h
index 0975f3d1f7..12a6d6e335 100644
--- a/include/d/actor/d_a_npc_ks.h
+++ b/include/d/actor/d_a_npc_ks.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-npcs
  * @class npc_ks_class
- * @brief Monkey NPC
+ * @brief Monkey NPC (Kozaru)
  *
  * @details
  *
diff --git a/include/d/actor/d_a_npc_tk.h b/include/d/actor/d_a_npc_tk.h
index d6cc44b203..000b1bf1cb 100644
--- a/include/d/actor/d_a_npc_tk.h
+++ b/include/d/actor/d_a_npc_tk.h
@@ -14,7 +14,7 @@ class J3DModel;
 /**
  * @ingroup actors-npcs
  * @class daNPC_TK_c
- * @brief Hawk
+ * @brief Hawk (Taka)
  *
  * @details
  *
diff --git a/include/d/actor/d_a_obj_batta.h b/include/d/actor/d_a_obj_batta.h
index 908fc8ecac..214ca977aa 100644
--- a/include/d/actor/d_a_obj_batta.h
+++ b/include/d/actor/d_a_obj_batta.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-objects
  * @class daObjBATTA_c
- * @brief Insect - Grasshopper
+ * @brief Insect - Grasshopper (Batta)
  *
  * @details
  *
diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h
index 311b26e281..1cf44a954b 100644
--- a/include/d/actor/d_a_obj_bemos.h
+++ b/include/d/actor/d_a_obj_bemos.h
@@ -2,6 +2,10 @@
 #define D_A_OBJ_BEMOS_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_bg_w_base.h"
+#include "d/d_cc_d.h"
+#include "m_Do/m_Do_ext.h"
 
 /**
  * @ingroup actors-objects
@@ -11,7 +15,7 @@
  * @details
  *
  */
-class daObjBm_c : public fopAc_ac_c {
+class daObjBm_c : public dBgS_MoveBgActor {
 public:
     class BgcSrc_c {};
 
@@ -28,6 +32,16 @@ public:
         static u8 M_wall_work[2576];
     };
 
+    u32 getSwNo3() { return fopAcM_GetParamBit(this, 16,8); }
+    u32 getMoveType() { return fopAcM_GetParamBit(this, 24, 4); }
+    s16 getHeadJoint() { return mHeadJntNo; }
+    s16 getBigGearJoint() { return mBigGearJntNo; }
+    s16 getSmallGear0Joint() { return mSmallGear0JntNo; }
+    s16 getSmallGear1Joint() { return mSmallGear1JntNo; }
+    s16 getSmallGear2Joint() { return mSmallGear2JntNo; }
+    s8 getSwNo() { return fopAcM_GetParamBit(this,8,8);}
+    s8 getSwNo2() { return fopAcM_GetParamBit(this,0,8);}
+    
     /* 80BAE36C */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
     /* 80BAE5FC */ void initBaseMtx();
     /* 80BAE68C */ void setBaseMtx();
@@ -76,8 +90,64 @@ public:
     /* 80BB2C8C */ int Delete();
 
     static u8 const M_dir_base[8];
-private:
-    /* 0x568 */ u8 field_0x568[0x1258 - 0x568];
+// private:
+    /* 0x05A0 */ u8 field_0x5a0[0x8];
+    /* 0x05A8 */ J3DModel* mpModel;
+    /* 0x05AC */ mDoExt_brkAnm* mpBrkAnm;
+    /* 0x05B0 */ mDoExt_baseAnm* mpBaseAnm;
+    /* 0x05B4 */ J3DModel* mpModel2;
+    /* 0x05B8 */ u8 field_0x5b8[0xa];
+    /* 0x05C4 */ J3DModel* mpModel3;
+    /* 0x05C8 */ mDoExt_baseAnm* mpBaseAnm2;
+    /* 0x05CC */ u8 field_0x5cc[0x7e4 - 0x5cc];
+    /* 0x07E4 */ dCcD_Stts mStts;
+    /* 0x0820 */ dCcD_Sph mSph;
+    /* 0x0958 */ dCcD_Cps mCps;
+    /* 0x0A9c */ dCcD_Cyl mCyl[4];
+    /* 0x0F8C */ s16 mHeadJntNo;
+    /* 0x0F8E */ s16 mBigGearJntNo;
+    /* 0x0F90 */ s16 mSmallGear0JntNo;
+    /* 0x0F92 */ s16 mSmallGear1JntNo;
+    /* 0x0F94 */ s16 mSmallGear2JntNo;
+    /* 0x0F96 */ s16 field_0xf96;
+    /* 0x0F96 */ s16 field_0xf98;
+    /* 0x0F9A */ s16 field_0xf9a;
+    /* 0x0F9C */ s16 field_0xf9c;
+    /* 0x0F9E */ s16 field_0xf9e;
+    /* 0x0FA0 */ s16 field_0xfa0;
+    /* 0x0FA2 */ s16 field_0xfa2;
+    /* 0x0FA4 */ s16 field_0xfa4;
+    /* 0x0FA6 */ s16 field_0xfa6;
+    /* 0x0FA8 */ u8 field_0xfa8[0xfb4 - 0xfa8];
+    /* 0x0FB4 */ J3DMaterial* mpMaterial;
+    /* 0x0FB8 */ cXyz field_0xfb8;
+    /* 0x0FC4 */ csXyz field_0xfc4;
+    /* 0x0FCA */ u8 field_0xfca[2];
+    /* 0x0FCC */ u32 field_0xfcc;
+    /* 0x0FD0 */ u8 field_0xfd0[0xff0 - 0xfd0];
+    /* 0x0FF0 */ f32 field_0xff0;
+    /* 0x0FF4 */ u8 field_0xff4[3];
+    /* 0x0FF7 */ u8 field_0xff7;
+    /* 0x0FF8 */ f32 field_0xff8;
+    /* 0x0FFC */ f32 field_0xffc;
+    /* 0x1000 */ f32 field_0x1000;
+    /* 0x1004 */ u8 field_0x1004[0x100c - 0x1004];
+    /* 0x100C */ f32 field_0x100c;
+    /* 0x1010 */ u8 field_0x1010[0x1038 - 0x1010];
+    /* 0x1038 */ u8 field_0x1038;
+    /* 0x1039 */ u8 field_0x1039;
+    /* 0x103A */ u8 field_0x103a[0x10a0 - 0x103a];
+    /* 0x10A0 */ cXyz field_0x10a0;
+    /* 0x10AC */ u8 field_0x10ac[0x10c0 - 0x10ac];
+    /* 0x10C0 */ int field_0x10c0;
+    /* 0x10C4 */ s16 field_0x10c4[4];
+    /* 0x10D4 */ u8 field_0x10cc[0x10d2 - 0x10cc];
+    /* 0x10D2 */ u8 field_0x10d2;
+    /* 0x10D3 */ u8 field_0x10d3;
+    /* 0x10D4 */ u8 field_0x10d4[0x10e8 - 0x10d4];
+    /* 0x10E8 */ f32 field_0x10e8;
+    /* 0x10EC */ f32 field_0x10ec;
+    /* 0x10F0 */ u8 field_0x10f0[0x1258 - 0x10f0];
 };
 
 STATIC_ASSERT(sizeof(daObjBm_c) == 0x1258);
diff --git a/include/d/actor/d_a_obj_kamakiri.h b/include/d/actor/d_a_obj_kamakiri.h
index 94004759d5..a455de44f6 100644
--- a/include/d/actor/d_a_obj_kamakiri.h
+++ b/include/d/actor/d_a_obj_kamakiri.h
@@ -10,7 +10,7 @@
 /**
  * @ingroup actors-objects
  * @class daObjKAM_c
- * @brief Insect - Mantis
+ * @brief Insect - Mantis (Kamakiri)
  *
  * @details
  *
diff --git a/include/d/actor/d_a_obj_kanban2.h b/include/d/actor/d_a_obj_kanban2.h
index f92d5c44aa..ee66c423fd 100644
--- a/include/d/actor/d_a_obj_kanban2.h
+++ b/include/d/actor/d_a_obj_kanban2.h
@@ -10,7 +10,7 @@
 /**
  * @ingroup actors-objects
  * @class daObj_Kanban2_c
- * @brief Sign 2
+ * @brief Sign 2 (Shredded Sign)
  *
  * @details
  *
diff --git a/include/d/actor/d_a_obj_katatsumuri.h b/include/d/actor/d_a_obj_katatsumuri.h
index 791264888a..f15b9e1834 100644
--- a/include/d/actor/d_a_obj_katatsumuri.h
+++ b/include/d/actor/d_a_obj_katatsumuri.h
@@ -10,7 +10,7 @@
 /**
  * @ingroup actors-objects
  * @class daObjKAT_c
- * @brief Insect - Snail
+ * @brief Insect - Snail (Katatsumuri)
  *
  * @details
  *
diff --git a/include/d/actor/d_a_obj_so.h b/include/d/actor/d_a_obj_so.h
index 5b43356ae7..077762083f 100644
--- a/include/d/actor/d_a_obj_so.h
+++ b/include/d/actor/d_a_obj_so.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-objects
  * @class obj_so_class
- * @brief Monkey Cage
+ * @brief Monkey Cage (Saru Ori)
  *
  * @details
  *
diff --git a/include/d/actor/d_a_obj_tombo.h b/include/d/actor/d_a_obj_tombo.h
index f52fd5027e..b3b7604bc9 100644
--- a/include/d/actor/d_a_obj_tombo.h
+++ b/include/d/actor/d_a_obj_tombo.h
@@ -9,7 +9,7 @@
 /**
  * @ingroup actors-objects
  * @class daObjTOMBO_c
- * @brief Insect - Dragonfly
+ * @brief Insect - Dragonfly (Tonbo)
  *
  * @details
  *