diff --git a/Progress.md b/Progress.md
index 8d1d7c440d0..fd212a9ba1c 100644
--- a/Progress.md
+++ b/Progress.md
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
 .init |  97.972973% | 9280 | 9472
 .extab | 100.000000% | 96 | 96
 .extabindex | 100.000000% | 96 | 96
-.text |  49.647439% | 1785592 | 3596544
+.text |  50.281826% | 1808408 | 3596544
 .ctors | 100.000000% | 448 | 448
 .dtors | 100.000000% | 32 | 32
 .rodata | 100.000000% | 193856 | 193856
 .data | 100.000000% | 197632 | 197632
 .sdata | 100.000000% | 1408 | 1408
 .sdata2 | 100.000000% | 20832 | 20832
-Total |  54.954197% | 2209528 | 4020672
+Total |  55.521664% | 2232344 | 4020672
 
 ## Total
 
 Section | Percentage | Decompiled (bytes) | Total (bytes)
 ---|---|---|---
-main.dol |  54.954197% | 2209528 | 4020672
+main.dol |  55.521664% | 2232344 | 4020672
 RELs |  38.860853% | 4469124 | 11500324
-Total |  43.029790% | 6678652 | 15520996
+Total |  43.176791% | 6701468 | 15520996
 
 ## RELs
 
diff --git a/docs/mainpage.h b/docs/mainpage.h
index f25e50ffb18..5f40b590460 100644
--- a/docs/mainpage.h
+++ b/docs/mainpage.h
@@ -13,6 +13,7 @@ This site contains documentation for the Twilight Princess code base. It is a wo
     - @ref actors-objects "Objects"
     - @ref actors-npcs "NPCs"
     - @ref actors-tags "Tags"
+    - @ref actors-unsorted "Unsorted"
 
     @subsection dolphin Dolphin
 
diff --git a/include/rel/d/a/b/d_a_b_bh/d_a_b_bh.h b/include/rel/d/a/b/d_a_b_bh/d_a_b_bh.h
index 4841f1e49ef..9d4d67b5b33 100644
--- a/include/rel/d/a/b/d_a_b_bh/d_a_b_bh.h
+++ b/include/rel/d/a/b/d_a_b_bh/d_a_b_bh.h
@@ -1,4 +1,27 @@
 #ifndef D_A_B_BH_H
 #define D_A_B_BH_H
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class b_bh_class
+ * @brief Big Baba
+ *
+ * @details Forest Temple enemy.
+ *
+ */
+class b_bh_class : public fopEn_enemy_c {
+private:
+    /* 0x5AC */ u8 field_0x568[0xf4c - 0x5AC];
+};
+
+STATIC_ASSERT(sizeof(b_bh_class) == 0xf4c);
+
+class daB_BH_HIO_c {
+public:
+    /* 805AE26C */ daB_BH_HIO_c();
+    /* 805B3098 */ ~daB_BH_HIO_c();
+};
+
 
 #endif /* D_A_B_BH_H */
diff --git a/include/rel/d/a/b/d_a_b_bq/d_a_b_bq.h b/include/rel/d/a/b/d_a_b_bq/d_a_b_bq.h
index d2d44c54cce..9dac0284cb5 100644
--- a/include/rel/d/a/b/d_a_b_bq/d_a_b_bq.h
+++ b/include/rel/d/a/b/d_a_b_bq/d_a_b_bq.h
@@ -1,4 +1,135 @@
 #ifndef D_A_B_BQ_H
 #define D_A_B_BQ_H
 
+#include "f_op/f_op_actor_mng.h"
+#include "Z2AudioLib/Z2Creature.h"
+#include "d/cc/d_cc_d.h"
+#include "d/cc/d_cc_uty.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class b_bq_class
+ * @brief Diababa
+ *
+ * @details Forest Temple dungeon boss.
+ *
+ */
+class b_bq_class : public fopEn_enemy_c {
+public:
+    /* 805B9B3C */ b_bq_class();
+
+private:
+    /* 0x05AC */ request_of_phase_process_class mPhase;
+    /* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x05B8 */ mDoExt_brkAnm* field_0x5b8;
+    /* 0x05BC */ mDoExt_btkAnm* field_0x5bc;
+    /* 0x05C0 */ s8 field_0x5c0;
+    /* 0x05C4 */ J3DModel* field_0x5c4;
+    /* 0x05C8 */ s8 field_0x5c8;
+    /* 0x05CC */ cXyz field_0x5cc;
+    /* 0x05D8 */ f32 field_0x5d8;
+    /* 0x05DC */ s16 field_0x5dc;
+    /* 0x05E0 */ Z2CreatureEnemy mSound;
+    /* 0x0684 */ Z2SoundObjSimple field_0x684;
+    /* 0x06A4 */ Z2SoundObjSimple field_0x6a4;
+    /* 0x06C4 */ int mAnmID;
+    /* 0x06C8 */ s16 field_0x6c8;
+    /* 0x06CA */ s16 mAction;
+    /* 0x06CC */ s16 mMode;
+    /* 0x06CE */ s16 mAngleToPlayer;
+    /* 0x06D0 */ f32 mDistToPlayer;
+    /* 0x06D4 */ s16 field_0x6d4[5];
+    /* 0x06DE */ s16 field_0x6de;
+    /* 0x06E0 */ int field_0x6e0;
+    /* 0x06E4 */ int field_0x6e4;
+    /* 0x06E8 */ fopAc_ac_c* mpMBactor;
+    /* 0x06EC */ u8 field_0x6ec;
+    /* 0x06ED */ u8 field_0x6ed;
+    /* 0x06F0 */ f32 field_0x6f0;
+    /* 0x06F4 */ s16 field_0x6f4;
+    /* 0x06F6 */ s16 field_0x6f6;
+    /* 0x06F8 */ s8 field_0x6f8;
+    /* 0x06F9 */ u8 field_0x6f9;
+    /* 0x06FA */ u8 field_0x6fa;
+    /* 0x06FB */ u8 field_0x6fb;
+    /* 0x06FC */ u8 field_0x6fc;
+    /* 0x06FE */ s16 field_0x6fe;
+    /* 0x0700 */ dCcD_Stts field_0x700;
+    /* 0x073C */ dCcD_Sph field_0x73c;
+    /* 0x0874 */ dCcD_Stts field_0x874;
+    /* 0x08B0 */ dCcD_Sph field_0x8b0;
+    /* 0x09E8 */ dCcD_Sph field_0x9e8;
+    /* 0x0B20 */ dCcD_Sph field_0xb20[4];
+    /* 0x1000 */ dCcD_Sph field_0x1000;
+    /* 0x1138 */ cXyz field_0x1138;
+    /* 0x1144 */ cXyz field_0x1144;
+    /* 0x1150 */ s8 field_0x1150;
+    /* 0x1151 */ u8 field_0x1151;
+    /* 0x1154 */ dCcU_AtInfo mAtInfo;
+    /* 0x1178 */ f32 field_0x1178;
+    /* 0x117C */ u8 field_0x117C[0x1180 - 0x117C];
+    /* 0x1180 */ u32 field_0x1180;
+    /* 0x1184 */ u32 field_0x1184;
+    /* 0x1188 */ u32 field_0x1188;
+    /* 0x118C */ u32 field_0x118c;
+    /* 0x1190 */ u32 field_0x1190;
+    /* 0x1194 */ u32 field_0x1194[5];
+    /* 0x11A8 */ u32 field_0x11a8[12];
+    /* 0x11D8 */ f32 field_0x11d8;
+    /* 0x11DC */ u8 field_0x11DC[0x11FC - 0x11DC];
+    /* 0x11FC */ s8 field_0x11fc;
+    /* 0x1200 */ u32 field_0x1200[4];
+    /* 0x1210 */ u32 field_0x1210[2];
+    /* 0x1218 */ u8 field_0x1218[0x1220 - 0x1218];
+    /* 0x1220 */ u32 field_0x1220;
+    /* 0x1224 */ u32 field_0x1224;
+    /* 0x1228 */ u32 field_0x1228[4];
+    /* 0x1238 */ s16 field_0x1238;
+    /* 0x123A */ s16 field_0x123a;
+    /* 0x123C */ u8 field_0x123C[0x1240 - 0x123C];
+    /* 0x1240 */ cXyz field_0x1240;
+    /* 0x124C */ cXyz field_0x124c;
+    /* 0x1258 */ cXyz field_0x1258;
+    /* 0x1264 */ cXyz field_0x1264;
+    /* 0x1270 */ cXyz field_0x1270;
+    /* 0x127C */ cXyz field_0x127c;
+    /* 0x1288 */ cXyz field_0x1288;
+    /* 0x1294 */ u8 field_0x1294[0x1298 - 0x1294];
+    /* 0x1298 */ f32 field_0x1298;
+    /* 0x129C */ f32 field_0x129c;
+    /* 0x12A0 */ f32 field_0x12a0;
+    /* 0x12A4 */ f32 field_0x12a4;
+    /* 0x12A8 */ f32 field_0x12a8;
+    /* 0x12AC */ s16 field_0x12ac;
+    /* 0x12AE */ s16 field_0x12ae;
+    /* 0x12B0 */ cXyz field_0x12b0;
+    /* 0x12BC */ cXyz field_0x12bc;
+    /* 0x12C8 */ cXyz field_0x12c8[16];
+    /* 0x1388 */ int field_0x1388;
+    /* 0x138C */ s16 field_0x138c;
+    /* 0x138E */ s16 field_0x138e;
+    /* 0x1390 */ s16 field_0x1390;
+    /* 0x1392 */ u8 field_0x1392;
+    /* 0x1393 */ s8 field_0x1393;
+    /* 0x1394 */ u8 field_0x1394;
+    /* 0x1395 */ u8 field_0x1395;
+    /* 0x1396 */ u8 field_0x1396;
+    /* 0x1397 */ s8 field_0x1397;
+    /* 0x1398 */ f32 field_0x1398;
+    /* 0x139C */ u8 field_0x139c;
+};
+
+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/rel/d/a/b/d_a_b_dr/d_a_b_dr.h b/include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h
index c90f541bf1a..980b602e4a2 100644
--- a/include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h
+++ b/include/rel/d/a/b/d_a_b_dr/d_a_b_dr.h
@@ -1,12 +1,19 @@
 #ifndef D_A_B_DR_H
 #define D_A_B_DR_H
 
+#include "f_op/f_op_actor_mng.h"
+#include "Z2AudioLib/Z2Creature.h"
+#include "d/cc/d_cc_d.h"
+#include "d/msg/d_msg_flow.h"
+#include "d/bg/d_bg_s_acch.h"
+
 /**
  * @ingroup actors-enemies
+ * @class daB_DR_c
  * @brief Argorok
- * 
- * City in the Sky dungeon boss.
- * 
+ *
+ * @details City in the Sky dungeon boss.
+ *
  */
 class daB_DR_c : public fopEn_enemy_c {
 public:
@@ -72,6 +79,7 @@ public:
     void onTarget() { mTarget = true; }
     bool isBack() { return mPrm0; }
 
+private:
     /* 0x05AC */ request_of_phase_process_class mPhase;
     /* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf;
     /* 0x05B8 */ J3DModel* mpPartModel;
@@ -163,4 +171,13 @@ public:
     /* 0x2814 */ dMsgFlow_c mMsgFlow;
 };
 
+STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860);
+
+
+class daB_DR_HIO_c {
+public:
+    /* 805BAE6C */ daB_DR_HIO_c();
+    /* 805C6B94 */ ~daB_DR_HIO_c();
+};
+
 #endif /* D_A_B_DR_H */
diff --git a/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h b/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h
index 1433b170cce..5bd1a167103 100644
--- a/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h
+++ b/include/rel/d/a/b/d_a_b_dre/d_a_b_dre.h
@@ -2,5 +2,46 @@
 #define D_A_B_DRE_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class daB_DRE_c
+ * @brief Argorok (child actor?)
+ *
+ * @details Used in the City in the Sky dungeon boss fight.
+ *
+ */
+class daB_DRE_c : public fopEn_enemy_c {
+public:
+    /* 805C7DD4 */ void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
+    /* 805C7EAC */ void CameraSet();
+    /* 805C8008 */ void SetStopingCam();
+    /* 805C808C */ void SetStopCam(cXyz, f32, f32, s16);
+    /* 805C8208 */ void SetCMoveCam(cXyz, f32, f32);
+    /* 805C81B8 */ void SetCMoveCam(cXyz, f32);
+    /* 805C8348 */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32, f32);
+    /* 805C824C */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32);
+    /* 805C8458 */ void SetMoveCam(f32, f32);
+    /* 805C8544 */ void SetReleaseCam();
+    /* 805C85E8 */ void CamAction2();
+    /* 805C8BF8 */ void DrAction2();
+    /* 805C8EDC */ void CamAction();
+    /* 805C9318 */ void Action();
+    /* 805C9378 */ void DrAction();
+    /* 805C9B40 */ void SoundChk();
+    /* 805CA158 */ void Execute();
+    /* 805CA49C */ void SpeedSet();
+    /* 805CA4FC */ void BreathSet();
+    /* 805CA670 */ void Delete();
+    /* 805CA6C0 */ void setBaseMtx();
+    /* 805CA944 */ void create();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x930 - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daB_DRE_c) == 0x930);
+
 
 #endif /* D_A_B_DRE_H */
diff --git a/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h b/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h
index 8abfa55951f..b753f31872e 100644
--- a/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h
+++ b/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h
@@ -12,10 +12,11 @@
 
 /**
  * @ingroup actors-enemies
+ * @class daB_DS_c
  * @brief Stallord
- * 
- * Arbiter's Grounds dungeon boss.
- * 
+ *
+ * @details Arbiter's Grounds dungeon boss.
+ *
  */
 class daB_DS_c : public fopEn_enemy_c {
 public:
@@ -177,6 +178,7 @@ public:
     /* 805DB974 */ cPhs__Step create();
     /* 805DC1E8 */ daB_DS_c();
 
+private:
     /* 0x05AC */ request_of_phase_process_class mPhase;
     /* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
     /* 0x05B8 */ mDoExt_McaMorfSO* mpSwordMorf;
@@ -321,4 +323,47 @@ public:
 
 STATIC_ASSERT(sizeof(daB_DS_c) == 0x2F28);
 
+class daB_DS_HIO_c {
+public:
+    /* 805CB22C */ daB_DS_HIO_c();
+#ifdef NONMATCHING
+    /* 805DC89C */ virtual ~daB_DS_HIO_c() {}
+#else
+    /* 805DC89C */ ~daB_DS_HIO_c();
+#endif
+
+#ifndef NONMATCHING
+    /* 0x00 */ void* _vtable;
+#endif
+    /* 0x04 */ s8 field_0x04;
+    /* 0x08 */ f32 mModelSize;
+    /* 0x0C */ f32 mHandRange;
+    /* 0x10 */ f32 mBreathRange;
+    /* 0x14 */ f32 mGuardSpawnRange;
+    /* 0x18 */ f32 mNoSearchRange;
+    /* 0x1C */ f32 mP2MoveAxis;
+    /* 0x20 */ f32 mP2ModelSize;
+    /* 0x24 */ f32 mP2AttackHeight;
+    /* 0x28 */ s16 mP2FallTime;
+    /* 0x2A */ s16 mPedestalFallTime;
+    /* 0x2C */ s16 mSandFallWaitTime;
+    /* 0x2E */ s16 mP2BulletFireTime;
+    /* 0x30 */ s16 mP2OuterWallAttackTime;
+    /* 0x32 */ s16 mP2TrapCreateWaitTime1;
+    /* 0x34 */ s16 mP2TrapCreateWaitTime2;
+    /* 0x36 */ s16 mP2TrapCreateID1;
+    /* 0x38 */ s16 mP2TrapCreateID2;
+    /* 0x3A */ s16 mHintTime1;
+    /* 0x3C */ s16 mHintTime2;
+    /* 0x3E */ s16 mP2OuterWallTrapSpeed;
+    /* 0x40 */ s16 mTowerTrapSpeed;
+    /* 0x42 */ s16 mP2ApproachAccel;
+    /* 0x44 */ s16 mP2ApproachSpeedMax;
+    /* 0x46 */ s16 mP2ApproachAfterBullet;
+    /* 0x48 */ s16 mP2ApproachDist;
+    /* 0x4A */ s16 mP2Health;
+    /* 0x4C */ bool mP2HealthDebugOn;
+};
+
+
 #endif /* D_A_B_DS_H */
diff --git a/include/rel/d/a/b/d_a_b_gg/d_a_b_gg.h b/include/rel/d/a/b/d_a_b_gg/d_a_b_gg.h
index d0217c8507e..1dd38b80d2f 100644
--- a/include/rel/d/a/b/d_a_b_gg/d_a_b_gg.h
+++ b/include/rel/d/a/b/d_a_b_gg/d_a_b_gg.h
@@ -1,4 +1,104 @@
 #ifndef D_A_B_GG_H
 #define D_A_B_GG_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class daB_GG_c
+ * @brief Aeralfos
+ *
+ * @details City in the Sky dungeon mini-boss.
+ *
+ */
+class daB_GG_c : public fopEn_enemy_c {
+public:
+    /* 805DE464 */ void CreateHeap();
+    /* 805DE650 */ void initCc();
+    /* 805DE7A4 */ void setCcCylinder();
+    /* 805DE9B8 */ void G_setCcCylinder();
+    /* 805DEAD0 */ void MoveCo();
+    /* 805DEB44 */ void ctrlJoint(J3DJoint*, J3DModel*);
+    /* 805DED58 */ void HeadctrlJoint(J3DJoint*, J3DModel*);
+    /* 805DEF64 */ void SetAnm(int, int, f32, f32);
+    /* 805DF9F4 */ void Yazirushi();
+    /* 805DFA48 */ void SpeedClear();
+    /* 805DFA64 */ void SetAction(u8, u8, u8);
+    /* 805DFA8C */ void GetAction(u8, u8, u8);
+    /* 805DFACC */ void DemoSkip(int);
+    /* 805DFC24 */ void DemoSkipCallBack(void*, int);
+    /* 805DFC58 */ void CameraSet();
+    /* 805DFD78 */ void SetStopingCam();
+    /* 805DFDFC */ void SetStopCam(cXyz, f32, f32, s16);
+    /* 805DFF4C */ void SetMoveCam(cXyz, f32, f32, s16, f32, f32);
+    /* 805E00D4 */ void SetMoveCam1(f32, f32);
+    /* 805E01F8 */ void SetReleaseCam();
+    /* 805E029C */ void St_CamAction();
+    /* 805E0F2C */ void St_DemoAction();
+    /* 805E18E8 */ void Md_CamAction();
+    /* 805E1C28 */ void Md_DemoAction();
+    /* 805E23E8 */ void Gn_CamAction();
+    /* 805E2974 */ void Gn_DemoAction();
+    /* 805E2F44 */ void DemoAction();
+    /* 805E3024 */ void F_WaitAction();
+    /* 805E31E4 */ void F_FookChk();
+    /* 805E3448 */ void F_MoveAction();
+    /* 805E3CAC */ void F_LV7_W_MoveAction();
+    /* 805E3F0C */ void F_AttackAction();
+    /* 805E4914 */ void F_DamageAction();
+    /* 805E5190 */ void AttentionChk();
+    /* 805E5220 */ void FlyAction();
+    /* 805E561C */ void F_A_TargetMove(cXyz);
+    /* 805E53DC */ void F_A_TargetMove(cXyz, u8);
+    /* 805E5808 */ void F_A_MoveAction();
+    /* 805E5D0C */ void F_A_WaitAction();
+    /* 805E5D2C */ void F_A_Action();
+    /* 805E5E78 */ void FookChk();
+    /* 805E608C */ void CutChk();
+    /* 805E6174 */ void G_MoveAction();
+    /* 805E6AB0 */ void FallChk();
+    /* 805E6E30 */ void G_AttackAction();
+    /* 805E73A8 */ void G_DamageAction();
+    /* 805E7D50 */ void G_DeathAction();
+    /* 805E7F50 */ void G_DeathAction1();
+    /* 805E82F0 */ void DeathCam();
+    /* 805E8D48 */ void GroundAction();
+    /* 805E8EE8 */ void StopAction();
+    /* 805E92A0 */ void HitChk();
+    /* 805E9310 */ void Action();
+    /* 805E9418 */ void HeadAction();
+    /* 805E9A28 */ void SetHeadAngle();
+    /* 805E9B48 */ void SoundChk();
+    /* 805EA344 */ void Execute();
+    /* 805EA72C */ void ObjHit();
+    /* 805EA74C */ void At_Check();
+    /* 805EA938 */ void MoveAt();
+    /* 805EA9AC */ void F_AtHit();
+    /* 805EAAFC */ void ChanceTime();
+    /* 805EB028 */ void ArmAngleSet();
+    /* 805EB090 */ void Guard();
+    /* 805EB5E0 */ void Draw();
+    /* 805EB8A8 */ void Delete();
+    /* 805EB910 */ void setBaseMtx();
+    /* 805EB980 */ void setShieldMtx();
+    /* 805EB9DC */ void setSwordMtx();
+    /* 805EBA4C */ void setSwordMtx1();
+    /* 805EBAB8 */ void setHeadMtx();
+    /* 805EBB30 */ void setHeadMtx1();
+    /* 805EBBE4 */ void Create();
+    /* 805EC424 */ daB_GG_c();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x116c - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daB_GG_c) == 0x116c);
+
+class daB_GG_HIO_c {
+public:
+    /* 805DE40C */ daB_GG_HIO_c();
+    /* 805EC9C4 */ ~daB_GG_HIO_c();
+};
+
+
 #endif /* D_A_B_GG_H */
diff --git a/include/rel/d/a/b/d_a_b_gm/d_a_b_gm.h b/include/rel/d/a/b/d_a_b_gm/d_a_b_gm.h
index 08edd37b137..5470b3c4bee 100644
--- a/include/rel/d/a/b/d_a_b_gm/d_a_b_gm.h
+++ b/include/rel/d/a/b/d_a_b_gm/d_a_b_gm.h
@@ -1,4 +1,36 @@
 #ifndef D_A_B_GM_H
 #define D_A_B_GM_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class b_gm_class
+ * @brief Armogohma
+ *
+ * @details Temple of Time dungeon boss.
+ *
+ */
+class b_gm_class : public fopEn_enemy_c {
+public:
+    /* 805F38E4 */ b_gm_class();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x1d08 - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(b_gm_class) == 0x1d08);
+
+class daB_GM_HIO_c {
+public:
+    /* 805ED94C */ daB_GM_HIO_c();
+    /* 805F3E64 */ ~daB_GM_HIO_c();
+};
+
+struct b_gm_foot {
+public:
+    /* 805F3AC0 */ ~b_gm_foot();
+    /* 805F3AFC */ b_gm_foot();
+};
+
 #endif /* D_A_B_GM_H */
diff --git a/include/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.h b/include/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.h
index c6741ad80cd..7c362750501 100644
--- a/include/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.h
+++ b/include/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.h
@@ -3,6 +3,10 @@
 
 #include "d/msg/d_msg_flow.h"
 #include "f_op/f_op_actor_mng.h"
+#include "Z2AudioLib/Z2Creature.h"
+#include "d/cc/d_cc_d.h"
+#include "d/cc/d_cc_uty.h"
+#include "d/bg/d_bg_s_acch.h"
 
 struct g_himo_s {
     /* 80601D40 */ ~g_himo_s();
@@ -25,6 +29,7 @@ public:
 
     bool checkAttackChance() { return field_0x2740 != 0; }
 
+private:
     /* 0x05AC */ request_of_phase_process_class mPhaseReq;
     /* 0x05B4 */ request_of_phase_process_class mHorsePhaseReq;
     /* 0x05BC */ s16 field_0x05bc;
@@ -186,4 +191,12 @@ public:
     /* 0x2744 */ dMsgFlow_c mMsgFlow;
 };
 
+STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790);
+
+class daB_GND_HIO_c {
+public:
+    /* 805F4A4C */ daB_GND_HIO_c();
+    /* 80602230 */ ~daB_GND_HIO_c();
+};
+
 #endif /* D_A_B_GND_H */
diff --git a/include/rel/d/a/b/d_a_b_go/d_a_b_go.h b/include/rel/d/a/b/d_a_b_go/d_a_b_go.h
index 9fad60394f1..8f789a096ab 100644
--- a/include/rel/d/a/b/d_a_b_go/d_a_b_go.h
+++ b/include/rel/d/a/b/d_a_b_go/d_a_b_go.h
@@ -9,13 +9,37 @@
 #include "d/cc/d_cc_uty.h"
 
 #define GORON_CHILD_MAX 31
+#define RES_IS_MODEL 0x13
+
+enum daB_GO_ANM {
+    /* 0x04 */ ANM_ATTACK = 4,
+    /* 0x05 */ ANM_DAMAGE_01,
+    /* 0x06 */ ANM_DAMAGE_02,
+    /* 0x07 */ ANM_DEAD_01,
+    /* 0x08 */ ANM_DEAD_02,
+    /* 0x09 */ ANM_FALL,
+    /* 0x0A */ ANM_START_L,
+    /* 0x0B */ ANM_START_R,
+    /* 0x0C */ ANM_STEP,
+    /* 0x0D */ ANM_TRAP,
+    /* 0x0E */ ANM_WAIT_02,
+    /* 0x0F */ ANM_WAIT_03,
+    /* 0x10 */ ANM_WALK,
+};
+
+enum daB_GO_Action {
+    /* 0x0 */ ACT_WAIT,
+    /* 0x1 */ ACT_WALK,
+    /* 0x2 */ ACT_ATTACK,
+};
 
 /**
  * @ingroup actors-enemies
+ * @class b_go_class
  * @brief Goron Golem
- * 
- * Unused golem boss made up of several small Gorons.
- * 
+ *
+ * @details Unused golem boss made up of several small Gorons.
+ *
  */
 class b_go_class : public fopEn_enemy_c {
 public:
@@ -48,4 +72,19 @@ public:
     /* 0xD34 */ u8 field_0xd34;
 };
 
+STATIC_ASSERT(sizeof(b_go_class) == 0xD38);
+
+class daB_GO_HIO_c {
+public:
+    /* 806031AC */ daB_GO_HIO_c();
+    /* 80603F9C */ virtual ~daB_GO_HIO_c() {}
+
+    /* 0x04 */ s8 field_0x4;
+    /* 0x08 */ f32 mSmallSize;
+    /* 0x0C */ f32 mNormalSpeed;
+    /* 0x10 */ f32 mAttackInitRange;
+    /* 0x14 */ bool mDisplayModelImage;
+};
+
+
 #endif /* D_A_B_GO_H */
diff --git a/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h b/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h
index 86ccfa8a4cf..551612c60d8 100644
--- a/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h
+++ b/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h
@@ -8,12 +8,14 @@
 #include "d/cc/d_cc_uty.h"
 #include "f_op/f_op_actor_mng.h"
 
+
 /**
  * @ingroup actors-enemies
+ * @class b_gos_class
  * @brief Goron Golem (small)
- * 
- * Unused golem boss made up of several small Gorons.
- * 
+ *
+ * @details Unused golem boss made up of several small Gorons.
+ *
  */
 class b_gos_class : public fopEn_enemy_c {
 public:
@@ -49,4 +51,24 @@ public:
     /* 0xCC8 */ u8 field_0xcc8;
 };
 
+STATIC_ASSERT(sizeof(b_gos_class) == 0xCCC);
+
+class daB_GOS_HIO_c {
+public:
+public:
+    /* 8060426C */ daB_GOS_HIO_c();
+    /* 80605320 */ virtual ~daB_GOS_HIO_c() {}
+
+    /* 0x4 */ s8 field_0x4;
+    /* 0x8 */ f32 mSize;
+    /* 0xC */ f32 mNormalSpeed;
+};
+
+struct b_gos_j_info {
+public:
+    s16 joint_no;
+    f32 field_0x4;
+};
+
+
 #endif /* D_A_B_GOS_H */
diff --git a/include/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.h b/include/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.h
index 7cd0a4a84c9..8a62c1b4c18 100644
--- a/include/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.h
+++ b/include/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.h
@@ -2,5 +2,86 @@
 #define D_A_B_MGN_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class daB_MGN_c
+ * @brief Beast Ganon?
+ *
+ * @details Hyrule Castle dungeon boss.
+ *
+ */
+class daB_MGN_c : public fopEn_enemy_c {
+public:
+    /* 8060577C */ void ctrlJoint(J3DJoint*, J3DModel*);
+    /* 8060584C */ void JointCallBack(J3DJoint*, int);
+    /* 80605898 */ void draw();
+    /* 80605D78 */ void setDashSmokeEffect();
+    /* 8060601C */ void setBackJumpEffect();
+    /* 806062C0 */ void setSlideSmokeEffect();
+    /* 80606424 */ void setBodySlideEffect();
+    /* 806065D4 */ void setOpeningEffect();
+    /* 80606754 */ void setStepEffect();
+    /* 8060688C */ void setFallAttackEffect();
+    /* 80606A10 */ void setHeadLightEffect();
+    /* 80606AEC */ void setHeadHitEffect();
+    /* 80606C6C */ void setHideSmokeEffect(cXyz*, u8);
+    /* 80606D60 */ void calcHideSmokeEffect();
+    /* 806071C4 */ void drawHideSmokeEffect();
+    /* 8060729C */ void setBloodEffect();
+    /* 80607498 */ void calcBloodMove();
+    /* 8060778C */ void checkDownBeforeBG();
+    /* 80607924 */ void setBck(int, u8, f32, f32);
+    /* 806079CC */ void checkBck(int);
+    /* 80607A2C */ void setActionMode(int, int);
+    /* 80607A80 */ void setExitMode(int);
+    /* 80607B50 */ void onBodyShield();
+    /* 80607B80 */ void offBodyShield();
+    /* 80607BB0 */ void onBodySlideAt();
+    /* 80607BFC */ void offBodySlideAt();
+    /* 80607C20 */ void checkHitSlideAt();
+    /* 80607CB0 */ void onBodyFallAt();
+    /* 80607CE4 */ void offBodyFallAt();
+    /* 80607D08 */ void onBodyCo();
+    /* 80607D44 */ void offBodyCo();
+    /* 80607D7C */ void getNearHitPos(cXyz*);
+    /* 8060819C */ void damage_check();
+    /* 80608738 */ void calcJointAngle(s16);
+    /* 806087A8 */ void executeCircle();
+    /* 80608EF8 */ void executeDash();
+    /* 80609D70 */ void executeThrown();
+    /* 8060A670 */ void setDownEnd();
+    /* 8060A72C */ void executeDown();
+    /* 8060ACB8 */ void executeDownDamage();
+    /* 8060B028 */ void executeDownBiteDamage();
+    /* 8060B430 */ void executeWarp();
+    /* 8060B544 */ void executeFall();
+    /* 8060BE6C */ void demo_skip(int);
+    /* 8060C034 */ void DemoSkipCallBack(void*, int);
+    /* 8060C068 */ void executeOpening();
+    /* 8060D078 */ void executeDeath();
+    /* 8060D880 */ void executeJump();
+    /* 8060DAC0 */ void checkStartJump();
+    /* 8060DDA0 */ void action();
+    /* 8060E158 */ void mtx_set();
+    /* 8060E1D0 */ void cc_set();
+    /* 8060E820 */ void execute();
+    /* 8060EA38 */ void _delete();
+    /* 8060EAE0 */ void CreateHeap();
+    /* 8060F0D0 */ void create();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x26cc - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daB_MGN_c) == 0x26cc);
+
+class daB_MGN_HIO_c {
+public:
+    /* 8060572C */ daB_MGN_HIO_c();
+    /* 8060F8D0 */ ~daB_MGN_HIO_c();
+};
+
 
 #endif /* D_A_B_MGN_H */
diff --git a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h
index 555ee1aec38..de2fd56c8b2 100644
--- a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h
+++ b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h
@@ -65,10 +65,11 @@ struct ob_ke_s {
 
 /**
  * @ingroup actors-enemies
+ * @class b_ob_class
  * @brief Morpheel (body)
- * 
- * Lakebed Temple dungeon boss. This is the core/body part of the boss.
- * 
+ *
+ * @details Lakebed Temple dungeon boss. This is the core/body part of the boss.
+ *
  */
 class b_ob_class : public fopEn_enemy_c {
 public:
@@ -188,4 +189,23 @@ public:
     /* 0x5DE0 */ u8 mHIOInit;
 };
 
+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/rel/d/a/b/d_a_b_oh/d_a_b_oh.h b/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h
index fc5862ebc90..37d6a6651ad 100644
--- a/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h
+++ b/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h
@@ -27,10 +27,11 @@ enum b_oh_action {
 
 /**
  * @ingroup actors-enemies
+ * @class b_oh_class
  * @brief Morpheel (head)
- * 
- * Lakebed Temple dungeon boss. This is the head part of the boss.
- * 
+ *
+ * @details Lakebed Temple dungeon boss. This is the head part of the boss.
+ *
  */
 class b_oh_class : public fopEn_enemy_c {
 public:
@@ -97,4 +98,6 @@ public:
     /* 0x1F86 */ u8 field_0x1f86;
 };
 
+STATIC_ASSERT(sizeof(b_oh_class) == 0x1F88);
+
 #endif /* D_A_B_OH_H */
diff --git a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h
index 9c0163bbe1f..adce144f750 100644
--- a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h
+++ b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h
@@ -6,10 +6,11 @@
 
 /**
  * @ingroup actors-enemies
+ * @class b_oh2_class
  * @brief Morpheel (tentacle)
- * 
- * Lakebed Temple dungeon boss. This is the tentacle part of the boss.
- * 
+ *
+ * @details Lakebed Temple dungeon boss. This is the tentacle part of the boss.
+ *
  */
 class b_oh2_class : public fopEn_enemy_c {
 public:
@@ -35,4 +36,6 @@ public:
     /* 0x93C */ u8 field_0x93c[0x948 - 0x93C];
 };
 
+STATIC_ASSERT(sizeof(b_oh2_class) == 0x948);
+
 #endif /* D_A_B_OH2_H */
diff --git a/include/rel/d/a/b/d_a_b_tn/d_a_b_tn.h b/include/rel/d/a/b/d_a_b_tn/d_a_b_tn.h
index 7ef4b651e81..8bcd7aeaba8 100644
--- a/include/rel/d/a/b/d_a_b_tn/d_a_b_tn.h
+++ b/include/rel/d/a/b/d_a_b_tn/d_a_b_tn.h
@@ -1,6 +1,93 @@
 #ifndef D_A_B_TN_H
 #define D_A_B_TN_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/cc/d_cc_d.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class daB_TN_c
+ * @brief Darknut
+ *
+ * @details Temple of Time dungeon mini-boss.
+ *
+ */
+class daB_TN_c : public fopEn_enemy_c {
+public:
+    /* 8061EC58 */ void ctrlJoint(J3DJoint*, J3DModel*);
+    /* 8061ED10 */ void JointCallBack(J3DJoint*, int);
+    /* 8061ED5C */ void calcNeckAngle();
+    /* 8061EE14 */ void calcWaistAngle();
+    /* 8061EEC8 */ void draw();
+    /* 8061F200 */ void setBreakPart(int);
+    /* 8061F31C */ void setBreakHeadPart(int);
+    /* 8061F3D0 */ void setPartLandEffect(int, int);
+    /* 8061F520 */ void calcShieldMove();
+    /* 8061F9F4 */ void calcSwordMoveA();
+    /* 8061FD7C */ void calcSwordMoveB();
+    /* 8061FFE0 */ void calcOtherPartMove(int);
+    /* 8062070C */ void calcPartMove();
+    /* 806208C8 */ void setBck(int, u8, f32, f32);
+    /* 8062096C */ void checkBck(int);
+    /* 806209C8 */ void setActionMode(int, int);
+    /* 806209E0 */ void setSwordAtBit(int);
+    /* 80620AE4 */ void setSwordAtBreak(int);
+    /* 80620B4C */ void setBodyShield();
+    /* 80620E90 */ void checkNormalAttackAble();
+    /* 80620FA0 */ void getCutType();
+    /* 80621070 */ void setDamage(dCcD_Sph*, int);
+    /* 8062138C */ void setShieldEffect(dCcD_Sph*);
+    /* 806213FC */ void damage_check();
+    /* 806227D0 */ void checkMoveArea();
+    /* 80622B60 */ void checkMoveAngle();
+    /* 80622BE0 */ void setAttackBlurEffect(int);
+    /* 80622CE4 */ void setArmorBreakEffect(int);
+    /* 80622F64 */ void demo_skip(int);
+    /* 8062318C */ void DemoSkipCallBack(void*, int);
+    /* 806231C0 */ void executeRoomDemo();
+    /* 80623920 */ void executeOpening();
+    /* 806246E8 */ void executeWaitH();
+    /* 806247D8 */ void setAwaitSound();
+    /* 80624890 */ void executeChaseH();
+    /* 80625394 */ void checkStartAttackH();
+    /* 806255F0 */ void executeAttackH();
+    /* 80625C74 */ void executeAttackShieldH();
+    /* 80625E40 */ void executeGuardH();
+    /* 80626034 */ void executeDamageH();
+    /* 80626320 */ void executeChangeDemo();
+    /* 80627100 */ void executeZakoChangeDemo();
+    /* 80627790 */ void setWalkDir();
+    /* 8062799C */ void initChaseL(int);
+    /* 80627CBC */ void checkAttackAble();
+    /* 80627D3C */ void checkNextMove();
+    /* 8062868C */ void executeChaseL();
+    /* 806292F8 */ void executeAttackL();
+    /* 80629D20 */ void executeAttackShieldL();
+    /* 80629FB0 */ void executeGuardL();
+    /* 8062A3D0 */ void executeDamageL();
+    /* 8062A71C */ void executeYoroke();
+    /* 8062A950 */ void executeEnding();
+    /* 8062B344 */ void executeZakoEnding();
+    /* 8062B6A8 */ void action();
+    /* 8062BA5C */ void mtx_set();
+    /* 8062BDCC */ void cc_set();
+    /* 8062C5B4 */ void execute();
+    /* 8062C7C8 */ void _delete();
+    /* 8062C868 */ void CreateHeap();
+    /* 8062CD78 */ void create();
+    /* 8062D2F0 */ daB_TN_c();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x5630 - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daB_TN_c) == 0x5630);
+
+class daB_TN_HIO_c {
+public:
+    /* 8061EBEC */ daB_TN_HIO_c();
+    /* 8062D98C */ ~daB_TN_HIO_c();
+};
+
 
 #endif /* D_A_B_TN_H */
diff --git a/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h b/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h
index 66663417841..c2d6ccc1d87 100644
--- a/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h
+++ b/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h
@@ -86,6 +86,7 @@ private:
     /* 0xFCC */ u8 field_0xfcc;
     /* 0xFCD */ u8 field_0xfcd[0x1B88 - 0xFCD];
 };
+
 STATIC_ASSERT(sizeof(daB_YO_c) == 0x1B88);
 
 struct daB_YO_HIO_c {
diff --git a/include/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.h b/include/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.h
index f5b8a0ffd6c..0f20a076361 100644
--- a/include/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.h
+++ b/include/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.h
@@ -2,5 +2,57 @@
 #define D_A_B_YO_ICE_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class daB_YOI_c
+ * @brief Blizzeta Second Phase Ice Block
+ *
+ * @details Snowpeak Ruins dungeon boss second phase ice blocks.
+ *
+ */
+class daB_YOI_c : public fopEn_enemy_c {
+public:
+    /* 8063A17C */ void draw();
+    /* 8063A2D8 */ void setActionMode(int, int);
+    /* 8063A2E4 */ void damage_check();
+    /* 8063A480 */ void setOperate(int);
+    /* 8063A628 */ void setWeight(u8);
+    /* 8063A638 */ void setBreakIceEffect();
+    /* 8063A6F8 */ void setWallBreakIceEffect();
+    /* 8063A79C */ void setApperEffect();
+    /* 8063A824 */ void setApperEffect2();
+    /* 8063A8C8 */ void setLandingEffect();
+    /* 8063A96C */ void executeFirst();
+    /* 8063ABC0 */ void getSingleFallPos();
+    /* 8063ACCC */ void executeRiseUp();
+    /* 8063B238 */ void executeSingleFall();
+    /* 8063BB40 */ void executeYose();
+    /* 8063C3F0 */ void executeYoseFall();
+    /* 8063C76C */ void executeDemoRevival();
+    /* 8063C900 */ void executeDamage();
+    /* 8063CC90 */ void executeDeath();
+    /* 8063CD14 */ void crack_execute();
+    /* 8063CD90 */ void action();
+    /* 8063D0C8 */ void mtx_set();
+    /* 8063D1B0 */ void cc_set();
+    /* 8063D350 */ void execute();
+    /* 8063D45C */ void _delete();
+    /* 8063D4F8 */ void CreateHeap();
+    /* 8063D5D0 */ void create();
+    /* 8063D8FC */ daB_YOI_c();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0xb3c - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daB_YOI_c) == 0xb3c);
+
+class daB_YOI_HIO_c {
+public:
+    /* 8063A14C */ daB_YOI_HIO_c();
+    /* 8063DBD0 */ ~daB_YOI_HIO_c();
+};
 
 #endif /* D_A_B_YO_ICE_H */
diff --git a/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h b/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h
index 46bca9dd3f8..7c9f9882704 100644
--- a/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h
+++ b/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h
@@ -1,14 +1,22 @@
 #ifndef D_A_B_ZANT_H
 #define D_A_B_ZANT_H
 
+#include "f_op/f_op_actor_mng.h"
+#include "d/cc/d_cc_d.h"
+#include "d/cc/d_cc_uty.h"
+#include "Z2AudioLib/Z2Creature.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/msg/d_msg_flow.h"
+
 /**
  * @ingroup actors-enemies
+ * @class daB_ZANT_c
  * @brief Zant
- * 
- * Palace of Twilight dungeon boss.
- * 
+ *
+ * @details Palace of Twilight dungeon boss.
+ *
  */
-class daB_ZANT_c : public fopAc_ac_c {
+class daB_ZANT_c : public fopEn_enemy_c {
 public:
     /* 8063E19C */ void ctrlJoint(J3DJoint*, J3DModel*);
     /* 8063E264 */ void JointCallBack(J3DJoint*, int);
@@ -82,9 +90,6 @@ public:
     /* 8064E190 */ void create();
 
 private:
-    /* 0x0568 */ u8 field_0x568[0x58e - 0x568];
-    /* 0x058E */ u16 field_0x58e;
-    /* 0x0590 */ u8 field_0x590[0x5ac - 0x590];
     /* 0x05AC */ request_of_phase_process_class mPhase;
     /* 0x05B4 */ mDoExt_McaMorfSO* mpMorfSO;
     /* 0x05B8 */ J3DModel* field_0x5b8;
@@ -185,11 +190,25 @@ private:
     /* 0x3624 */ dCcD_Sph field_0x3624[2];
     /* 0x3894 */ u32 field_0x3894;
     /* 0x3898 */ u32 field_0x3898;
-    /* 0x389C */ u32 field_0x389c;
+    // /* 0x389C */ u32 field_0x389c;
     /* 0x38A0 */ u8 field_0x38a0[0x38ac - 0x38a0];
-    /* 0x38AC */ u32 field_0x38ac[2];
-    /* 0x38B4 */ u32 field_0x38b4;
-    /* 0x38B8 */ u8 field_0x38b8;
+    // /* 0x38AC */ u32 field_0x38ac[2];
+    // /* 0x38B4 */ u32 field_0x38b4;
+    // /* 0x38B8 */ u8 field_0x38b8;
+};
+
+/* 
+    There is a misalignment here causing the class to be too big by 0x14.
+    Commenting out the class members at the end fixed it temporarily.
+    Needs to be fixed properly at some point.
+*/
+
+STATIC_ASSERT(sizeof(daB_ZANT_c) == 0x38BC);
+
+class daB_ZANT_HIO_c {
+public:
+    /* 8063E10C */ daB_ZANT_HIO_c();
+    /* 8064E994 */ ~daB_ZANT_HIO_c();
 };
 
 #endif /* D_A_B_ZANT_H */
diff --git a/include/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.h b/include/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.h
index f59c6f61794..e043abda884 100644
--- a/include/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.h
+++ b/include/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.h
@@ -1,6 +1,33 @@
 #ifndef D_A_B_ZANT_MAGIC_H
 #define D_A_B_ZANT_MAGIC_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class daB_ZANTM_c
+ * @brief Zant - Magic Attack
+ *
+ * @details Palace of Twilight dungeon boss magic attack.
+ *
+ */
+class daB_ZANTM_c : public fopEn_enemy_c {
+public:
+    /* 8064F778 */ void draw();
+    /* 8064F7D4 */ void setMagicEffect();
+    /* 8064F938 */ void setMagicHitEffect();
+    /* 8064FA50 */ void executeSmall();
+    /* 8064FD6C */ void cc_set();
+    /* 8064FE6C */ void execute();
+    /* 8064FF2C */ bool _delete();
+    /* 8064FF54 */ void create();
+    /* 806500A8 */ daB_ZANTM_c();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0xc0c - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daB_ZANTM_c) == 0xc0c);
+
 
 #endif /* D_A_B_ZANT_MAGIC_H */
diff --git a/include/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.h b/include/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.h
index c9941d80899..70b54024ab3 100644
--- a/include/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.h
+++ b/include/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.h
@@ -1,6 +1,42 @@
 #ifndef D_A_B_ZANT_MOBILE_H
 #define D_A_B_ZANT_MOBILE_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-enemies
+ * @class daB_ZANTZ_c
+ * @brief Zant (Mobile)
+ *
+ * @details Palace of Twilight dungeon boss (mobile form?).
+ *
+ */
+class daB_ZANTZ_c : public fopEn_enemy_c {
+public:
+    /* 806507B0 */ void draw();
+    /* 80650854 */ void setSnortEffect(int);
+    /* 806508E0 */ void calcSnortEffect();
+    /* 80650B7C */ void setMouthMode(u8);
+    /* 80650D0C */ void setAppearMode(u8);
+    /* 806510C0 */ void getGroundPos();
+    /* 8065127C */ void action();
+    /* 80651B1C */ void cc_set();
+    /* 80651C20 */ void execute();
+    /* 80651D1C */ void _delete();
+    /* 80651DC4 */ void CreateHeap();
+    /* 80652038 */ void create();
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0xd14 - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daB_ZANTZ_c) == 0xd14);
+
+class daB_ZANTZ_HIO_c {
+public:
+    /* 8065078C */ daB_ZANTZ_HIO_c();
+    /* 8065268C */ ~daB_ZANTZ_HIO_c();
+};
+
 
 #endif /* D_A_B_ZANT_MOBILE_H */
diff --git a/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h b/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h
index 2466d50d126..2c50a7342de 100644
--- a/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h
+++ b/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h
@@ -6,10 +6,11 @@
 
 /**
  * @ingroup actors-enemies
+ * @class daB_ZANTS_c
  * @brief Zant (Goron Mines Phase)
- * 
- * Palace of Twilight dungeon boss. This is the actor used during the Goron Mines part of the fight.
- * 
+ *
+ * @details Palace of Twilight dungeon boss. This is the actor used during the Goron Mines part of the fight.
+ *
  */
 class daB_ZANTS_c : public fopAc_ac_c {
 public:
@@ -35,4 +36,6 @@ public:
     /* 0x5C4 */ dBgW* mpBgW;
 };
 
+STATIC_ASSERT(sizeof(daB_ZANTS_c) == 0x5C8);
+
 #endif /* D_A_B_ZANT_SIMA_H */
diff --git a/include/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.h b/include/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.h
index c33097d3814..6477859f376 100644
--- a/include/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.h
+++ b/include/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.h
@@ -2,5 +2,38 @@
 #define D_A_L7DEMO_DR_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daDr_c
+ * @brief
+ *
+ * @details
+ *
+ */
+class daDr_c : public fopAc_ac_c {
+public:
+    /* 805A9238 */ void setAction(void (daDr_c::*)());
+    /* 805A92DC */ void action();
+    /* 805A9304 */ void mtx_set();
+    /* 805A93D4 */ void draw();
+    /* 805A9478 */ void wait();
+    /* 805A963C */ void pl_walk();
+    /* 805A9914 */ void pl_turn();
+    /* 805A9A34 */ void bridge_destroy();
+    /* 805A9D10 */ void bridge_destroy2();
+    /* 805A9EE4 */ void execute();
+    /* 805A9FFC */ void _delete();
+    /* 805AA084 */ void CreateHeap();
+    /* 805AA19C */ void check_start();
+    /* 805AA224 */ void create();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x65c - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daDr_c) == 0x65c);
+
 
 #endif /* D_A_L7DEMO_DR_H */
diff --git a/include/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.h b/include/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.h
index 52e50b75f82..34a5e2a4791 100644
--- a/include/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.h
+++ b/include/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.h
@@ -2,5 +2,33 @@
 #define D_A_L7LOW_DR_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daL7lowDr_c
+ * @brief
+ *
+ * @details
+ *
+ */
+class daL7lowDr_c : public fopAc_ac_c {
+public:
+    /* 805AA5F8 */ void setAction(void (daL7lowDr_c::*)());
+    /* 805AA69C */ void action();
+    /* 805AA748 */ void _delete();
+    /* 805AA7B8 */ void mtx_set();
+    /* 805AA828 */ void fly();
+    /* 805AABF8 */ void execute();
+    /* 805AAC5C */ void CreateHeap();
+    /* 805AAD58 */ void create();
+    /* 805AAEA8 */ void draw();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x644 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daL7lowDr_c) == 0x644);
+
 
 #endif /* D_A_L7LOW_DR_H */
diff --git a/include/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.h b/include/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.h
index 71e981d166b..29ffb02a440 100644
--- a/include/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.h
+++ b/include/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.h
@@ -2,5 +2,40 @@
 #define D_A_L7OP_DEMO_DR_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daL7ODR_c
+ * @brief
+ *
+ * @details
+ *
+ */
+class daL7ODR_c : public fopAc_ac_c {
+public:
+    /* 805AB098 */ void setAction(void (daL7ODR_c::*)());
+    /* 805AB13C */ void action();
+    /* 805AB164 */ void setDrAction(void (daL7ODR_c::*)());
+    /* 805AB208 */ void dr_action();
+    /* 805AB230 */ void mtx_set();
+    /* 805AB2E8 */ void draw();
+    /* 805AB3F0 */ void wait();
+    /* 805AB520 */ void pl_walk();
+    /* 805ABC2C */ void setZoomOutCamPos(cXyz&, cXyz&, f32);
+    /* 805ABCF8 */ void dr_wait();
+    /* 805ABE0C */ void dr_fly();
+    /* 805AD7B4 */ void execute();
+    /* 805AD87C */ void _delete();
+    /* 805AD90C */ void CreateHeap();
+    /* 805ADA2C */ void check_start();
+    /* 805ADAC0 */ void create();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x8b8 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daL7ODR_c) == 0x8b8);
+
 
 #endif /* D_A_L7OP_DEMO_DR_H */
diff --git a/include/rel/d/a/d_a_alldie/d_a_alldie.h b/include/rel/d/a/d_a_alldie/d_a_alldie.h
index 37bbe764a94..d41d8d07dc0 100644
--- a/include/rel/d/a/d_a_alldie/d_a_alldie.h
+++ b/include/rel/d/a/d_a_alldie/d_a_alldie.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daAlldie_c
+ * @brief
+ *
+ * @details
+ *
+ */
 class daAlldie_c : public fopAc_ac_c {
 public:
     enum EAction {
diff --git a/include/rel/d/a/d_a_andsw/d_a_andsw.h b/include/rel/d/a/d_a_andsw/d_a_andsw.h
index bba855da9a3..b46756ec93f 100644
--- a/include/rel/d/a/d_a_andsw/d_a_andsw.h
+++ b/include/rel/d/a/d_a_andsw/d_a_andsw.h
@@ -3,6 +3,14 @@
 
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daAndsw_c
+ * @brief
+ *
+ * @details
+ *
+ */
 class daAndsw_c : public fopAc_ac_c {
 public:
     u8 getSwNo() {
diff --git a/include/rel/d/a/d_a_andsw2/d_a_andsw2.h b/include/rel/d/a/d_a_andsw2/d_a_andsw2.h
index 9d5540b6f29..64b80ad4722 100644
--- a/include/rel/d/a/d_a_andsw2/d_a_andsw2.h
+++ b/include/rel/d/a/d_a_andsw2/d_a_andsw2.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daAndsw2_c
+ * @brief
+ *
+ * @details
+ *
+ */
 class daAndsw2_c : public fopAc_ac_c {
 public:
     enum Action_e {
diff --git a/include/rel/d/a/d_a_arrow/d_a_arrow.h b/include/rel/d/a/d_a_arrow/d_a_arrow.h
index 01196774440..bffe7a4b445 100644
--- a/include/rel/d/a/d_a_arrow/d_a_arrow.h
+++ b/include/rel/d/a/d_a_arrow/d_a_arrow.h
@@ -6,6 +6,14 @@
 #include "d/particle/d_particle.h"
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daArrow_c
+ * @brief Arrow
+ *
+ * @details
+ *
+ */
 class daArrow_c : public fopAc_ac_c {
 public:
     enum ArrowType_e {
@@ -78,6 +86,7 @@ public:
                                               NULL);
     }
 
+private:
     /* 0x568 */ J3DModel* mpModel;
     /* 0x56C */ dBgS_ArrowLinChk field_0x56c;
     /* 0x5DC */ dBgS_ObjLinChk field_0x5dc;
diff --git a/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h b/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h
index 69a1a15e21c..ab1ecac8402 100644
--- a/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h
+++ b/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h
@@ -13,6 +13,14 @@ class J2DPicture;
 class J2DPane;
 class J2DTextBox;
 
+/**
+ * @ingroup actors-unsorted
+ * @class daBalloon2D_c
+ * @brief ???
+ *
+ * @details
+ *
+ */
 class daBalloon2D_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
     class c_list 
@@ -162,5 +170,16 @@ public:
     /* 0xC0 */ f32 field_0xc0;
     /* 0xC4 */ f32 field_0xc4;
 };
+#include "f_op/f_op_actor_mng.h"
+
+class JMSMesgEntry_c : public fopEn_enemy_c {
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x748 - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(JMSMesgEntry_c) == 0x748);
+
+struct JKRExpHeap {};
+
 
 #endif /* D_A_BALLOON_2D_H */
diff --git a/include/rel/d/a/d_a_bd/d_a_bd.h b/include/rel/d/a/d_a_bd/d_a_bd.h
index 93fc6c4f3cc..0cacdf28f51 100644
--- a/include/rel/d/a/d_a_bd/d_a_bd.h
+++ b/include/rel/d/a/d_a_bd/d_a_bd.h
@@ -1,5 +1,28 @@
 #ifndef D_A_BD_H
 #define D_A_BD_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class bd_class
+ * @brief Bird
+ *
+ * @details Used by birds that sit on Coro's head.
+ *
+ */
+class bd_class : public fopEn_enemy_c {
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x9ec - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(bd_class) == 0x9ec);
+
+class daBd_HIO_c {
+public:
+    /* 804D6C4C */ daBd_HIO_c();
+    /* 804D9CB8 */ ~daBd_HIO_c();
+};
+
 
 #endif /* D_A_BD_H */
diff --git a/include/rel/d/a/d_a_bg/d_a_bg.h b/include/rel/d/a/d_a_bg/d_a_bg.h
index 23e2a7a6ee4..a1242e374e6 100644
--- a/include/rel/d/a/d_a_bg/d_a_bg.h
+++ b/include/rel/d/a/d_a_bg/d_a_bg.h
@@ -1,5 +1,72 @@
 #ifndef D_A_BG_H
 #define D_A_BG_H
 
+#include "f_op/f_op_actor_mng.h"
+#include "d/bg/d_bg_w_kcol.h"
+
+class daBg_btkAnm_c {
+public:
+    /* 80457F34 */ int create(J3DModelData*, J3DAnmTextureSRTKey*, int);
+    /* 80458088 */ void entry(J3DModelData*);
+    /* 804580CC */ void play();
+
+    void entryFrame() { mpBtk->entryFrame(); }
+    void playspeed(f32 speed) { mpBtk->setPlaySpeed(speed); }
+
+    /* 0x0 */ mDoExt_btkAnm* mpBtk;
+    /* 0x4 */ u8 field_0x4;
+};
+
+class daBg_brkAnm_c {
+public:
+    /* 804580F0 */ int create(J3DModelData*, J3DAnmTevRegKey*, int);
+    /* 80458230 */ void entry(J3DModelData*);
+    /* 80458274 */ void play();
+
+    void entryFrame() { mpBrk->entryFrame(); }
+    void entryFrame(f32 frame) { mpBrk->entryFrame(frame); }
+    f32 getEndFrame() { return mpBrk->getEndFrame(); }
+
+    /* 0x0 */ mDoExt_brkAnm* mpBrk;
+    /* 0x4 */ u8 field_0x4;
+};
+
+struct daBg_unkData {
+    /* 0x00 */ J3DModel* mpBgModel;
+    /* 0x04 */ daBg_btkAnm_c* mpBgBtk;
+    /* 0x08 */ daBg_brkAnm_c* mpBgBrk;
+    /* 0x0C */ dKy_tevstr_c* mpTevStr;
+    /* 0x10 */ f32 mBtkAnmSpeed;
+};  // Size: 0x14
+
+/**
+ * @ingroup actors-unsorted
+ * @class daBg_c
+ * @brief Background
+ *
+ * @details Stage collision.
+ *
+ */
+class daBg_c : public fopAc_ac_c {
+public:
+    /* 80457BF8 */ const char* setArcName();
+    /* 804582B8 */ int createHeap();
+    /* 80458788 */ ~daBg_c();
+    /* 804588C4 */ int draw();
+    /* 8045906C */ int create();
+
+    inline int execute();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x570 - 0x568];
+    /* 0x570 */ daBg_unkData mBgData[6];
+    /* 0x5E8 */ dBgW* mpBgW;
+    /* 0x5EC */ dBgWKCol* mpKCol;
+    /* 0x5F0 */ u8 field_0x5f0;
+    /* 0x5F0 */ u8 field_0x5f1;
+};
+
+STATIC_ASSERT(sizeof(daBg_c) == 0x5F4);
+
 
 #endif /* D_A_BG_H */
diff --git a/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h b/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h
index 8f2852e80b2..77fd075e822 100644
--- a/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h
+++ b/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h
@@ -13,6 +13,14 @@ typedef int (daBgObj_c::*executeFunc)();
 typedef void (daBgObj_c::*tgSetFunc)();
 typedef int (daBgObj_c::*actionFunc)();
 
+/**
+ * @ingroup actors-unsorted
+ * @class daBgObj_c
+ * @brief Moving Background Obj?
+ *
+ * @details
+ *
+ */
 class daBgObj_c : public dBgS_MoveBgActor {
 public:
     class spec_data_c {
@@ -127,4 +135,12 @@ inline u8 getObjArg0(daBgObj_c* i_this) {
 }
 };     // namespace daBgObj_prm
 
+struct spec_dat {
+public:
+    u16 field_0x0;
+    u16 field_0x2;
+    u8 field_0x4;
+};
+
+
 #endif /* D_A_BG_OBJ_H */
diff --git a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
index 644112e8e1d..fd52f0abb23 100644
--- a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
+++ b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
@@ -61,10 +61,11 @@ class daAlink_c;
 
 /**
  * @ingroup actors-items
+ * @class daBoomerang_c
  * @brief Gale Boomerang
- * 
- * Forest Temple dungeon item.
- * 
+ *
+ * @details Forest Temple dungeon item.
+ *
  */
 class daBoomerang_c : public fopAc_ac_c {
 public:
@@ -173,6 +174,19 @@ private:
     /* 0xDC0 */ int (daBoomerang_c::*mpProcFn)();
     /* 0xDCC */ void (daBoomerang_c::*mpSetAimActorFn)(fopAc_ac_c*);
     /* 0xDD8 */ void (daBoomerang_c::*mpCancelLockActorFn)(fopAc_ac_c*);
-};  // Size: 0xDE4
+};
+
+STATIC_ASSERT(sizeof(daBoomerang_c) == 0xDE4);
+
+class daBoomerang_HIO_c0 {
+public:
+    static u16 const m_lockWaitTime;
+    static f32 const m_minCircleR;
+    static f32 const m_middleCircleR;
+    static f32 const m_maxCircleR;
+    static f32 const m_scale;
+    static f32 const m_lockWindScale;
+};
+
 
 #endif /* D_A_BOOMERANG_H */
diff --git a/include/rel/d/a/d_a_bullet/d_a_bullet.h b/include/rel/d/a/d_a_bullet/d_a_bullet.h
index 9770efcf9af..ff475943e33 100644
--- a/include/rel/d/a/d_a_bullet/d_a_bullet.h
+++ b/include/rel/d/a/d_a_bullet/d_a_bullet.h
@@ -2,5 +2,48 @@
 #define D_A_BULLET_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daBullet_c
+ * @brief Bullet (Unused?)
+ *
+ * @details
+ *
+ */
+class daBullet_c : public fopEn_enemy_c {
+public:
+    /* 8065594C */ ~daBullet_c();
+    /* 80655B08 */ void create();
+    /* 80655E5C */ void CreateHeap();
+    /* 80655EDC */ void Delete();
+    /* 80655F10 */ void Execute();
+    /* 806560FC */ void Draw();
+    /* 80656160 */ void createHeapCallBack(fopAc_ac_c*);
+    /* 80656180 */ void getResName();
+    /* 80656198 */ void getBmdName();
+    /* 806561B0 */ void getTypeFromParam();
+    /* 806561D0 */ void initialize();
+    /* 80656378 */ void setProcess(int (daBullet_c::*)(void*));
+    /* 80656420 */ void wait(void*);
+    /* 806564B8 */ void move(void*);
+
+    static u8 const mCcDObjInfo[48];
+    static u8 mCcDSph[64];
+
+private:
+    /* 0x5ac */ u8 field_0x5ac[0x95c - 0x5ac];
+};
+
+STATIC_ASSERT(sizeof(daBullet_c) == 0x95c);
+
+class daBullet_Param_c {
+public:
+    /* 806566A8 */ ~daBullet_Param_c();
+
+    static u8 const m[24];
+};
+
 
 #endif /* D_A_BULLET_H */
diff --git a/include/rel/d/a/d_a_canoe/d_a_canoe.h b/include/rel/d/a/d_a_canoe/d_a_canoe.h
index 48df9bd069b..c365b9a9b3c 100644
--- a/include/rel/d/a/d_a_canoe/d_a_canoe.h
+++ b/include/rel/d/a/d_a_canoe/d_a_canoe.h
@@ -6,6 +6,14 @@
 #include "d/bg/d_bg_s_acch.h"
 #include "SSystem/SComponent/c_phase.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daCanoe_c
+ * @brief Canoe
+ *
+ * @details
+ *
+ */
 class daCanoe_c : public fopAc_ac_c {
 public:
     /* 804DA5F4 */ void createHeap();
@@ -38,6 +46,7 @@ public:
         field_0x1446 = 1;
     }
 
+private:
     /* 0x0568 */ request_of_phase_process_class mPhaseReq;
     /* 0x0570 */ J3DModel* mpModel;
     /* 0x0574 */ J3DModel* mpPaddleModel;
@@ -84,6 +93,8 @@ public:
     /* 0x14B8 */ cXyz field_0x14b8;
     /* 0x14C4 */ cXyz field_0x14c4;
     /* 0x14D0 */ cXyz field_0x14d0;
-};  // Size: 0x14DC
+};
+
+STATIC_ASSERT(sizeof(daCanoe_c) == 0x14dc);
 
 #endif /* D_A_CANOE_H */
diff --git a/include/rel/d/a/d_a_coach_2D/d_a_coach_2D.h b/include/rel/d/a/d_a_coach_2D/d_a_coach_2D.h
index 98758058367..998b7a12048 100644
--- a/include/rel/d/a/d_a_coach_2D/d_a_coach_2D.h
+++ b/include/rel/d/a/d_a_coach_2D/d_a_coach_2D.h
@@ -2,5 +2,43 @@
 #define D_A_COACH_2D_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daCoach2D_c
+ * @brief Coach 2D
+ *
+ * @details
+ *
+ */
+class daCoach2D_c : public fopAc_ac_c {
+public:
+    struct c_list {
+        /* 806569CC */ void draw();
+        /* 806577DC */ ~c_list();
+    };
+
+    /* 80656A38 */ void createHeap();
+    /* 80656D18 */ void create();
+    /* 80656D94 */ void destroy();
+    /* 80656DE4 */ void draw();
+    /* 80656E94 */ void execute();
+    /* 80656ED0 */ void drawMeter();
+    /* 8065722C */ void initiate();
+    /* 80657260 */ void update();
+    /* 80657490 */ void setBrkAnime(bool);
+    /* 80657824 */ ~daCoach2D_c();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x784 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daCoach2D_c) == 0x784);
+
+class daCoach2D_HIO_c {
+public:
+    /* 80657738 */ ~daCoach2D_HIO_c();
+};
 
 #endif /* D_A_COACH_2D_H */
diff --git a/include/rel/d/a/d_a_coach_fire/d_a_coach_fire.h b/include/rel/d/a/d_a_coach_fire/d_a_coach_fire.h
index 295bd9b63dd..72aada7c59c 100644
--- a/include/rel/d/a/d_a_coach_fire/d_a_coach_fire.h
+++ b/include/rel/d/a/d_a_coach_fire/d_a_coach_fire.h
@@ -2,5 +2,30 @@
 #define D_A_COACH_FIRE_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daCoachFire_c
+ * @brief Coach Fire
+ *
+ * @details
+ *
+ */
+class daCoachFire_c : public fopAc_ac_c {
+public:
+    /* 80657B78 */ void create_init();
+    /* 80657C48 */ void initBaseMtx();
+    /* 80657CA8 */ void setBaseMtx();
+    /* 80657D2C */ void initCcSphere();
+
+    static u8 const M_attr[16];
+
+private:
+    /* 0x568 */ u8 field_0x568[0x714 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daCoachFire_c) == 0x714);
+
 
 #endif /* D_A_COACH_FIRE_H */
diff --git a/include/rel/d/a/d_a_cow/d_a_cow.h b/include/rel/d/a/d_a_cow/d_a_cow.h
index 8b1a131cae1..6cae819c52c 100644
--- a/include/rel/d/a/d_a_cow/d_a_cow.h
+++ b/include/rel/d/a/d_a_cow/d_a_cow.h
@@ -1,7 +1,16 @@
 #ifndef D_A_COW_H
 #define D_A_COW_H
 
+#include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daCow_c
+ * @brief Ordon Goat
+ *
+ * @details
+ *
+ */
 class daCow_c : public fopAc_ac_c {
 public:
     /* 806585CC */ void calcRunAnime(int);
@@ -91,7 +100,12 @@ public:
 
     void setNaderu() { field_0x568 |= 0x80; }
 
+private:
     /* 0x568 */ u16 field_0x568;
+    /* 0x56A */ u8 field_0x56a[0xD40 - 0x56A];
 };
 
+STATIC_ASSERT(sizeof(daCow_c) == 0xd40);
+
+
 #endif /* D_A_COW_H */
diff --git a/include/rel/d/a/d_a_crod/d_a_crod.h b/include/rel/d/a/d_a_crod/d_a_crod.h
index 503433579f0..80c3f70ec7e 100644
--- a/include/rel/d/a/d_a_crod/d_a_crod.h
+++ b/include/rel/d/a/d_a_crod/d_a_crod.h
@@ -7,10 +7,11 @@
 
 /**
  * @ingroup actors-items
+ * @class daCrod_c
  * @brief Dominion Rod
- * 
- * Temple of Time dungeon item.
- * 
+ *
+ * @details Temple of Time dungeon item.
+ *
  */
 class daCrod_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/d_a_cstaF/d_a_cstaF.h b/include/rel/d/a/d_a_cstaF/d_a_cstaF.h
index da870375f06..d10dc7f7423 100644
--- a/include/rel/d/a/d_a_cstaF/d_a_cstaF.h
+++ b/include/rel/d/a/d_a_cstaF/d_a_cstaF.h
@@ -5,6 +5,14 @@
 #include "d/bg/d_bg_s_movebg_actor.h"
 #include "d/particle/d_particle_copoly.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daCstaF_c
+ * @brief Dominion Rod Statue
+ *
+ * @details
+ *
+ */
 class daCstaF_c : public dBgS_MoveBgActor {
 public:
     /* 804DDB48 */ void checkCoverModel();
diff --git a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h
index 88a685f4e25..28ba84e9bea 100644
--- a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h
+++ b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h
@@ -5,6 +5,14 @@
 #include "d/particle/d_particle_copoly.h"
 #include "f_op/f_op_actor.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daCstatue_c
+ * @brief Dominion Rod Statue (small?)
+ *
+ * @details
+ *
+ */
 class daCstatue_c : public fopAc_ac_c {
 public:
     /* 806636AC */ void atHitCallback(fopAc_ac_c*);
@@ -30,6 +38,7 @@ public:
 
     static u8 const m_bckIdxTable[70 + 2 /* padding */];
 
+private:
     /* 0x568 */ char* mResName;
     /* 0x56C */ request_of_phase_process_class mPhaseReq;
     /* 0x574 */ J3DModel* field_0x574;
@@ -70,6 +79,8 @@ public:
     /* 0xB08 */ cXyz field_0xb08;
     /* 0xB14 */ cXyz field_0xb14;
     /* 0xB20 */ cXyz mBallPos;
-};  // Size: 0xB2C
+};
+
+STATIC_ASSERT(sizeof(daCstatue_c) == 0xB2C);
 
 #endif /* D_A_CSTATUE_H */
diff --git a/include/rel/d/a/d_a_demo00/d_a_demo00.h b/include/rel/d/a/d_a_demo00/d_a_demo00.h
index 9730a926ea0..91397ecd3bb 100644
--- a/include/rel/d/a/d_a_demo00/d_a_demo00.h
+++ b/include/rel/d/a/d_a_demo00/d_a_demo00.h
@@ -1,6 +1,50 @@
 #ifndef D_A_DEMO00_H
 #define D_A_DEMO00_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_demo.h"
+
+struct demo_s1_ke_s {
+public:
+    /* 804A4420 */ ~demo_s1_ke_s();
+    /* 804A86B4 */ demo_s1_ke_s();
+};
+
+class daDemo00_resID_c {
+public:
+    /* 804A430C */ void reset();
+};
+
+class daDemo00_model_c {
+public:
+    /* 804A4338 */ void reset();
+};
+
+/**
+ * @ingroup actors-unsorted
+ * @class daDemo00_c
+ * @brief Cutscene
+ *
+ * @details
+ *
+ */
+class daDemo00_c : public fopAc_ac_c {
+public:
+    /* 804A4388 */ ~daDemo00_c();
+    /* 804A45A0 */ void setBaseMtx();
+    /* 804A4948 */ void setShadowSize();
+    /* 804A4F74 */ void createHeap();
+    /* 804A5798 */ void actStandby(dDemo_actor_c*);
+    /* 804A594C */ void actPerformance(dDemo_actor_c*);
+    /* 804A604C */ void actLeaving(dDemo_actor_c*);
+    /* 804A6F94 */ void draw();
+    /* 804A7BA8 */ void execute();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x292c - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daDemo00_c) == 0x292c);
+
 
 #endif /* D_A_DEMO00_H */
diff --git a/include/rel/d/a/d_a_demo_item/d_a_demo_item.h b/include/rel/d/a/d_a_demo_item/d_a_demo_item.h
index 74239b309b0..f61d1097b9a 100644
--- a/include/rel/d/a/d_a_demo_item/d_a_demo_item.h
+++ b/include/rel/d/a/d_a_demo_item/d_a_demo_item.h
@@ -1,6 +1,43 @@
 #ifndef D_A_DEMO_ITEM_H
 #define D_A_DEMO_ITEM_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daDitem_c
+ * @brief Cutscene Item
+ *
+ * @details
+ *
+ */
+class daDitem_c : public fopAc_ac_c {
+public:
+    /* 804DFBCC */ bool __CreateHeap();
+    /* 804DFBD4 */ void CreateInit();
+    /* 804DFC98 */ void action();
+    /* 804DFD10 */ void actionStart();
+    /* 804E00DC */ void actionEvent();
+    /* 804E0A50 */ void actionWaitLightEnd();
+    /* 804E0B40 */ void actionEnd();
+    /* 804E0B60 */ void setInsectEffect();
+    /* 804E0C44 */ void followInsectEffect();
+    /* 804E0CB0 */ void endInsectEffect();
+    /* 804E0D44 */ void onEventReg(int, int);
+    /* 804E0DB4 */ void set_pos();
+    /* 804E105C */ void anim_control();
+    /* 804E1098 */ void initEffectLight();
+    /* 804E10D0 */ void settingEffectLight();
+    /* 804E111C */ void set_mtx();
+    /* 804E11D4 */ void setTevStr();
+    /* 804E122C */ void setListStart();
+    /* 804E1230 */ void draw_WOOD_STICK();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x9c8 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daDitem_c) == 0x9c8);
+
 
 #endif /* D_A_DEMO_ITEM_H */
diff --git a/include/rel/d/a/d_a_disappear/d_a_disappear.h b/include/rel/d/a/d_a_disappear/d_a_disappear.h
index 007f5b6c320..73f1395e9dd 100644
--- a/include/rel/d/a/d_a_disappear/d_a_disappear.h
+++ b/include/rel/d/a/d_a_disappear/d_a_disappear.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class disappear_class
+ * @brief Enemy Death Effect
+ *
+ * @details
+ *
+ */
 class disappear_class : public fopAc_ac_c {
 public:
     /* 0x568 */ u8 field_0x568[0x574 - 0x568];
diff --git a/include/rel/d/a/d_a_dmidna/d_a_dmidna.h b/include/rel/d/a/d_a_dmidna/d_a_dmidna.h
index c7351527b5d..db086a893ed 100644
--- a/include/rel/d/a/d_a_dmidna/d_a_dmidna.h
+++ b/include/rel/d/a/d_a_dmidna/d_a_dmidna.h
@@ -3,6 +3,14 @@
 
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daDmidna_c
+ * @brief Dying Midna (White Midna)
+ *
+ * @details
+ *
+ */
 class daDmidna_c : public fopAc_ac_c {
 public:
     /* 8045CED8 */ int createHeap();
diff --git a/include/rel/d/a/d_a_do/d_a_do.h b/include/rel/d/a/d_a_do/d_a_do.h
index 0a0e447d052..31137e2acb2 100644
--- a/include/rel/d/a/d_a_do/d_a_do.h
+++ b/include/rel/d/a/d_a_do/d_a_do.h
@@ -76,6 +76,14 @@ public:
     /* 0x1E */ s16 mWaterHuntAnimType;
 };
 
+/**
+ * @ingroup actors-unsorted
+ * @class do_class
+ * @brief Dog
+ *
+ * @details
+ *
+ */
 class do_class : public fopEn_enemy_c {
 public:
     /* 0x5AC */ request_of_phase_process_class mPhase;
diff --git a/include/rel/d/a/d_a_dshutter/d_a_dshutter.h b/include/rel/d/a/d_a_dshutter/d_a_dshutter.h
index dd88fcded7e..2f2eeae1d91 100644
--- a/include/rel/d/a/d_a_dshutter/d_a_dshutter.h
+++ b/include/rel/d/a/d_a_dshutter/d_a_dshutter.h
@@ -4,6 +4,14 @@
 #include "d/bg/d_bg_s_movebg_actor.h"
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daDsh_c
+ * @brief Death Sword Shutter Gate
+ *
+ * @details
+ *
+ */
 class daDsh_c : public dBgS_MoveBgActor {
 public:
     class action_c {
diff --git a/include/rel/d/a/d_a_econt/d_a_econt.h b/include/rel/d/a/d_a_econt/d_a_econt.h
index 785e6d3261e..ce398edeb7c 100644
--- a/include/rel/d/a/d_a_econt/d_a_econt.h
+++ b/include/rel/d/a/d_a_econt/d_a_econt.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class econt_class
+ * @brief Encounter
+ *
+ * @details
+ *
+ */
 class econt_class : public fopEn_enemy_c {
 public:
     /* 0x5AC */ u8 field_0x5ac[8];
diff --git a/include/rel/d/a/d_a_fr/d_a_fr.h b/include/rel/d/a/d_a_fr/d_a_fr.h
index b95d91a3213..1a6505643c6 100644
--- a/include/rel/d/a/d_a_fr/d_a_fr.h
+++ b/include/rel/d/a/d_a_fr/d_a_fr.h
@@ -2,5 +2,28 @@
 #define D_A_FR_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class fr_class
+ * @brief Frog
+ *
+ * @details
+ *
+ */
+class fr_class : public fopAc_ac_c {
+private:
+    /* 0x568 */ u8 field_0x568[0x9e8 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(fr_class) == 0x9e8);
+
+class daFr_HIO_c {
+public:
+    /* 805198EC */ daFr_HIO_c();
+    /* 8051B920 */ ~daFr_HIO_c();
+};
+
 
 #endif /* D_A_FR_H */
diff --git a/include/rel/d/a/d_a_grass/d_a_grass.h b/include/rel/d/a/d_a_grass/d_a_grass.h
index 03a24af334e..ff01bde653c 100644
--- a/include/rel/d/a/d_a_grass/d_a_grass.h
+++ b/include/rel/d/a/d_a_grass/d_a_grass.h
@@ -173,6 +173,14 @@ public:
     /* 0x12A50 */ u32 m_Jhana01_cDL_size;
 };  // Size: 0x12A54
 
+/**
+ * @ingroup actors-unsorted
+ * @class daGrass_c
+ * @brief Grass
+ *
+ * @details
+ *
+ */
 class daGrass_c : public fopAc_ac_c {
 public:
     /* 8051BEFC */ int createGrass();
@@ -209,4 +217,10 @@ namespace daGrass_prm {
     inline u8 getItemBitNo(daGrass_c* i_this) { return (fopAcM_GetParam(i_this) >> 8) & 0xFF; }
 };
 
+struct offset_data {
+    /* 0x0 */ u8 num;
+    /* 0x4 */ csXyz* set_type;
+};
+
+
 #endif /* D_A_GRASS_H */
diff --git a/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h b/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h
index 91b31f60c49..608f33163bb 100644
--- a/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h
+++ b/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h
@@ -5,6 +5,14 @@
 #include "d/com/d_com_inf_game.h"
 #include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daGuardMng_c
+ * @brief Guard Manager?
+ *
+ * @details
+ *
+ */
 class daGuardMng_c : public fopAc_ac_c {
 public:
     void countMerchantNum() {
diff --git a/include/rel/d/a/d_a_hitobj/d_a_hitobj.h b/include/rel/d/a/d_a_hitobj/d_a_hitobj.h
index 2d07fd53d84..dd93efd5e08 100644
--- a/include/rel/d/a/d_a_hitobj/d_a_hitobj.h
+++ b/include/rel/d/a/d_a_hitobj/d_a_hitobj.h
@@ -3,6 +3,14 @@
 
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class hitobj_class
+ * @brief Hit Object?
+ *
+ * @details
+ *
+ */
 class hitobj_class : public fopAc_ac_c {
 public:
     /* 0x568 */ request_of_phase_process_class mPhase;
diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h
index 318b35ef47d..df319ca75d9 100644
--- a/include/rel/d/a/d_a_horse/d_a_horse.h
+++ b/include/rel/d/a/d_a_horse/d_a_horse.h
@@ -34,6 +34,15 @@ private:
 };  // Size: 0xE4
 
 class daHoZelda_c;
+
+/**
+ * @ingroup actors-unsorted
+ * @class daHorse_c
+ * @brief Epona
+ *
+ * @details
+ *
+ */
 class daHorse_c : public fopAc_ac_c {
 public:
     enum daHorse_ERFLG0 {
@@ -286,4 +295,14 @@ public:
     /* 0x18F8 */ void (daHorse_c::*mpOffRideFlgFn)();
 };
 
+class daHorse_hio_c0 {
+public:
+    static u8 const m[292];
+};
+
+class dBgS_HorseAcch {
+public:
+    /* 80845274 */ ~dBgS_HorseAcch();
+};
+
 #endif /* D_A_HORSE_H */
diff --git a/include/rel/d/a/d_a_hozelda/d_a_hozelda.h b/include/rel/d/a/d_a_hozelda/d_a_hozelda.h
index 7ee052896b8..793dafb21e9 100644
--- a/include/rel/d/a/d_a_hozelda/d_a_hozelda.h
+++ b/include/rel/d/a/d_a_hozelda/d_a_hozelda.h
@@ -22,6 +22,14 @@ public:
 
 class daHoZelda_hio_c;
 
+/**
+ * @ingroup actors-unsorted
+ * @class daHoZelda_c
+ * @brief Zelda (Horseback)
+ *
+ * @details
+ *
+ */
 class daHoZelda_c : public fopAc_ac_c {
 public:
     /* 80846000 */ void createHeap();
diff --git a/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h b/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h
index eeaaa7fa0d7..0f76cdf645e 100644
--- a/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h
+++ b/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h
@@ -4,6 +4,14 @@
 #include "d/bg/d_bg_s_movebg_actor.h"
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daIzumiGate_c
+ * @brief Ordon Spring Gate
+ *
+ * @details
+ *
+ */
 class daIzumiGate_c : public dBgS_MoveBgActor {
 public:
     /* 80849098 */ void initBaseMtx();
diff --git a/include/rel/d/a/d_a_kago/d_a_kago.h b/include/rel/d/a/d_a_kago/d_a_kago.h
index f9d4392d3e8..b8ae4f15dfb 100644
--- a/include/rel/d/a/d_a_kago/d_a_kago.h
+++ b/include/rel/d/a/d_a_kago/d_a_kago.h
@@ -1,8 +1,17 @@
 #ifndef D_A_KAGO_H
 #define D_A_KAGO_H
 
+#include "f_op/f_op_actor_mng.h"
 #include "d/d_path.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daKago_c
+ * @brief Basket
+ *
+ * @details
+ *
+ */
 class daKago_c : public fopAc_ac_c {
 public:
     /* 80849660 */ void getBckName(int);
@@ -92,6 +101,7 @@ public:
 
     MtxP getLegR3Mtx() { return mLegR3Mtx; }
 
+private:
     /* 0x568 */ u8 field_0x568[0x620 - 0x568];
     /* 0x620 */ Mtx mLegR3Mtx;
     /* 0x650 */ u8 field_0x650[0x6E1 - 0x650];
@@ -101,6 +111,15 @@ public:
     /* 0x744 */ int field_0x744;
     /* 0x748 */ u8 field_0x748[0x76C - 0x748];
     /* 0x76C */ dPath* field_0x76c;
+    /* 0x770 */ u8 field_0x770[0xBA4 - 0x770];
+};
+
+STATIC_ASSERT(sizeof(daKago_c) == 0xBA4);
+
+class daKago_HIO_c {
+public:
+    /* 808495AC */ daKago_HIO_c();
+    /* 80854A4C */ ~daKago_HIO_c();
 };
 
 #endif /* D_A_KAGO_H */
diff --git a/include/rel/d/a/d_a_mant/d_a_mant.h b/include/rel/d/a/d_a_mant/d_a_mant.h
index 0de5a7402c6..2bb43f32d1e 100644
--- a/include/rel/d/a/d_a_mant/d_a_mant.h
+++ b/include/rel/d/a/d_a_mant/d_a_mant.h
@@ -1,6 +1,33 @@
 #ifndef D_A_MANT_H
 #define D_A_MANT_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class mant_class
+ * @brief ???
+ *
+ * @details Related to Ganondorf Horseback Battle
+ *
+ */
+class mant_class : public fopAc_ac_c {
+private:
+    /* 0x568 */ u8 field_0x568[0x39a4 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(mant_class) == 0x39a4);
+
+class daMant_packet_c : public fopAc_ac_c {
+public:
+    /* 80861298 */ void draw();
+    /* 80862BA4 */ ~daMant_packet_c();
+};
+
+struct mant_j_s {
+public:
+    /* 80862AC0 */ ~mant_j_s();
+    /* 80862B3C */ mant_j_s();
+};
 
 #endif /* D_A_MANT_H */
diff --git a/include/rel/d/a/d_a_mg_fish/d_a_mg_fish.h b/include/rel/d/a/d_a_mg_fish/d_a_mg_fish.h
index 5b012d05855..4545d37b47c 100644
--- a/include/rel/d/a/d_a_mg_fish/d_a_mg_fish.h
+++ b/include/rel/d/a/d_a_mg_fish/d_a_mg_fish.h
@@ -4,8 +4,7 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "f_op/f_op_actor.h"
-// including this causes vtable problems
-// #include "d/bg/d_bg_s_acch.h"
+#include "d/bg/d_bg_s_acch.h"
 #include "d/cc/d_cc_d.h"
 
 struct mf_ke_s {
@@ -15,6 +14,14 @@ struct mf_ke_s {
     /* 0x00 */ u8 field_0x0[0x48];
 };
 
+/**
+ * @ingroup actors-unsorted
+ * @class mg_fish_class
+ * @brief Fish
+ *
+ * @details
+ *
+ */
 class mg_fish_class : public fopEn_enemy_c {
 public:
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
@@ -59,9 +66,8 @@ public:
     /* 0x754 */ mf_ke_s field_0x754[2];
     /* 0x7E4 */ mDoExt_3DlineMat0_c field_0x7e4;
     /* 0x800 */ Z2Creature mSound;
-    // /* 0x890 */ dBgS_AcchCir mAcchCir;
-    // /* 0x8D0 */ dBgS_ObjAcch mAcch;
-    /* 0x890 */ u8 field_0x890[0x218];
+    /* 0x890 */ dBgS_AcchCir mAcchCir;
+    /* 0x8D0 */ dBgS_ObjAcch mAcch;
     /* 0xAA8 */ dCcD_Stts mCcStatus;
     /* 0xAE4 */ dCcD_Cyl mCcCyl;
     /* 0xC20 */ u8 field_0xc20[0x1c];
@@ -73,4 +79,11 @@ public:
 
 STATIC_ASSERT(sizeof(mg_fish_class) == 0xC50);
 
+class daMg_Fish_HIO_c {
+public:
+    /* 80529D2C */ daMg_Fish_HIO_c();
+    /* 805360A8 */ ~daMg_Fish_HIO_c();
+};
+
+
 #endif /* D_A_MG_FISH_H */
diff --git a/include/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.h b/include/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.h
index 7c83101798f..2f38ddf8764 100644
--- a/include/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.h
+++ b/include/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.h
@@ -89,6 +89,14 @@ struct fs_koro2_s {
     /* 0x64 */ dBgW* mpBgW;
 };
 
+/**
+ * @ingroup actors-unsorted
+ * @class fshop_class
+ * @brief Hena's Shop
+ *
+ * @details
+ *
+ */
 class fshop_class : public fopAc_ac_c {
 public:
     /* 0x0568 */ request_of_phase_process_class mPhase;
diff --git a/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h b/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h
index 03cda761246..3867439a9fa 100644
--- a/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h
+++ b/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h
@@ -1,9 +1,12 @@
 #ifndef D_A_MG_ROD_H
 #define D_A_MG_ROD_H
 
+#include "f_op/f_op_actor_mng.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "d/bg/d_bg_s_acch.h"
 #include "d/cc/d_cc_d.h"
+#include "d/msg/d_msg_flow.h"
+#include "rel/d/a/d_a_mg_fish/d_a_mg_fish.h"
 
 struct mg_rod_s {
     /* 0x0 */ cXyz field_0x0[16];
@@ -14,14 +17,22 @@ struct mg_line_s {
 };
 
 struct mg_hook_s {
+    /* 804BAF78 */ ~mg_hook_s();
+    /* 804BAFD8 */ mg_hook_s();
+
     /* 0x00 */ cXyz field_0x0[2];
     /* 0x18 */ u8 field_0x18[0x20 - 0x18];
 };
 
+struct wd_ss {};
+
 /**
  * @ingroup actors-items
+ * @class dmg_rod_class
  * @brief Fishing Rod
- * 
+ *
+ * @details
+ *
  */
 class dmg_rod_class : public fopAc_ac_c {
 public:
@@ -31,6 +42,7 @@ public:
     f32 getRodStickY() { return mRodStickY; }
     bool checkRodEquipPermission() { return field_0x1514 == 0; }
 
+private:
     /* 0x0568 */ u8 field_0x568[0x5A4 - 0x568];
     /* 0x05A4 */ mg_rod_s field_0x5a4;
     /* 0x0664 */ u8 field_0x664[0x6AC - 0x664];
@@ -76,6 +88,15 @@ public:
     /* 0x1515 */ u8 field_0x1515[0x1518 - 0x1515];
     /* 0x1518 */ dCcD_Stts field_0x1518;
     /* 0x1554 */ dCcD_Sph field_0x1554;
+    /* 0x168C */ u8 field_0x168c;
+};
+
+STATIC_ASSERT(sizeof(dmg_rod_class) == 0x1690);
+
+class dmg_rod_HIO_c {
+public:
+    /* 804A95EC */ dmg_rod_HIO_c();
+    /* 804BB070 */ ~dmg_rod_HIO_c();
 };
 
 #endif /* D_A_MG_ROD_H */
diff --git a/include/rel/d/a/d_a_midna/d_a_midna.h b/include/rel/d/a/d_a_midna/d_a_midna.h
index 474d4ed1c29..5c60621e002 100644
--- a/include/rel/d/a/d_a_midna/d_a_midna.h
+++ b/include/rel/d/a/d_a_midna/d_a_midna.h
@@ -11,6 +11,14 @@
 class daMidna_c;
 typedef int (daMidna_c::*daMidna_func)();
 
+/**
+ * @ingroup actors-unsorted
+ * @class daMidna_c
+ * @brief Midna
+ *
+ * @details
+ *
+ */
 class daMidna_c : public fopAc_ac_c {
 public:
     enum daMidna_ERFLG0 {
@@ -279,4 +287,24 @@ private:
     /* 0x09D4 */ daMidna_func mpFunc;
 };
 
+STATIC_ASSERT(sizeof(daMidna_c) == 0x9e0);
+
+class daMidna_matAnm_c : public fopAc_ac_c {
+public:
+    /* 804BC218 */ void init();
+    /* 804BC248 */ void calc(J3DMaterial*) const;
+    /* 804C63E0 */ ~daMidna_matAnm_c();
+};
+
+class daMidna_hio_c0 {
+public:
+    static u8 const m[32];
+};
+
+class daMidna_McaMorfCB1_c {
+public:
+    /* 804BC36C */ void execute(u16, J3DTransformInfo*);
+    /* 804C6398 */ ~daMidna_McaMorfCB1_c();
+};
+
 #endif /* D_A_MIDNA_H */
diff --git a/include/rel/d/a/d_a_mirror/d_a_mirror.h b/include/rel/d/a/d_a_mirror/d_a_mirror.h
index 108064c8189..c8a72919c9b 100644
--- a/include/rel/d/a/d_a_mirror/d_a_mirror.h
+++ b/include/rel/d/a/d_a_mirror/d_a_mirror.h
@@ -27,6 +27,14 @@ public:
     /* 0x17C */ cXyz mViewScale;
 };
 
+/**
+ * @ingroup actors-unsorted
+ * @class daMirror_c
+ * @brief Mirror
+ *
+ * @details Used in Link's House? Or Blizzeta's Room? Or Twilight Mirror?
+ *
+ */
 class daMirror_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
     /* 80871E24 */ daMirror_c();
diff --git a/include/rel/d/a/d_a_movie_player/d_a_movie_player.h b/include/rel/d/a/d_a_movie_player/d_a_movie_player.h
index cc3dfdf4e19..736faf99a7e 100644
--- a/include/rel/d/a/d_a_movie_player/d_a_movie_player.h
+++ b/include/rel/d/a/d_a_movie_player/d_a_movie_player.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daMP_c
+ * @brief Movie Player
+ *
+ * @details
+ *
+ */
 class daMP_c : public fopAc_ac_c {
 public:
     /* 80031AD0 */ static int daMP_c_THPPlayerPlay();
@@ -30,6 +38,20 @@ private:
     /* 0x574 */ int (*mpTHPPlay)(void);
     /* 0x578 */ void (*mpTHPStop)(void);
     /* 0x57C */ int (*mpTHPPause)(void);
-};  // Size: 0x580
+};
+
+STATIC_ASSERT(sizeof(daMP_c) == 0x580);
+
+struct daMP_THPReadBuffer {};
+
+class daMP_Dlst_base_c {
+public:
+    /* 80878DB8 */ void draw();
+    /* 80878FD8 */ daMP_Dlst_base_c();
+};
+
+struct THPVideoInfo {};
+
+struct THPAudioInfo {};
 
 #endif /* D_A_MOVIE_PLAYER_H */
diff --git a/include/rel/d/a/d_a_myna/d_a_myna.h b/include/rel/d/a/d_a_myna/d_a_myna.h
index 9797efec131..e6248ba9d85 100644
--- a/include/rel/d/a/d_a_myna/d_a_myna.h
+++ b/include/rel/d/a/d_a_myna/d_a_myna.h
@@ -17,8 +17,17 @@ struct ShopItem {
     /* 0xC */ u8 mItemType;
     /* 0xD */ u8 mItemStatus;
 };
+
 STATIC_ASSERT(sizeof(ShopItem) == 0x10);
 
+/**
+ * @ingroup actors-npcs
+ * @class daMyna_c
+ * @brief Trill
+ *
+ * @details
+ *
+ */
 class daMyna_c : public fopAc_ac_c {
 public:
     /* 80945E80 */ int baseMotion00(int);
@@ -175,6 +184,7 @@ public:
     /* 0x938 */ u8 field_0x938;
     /* 0x939 */ u8 field_0x939;
 };
+
 STATIC_ASSERT(sizeof(daMyna_c) == 0x93C);
 
 class daMyna_HIO_c : public mDoHIO_entry_c {
@@ -200,6 +210,7 @@ public:
     /* 0x2E */ s16 field_0x2E;  // DAT_8094ba6a
     /* 0x30 */ s16 field_0x30;  // DAT_8094ba6c
 };
+
 STATIC_ASSERT(sizeof(daMyna_HIO_c) == 0x34);
 
 #endif /* D_A_MYNA_H */
diff --git a/include/rel/d/a/d_a_nbomb/d_a_nbomb.h b/include/rel/d/a/d_a_nbomb/d_a_nbomb.h
index 50f20e2b1c1..04db55b6899 100644
--- a/include/rel/d/a/d_a_nbomb/d_a_nbomb.h
+++ b/include/rel/d/a/d_a_nbomb/d_a_nbomb.h
@@ -6,6 +6,14 @@
 #include "d/cc/d_cc_d.h"
 #include "d/a/d_a_player.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daNbomb_c
+ * @brief Bomb
+ *
+ * @details Multi-purpose bomb actor. Used for normal bombs, water bombs and bomblings.
+ *
+ */
 class daNbomb_c : public dBomb_c {
 public:
     enum daNbomb_FLG0 {
diff --git a/include/rel/d/a/d_a_ni/d_a_ni.h b/include/rel/d/a/d_a_ni/d_a_ni.h
index 56340601fd4..828e23af965 100644
--- a/include/rel/d/a/d_a_ni/d_a_ni.h
+++ b/include/rel/d/a/d_a_ni/d_a_ni.h
@@ -1,5 +1,28 @@
 #ifndef D_A_NI_H
 #define D_A_NI_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class ni_class
+ * @brief Cucco
+ *
+ * @details
+ *
+ */
+class ni_class : public fopAc_ac_c {
+private:
+    /* 0x568 */ u8 field_0x568[0xb0c - 0x568];
+};
+
+STATIC_ASSERT(sizeof(ni_class) == 0xb0c);
+
+class daNi_HIO_c {
+public:
+    /* 8094BC2C */ daNi_HIO_c();
+    /* 80951118 */ ~daNi_HIO_c();
+};
+
 
 #endif /* D_A_NI_H */
diff --git a/include/rel/d/a/d_a_passer_mng/d_a_passer_mng.h b/include/rel/d/a/d_a_passer_mng/d_a_passer_mng.h
index 734f4064789..c05755aa8a2 100644
--- a/include/rel/d/a/d_a_passer_mng/d_a_passer_mng.h
+++ b/include/rel/d/a/d_a_passer_mng/d_a_passer_mng.h
@@ -1,6 +1,31 @@
 #ifndef D_A_PASSER_MNG_H
 #define D_A_PASSER_MNG_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daPasserMng_c
+ * @brief Hylian Passerby Manager?
+ *
+ * @details
+ *
+ */
+class daPasserMng_c : public fopAc_ac_c {
+public:
+    /* 80D45738 */ void execute();
+    /* 80D4597C */ void getPasserParam();
+    /* 80D45E14 */ void getLuggageParamHigh(u32);
+    /* 80D46768 */ void create();
+    /* 80D467C0 */ void create_init();
+
+    static void* mGroupTbl[4];
+
+private:
+    /* 0x568 */ u8 field_0x568[0x598 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daPasserMng_c) == 0x598);
+
 
 #endif /* D_A_PASSER_MNG_H */
diff --git a/include/rel/d/a/d_a_peru/d_a_peru.h b/include/rel/d/a/d_a_peru/d_a_peru.h
index 809ff9feee9..b52f2a4818f 100644
--- a/include/rel/d/a/d_a_peru/d_a_peru.h
+++ b/include/rel/d/a/d_a_peru/d_a_peru.h
@@ -2,5 +2,85 @@
 #define D_A_PERU_H
 
 #include "dolphin/types.h"
+#include "d/a/d_a_npc.h"
+
+/**
+ * @ingroup actors-npcs
+ * @class daPeru_c
+ * @brief Louise
+ *
+ * @details
+ *
+ */
+class daPeru_c : public fopAc_ac_c {
+public:
+    /* 80D46EEC */ ~daPeru_c();
+    /* 80D46FCC */ void create();
+    /* 80D4720C */ void CreateHeap();
+    /* 80D4765C */ void typeInitialize();
+    /* 80D47750 */ void Delete();
+    /* 80D47784 */ void Execute();
+    /* 80D477A4 */ void Draw();
+    /* 80D47840 */ void createHeapCallBack(fopAc_ac_c*);
+    /* 80D47860 */ void ctrlJointCallBack(J3DJoint*, int);
+    /* 80D478B8 */ void isDelete();
+    /* 80D478EC */ void reset();
+    /* 80D47B20 */ void setParam();
+    /* 80D47C4C */ void setAfterTalkMotion();
+    /* 80D47CAC */ void srchActors();
+    /* 80D47D5C */ void evtTalk();
+    /* 80D47E48 */ void evtCutProc();
+    /* 80D47F10 */ void action();
+    /* 80D47F5C */ void setAttnPos();
+    /* 80D481A4 */ void setCollision();
+    /* 80D4835C */ bool drawDbgInfo();
+    /* 80D48364 */ void setAction(int (daPeru_c::*)(int), int);
+    /* 80D48414 */ void wait(int);
+    /* 80D486A0 */ void is_AppearDemo_start();
+    /* 80D48720 */ void _AppearDemoTag_delete();
+    /* 80D48750 */ void talk(int);
+    /* 80D48A7C */ void jump_st(int);
+    /* 80D48C58 */ void jump_ed(int);
+    /* 80D48E34 */ void sniff(int);
+    /* 80D48FA8 */ void demo_appear(int);
+    /* 80D4910C */ void demo_walk_to_link(int);
+    /* 80D492A8 */ void demo_walk_circle(int);
+    /* 80D49418 */ void demo_walk_to_window(int);
+    /* 80D4971C */ void demo_walk_to_pathway(int);
+    /* 80D499AC */ void cutAppear(int);
+    /* 80D49A40 */ void _cutAppear_Init(int const&);
+    /* 80D4A334 */ void _cutAppear_Main(int const&);
+    /* 80D4A840 */ void _catdoor_open();
+    /* 80D4A920 */ void _catdoor_open_demoskip();
+    /* 80D4A984 */ void cutAppear_skip(int);
+    /* 80D4AA18 */ void _cutAppear_skip_Init(int const&);
+    /* 80D4AAF0 */ void _cutAppear_skip_Main(int const&);
+    /* 80D4BE2C */ daPeru_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
+                            daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
+                            daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
+                            daNpcT_evtData_c const*, char**);
+    /* 80D4BEC4 */ bool getEyeballMaterialNo();
+    /* 80D4BECC */ s32 getHeadJointNo();
+    /* 80D4BED4 */ s32 getNeckJointNo();
+    /* 80D4BEDC */ bool getBackboneJointNo();
+    /* 80D4BEE4 */ void checkChangeJoint(int);
+    /* 80D4BEF4 */ void checkRemoveJoint(int);
+    /* 80D4BF04 */ void beforeMove();
+
+    static void* mCutNameList[3];
+    static u8 mCutList[36];
+
+private:
+    /* 0x568 */ u8 field_0x568[0x112c - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daPeru_c) == 0x112c);
+
+class daPeru_Param_c {
+public:
+    /* 80D4BF7C */ ~daPeru_Param_c();
+
+    static u8 const m[152];
+};
 
 #endif /* D_A_PERU_H */
diff --git a/include/rel/d/a/d_a_ppolamp/d_a_ppolamp.h b/include/rel/d/a/d_a_ppolamp/d_a_ppolamp.h
index 793e0c55794..e1faf7b7776 100644
--- a/include/rel/d/a/d_a_ppolamp/d_a_ppolamp.h
+++ b/include/rel/d/a/d_a_ppolamp/d_a_ppolamp.h
@@ -2,5 +2,34 @@
 #define D_A_PPOLAMP_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daPPolamp_c
+ * @brief P Poe Lamp
+ *
+ * @details
+ *
+ */
+class daPPolamp_c : public fopAc_ac_c {
+public:
+    /* 80D4C958 */ ~daPPolamp_c();
+    /* 80D4C9FC */ void create();
+    /* 80D4CB24 */ void execute();
+    /* 80D4CB84 */ void draw();
+    /* 80D4CCF0 */ void Delete();
+    /* 80D4CD24 */ void setModelMtx();
+    /* 80D4CDA8 */ void setPclModelMtx();
+    /* 80D4CE9C */ void createHeap();
+    /* 80D4CFB0 */ void moveSwing();
+    /* 80D4D10C */ void initParam();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x5ac - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daPPolamp_c) == 0x5ac);
+
 
 #endif /* D_A_PPOLAMP_H */
diff --git a/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h b/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h
index 1b5b89078b5..bc17922c49f 100644
--- a/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h
+++ b/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daScex_c
+ * @brief Scene Exit
+ *
+ * @details
+ *
+ */
 class daScex_c : public fopAc_ac_c {
 public:
     daScex_c() {}
diff --git a/include/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.h b/include/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.h
index 7c6713cbf2d..463648034a3 100644
--- a/include/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.h
+++ b/include/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daScExit_c
+ * @brief Scene Exit 2
+ *
+ * @details
+ *
+ */
 class daScExit_c : public fopAc_ac_c {
 public:
     enum act_e {
diff --git a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h
index 41846245be3..89f8d59fbc4 100644
--- a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h
+++ b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h
@@ -3,6 +3,14 @@
 
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daSetBgObj_c
+ * @brief Set Background Object
+ *
+ * @details
+ *
+ */
 class daSetBgObj_c : public fopAc_ac_c {
 public:
     /* 80031870 */ static const char* getArcName(fopAc_ac_c*);
diff --git a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h
index 06636391306..0d1fc7aa0dd 100644
--- a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h
+++ b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h
@@ -5,6 +5,14 @@
 
 class dMeterButton_c;
 
+/**
+ * @ingroup actors-unsorted
+ * @class daSkip2D_c
+ * @brief ???
+ *
+ * @details
+ *
+ */
 class daSkip2D_c : public fopAc_ac_c {
 public:
     daSkip2D_c() {
diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h
index 58032c261b8..211421b4299 100644
--- a/include/rel/d/a/d_a_spinner/d_a_spinner.h
+++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h
@@ -7,10 +7,11 @@
 
 /**
  * @ingroup actors-items
+ * @class daSpinner_c
  * @brief Spinner
- * 
- * Arbiter's Grounds dungeon item.
- * 
+ *
+ * @details Arbiter's Grounds dungeon item.
+ *
  */
 class daSpinner_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/d_a_sq/d_a_sq.h b/include/rel/d/a/d_a_sq/d_a_sq.h
index f1e2b6f5be7..c4c203d91fd 100644
--- a/include/rel/d/a/d_a_sq/d_a_sq.h
+++ b/include/rel/d/a/d_a_sq/d_a_sq.h
@@ -8,6 +8,14 @@
 #include "d/cc/d_cc_uty.h"
 #include "d/msg/d_msg_flow.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class sq_class
+ * @brief Squirrel
+ *
+ * @details Is this different from the talking npc actor?
+ *
+ */
 class sq_class : public fopEn_enemy_c {
 public:
     enum Action {
diff --git a/include/rel/d/a/d_a_suspend/d_a_suspend.h b/include/rel/d/a/d_a_suspend/d_a_suspend.h
index 858301e30ab..8512d2620e1 100644
--- a/include/rel/d/a/d_a_suspend/d_a_suspend.h
+++ b/include/rel/d/a/d_a_suspend/d_a_suspend.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daSus_c
+ * @brief Suspend
+ *
+ * @details
+ *
+ */
 class daSus_c : public fopAc_ac_c {
 public:
     class data_c {
diff --git a/include/rel/d/a/d_a_swBall/d_a_swBall.h b/include/rel/d/a/d_a_swBall/d_a_swBall.h
index ba0526583d7..45dc0a89db9 100644
--- a/include/rel/d/a/d_a_swBall/d_a_swBall.h
+++ b/include/rel/d/a/d_a_swBall/d_a_swBall.h
@@ -1,6 +1,34 @@
 #ifndef D_A_SWBALL_H
 #define D_A_SWBALL_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daSwBall_c
+ * @brief Switch Ball
+ *
+ * @details
+ *
+ */
+class daSwBall_c : public fopAc_ac_c {
+public:
+    /* 80D4E054 */ void checkArea_sub(fopAc_ac_c*);
+    /* 80D4E194 */ void checkArea();
+    /* 80D4E248 */ void search_ball();
+    /* 80D4E374 */ void Create();
+    /* 80D4E42C */ void create();
+    /* 80D4E494 */ void execute();
+    /* 80D4E524 */ void actionRun();
+    /* 80D4E6C4 */ void actionStop();
+    /* 80D4E6C8 */ void PutCrrPos();
+    /* 80D4E90C */ bool _delete();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x5a0 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daSwBall_c) == 0x5a0);
+
 
 #endif /* D_A_SWBALL_H */
diff --git a/include/rel/d/a/d_a_swLBall/d_a_swLBall.h b/include/rel/d/a/d_a_swLBall/d_a_swLBall.h
index 0cd08b137a3..19aa8c1d303 100644
--- a/include/rel/d/a/d_a_swLBall/d_a_swLBall.h
+++ b/include/rel/d/a/d_a_swLBall/d_a_swLBall.h
@@ -1,6 +1,35 @@
 #ifndef D_A_SWLBALL_H
 #define D_A_SWLBALL_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daSwLBall_c
+ * @brief Switch L Ball
+ *
+ * @details
+ *
+ */
+class daSwLBall_c : public fopAc_ac_c {
+public:
+    /* 80D4EB8C */ void checkArea_sub(fopAc_ac_c*);
+    /* 80D4ECCC */ void checkArea();
+    /* 80D4ED80 */ void search_lb();
+    /* 80D4EEAC */ void Create();
+    /* 80D4EEF8 */ void create();
+    /* 80D4EF60 */ void execute();
+    /* 80D4F008 */ void actionInit();
+    /* 80D4F080 */ void actionRun();
+    /* 80D4F220 */ void actionStop();
+    /* 80D4F224 */ void PutCrrPos();
+    /* 80D4F444 */ bool _delete();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x578 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daSwLBall_c) == 0x578);
+
 
 #endif /* D_A_SWLBALL_H */
diff --git a/include/rel/d/a/d_a_swTime/d_a_swTime.h b/include/rel/d/a/d_a_swTime/d_a_swTime.h
index 4e36b154cdc..b945a889688 100644
--- a/include/rel/d/a/d_a_swTime/d_a_swTime.h
+++ b/include/rel/d/a/d_a_swTime/d_a_swTime.h
@@ -3,6 +3,14 @@
 
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daSwTime_c
+ * @brief Switch Time
+ *
+ * @details
+ *
+ */
 class daSwTime_c : public fopAc_ac_c {
 public:
     u8 getTime() {
@@ -22,9 +30,12 @@ public:
     /* 80D4F6C8 */ int execute();
     /* 80D4F758 */ int _delete();
 
+private:
     /* 0x568 */ u8 mTime;
     /* 0x569 */ u8 mSwbit;
     /* 0x56A */ u8 mSwbit2;
 };
 
+STATIC_ASSERT(sizeof(daSwTime_c) == 0x56C);
+
 #endif /* D_A_SWTIME_H */
diff --git a/include/rel/d/a/d_a_swc00/d_a_swc00.h b/include/rel/d/a/d_a_swc00/d_a_swc00.h
index 8068b4a7eb1..51e918b7b0e 100644
--- a/include/rel/d/a/d_a_swc00/d_a_swc00.h
+++ b/include/rel/d/a/d_a_swc00/d_a_swc00.h
@@ -1,5 +1,35 @@
 #ifndef D_A_SWC00_H
 #define D_A_SWC00_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daSwc00_c
+ * @brief Switch Area C
+ *
+ * @details
+ *
+ */
+class daSwc00_c : public fopAc_ac_c {
+public:
+public:
+    /* 805A15FC */ int execute();
+    /* 805A18E8 */ void event_proc_call();
+    /* 805A19A4 */ void actionWait();
+    /* 805A1A28 */ void actionOrderEvent();
+    /* 805A1A94 */ void actionEvent();
+    /* 805A1AF0 */ void actionDead();
+
+private: 
+    /* 0x568 */ cXyz field_0x568;
+    /* 0x574 */ cXyz field_0x574;
+    /* 0x580 */ u16 mEventID;
+    /* 0x582 */ u8 mAction;
+    /* 0x584 */ u8 field_0x584[4];
+};
+
+STATIC_ASSERT(sizeof(daSwc00_c) == 0x588);
+
 
 #endif /* D_A_SWC00_H */
diff --git a/include/rel/d/a/d_a_swhit0/d_a_swhit0.h b/include/rel/d/a/d_a_swhit0/d_a_swhit0.h
index 1935b2df5cf..08604d35470 100644
--- a/include/rel/d/a/d_a_swhit0/d_a_swhit0.h
+++ b/include/rel/d/a/d_a_swhit0/d_a_swhit0.h
@@ -1,5 +1,48 @@
 #ifndef D_A_SWHIT0_H
 #define D_A_SWHIT0_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daSwhit0_c
+ * @brief Crystal Switch (?)
+ *
+ * @details
+ *
+ */
+class daSwhit0_c : public fopAc_ac_c {
+public:
+    /* 80485FF8 */ void getSwNo();
+    /* 80486004 */ void getSwNo2();
+    /* 80486010 */ void getEvNo();
+    /* 8048602C */ void getTimer();
+    /* 80486048 */ void getType();
+    /* 80486064 */ void makeEventId();
+    /* 804860EC */ void CreateHeap();
+    /* 80486214 */ void CreateInit();
+    /* 804863B0 */ void create();
+    /* 8048668C */ void checkHit();
+    /* 80486704 */ void setCombackTimer();
+    /* 80486788 */ void endCombackTimer();
+    /* 80486800 */ void onSwitch();
+    /* 80486858 */ void offSwitch();
+    /* 804868A8 */ void DemoProc();
+    /* 804869C4 */ void orderEvent();
+    /* 80486ABC */ void actionOffWait();
+    /* 80486BC4 */ void actionToOnReady();
+    /* 80486C28 */ void actionToOnOrder();
+    /* 80486CE4 */ void actionToOnDemo();
+    /* 80486D88 */ void actionToOnDemo2();
+    /* 80486EC4 */ void actionSwWait();
+    /* 80486FC0 */ void actionOnWait();
+    /* 804870E0 */ void setDrawMtx();
+
+private:
+    /* 0x568 */ u8 field_0x568[0x75c - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daSwhit0_c) == 0x75c);
+
 
 #endif /* D_A_SWHIT0_H */
diff --git a/include/rel/d/a/d_a_talk/d_a_talk.h b/include/rel/d/a/d_a_talk/d_a_talk.h
index 1cb1c04005e..d7f77ecbca5 100644
--- a/include/rel/d/a/d_a_talk/d_a_talk.h
+++ b/include/rel/d/a/d_a_talk/d_a_talk.h
@@ -4,6 +4,14 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/msg/d_msg_flow.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daTalk_c
+ * @brief Talk (Unused?)
+ *
+ * @details
+ *
+ */
 class daTalk_c : public fopAc_ac_c {
 public:
     /* 80D66378 */ ~daTalk_c();
@@ -14,8 +22,11 @@ public:
     /* 80D66688 */ u16 getStatus();
     /* 80D666A8 */ u32 messageSet();
 
+private:
     /* 0x568 */ dMsgFlow_c mMsgFlow;
     /* 0x5B4 */ u32 mMessageID;
 };
 
+STATIC_ASSERT(sizeof(daTalk_c) == 0x5B8);
+
 #endif /* D_A_TALK_H */
diff --git a/include/rel/d/a/d_a_tbox/d_a_tbox.h b/include/rel/d/a/d_a_tbox/d_a_tbox.h
index a171f010705..0fe6182c89d 100644
--- a/include/rel/d/a/d_a_tbox/d_a_tbox.h
+++ b/include/rel/d/a/d_a_tbox/d_a_tbox.h
@@ -35,6 +35,14 @@ class daTbox_c;
 typedef int (daTbox_c::*daTbox_actionFn)();
 typedef void (daTbox_c::*daTbox_modeFn)();
 
+/**
+ * @ingroup actors-unsorted
+ * @class daTbox_c
+ * @brief Treasure Box
+ *
+ * @details
+ *
+ */
 class daTbox_c : public daTboxBase_c {
 public:
     enum Shape {
diff --git a/include/rel/d/a/d_a_tbox2/d_a_tbox2.h b/include/rel/d/a/d_a_tbox2/d_a_tbox2.h
index 586a1a8be07..7829765beb0 100644
--- a/include/rel/d/a/d_a_tbox2/d_a_tbox2.h
+++ b/include/rel/d/a/d_a_tbox2/d_a_tbox2.h
@@ -3,6 +3,14 @@
 
 #include "rel/d/a/d_a_tbox/d_a_tbox.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daTbox2_c
+ * @brief Treasure Box 2
+ *
+ * @details
+ *
+ */
 class daTbox2_c : public daTboxBase_c {
 public:
     enum Type_e {
@@ -59,6 +67,7 @@ public:
     u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); }
     u8 getItemNo() { return fopAcM_GetParamBit(this, 0, 8); }
 
+private:
     /* 0x718 */ u8 mReturnRupee;
     /* 0x71C */ request_of_phase_process_class mPhase;
     /* 0x724 */ J3DModel* mpModel;
@@ -76,4 +85,15 @@ public:
     /* 0xAC8 */ dBgW* mBoxBgW;
 };
 
+STATIC_ASSERT(sizeof(daTbox2_c) == 0xACC);
+
+struct res_info {
+public:
+    /* 0x0 */ int bmd_no;
+    /* 0x4 */ int bck_no;
+    /* 0x8 */ int dzb_id;
+    /* 0xC */ int dzb_no;
+};
+
+
 #endif /* D_A_TBOX2_H */
diff --git a/include/rel/d/a/d_a_tboxSw/d_a_tboxSw.h b/include/rel/d/a/d_a_tboxSw/d_a_tboxSw.h
index d3a0c3cbd11..50222e63a84 100644
--- a/include/rel/d/a/d_a_tboxSw/d_a_tboxSw.h
+++ b/include/rel/d/a/d_a_tboxSw/d_a_tboxSw.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daTboxSw_c
+ * @brief Treasure Box Switch
+ *
+ * @details
+ *
+ */
 class daTboxSw_c : public fopAc_ac_c {
 public:
     /* 80D66858 */ int Create();
@@ -12,6 +20,8 @@ public:
     /* 80D66940 */ int _delete();
 };
 
+STATIC_ASSERT(sizeof(daTboxSw_c) == 0x568);
+
 namespace daTboxSw_prm {
     inline u8 getTboxNo(daTboxSw_c* p_tbox) { return fopAcM_GetParam(p_tbox) & 0x3F; }
     inline u8 getSwNo(daTboxSw_c* p_tbox) { return fopAcM_GetParam(p_tbox) >> 8; }
diff --git a/include/rel/d/a/d_a_title/d_a_title.h b/include/rel/d/a/d_a_title/d_a_title.h
index 3a3118a6d9c..09cf8bbbc78 100644
--- a/include/rel/d/a/d_a_title/d_a_title.h
+++ b/include/rel/d/a/d_a_title/d_a_title.h
@@ -1,5 +1,55 @@
 #ifndef D_A_TITLE_H
 #define D_A_TITLE_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class daTitle_c
+ * @brief Title Logo
+ *
+ * @details
+ *
+ */
+class daTitle_c : public fopAc_ac_c {
+public:
+    /* 80D66B54 */ void CreateHeap();
+    /* 80D66CDC */ void create();
+    /* 80D66E7C */ void createHeapCallBack(fopAc_ac_c*);
+    /* 80D66E9C */ void Execute();
+    /* 80D66F34 */ void KeyWaitAnm();
+    /* 80D67010 */ void loadWait_init();
+    /* 80D6701C */ void loadWait_proc();
+    /* 80D672E0 */ void logoDispWaitInit();
+    /* 80D672EC */ void logoDispWait();
+    /* 80D67350 */ void logoDispAnmInit();
+    /* 80D6737C */ void logoDispAnm();
+    /* 80D674A8 */ void keyWaitInit();
+    /* 80D674B4 */ void keyWait();
+    /* 80D67544 */ void nextScene_init();
+    /* 80D67550 */ void nextScene_proc();
+    /* 80D675EC */ void fastLogoDispInit();
+    /* 80D676AC */ void fastLogoDisp();
+    /* 80D676F4 */ void getDemoPrm();
+    /* 80D67768 */ void Draw();
+    /* 80D6786C */ void Delete();
+private:
+    /* 0x568 */ u8 field_0x568[0x608 - 0x568];
+};
+
+STATIC_ASSERT(sizeof(daTitle_c) == 0x608);
+
+class daTit_HIO_c {
+public:
+    /* 80D66B0C */ daTit_HIO_c();
+    /* 80D67A08 */ ~daTit_HIO_c();
+};
+
+class dDlst_daTitle_c {
+public:
+    /* 80D679C8 */ void draw();
+    /* 80D67B30 */ ~dDlst_daTitle_c();
+};
+
 
 #endif /* D_A_TITLE_H */
diff --git a/include/rel/d/a/d_a_vrbox/d_a_vrbox.h b/include/rel/d/a/d_a_vrbox/d_a_vrbox.h
index cf40dd47ad4..3638fd31f63 100644
--- a/include/rel/d/a/d_a_vrbox/d_a_vrbox.h
+++ b/include/rel/d/a/d_a_vrbox/d_a_vrbox.h
@@ -3,6 +3,14 @@
 
 #include "d/com/d_com_inf_game.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class vrbox_class
+ * @brief VR Box
+ *
+ * @details
+ *
+ */
 class vrbox_class : public fopAc_ac_c {
 public:
     /* 0x568 */ u8 unk_0x568[0x56C - 0x568];
@@ -11,4 +19,6 @@ public:
     /* 0x574 */ u8 field_0x574;
 };
 
+STATIC_ASSERT(sizeof(vrbox_class) == 0x578);
+
 #endif /* D_A_VRBOX_H */
diff --git a/include/rel/d/a/d_a_vrbox2/d_a_vrbox2.h b/include/rel/d/a/d_a_vrbox2/d_a_vrbox2.h
index 3034e94ea4d..75cecd7d5a2 100644
--- a/include/rel/d/a/d_a_vrbox2/d_a_vrbox2.h
+++ b/include/rel/d/a/d_a_vrbox2/d_a_vrbox2.h
@@ -1,5 +1,30 @@
 #ifndef D_A_VRBOX2_H
 #define D_A_VRBOX2_H
 
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-unsorted
+ * @class vrbox2_class
+ * @brief VR Box 2
+ *
+ * @details
+ *
+ */
+class vrbox2_class : public fopAc_ac_c {
+public:
+    /* 0x568 */ u8 field_0x568[0x56C - 0x568];
+    /* 0x56C */ J3DModel* mpKumoModel;
+    /* 0x570 */ u8 field_0x570[0x574 - 0x570];
+    /* 0x574 */ J3DModel* model2;
+    /* 0x578 */ J3DModel* model2_und;
+    /* 0x57C */ u8 field_0x57C[0x580 - 0x57C];
+    /* 0x580 */ mDoExt_btkAnm mSunBtk;
+    /* 0x598 */ J3DModel* mpKasumimModel;
+    /* 0x59C */ u8 field_0x59C[0x5A0 - 0x59C];
+};
+
+STATIC_ASSERT(sizeof(vrbox2_class) == 0x5A0);
+
 
 #endif /* D_A_VRBOX2_H */
diff --git a/include/rel/d/a/d_a_warp_bug/d_a_warp_bug.h b/include/rel/d/a/d_a_warp_bug/d_a_warp_bug.h
index 451d2a88ea5..a2f4d26b593 100644
--- a/include/rel/d/a/d_a_warp_bug/d_a_warp_bug.h
+++ b/include/rel/d/a/d_a_warp_bug/d_a_warp_bug.h
@@ -3,6 +3,14 @@
 
 #include "f_op/f_op_actor_mng.h"
 
+/**
+ * @ingroup actors-unsorted
+ * @class daWarpBug_c
+ * @brief Warp Bug (unused)
+ *
+ * @details
+ *
+ */
 class daWarpBug_c : public fopAc_ac_c {
 public:
     inline ~daWarpBug_c();
@@ -22,4 +30,6 @@ public:
     /* 0x57E */ u8 field_0x57e;
 };
 
+STATIC_ASSERT(sizeof(daWarpBug_c) == 0x580);
+
 #endif /* D_A_WARP_BUG_H */
diff --git a/include/rel/d/a/d_a_ykgr/d_a_ykgr.h b/include/rel/d/a/d_a_ykgr/d_a_ykgr.h
index 0a1060d8e6b..568cb800be1 100644
--- a/include/rel/d/a/d_a_ykgr/d_a_ykgr.h
+++ b/include/rel/d/a/d_a_ykgr/d_a_ykgr.h
@@ -36,6 +36,14 @@ extern "C" u8 m_flag__8daYkgr_c;
 extern "C" u8 m_alpha_flag__8daYkgr_c;
 extern "C" u8 m_alpha__8daYkgr_c;
 
+/**
+ * @ingroup actors-unsorted
+ * @class daYkgr_c
+ * @brief Floor Gravity On/Off
+ *
+ * @details
+ *
+ */
 class daYkgr_c : public fopAc_ac_c {
 public:
     static void init() {
@@ -93,4 +101,6 @@ public:
     f32 field_0x5a8;
 };
 
+STATIC_ASSERT(sizeof(daYkgr_c) == 0x5AC);
+
 #endif /* D_A_YKGR_H */
diff --git a/include/rel/d/a/e/d_a_e_ai/d_a_e_ai.h b/include/rel/d/a/e/d_a_e_ai/d_a_e_ai.h
index 9af749fd8ab..7303e564b08 100644
--- a/include/rel/d/a/e/d_a_e_ai/d_a_e_ai.h
+++ b/include/rel/d/a/e/d_a_e_ai/d_a_e_ai.h
@@ -36,6 +36,7 @@ class e_ai_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xd44 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_ai_class) == 0xd44);
 
 class daE_AI_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h b/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h
index c8f24eb0400..4590ff23fe8 100644
--- a/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h
+++ b/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h
@@ -39,6 +39,7 @@ class daE_BG_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xbbc - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_BG_c) == 0xbbc);
 
 class daE_BG_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_bi/d_a_e_bi.h b/include/rel/d/a/e/d_a_e_bi/d_a_e_bi.h
index 75765f338eb..8a7a3b2460a 100644
--- a/include/rel/d/a/e/d_a_e_bi/d_a_e_bi.h
+++ b/include/rel/d/a/e/d_a_e_bi/d_a_e_bi.h
@@ -14,6 +14,7 @@ class e_bi_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xc00 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_bi_class) == 0xc00);
 
 class daE_BI_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_bs/d_a_e_bs.h b/include/rel/d/a/e/d_a_e_bs/d_a_e_bs.h
index c59b9351e69..3beb134b841 100644
--- a/include/rel/d/a/e/d_a_e_bs/d_a_e_bs.h
+++ b/include/rel/d/a/e/d_a_e_bs/d_a_e_bs.h
@@ -14,6 +14,7 @@ class e_bs_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xcfc - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_bs_class) == 0xcfc);
 
 class daE_BS_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_bu/d_a_e_bu.h b/include/rel/d/a/e/d_a_e_bu/d_a_e_bu.h
index fd39654d1aa..ebbfbe3eeae 100644
--- a/include/rel/d/a/e/d_a_e_bu/d_a_e_bu.h
+++ b/include/rel/d/a/e/d_a_e_bu/d_a_e_bu.h
@@ -14,6 +14,7 @@ class e_bu_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xaa4 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_bu_class) == 0xaa4);
 
 class daE_BU_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h b/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h
index 6f273f45829..1ba8b84e950 100644
--- a/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h
+++ b/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h
@@ -15,6 +15,7 @@ class e_bug_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x7db0 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_bug_class) == 0x7db0);
 
 class daE_Bug_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_cr/d_a_e_cr.h b/include/rel/d/a/e/d_a_e_cr/d_a_e_cr.h
index 266ed0ef9e3..106648e1bf0 100644
--- a/include/rel/d/a/e/d_a_e_cr/d_a_e_cr.h
+++ b/include/rel/d/a/e/d_a_e_cr/d_a_e_cr.h
@@ -14,6 +14,7 @@ class e_cr_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa60 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_cr_class) == 0xa60);
 
 class daE_CR_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.h b/include/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.h
index 03f67532a65..6bf9a5178b4 100644
--- a/include/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.h
+++ b/include/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.h
@@ -14,6 +14,7 @@ class e_cr_egg_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa0c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_cr_egg_class) == 0xa0c);
 
 
diff --git a/include/rel/d/a/e/d_a_e_db/d_a_e_db.h b/include/rel/d/a/e/d_a_e_db/d_a_e_db.h
index bc9bcd55f21..38a759d3d70 100644
--- a/include/rel/d/a/e/d_a_e_db/d_a_e_db.h
+++ b/include/rel/d/a/e/d_a_e_db/d_a_e_db.h
@@ -14,6 +14,7 @@ class e_db_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1270 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_db_class) == 0x1270);
 
 class daE_DB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_dd/d_a_e_dd.h b/include/rel/d/a/e/d_a_e_dd/d_a_e_dd.h
index b17eb827ea9..e43c3970a55 100644
--- a/include/rel/d/a/e/d_a_e_dd/d_a_e_dd.h
+++ b/include/rel/d/a/e/d_a_e_dd/d_a_e_dd.h
@@ -14,6 +14,7 @@ class e_dd_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xe94 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_dd_class) == 0xe94);
 
 class daE_DD_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_df/d_a_e_df.h b/include/rel/d/a/e/d_a_e_df/d_a_e_df.h
index f0592f95cb2..22cddedd581 100644
--- a/include/rel/d/a/e/d_a_e_df/d_a_e_df.h
+++ b/include/rel/d/a/e/d_a_e_df/d_a_e_df.h
@@ -42,6 +42,7 @@ class daE_DF_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x838 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_DF_c) == 0x838);
 
 class daE_DF_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h b/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h
index a5a42876b1a..67cbe4f3367 100644
--- a/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h
+++ b/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h
@@ -41,6 +41,7 @@ class daE_DK_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xd54 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_DK_c) == 0xd54);
 
 class daE_DK_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_dn/d_a_e_dn.h b/include/rel/d/a/e/d_a_e_dn/d_a_e_dn.h
index 202de1d31c1..53c450ef66a 100644
--- a/include/rel/d/a/e/d_a_e_dn/d_a_e_dn.h
+++ b/include/rel/d/a/e/d_a_e_dn/d_a_e_dn.h
@@ -15,6 +15,7 @@ class e_dn_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x110c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_dn_class) == 0x110c);
 
 class daE_DN_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h b/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h
index 799df463643..62c90e0950c 100644
--- a/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h
+++ b/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h
@@ -71,6 +71,7 @@ class daE_DT_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1174 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_DT_c) == 0x1174);
 
 class daE_DT_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h b/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h
index e7a0e7ad9a3..009ee1906b0 100644
--- a/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h
+++ b/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h
@@ -37,6 +37,7 @@ class daE_FB_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xce8 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_FB_c) == 0xce8);
 
 class daE_FB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_fk/d_a_e_fk.h b/include/rel/d/a/e/d_a_e_fk/d_a_e_fk.h
index 4e19249f175..78ac4deb489 100644
--- a/include/rel/d/a/e/d_a_e_fk/d_a_e_fk.h
+++ b/include/rel/d/a/e/d_a_e_fk/d_a_e_fk.h
@@ -48,6 +48,7 @@ class daE_FK_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xf6c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_FK_c) == 0xf6c);
 
 class daE_FK_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h b/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h
index 63c193e8e1b..010cb7818bb 100644
--- a/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h
+++ b/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h
@@ -15,6 +15,7 @@ class e_fm_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1b084 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_fm_class) == 0x1b084);
 
 class daE_FM_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_fs/d_a_e_fs.h b/include/rel/d/a/e/d_a_e_fs/d_a_e_fs.h
index c98ddfba823..fd72ab15287 100644
--- a/include/rel/d/a/e/d_a_e_fs/d_a_e_fs.h
+++ b/include/rel/d/a/e/d_a_e_fs/d_a_e_fs.h
@@ -14,6 +14,7 @@ class e_fs_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xb9c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_fs_class) == 0xb9c);
 
 class daE_Fs_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h b/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h
index 16f4538ac2e..51fd2280611 100644
--- a/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h
+++ b/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h
@@ -140,6 +140,7 @@ private:
     /* 0xC22 */ u8 field_0xc22;                             /**< ??? */
     /* 0xC23 */ u8 field_0xc23;                             /**< ??? */
 };
+
 STATIC_ASSERT(sizeof(daE_FZ_c) == 0xC24);
 
 class daE_FZ_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h b/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h
index 9d2da2d9e9c..0988002005e 100644
--- a/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h
+++ b/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h
@@ -20,6 +20,7 @@ class e_ga_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x4d7c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_ga_class) == 0x4d7c);
 
 class daE_Ga_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_gb/d_a_e_gb.h b/include/rel/d/a/e/d_a_e_gb/d_a_e_gb.h
index 9c4ef6e7f91..f499640b392 100644
--- a/include/rel/d/a/e/d_a_e_gb/d_a_e_gb.h
+++ b/include/rel/d/a/e/d_a_e_gb/d_a_e_gb.h
@@ -15,6 +15,7 @@ class e_gb_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xef8 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_gb_class) == 0xef8);
 
 class daE_GB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_ge/d_a_e_ge.h b/include/rel/d/a/e/d_a_e_ge/d_a_e_ge.h
index 73eb51d2f94..4d8559c52d6 100644
--- a/include/rel/d/a/e/d_a_e_ge/d_a_e_ge.h
+++ b/include/rel/d/a/e/d_a_e_ge/d_a_e_ge.h
@@ -57,6 +57,7 @@ private:
 
     static u8 l_actionmenu[108];
 };
+
 STATIC_ASSERT(sizeof(daE_GE_c) == 0xBA0);
 
 class daE_GE_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h b/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h
index 5321654d0db..659351a0c7c 100644
--- a/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h
+++ b/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h
@@ -41,6 +41,7 @@ class daE_GI_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x107c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_GI_c) == 0x107c);
 
 class daE_GI_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h b/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h
index edd1a7fc9df..4da25fbd722 100644
--- a/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h
+++ b/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h
@@ -48,6 +48,7 @@ class daE_GM_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa78 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_GM_c) == 0xa78);
 
 class daE_GM_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_gob/d_a_e_gob.h b/include/rel/d/a/e/d_a_e_gob/d_a_e_gob.h
index deacb7479a4..27f1ee25b95 100644
--- a/include/rel/d/a/e/d_a_e_gob/d_a_e_gob.h
+++ b/include/rel/d/a/e/d_a_e_gob/d_a_e_gob.h
@@ -15,6 +15,7 @@ class e_gob_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xde4 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_gob_class) == 0xde4);
 
 class daE_GOB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h b/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h
index f6a9e82d37a..0d2da9476b1 100644
--- a/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h
+++ b/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h
@@ -15,6 +15,7 @@ class e_gs_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x6bc - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_gs_class) == 0x6bc);
 
 class daE_GS_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_hb/d_a_e_hb.h b/include/rel/d/a/e/d_a_e_hb/d_a_e_hb.h
index 25bd2384478..86e1915c675 100644
--- a/include/rel/d/a/e/d_a_e_hb/d_a_e_hb.h
+++ b/include/rel/d/a/e/d_a_e_hb/d_a_e_hb.h
@@ -14,6 +14,7 @@ class e_hb_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1268 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_hb_class) == 0x1268);
 
 class daE_HB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h b/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h
index 7b347033d5f..980d70cb2a9 100644
--- a/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h
+++ b/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h
@@ -65,6 +65,7 @@ class daE_HM_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa88 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_HM_c) == 0xa88);
 
 class daE_HM_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h b/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h
index 36cf6be312d..cbce6d8794b 100644
--- a/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h
+++ b/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h
@@ -39,6 +39,7 @@ class daE_HP_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xdfc - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_HP_c) == 0xdfc);
 
 class daE_HP_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_hz/d_a_e_hz.h b/include/rel/d/a/e/d_a_e_hz/d_a_e_hz.h
index 6dd044828a4..93f42a6c172 100644
--- a/include/rel/d/a/e/d_a_e_hz/d_a_e_hz.h
+++ b/include/rel/d/a/e/d_a_e_hz/d_a_e_hz.h
@@ -56,6 +56,7 @@ class daE_HZ_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1238 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_HZ_c) == 0x1238);
 
 class daE_HZ_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.h b/include/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.h
index 55392d4e24b..aca9c37dd23 100644
--- a/include/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.h
+++ b/include/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.h
@@ -15,6 +15,7 @@ class e_hzelda_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1460 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_hzelda_class) == 0x1460);
 
 class daE_HZELDA_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_is/d_a_e_is.h b/include/rel/d/a/e/d_a_e_is/d_a_e_is.h
index 00f624ff2cc..0faf949a1d3 100644
--- a/include/rel/d/a/e/d_a_e_is/d_a_e_is.h
+++ b/include/rel/d/a/e/d_a_e_is/d_a_e_is.h
@@ -15,6 +15,7 @@ class e_is_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xcf8 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_is_class) == 0xcf8);
 
 class daE_IS_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_kg/d_a_e_kg.h b/include/rel/d/a/e/d_a_e_kg/d_a_e_kg.h
index e4b7bf9277f..2b0fbebc457 100644
--- a/include/rel/d/a/e/d_a_e_kg/d_a_e_kg.h
+++ b/include/rel/d/a/e/d_a_e_kg/d_a_e_kg.h
@@ -14,6 +14,7 @@ class e_kg_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa74 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_kg_class) == 0xa74);
 
 class daE_KG_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h b/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h
index ca9200c53d0..d68a20a0070 100644
--- a/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h
+++ b/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h
@@ -45,6 +45,7 @@ class daE_KK_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x13d4 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_KK_c) == 0x13d4);
 
 class daE_KK_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_kr/d_a_e_kr.h b/include/rel/d/a/e/d_a_e_kr/d_a_e_kr.h
index 4df16176f8a..176cdedf44e 100644
--- a/include/rel/d/a/e/d_a_e_kr/d_a_e_kr.h
+++ b/include/rel/d/a/e/d_a_e_kr/d_a_e_kr.h
@@ -15,6 +15,7 @@ class e_kr_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xf08 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_kr_class) == 0xf08);
 
 class e_krHIO_c {
diff --git a/include/rel/d/a/e/d_a_e_mb/d_a_e_mb.h b/include/rel/d/a/e/d_a_e_mb/d_a_e_mb.h
index 6a6736e08c3..5a6be495fde 100644
--- a/include/rel/d/a/e/d_a_e_mb/d_a_e_mb.h
+++ b/include/rel/d/a/e/d_a_e_mb/d_a_e_mb.h
@@ -14,6 +14,7 @@ class e_mb_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x8cc - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_mb_class) == 0x8cc);
 
 class daE_MB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_md/d_a_e_md.h b/include/rel/d/a/e/d_a_e_md/d_a_e_md.h
index 8a10fa7f47a..e78651edf79 100644
--- a/include/rel/d/a/e/d_a_e_md/d_a_e_md.h
+++ b/include/rel/d/a/e/d_a_e_md/d_a_e_md.h
@@ -29,6 +29,7 @@ class daE_MD_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa50 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_MD_c) == 0xa50);
 
 
diff --git a/include/rel/d/a/e/d_a_e_mf/d_a_e_mf.h b/include/rel/d/a/e/d_a_e_mf/d_a_e_mf.h
index 1490af8cdfe..f1355f2134f 100644
--- a/include/rel/d/a/e/d_a_e_mf/d_a_e_mf.h
+++ b/include/rel/d/a/e/d_a_e_mf/d_a_e_mf.h
@@ -15,6 +15,7 @@ class e_mf_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x10ec - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_mf_class) == 0x10ec);
 
 class daE_MF_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_mk/d_a_e_mk.h b/include/rel/d/a/e/d_a_e_mk/d_a_e_mk.h
index f5bd841456f..5b02e895801 100644
--- a/include/rel/d/a/e/d_a_e_mk/d_a_e_mk.h
+++ b/include/rel/d/a/e/d_a_e_mk/d_a_e_mk.h
@@ -15,6 +15,7 @@ class e_mk_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xcf8 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_mk_class) == 0xcf8);
 
 class daE_MK_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.h b/include/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.h
index a855a7d18ee..56b1bf73bf7 100644
--- a/include/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.h
+++ b/include/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.h
@@ -14,6 +14,7 @@ class e_mk_bo_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x9c0 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_mk_bo_class) == 0x9c0);
 
 
diff --git a/include/rel/d/a/e/d_a_e_mm/d_a_e_mm.h b/include/rel/d/a/e/d_a_e_mm/d_a_e_mm.h
index 977dd24e7ed..b929e343224 100644
--- a/include/rel/d/a/e/d_a_e_mm/d_a_e_mm.h
+++ b/include/rel/d/a/e/d_a_e_mm/d_a_e_mm.h
@@ -14,6 +14,7 @@ class e_mm_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xc1c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_mm_class) == 0xc1c);
 
 class daE_MM_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.h b/include/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.h
index 355ca54a1fd..27b607bc590 100644
--- a/include/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.h
+++ b/include/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.h
@@ -14,6 +14,7 @@ class e_mm_mt_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xba4 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_mm_mt_class) == 0xba4);
 
 
diff --git a/include/rel/d/a/e/d_a_e_ms/d_a_e_ms.h b/include/rel/d/a/e/d_a_e_ms/d_a_e_ms.h
index 2478a834833..3ef8759e0fb 100644
--- a/include/rel/d/a/e/d_a_e_ms/d_a_e_ms.h
+++ b/include/rel/d/a/e/d_a_e_ms/d_a_e_ms.h
@@ -14,6 +14,7 @@ class e_ms_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xbbc - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_ms_class) == 0xbbc);
 
 class daE_MS_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h b/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h
index 4caa528f74d..fd03eb799df 100644
--- a/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h
+++ b/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h
@@ -30,6 +30,7 @@ struct nest_hahen_s {
     /* 0x53 */ bool mActive;
     /* 0x54 */ u8 mTimer;
 };
+
 STATIC_ASSERT(sizeof(nest_hahen_s) == 0x58);
 
 /**
@@ -106,6 +107,7 @@ public:
     /* 0xCF0 */ f32 mDemoCameraFovY;
     /* 0xCF4 */ bool mHIOInit;
 };
+
 STATIC_ASSERT(sizeof(e_nest_class) == 0xCF8);
 
 class daE_Nest_HIO_c {
@@ -116,6 +118,7 @@ public:
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScale;
 };
+
 STATIC_ASSERT(sizeof(daE_Nest_HIO_c) == 0xC);
 
 #endif /* D_A_E_NEST_H */
diff --git a/include/rel/d/a/e/d_a_e_nz/d_a_e_nz.h b/include/rel/d/a/e/d_a_e_nz/d_a_e_nz.h
index 3167a4c5182..444e7e39003 100644
--- a/include/rel/d/a/e/d_a_e_nz/d_a_e_nz.h
+++ b/include/rel/d/a/e/d_a_e_nz/d_a_e_nz.h
@@ -14,6 +14,7 @@ class e_nz_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa88 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_nz_class) == 0xa88);
 
 class daE_NZ_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h b/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h
index f791eab64f7..1d0fe0a9510 100644
--- a/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h
+++ b/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h
@@ -74,6 +74,7 @@ class daE_OC_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xe88 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_OC_c) == 0xe88);
 
 class daE_OC_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h b/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h
index ff86f6614a4..3666c695d7c 100644
--- a/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h
+++ b/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h
@@ -94,6 +94,7 @@ private:
     /* 0xBB2 */ u8 field_0xbb2;
     /* 0xBB3 */ u8 field_0xbb3;
 };
+
 STATIC_ASSERT(sizeof(daE_OctBg_c) == 0xBB4);
 
 class daE_OctBg_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h b/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h
index 8d2cfb33481..605ffe41477 100644
--- a/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h
+++ b/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h
@@ -36,6 +36,7 @@ class daE_OT_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xb98 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_OT_c) == 0xb98);
 
 class daE_OT_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_pm/d_a_e_pm.h b/include/rel/d/a/e/d_a_e_pm/d_a_e_pm.h
index c33cc9a5057..0e603e15ffa 100644
--- a/include/rel/d/a/e/d_a_e_pm/d_a_e_pm.h
+++ b/include/rel/d/a/e/d_a_e_pm/d_a_e_pm.h
@@ -78,6 +78,7 @@ private:
     /* 0x619 */ bool mAppear;
     /* 0x61A */ u8 field_0x61a[0xb7c - 0x61a];
 };
+
 STATIC_ASSERT(sizeof(daE_PM_c) == 0xb7c);
 
 class daE_PM_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_po/d_a_e_po.h b/include/rel/d/a/e/d_a_e_po/d_a_e_po.h
index c0e374d7b87..388387f4a31 100644
--- a/include/rel/d/a/e/d_a_e_po/d_a_e_po.h
+++ b/include/rel/d/a/e/d_a_e_po/d_a_e_po.h
@@ -15,6 +15,7 @@ class e_po_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xee0 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_po_class) == 0xee0);
 
 class daE_PO_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h b/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h
index 6cadb83672c..9c0eb3ce32b 100644
--- a/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h
+++ b/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h
@@ -48,6 +48,7 @@ private:
     /* 0x845 */ u8 field_0x845;
     /* 0x846 */ u8 field_0x846[0xef8 - 0x846];
 };
+
 STATIC_ASSERT(sizeof(daE_PZ_c) == 0xEF8);
 
 class daE_PZ_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_rb/d_a_e_rb.h b/include/rel/d/a/e/d_a_e_rb/d_a_e_rb.h
index 52abe718793..0c571f5632a 100644
--- a/include/rel/d/a/e/d_a_e_rb/d_a_e_rb.h
+++ b/include/rel/d/a/e/d_a_e_rb/d_a_e_rb.h
@@ -14,6 +14,7 @@ class e_rb_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa6c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_rb_class) == 0xa6c);
 
 class daE_RB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_rd/d_a_e_rd.h b/include/rel/d/a/e/d_a_e_rd/d_a_e_rd.h
index c21e83732b6..c05670b9c28 100644
--- a/include/rel/d/a/e/d_a_e_rd/d_a_e_rd.h
+++ b/include/rel/d/a/e/d_a_e_rd/d_a_e_rd.h
@@ -15,6 +15,7 @@ class e_rd_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1368 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_rd_class) == 0x1368);
 
 class daE_RD_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.h b/include/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.h
index 2f58616312c..af644795865 100644
--- a/include/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.h
+++ b/include/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.h
@@ -15,6 +15,7 @@ class e_rdb_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1154 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_rdb_class) == 0x1154);
 
 class daE_RDB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h b/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h
index 462c3ce1bf5..49aa7f9f4ab 100644
--- a/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h
+++ b/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h
@@ -22,6 +22,7 @@ public:
     /* 0x1372 */ s16 field_0x1372;
     /* 0x1374 */ u8 field_0x1374[0x142c - 0x1374];
 };
+
 STATIC_ASSERT(sizeof(e_rdy_class) == 0x142C);
 
 class daE_RDY_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_s1/d_a_e_s1.h b/include/rel/d/a/e/d_a_e_s1/d_a_e_s1.h
index 4420f89be22..9ba691e6649 100644
--- a/include/rel/d/a/e/d_a_e_s1/d_a_e_s1.h
+++ b/include/rel/d/a/e/d_a_e_s1/d_a_e_s1.h
@@ -14,6 +14,7 @@ class e_s1_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x3084 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_s1_class) == 0x3084);
 
 class daE_S1_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_sb/d_a_e_sb.h b/include/rel/d/a/e/d_a_e_sb/d_a_e_sb.h
index 42154f830bf..ba3ac14ccc0 100644
--- a/include/rel/d/a/e/d_a_e_sb/d_a_e_sb.h
+++ b/include/rel/d/a/e/d_a_e_sb/d_a_e_sb.h
@@ -56,6 +56,7 @@ class daE_SB_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xbc0 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_SB_c) == 0xbc0);
 
 class daE_SB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_sf/d_a_e_sf.h b/include/rel/d/a/e/d_a_e_sf/d_a_e_sf.h
index e2e75766266..59c204c520d 100644
--- a/include/rel/d/a/e/d_a_e_sf/d_a_e_sf.h
+++ b/include/rel/d/a/e/d_a_e_sf/d_a_e_sf.h
@@ -14,6 +14,7 @@ class e_sf_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1000 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_sf_class) == 0x1000);
 
 class daE_SF_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_sg/d_a_e_sg.h b/include/rel/d/a/e/d_a_e_sg/d_a_e_sg.h
index 9e3417cecf9..15781e0d499 100644
--- a/include/rel/d/a/e/d_a_e_sg/d_a_e_sg.h
+++ b/include/rel/d/a/e/d_a_e_sg/d_a_e_sg.h
@@ -14,6 +14,7 @@ class e_sg_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xab0 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_sg_class) == 0xab0);
 
 class daE_SG_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_sh/d_a_e_sh.h b/include/rel/d/a/e/d_a_e_sh/d_a_e_sh.h
index ce9bbee7a71..d8630477a31 100644
--- a/include/rel/d/a/e/d_a_e_sh/d_a_e_sh.h
+++ b/include/rel/d/a/e/d_a_e_sh/d_a_e_sh.h
@@ -14,6 +14,7 @@ class e_sh_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xd0c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_sh_class) == 0xd0c);
 
 class daE_SH_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_sm/d_a_e_sm.h b/include/rel/d/a/e/d_a_e_sm/d_a_e_sm.h
index ab3c200e371..e70a71451ed 100644
--- a/include/rel/d/a/e/d_a_e_sm/d_a_e_sm.h
+++ b/include/rel/d/a/e/d_a_e_sm/d_a_e_sm.h
@@ -55,6 +55,7 @@ class daE_SM_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1160 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_SM_c) == 0x1160);
 
 class daE_Sm_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.h b/include/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.h
index 9e05ef89a73..a7f2ecf4776 100644
--- a/include/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.h
+++ b/include/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.h
@@ -93,6 +93,7 @@ private:
     /* 0xFD8 */ u32 field_0xfd8;
     /* 0xFDC */ u8 field_0xfdc[0xFF0 - 0xFDC];
 };
+
 STATIC_ASSERT(sizeof(e_sm2_class) == 0xff0);
 
 class daE_SM2_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_st/d_a_e_st.h b/include/rel/d/a/e/d_a_e_st/d_a_e_st.h
index 70188633509..2cf0bd02056 100644
--- a/include/rel/d/a/e/d_a_e_st/d_a_e_st.h
+++ b/include/rel/d/a/e/d_a_e_st/d_a_e_st.h
@@ -15,6 +15,7 @@ class e_st_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1068 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_st_class) == 0x1068);
 
 class daE_ST_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h b/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h
index d2f67ecdc7b..fdbd7d1a273 100644
--- a/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h
+++ b/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h
@@ -71,6 +71,7 @@ class daE_SW_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xb18 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_SW_c) == 0xb18);
 
 class daE_SW_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_th/d_a_e_th.h b/include/rel/d/a/e/d_a_e_th/d_a_e_th.h
index ea3bd1fd17f..b25bd3d8aac 100644
--- a/include/rel/d/a/e/d_a_e_th/d_a_e_th.h
+++ b/include/rel/d/a/e/d_a_e_th/d_a_e_th.h
@@ -14,6 +14,7 @@ class e_th_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x123c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_th_class) == 0x123c);
 
 class daE_TH_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.h b/include/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.h
index ef2583b32af..77b65e0224b 100644
--- a/include/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.h
+++ b/include/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.h
@@ -15,6 +15,7 @@ class e_th_ball_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1a90 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_th_ball_class) == 0x1a90);
 
 
diff --git a/include/rel/d/a/e/d_a_e_tk/d_a_e_tk.h b/include/rel/d/a/e/d_a_e_tk/d_a_e_tk.h
index ac19ed7d6bd..848f8a428c2 100644
--- a/include/rel/d/a/e/d_a_e_tk/d_a_e_tk.h
+++ b/include/rel/d/a/e/d_a_e_tk/d_a_e_tk.h
@@ -14,6 +14,7 @@ class e_tk_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa64 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_tk_class) == 0xa64);
 
 class daE_TK_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.h b/include/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.h
index adf0fe8f625..2e3d445a536 100644
--- a/include/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.h
+++ b/include/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.h
@@ -14,6 +14,7 @@ class e_tk2_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa50 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_tk2_class) == 0xa50);
 
 class daE_TK2_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.h b/include/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.h
index cdf55ae7a8a..739b7715778 100644
--- a/include/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.h
+++ b/include/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.h
@@ -14,6 +14,7 @@ class e_tk_ball_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x8cc - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_tk_ball_class) == 0x8cc);
 
 
diff --git a/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h b/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h
index 0dca36acc27..c4ffdfe123d 100644
--- a/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h
+++ b/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h
@@ -45,6 +45,7 @@ class daE_TT_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xad0 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_TT_c) == 0xad0);
 
 class daE_TT_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h b/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h
index b0499bde6b8..3d373db08c7 100644
--- a/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h
+++ b/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h
@@ -15,6 +15,7 @@ class e_warpappear_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x650 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_warpappear_class) == 0x650);
 
 
diff --git a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h
index 3db2295c76b..01576d5da97 100644
--- a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h
+++ b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h
@@ -174,6 +174,7 @@ private:
     /* 0x17E4 */ u8 field_0x17e4[0x17e8 - 0x17e4];
     /* 0x17E8 */ f32 mSpeedRate;
 };
+
 STATIC_ASSERT(sizeof(e_wb_class) == 0x17EC);
 
 struct himo_s {
diff --git a/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h b/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h
index 6838ec6647b..27bccdb6b79 100644
--- a/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h
+++ b/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h
@@ -39,6 +39,7 @@ class daE_WS_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xb80 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_WS_c) == 0xb80);
 
 class daE_WS_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h b/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h
index 49196340379..33c9ae1f8b7 100644
--- a/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h
+++ b/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h
@@ -52,6 +52,7 @@ class daE_WW_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xec8 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_WW_c) == 0xec8);
 
 class daE_WW_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_yd/d_a_e_yd.h b/include/rel/d/a/e/d_a_e_yd/d_a_e_yd.h
index 06479665079..c74149e3cff 100644
--- a/include/rel/d/a/e/d_a_e_yd/d_a_e_yd.h
+++ b/include/rel/d/a/e/d_a_e_yd/d_a_e_yd.h
@@ -14,6 +14,7 @@ class e_yd_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x126c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_yd_class) == 0x126c);
 
 class daE_YD_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_yg/d_a_e_yg.h b/include/rel/d/a/e/d_a_e_yg/d_a_e_yg.h
index 336fc08a7d9..a1b16a0a774 100644
--- a/include/rel/d/a/e/d_a_e_yg/d_a_e_yg.h
+++ b/include/rel/d/a/e/d_a_e_yg/d_a_e_yg.h
@@ -14,6 +14,7 @@ class e_yg_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x18a0 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_yg_class) == 0x18a0);
 
 class daE_YG_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_yh/d_a_e_yh.h b/include/rel/d/a/e/d_a_e_yh/d_a_e_yh.h
index b166f0913e8..cb7662e448e 100644
--- a/include/rel/d/a/e/d_a_e_yh/d_a_e_yh.h
+++ b/include/rel/d/a/e/d_a_e_yh/d_a_e_yh.h
@@ -14,6 +14,7 @@ class e_yh_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0x1274 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_yh_class) == 0x1274);
 
 class daE_YH_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h
index d68acedbe6a..dd09c4a64a6 100644
--- a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h
+++ b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h
@@ -220,6 +220,7 @@ private:
     /* 0xAE8 */ u32 field_0xae8[3];
     /* 0xAF4 */ u8 field_0xaf4;
 };
+
 STATIC_ASSERT(sizeof(daE_YM_c) == 0xAF8);
 
 struct E_YM_n {
diff --git a/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h b/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h
index 6c640281ba3..e122c693b95 100644
--- a/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h
+++ b/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h
@@ -81,6 +81,7 @@ public:
 private:
     /* 0x5AC */ u8 field_0x5ac[0x1524 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_YMB_c) == 0x1524);
 
 struct daE_YMB_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_yr/d_a_e_yr.h b/include/rel/d/a/e/d_a_e_yr/d_a_e_yr.h
index 15138c2fae6..0b4dbd8dce1 100644
--- a/include/rel/d/a/e/d_a_e_yr/d_a_e_yr.h
+++ b/include/rel/d/a/e/d_a_e_yr/d_a_e_yr.h
@@ -15,6 +15,7 @@ class e_yr_class : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xf20 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(e_yr_class) == 0xf20);
 
 class e_yrHIO_c {
diff --git a/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h b/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h
index 1f10a671347..e22a1ec5212 100644
--- a/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h
+++ b/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h
@@ -51,6 +51,7 @@ class daE_ZH_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xe08 - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_ZH_c) == 0xe08);
 
 class daE_ZH_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h b/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h
index 42932f59e65..2cb8a146c6d 100644
--- a/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h
+++ b/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h
@@ -35,6 +35,7 @@ class daE_ZM_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xc3c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_ZM_c) == 0xc3c);
 
 class daE_ZM_HIO_c {
diff --git a/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h b/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h
index 99c7be15852..99bc365b93b 100644
--- a/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h
+++ b/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h
@@ -32,6 +32,7 @@ class daE_ZS_c : public fopEn_enemy_c {
 private:
     /* 0x5ac */ u8 field_0x5ac[0xa3c - 0x5ac];
 };
+
 STATIC_ASSERT(sizeof(daE_ZS_c) == 0xa3c);
 
 class daE_ZS_HIO_c {
diff --git a/include/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.h b/include/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.h
index b6fe3920c6c..120a1ffa599 100644
--- a/include/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.h
+++ b/include/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.h
@@ -80,6 +80,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfd8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Aru_c) == 0xfd8);
 
 class daNpc_Aru_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.h b/include/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.h
index 020e95198b0..531480ecf7e 100644
--- a/include/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.h
+++ b/include/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.h
@@ -48,6 +48,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xdf0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcAshB_c) == 0xdf0);
 
 class daNpcAshB_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.h b/include/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.h
index 8c7d3fa6d54..d8fc371d237 100644
--- a/include/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.h
+++ b/include/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.h
@@ -68,6 +68,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1270 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Bans_c) == 0x1270);
 
 class daNpc_Bans_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.h b/include/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.h
index 8203b54ee7d..c7ce6b9b591 100644
--- a/include/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.h
+++ b/include/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.h
@@ -86,6 +86,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1138 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Besu_c) == 0x1138);
 
 class daNpc_Besu_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.h b/include/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.h
index 0f4cdeaf0e8..63a80693dc9 100644
--- a/include/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.h
+++ b/include/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.h
@@ -75,6 +75,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe14 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcBlueNS_c) == 0xe14);
 
 class daNpcBlueNS_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.h b/include/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.h
index 4d6608b4e3f..cd41818c741 100644
--- a/include/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.h
+++ b/include/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.h
@@ -71,6 +71,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xffc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Bou_c) == 0xffc);
 
 class daNpc_Bou_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.h b/include/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.h
index 32c7b269feb..aa23210860a 100644
--- a/include/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.h
+++ b/include/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.h
@@ -54,6 +54,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe00 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcBouS_c) == 0xe00);
 
 class daNpcBouS_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.h b/include/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.h
index adec512b354..41b848b6348 100644
--- a/include/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.h
+++ b/include/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.h
@@ -136,6 +136,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb9c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcCdn3_c) == 0xb9c);
 
 
diff --git a/include/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.h b/include/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.h
index 22d06f0dd93..a84d9674239 100644
--- a/include/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.h
+++ b/include/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.h
@@ -65,6 +65,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe54 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcChat_c) == 0xe54);
 
 class daNpcChat_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.h b/include/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.h
index 7e6179bc2eb..c6568cac1eb 100644
--- a/include/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.h
+++ b/include/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.h
@@ -86,6 +86,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe78 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcChin_c) == 0xe78);
 
 class daNpcChin_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.h b/include/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.h
index cb21017f8b6..cd3fe52e018 100644
--- a/include/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.h
+++ b/include/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.h
@@ -60,6 +60,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x10f4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_clerkA_c) == 0x10f4);
 
 class daNpc_clerkA_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.h b/include/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.h
index ef2cf238b50..3018210604d 100644
--- a/include/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.h
+++ b/include/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.h
@@ -64,6 +64,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1118 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_clerkB_c) == 0x1118);
 
 class daNpc_clerkB_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.h b/include/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.h
index ef77c9e7f02..4be134b46ec 100644
--- a/include/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.h
+++ b/include/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.h
@@ -58,6 +58,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x10f0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcClerkT_c) == 0x10f0);
 
 class daNpcClerkt_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.h b/include/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.h
index d8b08f60bd2..c9fe7a6a6ae 100644
--- a/include/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.h
+++ b/include/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.h
@@ -47,6 +47,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x2570 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcCoach_c) == 0x2570);
 
 class daNpcChHarness_c {
diff --git a/include/rel/d/a/npc/d_a_npc_df/d_a_npc_df.h b/include/rel/d/a/npc/d_a_npc_df/d_a_npc_df.h
index 3114bc7664d..ddf04494b79 100644
--- a/include/rel/d/a/npc/d_a_npc_df/d_a_npc_df.h
+++ b/include/rel/d/a/npc/d_a_npc_df/d_a_npc_df.h
@@ -15,6 +15,7 @@ class npc_df_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xd44 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_df_class) == 0xd44);
 
 struct df_s {
diff --git a/include/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.h b/include/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.h
index c78fdb1dbd9..c242abb52fb 100644
--- a/include/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.h
+++ b/include/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.h
@@ -62,6 +62,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfcc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Doc_c) == 0xfcc);
 
 class daNpc_Doc_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.h b/include/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.h
index 5df7e03a65b..d1358be19bf 100644
--- a/include/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.h
+++ b/include/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.h
@@ -44,6 +44,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe08 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcDoorBoy_c) == 0xe08);
 
 class daNpcDoorBoy_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.h b/include/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.h
index 2ab5f20cf0b..b250c5066f9 100644
--- a/include/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.h
+++ b/include/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xd3c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcDrSol_c) == 0xd3c);
 
 class daNpcDrSol_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_du/d_a_npc_du.h b/include/rel/d/a/npc/d_a_npc_du/d_a_npc_du.h
index 1da29924f96..3105ab53e1b 100644
--- a/include/rel/d/a/npc/d_a_npc_du/d_a_npc_du.h
+++ b/include/rel/d/a/npc/d_a_npc_du/d_a_npc_du.h
@@ -15,6 +15,7 @@ class npc_du_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xa00 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_du_class) == 0xa00);
 
 class daNpc_Du_HIO_c {
diff --git a/include/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.h b/include/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.h
index 7b551566fa1..06750af041b 100644
--- a/include/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.h
+++ b/include/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.h
@@ -119,6 +119,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x10c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Fairy_c) == 0x10c8);
 
 class daNpc_Fairy_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.h b/include/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.h
index a2995b7774b..312b46d3e58 100644
--- a/include/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.h
+++ b/include/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.h
@@ -47,6 +47,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfb0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_FairySeirei_c) == 0xfb0);
 
 class daNpc_FairySeirei_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.h b/include/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.h
index b089f468e28..5afb4866037 100644
--- a/include/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.h
+++ b/include/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.h
@@ -59,6 +59,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Gnd_c) == 0xfa0);
 
 class daNpc_Gnd_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.h b/include/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.h
index ca6e1ccef05..e67a0c03c8e 100644
--- a/include/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.h
+++ b/include/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.h
@@ -101,6 +101,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1698 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_grA_c) == 0x1698);
 
 class daNpc_grA_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.h b/include/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.h
index 8afbee28465..1a571fba353 100644
--- a/include/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.h
+++ b/include/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe54 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_grC_c) == 0xe54);
 
 class daNpc_grC_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.h b/include/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.h
index 724c55d8c93..847f0d52805 100644
--- a/include/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.h
+++ b/include/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.h
@@ -59,6 +59,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe1c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Grd_c) == 0xe1c);
 
 class daNpc_Grd_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.h b/include/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.h
index 187abc7468a..04f71fabdcf 100644
--- a/include/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.h
+++ b/include/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x10e4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_grM_c) == 0x10e4);
 
 class daNpc_grM_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.h b/include/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.h
index e75409ad9ab..37aa956107b 100644
--- a/include/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.h
+++ b/include/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.h
@@ -61,6 +61,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x10e4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_grMC_c) == 0x10e4);
 
 class daNpc_grMC_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.h b/include/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.h
index 5eae13fb54a..ce1917043fb 100644
--- a/include/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.h
+++ b/include/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.h
@@ -62,6 +62,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe30 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_grO_c) == 0xe30);
 
 class daNpc_grO_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.h b/include/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.h
index 783faffd2fc..5e6fe61aae3 100644
--- a/include/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.h
+++ b/include/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.h
@@ -59,6 +59,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe20 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_grR_c) == 0xe20);
 
 class daNpc_grR_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.h b/include/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.h
index 2a11596a926..fa9f08fb3b5 100644
--- a/include/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.h
+++ b/include/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.h
@@ -60,6 +60,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe38 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_grS_c) == 0xe38);
 
 class daNpc_grS_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.h b/include/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.h
index 2cc734d7dd0..4273b18dd5f 100644
--- a/include/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.h
+++ b/include/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.h
@@ -77,6 +77,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1b08 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Grz_c) == 0x1b08);
 
 class daNpc_Grz_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.h b/include/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.h
index 83c12bf597b..b3188809074 100644
--- a/include/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.h
+++ b/include/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.h
@@ -47,6 +47,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xda8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcGuard_c) == 0xda8);
 
 
diff --git a/include/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.h b/include/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.h
index 1e050991d48..59c1ac36f85 100644
--- a/include/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.h
+++ b/include/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.h
@@ -70,6 +70,7 @@ private:
     /* 0x568 */ u8 field_0xb48[0xE1C - 0x568];
     /* 0xE1C */ u8 field_0xe1c;
 };
+
 STATIC_ASSERT(sizeof(daNpc_GWolf_c) == 0xe20);
 
 class daNpc_GWolf_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.h b/include/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.h
index fa131192ff9..19bdc69a04f 100644
--- a/include/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.h
+++ b/include/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.h
@@ -76,6 +76,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x172c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Hanjo_c) == 0x172c);
 
 class daNpc_Hanjo_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.h b/include/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.h
index 0b6e9db346f..f85a7b5f5cb 100644
--- a/include/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.h
+++ b/include/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.h
@@ -15,6 +15,7 @@ class npc_henna_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x7fc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_henna_class) == 0x7fc);
 
 class daNpc_Henna_HIO_c {
diff --git a/include/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.h b/include/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.h
index 8aa72ddae64..bc0216d3373 100644
--- a/include/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.h
+++ b/include/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.h
@@ -48,6 +48,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xdec - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcImpal_c) == 0xdec);
 
 class daNpcImpal_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.h b/include/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.h
index 64697eb1914..ee87d93d453 100644
--- a/include/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.h
+++ b/include/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.h
@@ -15,6 +15,7 @@ class npc_inko_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x648 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_inko_class) == 0x648);
 
 
diff --git a/include/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.h b/include/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.h
index fb8d5c54703..36a293f9671 100644
--- a/include/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.h
+++ b/include/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.h
@@ -58,6 +58,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe24 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcIns_c) == 0xe24);
 
 class daNpcIns_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.h b/include/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.h
index 206b5e390a4..6b84272f7fe 100644
--- a/include/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.h
+++ b/include/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.h
@@ -72,6 +72,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x100c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Jagar_c) == 0x100c);
 
 class daNpc_Jagar_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.h b/include/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.h
index 4b2b1c8f778..4729507493c 100644
--- a/include/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.h
+++ b/include/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.h
@@ -60,6 +60,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1398 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Kakashi_c) == 0x1398);
 
 class daNpc_Kakashi_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.h b/include/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.h
index 13d0d972a1f..955e1130c09 100644
--- a/include/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.h
+++ b/include/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.h
@@ -79,6 +79,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1ac8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcKasiHana_c) == 0x1ac8);
 
 class daNpcKasiHana_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.h b/include/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.h
index 7d733d060bf..8fd4ab0e1cf 100644
--- a/include/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.h
+++ b/include/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.h
@@ -71,6 +71,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x146c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcKasiKyu_c) == 0x146c);
 
 class daNpcKasiKyu_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.h b/include/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.h
index e48688b95f8..6c010e9428d 100644
--- a/include/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.h
+++ b/include/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.h
@@ -71,6 +71,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x146c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcKasiMich_c) == 0x146c);
 
 class daNpcKasiMich_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.h b/include/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.h
index 15d9d03b787..4ee3f8aa808 100644
--- a/include/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.h
+++ b/include/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfdc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Kkri_c) == 0xfdc);
 
 class daNpc_Kkri_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.h b/include/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.h
index bdd1fb2eb33..d663821ee83 100644
--- a/include/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.h
+++ b/include/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.h
@@ -209,6 +209,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1758 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Kn_c) == 0x1758);
 
 class daNpc_Kn_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.h b/include/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.h
index 0e4d912148e..3b3b51863a0 100644
--- a/include/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.h
+++ b/include/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.h
@@ -50,6 +50,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe68 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Knj_c) == 0xe68);
 
 class daNpc_Knj_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.h b/include/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.h
index 7d2c31ce5a6..66ad20b34df 100644
--- a/include/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.h
+++ b/include/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.h
@@ -79,6 +79,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1020 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Kolin_c) == 0x1020);
 
 class daNpc_Kolin_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.h b/include/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.h
index 21a66e681c5..583b8927555 100644
--- a/include/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.h
+++ b/include/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.h
@@ -62,6 +62,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xffc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Kolinb_c) == 0xffc);
 
 class daNpc_Kolinb_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.h b/include/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.h
index b705d938002..77238c09c14 100644
--- a/include/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.h
+++ b/include/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.h
@@ -15,6 +15,7 @@ class npc_ks_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xc20 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_ks_class) == 0xc20);
 
 class daNpc_Ks_HIO_c {
diff --git a/include/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.h b/include/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.h
index 32e0c8a657a..92da0185a82 100644
--- a/include/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.h
+++ b/include/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.h
@@ -60,6 +60,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfdc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Kyury_c) == 0xfdc);
 
 class daNpc_Kyury_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_len/d_a_npc_len.h b/include/rel/d/a/npc/d_a_npc_len/d_a_npc_len.h
index cc8440367d5..a6ad8d51d92 100644
--- a/include/rel/d/a/npc/d_a_npc_len/d_a_npc_len.h
+++ b/include/rel/d/a/npc/d_a_npc_len/d_a_npc_len.h
@@ -66,6 +66,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xff4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Len_c) == 0xff4);
 
 class daNpc_Len_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.h b/include/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.h
index 2832b711a61..4204f623095 100644
--- a/include/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.h
+++ b/include/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.h
@@ -15,6 +15,7 @@ class npc_lf_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x1fc4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_lf_class) == 0x1fc4);
 
 struct lf_s {
diff --git a/include/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.h b/include/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.h
index 4cdf16e5ab8..8358c287586 100644
--- a/include/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.h
+++ b/include/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.h
@@ -70,6 +70,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfdc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Lud_c) == 0xfdc);
 
 class daNpc_Lud_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.h b/include/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.h
index 1c53bf38584..8157f61880b 100644
--- a/include/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.h
+++ b/include/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.h
@@ -88,6 +88,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1140 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Maro_c) == 0x1140);
 
 class daNpc_Maro_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.h b/include/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.h
index c19c424d1d1..74adb990160 100644
--- a/include/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.h
+++ b/include/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.h
@@ -60,6 +60,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_midP_c) == 0xfa0);
 
 class daNpc_midP_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.h b/include/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.h
index 60fc55c6ffc..7a25d28bb71 100644
--- a/include/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.h
+++ b/include/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.h
@@ -86,6 +86,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1674 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Moi_c) == 0x1674);
 
 class daNpc_Moi_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.h b/include/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.h
index 56bc858d0d9..2f832fd3daf 100644
--- a/include/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.h
+++ b/include/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.h
@@ -56,6 +56,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe0c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcMoiR_c) == 0xe0c);
 
 class daNpcMoiR_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.h b/include/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.h
index 33f5c4f22af..302ceba1199 100644
--- a/include/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.h
+++ b/include/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.h
@@ -57,6 +57,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe34 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_myna2_c) == 0xe34);
 
 class daNpc_myna2_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.h b/include/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.h
index cae25931bbf..7eedf23f52d 100644
--- a/include/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.h
+++ b/include/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.h
@@ -93,6 +93,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfcc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Pachi_Besu_c) == 0xfcc);
 
 class daNpc_Pachi_Besu_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.h b/include/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.h
index 6a833b6b864..34b475137a2 100644
--- a/include/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.h
+++ b/include/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.h
@@ -95,6 +95,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfcc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Pachi_Maro_c) == 0xfcc);
 
 class daNpc_Pachi_Maro_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.h b/include/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.h
index 66a5c0123f6..186d878e60b 100644
--- a/include/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.h
+++ b/include/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.h
@@ -111,6 +111,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x100c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Pachi_Taro_c) == 0x100c);
 
 class daNpc_Pachi_Taro_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.h b/include/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.h
index ea75bb29ea3..94355f05da4 100644
--- a/include/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.h
+++ b/include/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.h
@@ -101,6 +101,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb28 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcPasser_c) == 0xb28);
 
 
diff --git a/include/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.h b/include/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.h
index 8e8c5b938c8..ad6ac346add 100644
--- a/include/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.h
+++ b/include/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa44 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcPasser2_c) == 0xa44);
 
 #endif /* D_A_NPC_PASSER2_H */
diff --git a/include/rel/d/a/npc/d_a_npc_post/d_a_npc_post.h b/include/rel/d/a/npc/d_a_npc_post/d_a_npc_post.h
index 5f52f14b20c..ff75faca72f 100644
--- a/include/rel/d/a/npc/d_a_npc_post/d_a_npc_post.h
+++ b/include/rel/d/a/npc/d_a_npc_post/d_a_npc_post.h
@@ -68,6 +68,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1018 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Post_c) == 0x1018);
 
 class daNpc_Post_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.h b/include/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.h
index 691f8ed36fa..8ba1a94380f 100644
--- a/include/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.h
+++ b/include/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfd4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Pouya_c) == 0xfd4);
 
 class daNpc_Pouya_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.h b/include/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.h
index c04fa4586fa..6adadfcfac4 100644
--- a/include/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.h
+++ b/include/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.h
@@ -51,6 +51,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe10 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcPray_c) == 0xe10);
 
 class daNpcPray_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.h b/include/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.h
index d0d4fd638d1..8c92a0069f1 100644
--- a/include/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.h
+++ b/include/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.h
@@ -62,6 +62,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfd4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Raca_c) == 0xfd4);
 
 class daNpc_Raca_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.h b/include/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.h
index 53260b26061..ed98b6792ec 100644
--- a/include/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.h
+++ b/include/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.h
@@ -54,6 +54,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe18 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcRafrel_c) == 0xe18);
 
 class daNpcRafrel_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.h b/include/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.h
index 837498ecb51..400c20ebee8 100644
--- a/include/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.h
+++ b/include/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.h
@@ -61,6 +61,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfe0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Saru_c) == 0xfe0);
 
 class daNpc_Saru_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.h b/include/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.h
index c10cd736eea..89e78a002fe 100644
--- a/include/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.h
+++ b/include/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.h
@@ -50,6 +50,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe68 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_seiB_c) == 0xe68);
 
 class daNpc_seiB_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.h b/include/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.h
index d69791450c4..5911a910abc 100644
--- a/include/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.h
+++ b/include/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.h
@@ -50,6 +50,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe64 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_seiC_c) == 0xe64);
 
 class daNpc_seiC_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.h b/include/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.h
index 7406eea5e36..0cacf975eac 100644
--- a/include/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.h
+++ b/include/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.h
@@ -50,6 +50,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe64 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_seiD_c) == 0xe64);
 
 class daNpc_seiD_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.h b/include/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.h
index 5d0cb6457d3..248c60d1c27 100644
--- a/include/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.h
+++ b/include/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.h
@@ -79,6 +79,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1108 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Seira_c) == 0x1108);
 
 class daNpc_Seira_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.h b/include/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.h
index c7652e76d7d..ed0734be7af 100644
--- a/include/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.h
+++ b/include/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.h
@@ -71,6 +71,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x10f4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Seira2_c) == 0x10f4);
 
 class daNpc_Seira2_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.h b/include/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.h
index f01c347c1c8..a18e88138e8 100644
--- a/include/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.h
+++ b/include/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.h
@@ -53,6 +53,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe88 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Seirei_c) == 0xe88);
 
 class daNpc_Seirei_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.h b/include/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.h
index d84b0387d8e..bfd1c42a87e 100644
--- a/include/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.h
+++ b/include/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.h
@@ -64,6 +64,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe24 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcShad_c) == 0xe24);
 
 class daNpcShad_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.h b/include/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.h
index 10b0a0d44f3..d797740122b 100644
--- a/include/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.h
+++ b/include/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.h
@@ -76,6 +76,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Sha_c) == 0xfa8);
 
 class daNpc_Sha_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.h b/include/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.h
index 9f8006cc970..a5c9f3ca0f8 100644
--- a/include/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.h
+++ b/include/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.h
@@ -43,6 +43,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe1c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcShoe_c) == 0xe1c);
 
 class daNpcShoe_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.h b/include/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.h
index eb20dc05871..201b93b7804 100644
--- a/include/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.h
+++ b/include/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.h
@@ -42,6 +42,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9ec - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Shop0_c) == 0x9ec);
 
 class daNpc_Shop0_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.h b/include/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.h
index 263875e2fdd..6348da53b64 100644
--- a/include/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.h
+++ b/include/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.h
@@ -20,6 +20,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xf7c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_shopMaro_c) == 0xf7c);
 
 
diff --git a/include/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.h b/include/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.h
index f8a15292025..bba910bb887 100644
--- a/include/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.h
+++ b/include/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.h
@@ -55,6 +55,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_solA_c) == 0xfa0);
 
 class daNpc_solA_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.h b/include/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.h
index 2a7c7cb5cbf..4808ae48875 100644
--- a/include/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.h
+++ b/include/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.h
@@ -54,6 +54,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe20 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_SoldierA_c) == 0xe20);
 
 class daNpc_SoldierA_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.h b/include/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.h
index dd39699ac3a..0a525996d3a 100644
--- a/include/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.h
+++ b/include/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.h
@@ -53,6 +53,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe20 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_SoldierB_c) == 0xe20);
 
 class daNpc_SoldierB_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.h b/include/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.h
index f7cc42568e9..9e467229d40 100644
--- a/include/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.h
+++ b/include/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.h
@@ -87,6 +87,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x11ac - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Taro_c) == 0x11ac);
 
 class daNpc_Taro_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.h b/include/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.h
index e214d6983d4..4dee834b1d9 100644
--- a/include/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.h
+++ b/include/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.h
@@ -55,6 +55,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xd7c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcTkc_c) == 0xd7c);
 
 class daNpcTkc_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.h b/include/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.h
index 4d1af07e834..8ae78795580 100644
--- a/include/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.h
+++ b/include/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.h
@@ -58,6 +58,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcTkj_c) == 0xfa4);
 
 class daNpc_Tkj_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.h b/include/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.h
index f08ce6974a7..562ebbe111b 100644
--- a/include/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.h
+++ b/include/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.h
@@ -15,6 +15,7 @@ class npc_tkj2_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xaa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_tkj2_class) == 0xaa0);
 
 class daNpc_Tkj2_HIO_c {
diff --git a/include/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.h b/include/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.h
index b496760f944..1e3873f22b5 100644
--- a/include/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.h
+++ b/include/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x138c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpcTks_c) == 0x138c);
 
 class daNpcTks_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.h b/include/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.h
index 308248d3864..399a040079f 100644
--- a/include/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.h
+++ b/include/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.h
@@ -76,6 +76,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1008 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Toby_c) == 0x1008);
 
 class daNpc_Toby_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.h b/include/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.h
index bded86a9cb7..6f4741b514d 100644
--- a/include/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.h
+++ b/include/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.h
@@ -76,6 +76,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1018 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Uri_c) == 0x1018);
 
 class daNpc_Uri_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.h b/include/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.h
index 45a6209ecc9..5d799129b8a 100644
--- a/include/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.h
+++ b/include/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.h
@@ -15,6 +15,7 @@ class npc_worm_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x5ec - 0x568];
 };
+
 STATIC_ASSERT(sizeof(npc_worm_class) == 0x5ec);
 
 
diff --git a/include/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.h b/include/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.h
index 9400945fd0c..75d4b8a22bb 100644
--- a/include/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.h
+++ b/include/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfcc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_yamiD_c) == 0xfcc);
 
 class daNpc_yamiD_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.h b/include/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.h
index 0f2f1473e64..22f8532b5f7 100644
--- a/include/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.h
+++ b/include/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfcc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_yamiS_c) == 0xfcc);
 
 class daNpc_yamiS_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.h b/include/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.h
index bce34f4660d..2b26fefc419 100644
--- a/include/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.h
+++ b/include/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.h
@@ -65,6 +65,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfcc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_yamiT_c) == 0xfcc);
 
 class daNpc_yamiT_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.h b/include/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.h
index 65071529a5e..7ce12a6d8dd 100644
--- a/include/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.h
+++ b/include/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.h
@@ -65,6 +65,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xff0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Yelia_c) == 0xff0);
 
 class daNpc_Yelia_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.h b/include/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.h
index bf85028aef5..00475984a22 100644
--- a/include/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.h
+++ b/include/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.h
@@ -85,6 +85,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x158c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_ykM_c) == 0x158c);
 
 class daNpc_ykM_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.h b/include/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.h
index dbdb8c20534..8a984c2e577 100644
--- a/include/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.h
+++ b/include/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.h
@@ -80,6 +80,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1078 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_ykW_c) == 0x1078);
 
 class daNpc_ykW_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.h b/include/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.h
index 3ba9aec453d..8dff67eb368 100644
--- a/include/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.h
+++ b/include/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.h
@@ -59,6 +59,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_zanB_c) == 0xfa0);
 
 class daNpc_zanB_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.h b/include/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.h
index 4d27cb7cfeb..9e596370cb2 100644
--- a/include/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.h
+++ b/include/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.h
@@ -53,6 +53,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Zant_c) == 0xfa0);
 
 class daNpc_Zant_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.h b/include/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.h
index 4cdb7cd2f34..2f6d27c8e09 100644
--- a/include/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.h
+++ b/include/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.h
@@ -60,6 +60,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfc8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_ZelR_c) == 0xfc8);
 
 class daNpc_ZelR_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.h b/include/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.h
index 408e7655336..c42322a7d45 100644
--- a/include/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.h
+++ b/include/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.h
@@ -61,6 +61,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfc8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_ZelRo_c) == 0xfc8);
 
 class daNpc_ZelRo_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.h b/include/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.h
index 97d5f3c18ab..884e6b73ff9 100644
--- a/include/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.h
+++ b/include/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.h
@@ -60,6 +60,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_Zelda_c) == 0xfa0);
 
 class daNpc_Zelda_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.h b/include/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.h
index a383c810c98..e9cbd3e17b6 100644
--- a/include/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.h
+++ b/include/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe3c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_zrC_c) == 0xe3c);
 
 class daNpc_zrC_Param_c {
diff --git a/include/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.h b/include/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.h
index f26a0cc4571..7bc590be3d4 100644
--- a/include/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.h
+++ b/include/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.h
@@ -76,6 +76,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x14c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daNpc_zrZ_c) == 0x14c8);
 
 class daNpc_zrZ_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h
index 7fd0dd06f1c..8e8d7ddccc1 100644
--- a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h
+++ b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h
@@ -45,6 +45,7 @@ private:
     /* 0x945 */ s8 mStatus;
     /* 0x946 */ u8 field_0x946[0x97c - 0x946];
 };
+
 STATIC_ASSERT(sizeof(daObjLv5Key_c) == 0x97c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h b/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h
index 5488d155726..2ce0a20bc54 100644
--- a/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h
+++ b/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h
@@ -41,6 +41,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x998 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTurara_c) == 0x998);
 
 class daTurara_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h b/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h
index d087b4bb627..5ac985903c2 100644
--- a/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h
+++ b/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x754 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTvCdlst_c) == 0x754);
 
 class daTvCdlst_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h b/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h
index 61fca42588b..635494548b9 100644
--- a/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h
+++ b/include/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x778 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjYtaihou_c) == 0x778);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h b/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h
index 285911d6302..e3a83fb8244 100644
--- a/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h
+++ b/include/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.h
@@ -37,6 +37,7 @@ class daAmiShutter_c : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x5dc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daAmiShutter_c) == 0x5dc);
 
 class daAmiShutter_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h b/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h
index afd14957358..3cb2f513f69 100644
--- a/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h
+++ b/include/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb38 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_AutoMata_c) == 0xb38);
 
 class daObj_AutoMata_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h b/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h
index 98c912dc948..8ecec4eb4e3 100644
--- a/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h
+++ b/include/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x590 */ u8 field_0x568[0x9f8 - 0x590];
 };
+
 STATIC_ASSERT(sizeof(daObjBATTA_c) == 0x9f8);
 
 class daObj_BattaHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h b/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h
index 7657dbe583d..a36b4dc3a9c 100644
--- a/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h
+++ b/include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h
@@ -32,6 +32,7 @@ private:
     /* 0x5AC */ dCcD_Stts mStts;
     /* 0x5E8 */ dCcD_Cyl mCyl;
 };
+
 STATIC_ASSERT(sizeof(daObjBBox_c) == 0x724);
 
 #endif /* D_A_OBJ_BBOX_H */
diff --git a/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h b/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h
index 2389ef51d97..311b26e281a 100644
--- a/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h
+++ b/include/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.h
@@ -79,6 +79,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1258 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjBm_c) == 0x1258);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h b/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h
index e335ce36a64..710e3fa42d3 100644
--- a/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h
+++ b/include/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1464 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjBHASHI_c) == 0x1464);
 
 class Hahen_c {
diff --git a/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h b/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h
index be1fcd19b9a..f224d470b0a 100644
--- a/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h
+++ b/include/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x810 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjBhbridge_c) == 0x810);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h b/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h
index ce0ee8f3dd8..aaee757e9eb 100644
--- a/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h
+++ b/include/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.h
@@ -35,6 +35,7 @@ public:
     /* 0x57D */ u8 field_0x57D;
     /* 0x57E */ s16 field_0x57E;
 };
+
 STATIC_ASSERT(sizeof(daBkLeaf_c) == 0x580);
 
 #endif /* D_A_OBJ_BK_LEAF_H */
diff --git a/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h b/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h
index 8440a726fb0..c58837ddba6 100644
--- a/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h
+++ b/include/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.h
@@ -44,6 +44,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xf50 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daBkyRock_c) == 0xf50);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h b/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h
index c6a216dff4c..b2eb1e3d341 100644
--- a/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h
+++ b/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h
@@ -69,6 +69,7 @@ private:
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
 };
+
 STATIC_ASSERT(sizeof(daBmWindow_c) == 0xEE0);
 
 class daBmWindow_HIO_c : public fOpAcm_HIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h b/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h
index 5066dfe9c85..bf4e36994fa 100644
--- a/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h
+++ b/include/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.h
@@ -37,6 +37,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5dc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjBmSh_c) == 0x5dc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h b/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h
index 92f7b145481..dfaee62abcd 100644
--- a/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h
+++ b/include/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h
@@ -31,6 +31,7 @@ private:
     /* 0x582 */ u8 field_0x582;
     /* 0x584 */ f32 field_0x584;
 };
+
 STATIC_ASSERT(sizeof(daObjBombf_c) == 0x588);
 
 #endif /* D_A_OBJ_BOMBF_H */
diff --git a/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h b/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h
index 76c987118c8..db1778d5c55 100644
--- a/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h
+++ b/include/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h
@@ -88,6 +88,7 @@ private:
     /* 0x620 */ cXyz field_0x620;
     /* 0x62C */ bool mScalingUp;
 };
+
 STATIC_ASSERT(sizeof(daObjBossWarp_c) == 0x630);
 
 #endif /* D_A_OBJ_BOSSWARP_H */
diff --git a/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h b/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h
index 226e899bc38..e87c2400953 100644
--- a/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h
+++ b/include/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.h
@@ -33,6 +33,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa40 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_BouMato_c) == 0xa40);
 
 class daObj_BouMato_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h b/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h
index e304a642234..9709b38825d 100644
--- a/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h
+++ b/include/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.h
@@ -15,6 +15,7 @@ class obj_brakeeff_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x73c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_brakeeff_class) == 0x73c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h b/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h
index 324f3a8d056..94af8d35cc8 100644
--- a/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h
+++ b/include/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.h
@@ -15,6 +15,7 @@ class obj_brg_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xb1f8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_brg_class) == 0xb1f8);
 
 struct br_s {
diff --git a/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h b/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h
index d5f5394d6e0..c5b177c08bf 100644
--- a/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h
+++ b/include/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.h
@@ -45,6 +45,7 @@ private:
     /* 0x5B0 */ f32 mTargetDist;
     /* 0x5B4 */ f32 mOpenDist;
 };
+
 STATIC_ASSERT(sizeof(daBsGate_c) == 0x5B8);
 
 class daBsGate_HIO_c : public mDoHIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h b/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h
index 89b61d297e0..acf20561961 100644
--- a/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h
+++ b/include/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x750 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daBubbPilar_c) == 0x750);
 
 class daBubbPilar_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h b/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h
index 3968edac748..1d3659f0011 100644
--- a/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h
+++ b/include/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x740 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjBurnBox_c) == 0x740);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
index 3f9b773d3e4..f67cfafd64a 100644
--- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
+++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
@@ -305,6 +305,7 @@ public:
 private:
     u16 getType_private() { return field_0xd18 >> 1 & 0x1f; }
 };
+
 STATIC_ASSERT(sizeof(daObjCarry_c) == 0xE28);
 
 struct daObjCarry_Data {
diff --git a/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h b/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h
index cb3e167e181..2732c674d8b 100644
--- a/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h
+++ b/include/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.h
@@ -15,6 +15,7 @@ class obj_cb_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x97c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_cb_class) == 0x97c);
 
 class daObj_Cb_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h b/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h
index 52bbcdd98dc..591e4aeb9c5 100644
--- a/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h
+++ b/include/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xca8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCBlk_c) == 0xca8);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
index 30d401edb1d..838384ac5b2 100644
--- a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
+++ b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
@@ -32,6 +32,7 @@ private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ Mtx field_0x5a8;
 };
+
 STATIC_ASSERT(sizeof(daObjBoard_c) == 0x5D8);
 
 #endif /* D_A_OBJ_CBOARD_H */
diff --git a/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h b/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h
index 10a07ef35b9..ad9835da695 100644
--- a/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h
+++ b/include/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.h
@@ -58,6 +58,7 @@ private:
     /* 0xA9C */ f32 field_0xa9c;
     /* 0xAA0 */ f32 mScaleY;
 };
+
 STATIC_ASSERT(sizeof(daObjChest_c) == 0xAA4);
 
 #endif /* D_A_OBJ_CHEST_H */
diff --git a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h
index 6201637e392..ef7b3691517 100644
--- a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h
+++ b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h
@@ -26,6 +26,7 @@ private:
     /* 0x5A0 */ request_of_phase_process_class field_0x5a0;
     /* 0x5A8 */ J3DModel* field_0x5a8;
 };
+
 STATIC_ASSERT(sizeof(daCowdoor_c) == 0x5AC);
 
 #endif /* D_A_OBJ_COWDOOR_H */
diff --git a/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h b/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h
index 43539203b28..3e070eca54b 100644
--- a/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h
+++ b/include/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.h
@@ -63,6 +63,7 @@ private:
     /* 0x0BD8 */ cXyz field_0xbd8[98];
     /* 0x1070 */ mDoExt_3DlineMat1_c mLineMat;
 };
+
 STATIC_ASSERT(sizeof(daObjCrope_c) == 0x10ac);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h b/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h
index ac5cc2f4e68..2851dc4cdf7 100644
--- a/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h
+++ b/include/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.h
@@ -33,6 +33,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x103c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCRVFENCE_c) == 0x103c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h b/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h
index cff6bbfbc19..949f4679b8e 100644
--- a/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h
+++ b/include/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.h
@@ -45,6 +45,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xde4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCRVGATE_c) == 0xde4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h b/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h
index 0e6fbd49d1d..64a9408a2bd 100644
--- a/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h
+++ b/include/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x794 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCRVHAHEN_c) == 0x794);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h b/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h
index c2266eced3c..88823a365bc 100644
--- a/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h
+++ b/include/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x74c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCRVLH_DW_c) == 0x74c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h b/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h
index 56e5cc3aeac..35448e269dc 100644
--- a/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h
+++ b/include/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x770 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCRVLH_UP_c) == 0x770);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h b/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h
index b5327594dc1..46883ba8b12 100644
--- a/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h
+++ b/include/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x848 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCRVSTEEL_c) == 0x848);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h b/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h
index 692701b53e1..8eaddc3ece7 100644
--- a/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h
+++ b/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h
@@ -28,6 +28,7 @@ private:
     /* 0x578 */ JPABaseEmitter* mpEmitter;
     /* 0x57C */ u16 mJointID;
 };
+
 STATIC_ASSERT(sizeof(daObjCrystal_c) == 0x580);
 
 #endif /* D_A_OBJ_CRYSTAL_H */
diff --git a/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h b/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h
index d70aa084be2..211775286f1 100644
--- a/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h
+++ b/include/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.h
@@ -49,6 +49,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xf5c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjCwall_c) == 0xf5c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h b/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h
index 043151fc235..2635ad9d5cf 100644
--- a/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h
+++ b/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h
@@ -33,6 +33,7 @@ public:
     u8 getSceneNum() { return (fopAcM_GetParam(this) >> 0xC) & 0xFF; }
     int getItemNum() { return getSceneNum(); }
 };
+
 STATIC_ASSERT(sizeof(daObjDigpl_c) == 0x5C0);
 
 #endif /* D_A_OBJ_DIGPLACE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h b/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h
index 2a107df46c6..9d767b6a60f 100644
--- a/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h
+++ b/include/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.h
@@ -92,6 +92,7 @@ private:
     /* 0x63C */ f32 field_0x63c;
     /* 0x640 */ f32 field_0x640;
 };
+
 STATIC_ASSERT(sizeof(daObjDmElevator_c) == 0x644);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h b/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h
index 65273a162af..1e69c712152 100644
--- a/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h
+++ b/include/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.h
@@ -37,6 +37,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa7c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjDrop_c) == 0xa7c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h b/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h
index b1d0accb8dd..7302f2b3279 100644
--- a/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h
+++ b/include/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x84c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjDust_c) == 0x84c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h b/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h
index 04221e4ba84..2724af96697 100644
--- a/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h
+++ b/include/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h
@@ -37,6 +37,7 @@ private:
     /* 0x584 */ u8 mAction;
     /* 0x588 */ u8 unused[12];
 };
+
 STATIC_ASSERT(sizeof(daObjE_CREATE_c) == 0x594);
 
 enum daObjE_EnemyType {
diff --git a/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h b/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h
index cd4415db428..b4aee10e919 100644
--- a/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h
+++ b/include/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.h
@@ -57,6 +57,7 @@ private:
     /* 0x5F1 */ u8 field_0x5f1;
     /* 0x5F4 */ Z2SoundObjSimple mSoundObj;
 };
+
 STATIC_ASSERT(sizeof(daObjFallObj_c) == 0x614);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h b/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h
index 283498b55ac..34669d0cec5 100644
--- a/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h
+++ b/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h
@@ -41,6 +41,7 @@ private:
     /* 0xAD4 */ u8 field_0xad4;
     /* 0xAD8 */ cXyz field_0xad8;
 };
+
 STATIC_ASSERT(sizeof(daObjFan_c) == 0xAE4);
 
 #endif /* D_A_OBJ_FAN_H */
diff --git a/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h b/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h
index 4ba07b079b5..016c6c09385 100644
--- a/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h
+++ b/include/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x928 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjFchain_c) == 0x928);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h b/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h
index 84a13de0a18..765cba224fa 100644
--- a/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h
+++ b/include/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.h
@@ -39,6 +39,7 @@ private:
     /* 0x71C */ LIGHT_INFLUENCE mLightInfluence;
     /* 0x73C */ u8 field_0x73c;
 };
+
 STATIC_ASSERT(sizeof(daFireWood_c) == 0x740);
 
 #ifdef NONMATCHING
diff --git a/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h b/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h
index feb8553af51..f951e0ddcca 100644
--- a/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h
+++ b/include/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.h
@@ -45,6 +45,7 @@ private:
     /* 0x71C */ f32 field_0x71c;
     /* 0x720 */ LIGHT_INFLUENCE mLightInfluence;
 };
+
 STATIC_ASSERT(sizeof(daFireWood2_c) == 0x740);
 
 class daFireWood2_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h b/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h
index f7297a0f0e8..7f6720c59b2 100644
--- a/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h
+++ b/include/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x974 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjFPillar_c) == 0x974);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h b/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h
index 689f8febfdf..8b81ff07d51 100644
--- a/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h
+++ b/include/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9ec - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjFPillar2_c) == 0x9ec);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h b/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h
index f45aac605d1..1c05a394547 100644
--- a/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h
+++ b/include/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5ec - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjFlag_c) == 0x5ec);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h b/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h
index 69cfbbed7f5..ba4c7fd6a63 100644
--- a/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h
+++ b/include/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.h
@@ -28,6 +28,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x10c0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjFlag2_c) == 0x10c0);
 
 class FlagCloth_c {
diff --git a/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h b/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h
index 266f20d29dc..0583e38181e 100644
--- a/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h
+++ b/include/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.h
@@ -24,6 +24,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1340 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjFlag3_c) == 0x1340);
 
 class FlagCloth2_c {
diff --git a/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h b/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h
index 04857b3e25a..eb7f9f33f1e 100644
--- a/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h
+++ b/include/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.h
@@ -15,6 +15,7 @@ class obj_fw_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x628 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_fw_class) == 0x628);
 
 class daObj_Fw_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h b/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h
index 9aa9a7ae0c7..6153f40b949 100644
--- a/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h
+++ b/include/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.h
@@ -33,6 +33,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa4c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Gadget_c) == 0xa4c);
 
 class daObj_Gadget_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h b/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h
index 642351ce580..b02da9dcfc6 100644
--- a/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h
+++ b/include/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.h
@@ -35,6 +35,7 @@ private:
     /* 0x57A */ u16 field_0x57a;
     /* 0x57C */ s16 field_0x57c;
 };
+
 STATIC_ASSERT(sizeof(daObjGWall_c) == 0x580);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h b/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h
index 964280c9faf..3c1dfb3fc2e 100644
--- a/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h
+++ b/include/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjGWall2_c) == 0x5c0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h b/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h
index 3f9533b6bea..d1e1f9968af 100644
--- a/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h
+++ b/include/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.h
@@ -15,6 +15,7 @@ class obj_gb_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x6bc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_gb_class) == 0x6bc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h b/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h
index 393f464bdba..de324f7bf1f 100644
--- a/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h
+++ b/include/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.h
@@ -55,6 +55,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x7f0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjGeyser_c) == 0x7f0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h b/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h
index ea75fa3fe8f..73c75253716 100644
--- a/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h
+++ b/include/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x98c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daGlwSph_c) == 0x98C);
 
 class daGlwSph_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h b/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h
index 78b941c25fa..94f38e46f35 100644
--- a/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h
+++ b/include/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.h
@@ -15,6 +15,7 @@ class obj_gm_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xaf4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_gm_class) == 0xaf4);
 
 class daObj_Gm_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h b/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h
index 827e2330d55..310de04d2d2 100644
--- a/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h
+++ b/include/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5b8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daGoGate_c) == 0x5b8);
 
 class daGoGate_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h b/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h
index afe8b99c22b..06b891eb631 100644
--- a/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h
+++ b/include/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.h
@@ -36,6 +36,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x13c4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjGOMIKABE_c) == 0x13c4);
 
 class daObjGOMIKABE_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h b/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h
index 706f1e0f910..271c94dbfce 100644
--- a/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h
+++ b/include/rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.h
@@ -46,6 +46,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9ac - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daGpTaru_c) == 0x9ac);
 
 class daGpTaru_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h b/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h
index daa020e3c0f..f4a9b6de970 100644
--- a/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h
+++ b/include/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.h
@@ -154,6 +154,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x20a4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_GrA_c) == 0x20a4);
 
 class daObj_GrA_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h b/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h
index 92f6fb7a139..4e3858bc3d1 100644
--- a/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h
+++ b/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h
@@ -25,6 +25,7 @@ private:
     /* 0x5A4 */ dCcD_Cyl mCyl;
     /* 0x6E0 */ u8 field_0x6e0;
 };
+
 STATIC_ASSERT(sizeof(daObjGraWall_c) == 0x6E4);
 
 #endif /* D_A_OBJ_GRAWALL_H */
diff --git a/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h b/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h
index c42f1197083..65a7d671cfa 100644
--- a/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h
+++ b/include/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9cc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjGraRock_c) == 0x9cc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h b/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h
index 719e1e871a7..c0ca0b8ffd3 100644
--- a/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h
+++ b/include/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x6f4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daGrdWater_c) == 0x6f4);
 
 class daGrdWater_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h b/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h
index 2dc13e477ff..6cb925b7119 100644
--- a/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h
+++ b/include/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x804 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjGrzRock_c) == 0x804);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h b/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h
index 8a736f890a5..2a88198acf8 100644
--- a/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h
+++ b/include/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x850 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjH_Saku_c) == 0x850);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h b/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h
index 34a1aded88d..e434217b401 100644
--- a/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h
+++ b/include/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x710 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjHBarrel_c) == 0x710);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h b/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h
index 87b7ed8db42..ec32715c474 100644
--- a/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h
+++ b/include/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x860 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjHFtr_c) == 0x860);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h b/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h
index 5806c882249..f2bedb32d70 100644
--- a/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h
+++ b/include/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x634 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjMHasu_c) == 0x634);
 }  // namespace nObjMHasu
 
diff --git a/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h b/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h
index f7f5c8d7ad2..9b10a8a6ad1 100644
--- a/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h
+++ b/include/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.h
@@ -15,6 +15,7 @@ class obj_hb_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xa8c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_hb_class) == 0xa8c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h b/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h
index db5cc62ba56..3d2e9ff72c6 100644
--- a/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h
+++ b/include/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.h
@@ -50,6 +50,7 @@ private:
     /* 0x648 */ dCcD_Stts mStts;
     /* 0x684 */ dCcD_Cyl mCyl;
 };
+
 STATIC_ASSERT(sizeof(daObjHBombkoya_c) == 0x7c0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h b/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h
index bf01f348cb1..deb9e958a5c 100644
--- a/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h
+++ b/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5cc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjFuta_c) == 0x5cc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h b/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h
index 3514b3dd185..754c8f6fa29 100644
--- a/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h
+++ b/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x119c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjHHASHI_c) == 0x119c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h
index f2bd7fea171..71b318dd242 100644
--- a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h
+++ b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h
@@ -28,6 +28,7 @@ private:
     /* 0x5A8 */ J3DModel* mpModel;
     /* 0x5AC */ u8 mIndex;
 };
+
 STATIC_ASSERT(sizeof(daHsTarget_c) == 0x5B0);
 
 class daHsTarget_HIO_c : mDoHIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h b/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h
index 10af13992ac..482d0908500 100644
--- a/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h
+++ b/include/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.h
@@ -56,6 +56,7 @@ private:
     /* 0x634 */ J3DModel* mpModel;
     /* 0x638 */ request_of_phase_process_class mPhase;
 };
+
 STATIC_ASSERT(sizeof(daObjIce_l_c) == 0x640);
 
 #endif /* D_A_OBJ_ICE_L_H */
diff --git a/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h b/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h
index e43ea568c73..d11323cf411 100644
--- a/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h
+++ b/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h
@@ -28,6 +28,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x644 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644);
 
 class daOBJ_ICE_S_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h b/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h
index 0d7d2eb3e26..78ef4f779d9 100644
--- a/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h
+++ b/include/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.h
@@ -48,6 +48,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9ec - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjIceBlk_c) == 0x9ec);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h b/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h
index 0ce3b109edf..e38de9388d2 100644
--- a/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h
+++ b/include/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.h
@@ -60,6 +60,7 @@ private:
     /* 0x964 */ cXyz field_0x964;
     /* 0x970 */ cXyz field_0x970;
 };
+
 STATIC_ASSERT(sizeof(daObjIceLeaf_c) == 0x97c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h b/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h
index 81abb1d38ba..ff9e4bb714a 100644
--- a/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h
+++ b/include/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.h
@@ -15,6 +15,7 @@ class obj_ihasi_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x5c4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_ihasi_class) == 0x5c4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h b/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h
index 5b2167831bb..748f0fb8a60 100644
--- a/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h
+++ b/include/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x844 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjIkada_c) == 0x844);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h b/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h
index a0ea465f2ad..fe36e2836e8 100644
--- a/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h
+++ b/include/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x84c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjIBone_c) == 0x84c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h b/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h
index 91bb276dc01..2f9e61bbfb9 100644
--- a/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h
+++ b/include/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x8dc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjIta_c) == 0x8dc);
 
 class daObj_ITA_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h b/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h
index 5e60f258a45..c5e8b066cf3 100644
--- a/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h
+++ b/include/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa20 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_ItaMato_c) == 0xa20);
 
 class daObj_ItaMato_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h b/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h
index 04a37739fdc..de00fe4f649 100644
--- a/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h
+++ b/include/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.h
@@ -15,6 +15,7 @@ class obj_ito_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x150c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_ito_class) == 0x150c);
 
 struct ito_s {};
diff --git a/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h b/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h
index a0427d5a8ff..b79f782856c 100644
--- a/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h
+++ b/include/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x590 */ u8 field_0x568[0x860 - 0x590];
 };
+
 STATIC_ASSERT(sizeof(daObjKAG_c) == 0x860);
 
 class daObj_KagHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h b/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h
index 2cf46c68e2a..1992781c8fe 100644
--- a/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h
+++ b/include/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.h
@@ -15,6 +15,7 @@ class obj_kage_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_kage_class) == 0x5b4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h b/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h
index 06484078f73..c9bc9d68fcb 100644
--- a/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h
+++ b/include/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.h
@@ -33,6 +33,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xba8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Kago_c) == 0xba8);
 
 class daObj_Kago_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h b/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h
index 459a240d086..52f1a677f68 100644
--- a/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h
+++ b/include/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x79c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKaisou_c) == 0x79c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h b/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h
index 1ba5f2f21bb..557d996fb7a 100644
--- a/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h
+++ b/include/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa68 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKAM_c) == 0xa68);
 
 class daObj_KamHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h b/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h
index a770de044cc..aaa4fdee5e5 100644
--- a/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h
+++ b/include/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.h
@@ -49,6 +49,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa50 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Kanban2_c) == 0xa50);
 
 class daObj_Kanban2_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h b/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h
index 3d9f222d699..236bd0b4305 100644
--- a/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h
+++ b/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h
@@ -43,6 +43,7 @@ private:
     /* 0x93A */ s16 field_0x93a;
     /* 0x93C */ cXyz field_0x93c;
 };
+
 STATIC_ASSERT(sizeof(daItemKantera_c) == 0x948);
 #else
 struct daItemKantera_c {
diff --git a/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h b/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h
index beafc48c797..ca464a2a700 100644
--- a/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h
+++ b/include/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.h
@@ -37,6 +37,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa74 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKAT_c) == 0xa74);
 
 class daObj_KatHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h b/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h
index da43da3c3bb..46c12ea6ab0 100644
--- a/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h
+++ b/include/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x754 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKazeNeko_c) == 0x754);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h b/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h
index 5a534eb087b..bb342f68194 100644
--- a/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h
+++ b/include/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.h
@@ -33,6 +33,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa54 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_KBacket_c) == 0xa54);
 
 class daObj_KBacket_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h b/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h
index 31b7974e2f9..1bba0b54239 100644
--- a/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h
+++ b/include/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.h
@@ -15,6 +15,7 @@ class obj_kbox_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x9f0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_kbox_class) == 0x9f0);
 
 class daObj_Kbox_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h b/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h
index 1009be44d05..f518b458bf0 100644
--- a/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h
+++ b/include/rel/d/a/obj/d_a_obj_key/d_a_obj_key.h
@@ -15,6 +15,7 @@ class obj_key_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x9b8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_key_class) == 0x9b8);
 
 class daObj_Key_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h b/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h
index 86e796f30ba..0df0d79a20a 100644
--- a/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h
+++ b/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h
@@ -21,6 +21,7 @@ private:
     /* 0x2ca4 */ u8 mOpenState;
     /* 0x2ca5 */ u8 field_0x2ca5[0x2cb8 - 0x2ca5];
 };
+
 STATIC_ASSERT(sizeof(obj_keyhole_class) == 0x2CB8);
 
 class kh_chain_s {
diff --git a/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h b/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h
index 5967a7b2283..ece9ce24680 100644
--- a/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h
+++ b/include/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x578 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daKiPot_c) == 0x578);
 
 class daKiPot_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h b/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h
index 6a70d286632..c587d55a854 100644
--- a/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h
+++ b/include/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.h
@@ -15,6 +15,7 @@ class obj_kita_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xd78 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_kita_class) == 0xd78);
 
 struct kita_s {
diff --git a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h
index ab2b6517688..b4f978ff600 100644
--- a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h
+++ b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h
@@ -30,6 +30,7 @@ private:
     /* 0x608 */ J3DModel* mpModel;
     /* 0x60C */ s32 field_0x60c;
 };
+
 STATIC_ASSERT(sizeof(daObjKJgjs_c) == 0x610);
 
 #endif /* D_A_OBJ_KJGJS_H */
diff --git a/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h b/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h
index 4c77b39447f..55f16351ed0 100644
--- a/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h
+++ b/include/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.h
@@ -37,6 +37,7 @@ public:
     /* 0x74C */ f32 field_0x74c;
     /* 0x750 */ s32 field_0x750;
 };
+
 STATIC_ASSERT(sizeof(daObjKKanban_c) == 0x754);
 
 #endif /* D_A_OBJ_KKANBAN_H */
diff --git a/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h b/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h
index b7569126ce2..5e5fb3ee86f 100644
--- a/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h
+++ b/include/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1160 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKLift00_c) == 0x1160);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h b/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h
index fc7e7f6c63e..c4bba9dabaf 100644
--- a/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h
+++ b/include/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x71c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKnBullet_c) == 0x71c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h b/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h
index eb895411315..ea3d6e78717 100644
--- a/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h
+++ b/include/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.h
@@ -57,6 +57,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x620 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKshtr_c) == 0x620);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h b/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h
index 04ec22bf8a5..49aad848f11 100644
--- a/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h
+++ b/include/rel/d/a/obj/d_a_obj_ktOnFire/d_a_obj_ktOnFire.h
@@ -28,6 +28,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x728 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daKtOnFire_c) == 0x728);
 
 class daKtOnFire_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h b/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h
index e943fdd8ff5..e00f5d498dc 100644
--- a/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h
+++ b/include/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa68 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKUW_c) == 0xa68);
 
 class daObj_KuwHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h b/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h
index 933f7d239b9..303c94d8bfd 100644
--- a/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h
+++ b/include/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb44 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKWheel00_c) == 0xb44);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h b/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h
index 70037098915..a1615407bd9 100644
--- a/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h
+++ b/include/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x704 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKWheel01_c) == 0x704);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h b/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h
index 35e22aa795e..9961a2465d0 100644
--- a/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h
+++ b/include/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.h
@@ -37,6 +37,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x7b4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjKznkarm_c) == 0x7b4);
 
 #endif /* D_A_OBJ_KZNKARM_H */
diff --git a/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h b/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h
index 6b25836fce4..444a83f6713 100644
--- a/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h
+++ b/include/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.h
@@ -45,6 +45,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x620 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLadder) == 0x620);
 
 struct daObj {
diff --git a/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h b/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h
index 3b9ba8f4be7..65c7008471e 100644
--- a/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h
+++ b/include/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x7c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLdy_c) == 0x7c8);
 
 class LaundJoint_c {
diff --git a/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h b/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h
index 68be77cb630..d77b048b117 100644
--- a/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h
+++ b/include/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.h
@@ -23,6 +23,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1774 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLndRope_c) == 0x1774);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h b/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h
index b7ff261eec6..c4e245e261d 100644
--- a/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h
+++ b/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h
@@ -37,6 +37,7 @@ public:
     /* 0xA88 */ u32 field_0xa88;
     /* 0xA8C */ u8 field_0xa8c;
 };
+
 STATIC_ASSERT(sizeof(obj_lbox_class) == 0xA90);
 
 class daObj_Lbox_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h b/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h
index 88c32a63439..c5ce1684f59 100644
--- a/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h
+++ b/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h
@@ -41,6 +41,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9d4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLife_c) == 0x9d4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h b/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h
index ea90681e1fc..86a85028993 100644
--- a/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h
+++ b/include/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.h
@@ -21,6 +21,7 @@ class obj_lp_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xadb8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_lp_class) == 0xadb8);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h b/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h
index 8609030bc4c..7337251de56 100644
--- a/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h
+++ b/include/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x628 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv3Water_c) == 0x628);
 
 class daLv3Water_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h b/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h
index ad61d3967e1..d2753e5fbcb 100644
--- a/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h
+++ b/include/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.h
@@ -28,6 +28,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x610 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv3Water2_c) == 0x610);
 
 class daLv3Water2_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h b/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h
index 0946d244c2a..7025763f364 100644
--- a/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h
+++ b/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h
@@ -33,6 +33,7 @@ public:
     /* 0x5C4 */ Mtx mpOctHibiMtx;
     /* 0x5F4 */ dBgW* mpOctHibiBgW;
 };
+
 STATIC_ASSERT(sizeof(obj_lv3WaterB_class) == 0x5F8);
 
 #endif /* D_A_OBJ_LV3WATERB_H */
diff --git a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h
index e86ff57680e..0469804f144 100644
--- a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h
+++ b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h
@@ -23,6 +23,7 @@ private:
     /* 0x580 */ JPABaseEmitter* mParticles[4];
     /* 0x590 */ u8 unused_0x590[0x594 - 0x590];
 };
+
 STATIC_ASSERT(sizeof(daObjWaterEff_c) == 0x594);
 
 #endif /* D_A_OBJ_LV3WATEREFF_H */
diff --git a/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h b/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h
index fc89caa210d..ea2a4c9ac4b 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h
@@ -56,6 +56,7 @@ private:
     /* 0x588 */ u16 mEnemyWaitTime;
     /* 0x58C */ daLv4EdShutter_c* mpShutterActor;
 };
+
 STATIC_ASSERT(sizeof(dalv4CandleDemoTag_c) == 0x590);
 
 class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h b/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h
index a3d9ac9ae91..ff0441b1986 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h
@@ -38,6 +38,7 @@ private:
     /* 0x5CA */ u8 mStatus;
     /* 0x5CB */ u8 field_0x56B[0x5DC - 0x5CB];
 };
+
 STATIC_ASSERT(sizeof(daLv4EdShutter_c) == 0x5dc);
 
 class daLv4EdShutter_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h b/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h
index 48ff469bdc6..596bec6f7ba 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h
@@ -27,6 +27,7 @@ private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ J3DModel* mpModel;
 };
+
 STATIC_ASSERT(sizeof(daLv4HsTarget_c) == 0x5AC);
 
 class daLv4HsTarget_HIO_c : public mDoHIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h b/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h
index ccf75b31410..4b9b15bfeb5 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h
@@ -62,6 +62,7 @@ private:
     /* 0x5B4 */ f32 mMoveValue;
     /* 0x5B8 */ u8 mCloseWaitTime;
 };
+
 STATIC_ASSERT(sizeof(daLv4PoGate_c) == 0x5BC);
 
 class daLv4PoGate_HIO_c : public mDoHIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h b/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h
index 63a6d292813..bb18054e42c 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x95c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv4Wall_c) == 0x95c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h b/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h
index 068629fc920..37c5f345ddd 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daSldWall_c) == 0x5b4);
 
 class daSldWall_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h b/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h
index eb8d20dd647..887570812d9 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5d0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv4Brg_c) == 0x5d0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h b/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h
index eae512d55f3..fa34834cacb 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.h
@@ -36,6 +36,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x24a4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv4Chan_c) == 0x24a4);
 
 class daObjSwChain_c : public fopAc_ac_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h b/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h
index 424c52302fd..138e1ae829d 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x944 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjL4DigSand_c) == 0x944);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h b/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h
index 99295ea374a..3f4d956c414 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.h
@@ -44,6 +44,7 @@ private:
     /* 0x5AC */ f32 mMoveYPos;
     /* 0x5B0 */ u8 mAction;
 };
+
 STATIC_ASSERT(sizeof(daObjLv4Floor_c) == 0x5B4);
 
 #endif /* D_A_OBJ_LV4FLOOR_H */
diff --git a/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h b/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h
index c65cd7320bb..f0e436b560f 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x610 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjPRElvtr_c) == 0x610);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h b/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h
index 6c3ec3503c0..73a84f50078 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x62c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv4PRwall_c) == 0x62c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h b/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h
index 25122a46c1a..725cc46dedb 100644
--- a/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h
+++ b/include/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv4Sand_c) == 0x5c8);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h b/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h
index c5d1563b464..229b639e0ab 100644
--- a/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h
+++ b/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x734 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daFlorBoad_c) == 0x734);
 
 class daFlorBoad_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h b/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h
index 2abc33ac5c6..1c42a39300c 100644
--- a/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h
+++ b/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x884 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daIceWall_c) == 0x884);
 
 class daIceWall_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h b/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h
index 1dbb1bb130d..2281d447bbd 100644
--- a/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h
+++ b/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x738 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv5SwIce_c) == 0x738);
 
 class daLv5SwIce_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h b/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h
index d45791294b2..41689cd14c6 100644
--- a/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h
+++ b/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xca0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjYchndlr_c) == 0xca0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h
index 8158c1ca4a8..90c12aa8338 100644
--- a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h
+++ b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa94 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjYIblltray_c) == 0xa94);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h b/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h
index 89ce09ba5f2..51517c1da75 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x14dc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv6ChangeGate_c) == 0x14dc);
 
 class daLv6ChangeGate_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h b/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h
index a9cd417e809..6b97849ce94 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1d18 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv6FurikoTrap_c) == 0x1d18);
 
 class daLv6FurikoTrap_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h b/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h
index e944629cf3b..83a7e94cebd 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5b8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv6Lblock_c) == 0x5b8);
 
 class daLv6Lblock_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h b/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h
index fcb3f88e080..42a007659ed 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.h
@@ -36,6 +36,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x14f8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8);
 
 class daLv6SwGate_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h b/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h
index 5afaf9cc697..0147df492ba 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x61c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv6SzGate_c) == 0x61c);
 
 class daLv6SzGate_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h b/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h
index ab9fd031eb7..124770f05dc 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x654 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTenbin_c) == 0x654);
 
 class daTenbin_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h b/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h
index e15edab6e7c..3d39ccf9499 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.h
@@ -48,6 +48,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x117c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTogeRoll_c) == 0x117c);
 
 class daTogeRoll_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h b/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h
index 0627093e35d..26c731af6fc 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.h
@@ -62,6 +62,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x8f4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv6TogeTrap_c) == 0x8f4);
 
 class daLv6TogeTrap_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h b/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h
index 0746e632717..68e201376f4 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x918 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjL6Bm_c) == 0x918);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h b/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h
index 05950d4fac6..c57dbb20c17 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.h
@@ -47,6 +47,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xabc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv6Bm_c) == 0xabc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h b/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h
index 1d932226b61..f1d51da41a5 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1038 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv6EGate_c) == 0x1038);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h b/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h
index 155b5356859..e5ad5a71575 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x628 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv6ElevtA_c) == 0x628);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h b/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h
index 555c68fb68b..715a5a2634b 100644
--- a/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h
+++ b/include/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5cc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv6SwTurn_c) == 0x5cc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h b/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h
index 8972b531ba4..5cfba71982a 100644
--- a/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h
+++ b/include/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5bc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv7BsGate_c) == 0x5bc);
 
 class daLv7BsGate_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h b/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h
index 01d99a33906..66b607b308d 100644
--- a/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h
+++ b/include/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daPropY_c) == 0x5c8);
 
 class daPropY_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h b/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h
index 1731b4becd8..58952b9e239 100644
--- a/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h
+++ b/include/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xaa4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjLv7Brg_c) == 0xaa4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h b/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h
index 46492a4462c..e1815bbc842 100644
--- a/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h
+++ b/include/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daKekaiTrap_c) == 0x5b4);
 
 class daKekaiTrap_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h b/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h
index 920360e9233..a64d6c36da8 100644
--- a/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h
+++ b/include/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.h
@@ -49,6 +49,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x830 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daL8Lift_c) == 0x830);
 
 class daL8Lift_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h b/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h
index fdf1efda91a..e344bf374ab 100644
--- a/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h
+++ b/include/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.h
@@ -48,6 +48,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x618 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daOptiLift_c) == 0x618);
 
 class daOptiLift_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h b/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h
index 70ca056d31e..bee36f75c00 100644
--- a/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h
+++ b/include/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daUdFloor_c) == 0x5c8);
 
 class daUdFloor_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h b/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h
index 27d02b67d5e..422cba55845 100644
--- a/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h
+++ b/include/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daLv9SwShutter_c) == 0x5b4);
 
 class daLv9SwShutter_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h b/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h
index 5a277442763..02fdef803bf 100644
--- a/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h
+++ b/include/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5d4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daMagLift_c) == 0x5d4);
 
 class daMagLift_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h b/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h
index 760c541b5b1..d4c91f320f2 100644
--- a/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h
+++ b/include/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.h
@@ -58,6 +58,7 @@ private:
     /* 0x62C */ f32 field_0x62c;
     /* 0x630 */ f32 field_0x630;
 };
+
 STATIC_ASSERT(sizeof(daMagLiftRot_c) == 0x634);
 
 class daMagLiftRot_HIO_c : public mDoHIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h b/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h
index d0af78a0633..2025dc95772 100644
--- a/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h
+++ b/include/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.h
@@ -85,6 +85,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa6c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjMarm_c) == 0xa6c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h b/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h
index 77075dc0714..f2daffc012c 100644
--- a/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h
+++ b/include/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.h
@@ -15,6 +15,7 @@ class obj_maki_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x730 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_maki_class) == 0x730);
 
 class daObj_Maki_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h b/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h
index 13025d92600..2952f94ace2 100644
--- a/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h
+++ b/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h
@@ -60,6 +60,7 @@ private:
     /* 0x728 */ cBgS_PolyInfo field_0x728;
     /* 0x738 */ f32 field_0x738;
 };
+
 STATIC_ASSERT(sizeof(daObjMasterSword_c) == 0x73C);
 
 #endif /* D_A_OBJ_MASTER_SWORD_H */
diff --git a/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h b/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h
index 1b80d121bc2..bcba5213b80 100644
--- a/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h
+++ b/include/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x39f8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjMATO_c) == 0x39f8);
 
 struct MatoData_s {
diff --git a/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h b/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h
index b83e4cb2f1e..5d88b800597 100644
--- a/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h
+++ b/include/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x944 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjMBox_c) == 0x944);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h
index 2636c89e415..de0ce5253d1 100644
--- a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h
+++ b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h
@@ -52,6 +52,7 @@ private:
     /* 0x5C8 */ int mCounter;
     /* 0x5CC */ s16 mGateKeyAngle;
 };
+
 STATIC_ASSERT(sizeof(daObjMGate_c) == 0x5D0);
 
 #endif /* D_A_OBJ_MGATE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h b/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h
index f1d2166b723..6359627d9d5 100644
--- a/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h
+++ b/include/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.h
@@ -28,6 +28,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x734 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjMHole_c) == 0x734);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h b/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h
index 9d6d8220297..2b0738107f8 100644
--- a/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h
+++ b/include/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa50 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Mie_c) == 0xa50);
 
 class daObj_Mie_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h b/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h
index ee5a4a7ee69..9a778e3a7ed 100644
--- a/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h
+++ b/include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h
@@ -84,6 +84,7 @@ class daObjMovebox : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x90c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjMovebox) == 0x90C);
 
 #endif /* D_A_OBJ_MOVEBOX_H */
diff --git a/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h b/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h
index b1cfcca34ae..72293438029 100644
--- a/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h
+++ b/include/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.h
@@ -15,6 +15,7 @@ class obj_msima_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x8a4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_msima_class) == 0x8a4);
 
 struct ms_chain_s {
diff --git a/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h b/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h
index 9f26db82181..46c9dde5481 100644
--- a/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h
+++ b/include/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.h
@@ -41,6 +41,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x66c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjStair_c) == 0x66c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h b/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h
index 6c883963d3e..361b097b1e6 100644
--- a/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h
+++ b/include/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb6e4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjNagaisu_c) == 0xb6e4);
 
 // child seat / couch?
diff --git a/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h b/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h
index 2f6e075dc61..b09abb45e2b 100644
--- a/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h
+++ b/include/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x780 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjNameplate_c) == 0x780);
 
 struct daObj {
diff --git a/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h b/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h
index 10166d108cc..0095b95b28e 100644
--- a/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h
+++ b/include/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x590 */ u8 field_0x568[0x800 - 0x590];
 };
+
 STATIC_ASSERT(sizeof(daObjNAN_c) == 0x800);
 
 class daObj_NanHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h b/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h
index 49d355000c7..369e2d4cd81 100644
--- a/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h
+++ b/include/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.h
@@ -15,6 +15,7 @@ class obj_ndoor_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x718 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_ndoor_class) == 0x718);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h b/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h
index 43640cfcc03..c6b288b83e9 100644
--- a/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h
+++ b/include/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xe30 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Nougu_c) == 0xe30);
 
 class daObj_Nougu_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h b/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h
index 826165e7da5..cb7e5ade3b2 100644
--- a/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h
+++ b/include/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.h
@@ -33,6 +33,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x14b0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjOCTHASHI_c) == 0x14b0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h b/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h
index b4f57032e4b..25f3abe8b2e 100644
--- a/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h
+++ b/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h
@@ -56,6 +56,7 @@ private:
 public:
     /* 80CA7628 */ virtual ~daObj_Oiltubo_c() {}
 };
+
 STATIC_ASSERT(sizeof(daObj_Oiltubo_c) == 0xAD4);
 
 #endif /* D_A_OBJ_OILTUBO_H */
diff --git a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h
index b2e0bb13e2e..f5e3c2b8d26 100644
--- a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h
+++ b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h
@@ -31,6 +31,7 @@ private:
     /* 0x5B0 */ mDoExt_btkAnm* mpBtk;
     /* 0x5B4 */ u8 mType;
 };
+
 STATIC_ASSERT(sizeof(daObjOnsen_c) == 0x5B8);
 
 #endif /* D_A_OBJ_ONSEN_H */
diff --git a/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h b/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h
index 7f014c66324..98ae6b4d136 100644
--- a/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h
+++ b/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h
@@ -42,6 +42,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x948 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daOnsTaru_c) == 0x948);
 
 class daOnsTaru_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h b/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h
index f22eef6981e..852ed7d4bb1 100644
--- a/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h
+++ b/include/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.h
@@ -24,6 +24,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x6c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjOnCloth_c) == 0x6c8);
 
 class ClothJoint_c {
diff --git a/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h b/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h
index e99dc79b4a4..feec7aed90c 100644
--- a/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h
+++ b/include/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjPDoor_c) == 0x5c4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h b/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h
index 6786b8db881..66374e15975 100644
--- a/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h
+++ b/include/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x7fc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjPDtile_c) == 0x7fc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h b/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h
index 4571bf6cbc6..3c7b41c3e3a 100644
--- a/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h
+++ b/include/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa18 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjPDwall_c) == 0xa18);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h b/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h
index 12800a93aaf..5084fa353ed 100644
--- a/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h
+++ b/include/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xda0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjPicture_c) == 0xda0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h b/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h
index ee56bb13a19..2faf88ec9c7 100644
--- a/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h
+++ b/include/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x750 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daPillar_c) == 0x750);
 
 class daPillar_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h b/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h
index 91a91b74501..dd40fd49d87 100644
--- a/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h
+++ b/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h
@@ -42,6 +42,7 @@ public:
 
     u32 getType() { return 0; }
 };
+
 STATIC_ASSERT(sizeof(daObj_Pleaf_c) == 0x950);
 
 class daObj_Pleaf_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h b/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h
index 23666979a13..417ee125b72 100644
--- a/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h
+++ b/include/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x614 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daPoCandle_c) == 0x614);
 
 class daPoCandle_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h b/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h
index 7b4ffb903b2..be408f35e1c 100644
--- a/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h
+++ b/include/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.h
@@ -46,6 +46,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x618 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daPoFire_c) == 0x618);
 
 class daPoFire_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h b/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h
index 097e32d6c08..5655f40bef4 100644
--- a/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h
+++ b/include/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x608 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daPoTbox_c) == 0x608);
 
 class daPoTbox_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h b/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h
index 62d878205d8..0efdb9bcbee 100644
--- a/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h
+++ b/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h
@@ -30,6 +30,7 @@ private:
     /* 0x574 */ J3DModel* mpModel;
     /* 0x578 */ u8 mArg;
 };
+
 STATIC_ASSERT(sizeof(daObjProp_c) == 0x57C);
 
 #endif /* D_A_OBJ_PROP_H */
diff --git a/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h b/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h
index f17f549b98f..adee8f88c98 100644
--- a/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h
+++ b/include/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xbbc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Pumpkin_c) == 0xbbc);
 
 class daObj_Pumpkin_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h
index 3a7a576d67c..02b3b7a3f7e 100644
--- a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h
+++ b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h
@@ -31,6 +31,7 @@ private:
     /* 0x5A4 */ J3DModel* mpModel;
     /* 0x5A8 */ u8 mSwitch;
 };
+
 STATIC_ASSERT(sizeof(daObjRCircle_c) == 0x5AC);
 
 #endif /* D_A_OBJ_RCIRCLE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h b/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h
index 837a6940bf6..ddd9319c3f1 100644
--- a/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h
+++ b/include/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4);
 
 class daRfHole_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h b/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h
index 930c15a535f..13e008cbce6 100644
--- a/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h
+++ b/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h
@@ -84,6 +84,7 @@ public:
     /* 0xC00 */ Mtx field_0xc00;
     /* 0xC30 */ Mtx field_0xc30;
 };
+
 STATIC_ASSERT(sizeof(daObjRgate_c) == 0xC60);
 
 #endif /* D_A_OBJ_RGATE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h b/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h
index 07cde0c0ee2..04f1fd31780 100644
--- a/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h
+++ b/include/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x79c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjRIVERROCK_c) == 0x79c);
 
 class daObjRIVERROCK_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h b/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h
index ffe3123edff..2dc7b154dac 100644
--- a/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h
+++ b/include/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.h
@@ -40,6 +40,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb6c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjRBridge_c) == 0xb6c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h b/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h
index b144e44a7d5..fb0af747481 100644
--- a/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h
+++ b/include/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x610 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daRotBridge_c) == 0x610);
 
 class daRotBridge_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h b/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h
index 235d4d0089b..9f6f5e97951 100644
--- a/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h
+++ b/include/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x173c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daRotTrap_c) == 0x173c);
 
 class daRotTrap_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h b/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h
index 43c552f0115..8af4a816bc3 100644
--- a/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h
+++ b/include/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Roten_c) == 0x5c8);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h b/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h
index 7d5ef5bc2a7..50dc9ac0a32 100644
--- a/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h
+++ b/include/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5e4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjRotStair_c) == 0x5e4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h b/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h
index d3d7c5a5e87..3fcfac0e235 100644
--- a/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h
+++ b/include/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.h
@@ -16,6 +16,7 @@ class obj_rw_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xe3c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_rw_class) == 0xe3c);
 
 struct daObj {
diff --git a/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h b/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h
index ba8be22c8c4..890bb3be0e3 100644
--- a/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h
+++ b/include/rel/d/a/obj/d_a_obj_sWallShutter/d_a_obj_sWallShutter.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5e8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daSwShutter_c) == 0x5e8);
 
 class daSwShutter_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h b/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h
index 4d4503ca6bb..2b1913de3ee 100644
--- a/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h
+++ b/include/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x750 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSakuita_c) == 0x750);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h b/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h
index 3746176d51b..d04a3d6da74 100644
--- a/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h
+++ b/include/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.h
@@ -23,6 +23,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x638 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjItaRope_c) == 0x638);
 
 class Sakuita_c {
diff --git a/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h b/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h
index cae0c3136e1..c7cb57a1ad6 100644
--- a/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h
+++ b/include/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.h
@@ -63,6 +63,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x638 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daSCannon_c) == 0x638);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h b/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h
index ce5a46d3cea..c5125f6fa6a 100644
--- a/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h
+++ b/include/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.h
@@ -40,6 +40,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x674 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daSCannonCrs_c) == 0x674);
 
 #endif /* D_A_OBJ_SCANNON_CRS_H */
diff --git a/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h b/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h
index 366040d3456..2c1a26cf493 100644
--- a/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h
+++ b/include/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.h
@@ -54,6 +54,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x604 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSCannonTen_c) == 0x604);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h b/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h
index 15a4784b973..e938fea64c6 100644
--- a/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h
+++ b/include/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5d8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_SekiDoor_c) == 0x5d8);
 
 class daObj_SekiDoor_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h b/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h
index 91d4b256487..d12bd90b696 100644
--- a/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h
+++ b/include/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x958 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daItemShield_c) == 0x958);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h b/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h
index c005bef8d08..a30f9bbfa82 100644
--- a/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h
+++ b/include/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x858 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSM_DOOR_c) == 0x858);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h b/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h
index 10659ca0429..9c1b7bb2055 100644
--- a/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h
+++ b/include/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.h
@@ -43,6 +43,7 @@ class daKey_c : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x988 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daKey_c) == 0x988);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h b/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h
index ec693e651bb..a465ea37284 100644
--- a/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h
+++ b/include/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5f4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSmgDoor_c) == 0x5f4);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h b/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h
index 47ad2800973..5e055572c1a 100644
--- a/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h
+++ b/include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ JPABaseEmitter* mParticle;
 };
+
 STATIC_ASSERT(sizeof(daObjSmoke_c) == 0x56C);
 
 #endif /* D_A_OBJ_SMOKE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h b/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h
index 5db6fac21bf..6cb9a409b2a 100644
--- a/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h
+++ b/include/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.h
@@ -28,6 +28,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb30 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_SMTile_c) == 0xb30);
 
 class daObj_SMTile_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h b/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h
index cc095333f02..ce106310a46 100644
--- a/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h
+++ b/include/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daSmWStone_c) == 0x5c8);
 
 #endif /* D_A_OBJ_SMW_STONE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h b/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h
index 99bcdc76485..f568d5da9f8 100644
--- a/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h
+++ b/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h
@@ -31,6 +31,7 @@ private:
     /* 0x574 */ f32 field_0x574;
     /* 0x578 */ u32 mEmitterID;
 };
+
 STATIC_ASSERT(sizeof(daSnowEffTag_c) == 0x57C);
 
 class daSnowEffTag_HIO_c : public mDoHIO_entry_c {
diff --git a/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h b/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h
index 15f62ceb6fa..74544857253 100644
--- a/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h
+++ b/include/rel/d/a/obj/d_a_obj_so/d_a_obj_so.h
@@ -15,6 +15,7 @@ class obj_so_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x1bd0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_so_class) == 0x1bd0);
 
 class daObj_So_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h b/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h
index 37557c38590..46d24eff8e2 100644
--- a/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h
+++ b/include/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daSpinLift_c) == 0x5c0);
 
 class daSpinLift_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h b/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h
index d2910506672..a61dededfca 100644
--- a/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h
+++ b/include/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.h
@@ -50,6 +50,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb10 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_SSDrink_c) == 0xb10);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h b/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h
index aa4975995d8..4538d1eef29 100644
--- a/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h
+++ b/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h
@@ -67,6 +67,7 @@ private:
     /* 0xB0C */ u16 mEventType;
     /* 0xB0E */ u8 field_0xB0E;
 };
+
 STATIC_ASSERT(sizeof(daObj_SSItem_c) == 0xB10);
 
 #endif /* D_A_OBJ_SS_ITEM_H */
diff --git a/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h b/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h
index d69deb8d280..a942724753a 100644
--- a/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h
+++ b/include/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x132c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daStairBlock_c) == 0x132c);
 
 class daStairBlock_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h b/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h
index da91a64e7a7..d888d6716d2 100644
--- a/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h
+++ b/include/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.h
@@ -31,6 +31,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x950 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_Stick_c) == 0x950);
 
 class daObj_Stick_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h
index e296da87d74..39dc766eb1f 100644
--- a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h
+++ b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h
@@ -84,6 +84,7 @@ private:
     /* 0x0964 */ JPABaseEmitter* field_0x0964[3];
     /* 0x0970 */ Z2SoundObjSimple mSound;
 };
+
 STATIC_ASSERT(sizeof(daObjStone_c) == 0x990);
 
 #endif /* D_A_OBJ_STONE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h b/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h
index 3ce1859355f..2aa6c35bc64 100644
--- a/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h
+++ b/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h
@@ -31,6 +31,7 @@ private:
     /* 0x07A8 */ dCcD_Stts mStts;
     /* 0x07E4 */ Mtx cullMtx;
 };
+
 STATIC_ASSERT(sizeof(daObjSMark_c) == 0x0814);
 
 #endif /* D_A_OBJ_STONEMARK_H */
diff --git a/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h b/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h
index d9a75b7d042..afbd9d0bdf8 100644
--- a/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h
+++ b/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h
@@ -55,6 +55,7 @@ private:
     /* 0x93C */ u8 mAction;
     /* 0x93D */ u8 field_0x93d[0xa00 - 0x93d];
 };
+
 STATIC_ASSERT(sizeof(daObjStopper_c) == 0xA00);
 
 #endif /* D_A_OBJ_STOPPER_H */
diff --git a/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h b/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h
index 7894f46814f..4da223654ae 100644
--- a/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h
+++ b/include/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.h
@@ -47,6 +47,7 @@ private:
     /* 0x587 */ u8 field_0x587;
     /* 0x588 */ u8 field_0x588;
 };
+
 STATIC_ASSERT(sizeof(daObjStopper2_c) == 0x58C);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h b/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h
index 5848d30548d..f6d81db272b 100644
--- a/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h
+++ b/include/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.h
@@ -27,6 +27,7 @@ private:
     /* 0x578 */ dBgS_AcchCir mAcchCir;
     /* 0x5B8 */ dBgS_ObjAcch mAcch;
 };
+
 STATIC_ASSERT(sizeof(daObj_Suisya_c) == 0x790);
 
 #endif /* D_A_OBJ_SUISYA_H */
diff --git a/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h b/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h
index 7f4d7a77e94..94b2c39cb05 100644
--- a/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h
+++ b/include/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.h
@@ -15,6 +15,7 @@ class obj_sw_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0xd90 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_sw_class) == 0xd90);
 
 struct obj_sc_s {
diff --git a/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h b/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h
index b0d25e654ff..33ac722a2d1 100644
--- a/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h
+++ b/include/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h
@@ -56,6 +56,7 @@ private:
     /* 0x5C6 */ u16 field_0x5c6;
     /* 0x5C8 */ u16 field_0x5c8;
 };
+
 STATIC_ASSERT(sizeof(daObjSwBallA_c) == 0x5CC);
 
 #endif /* D_A_OBJ_SWBALLA_H */
diff --git a/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h b/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h
index e49709b8e0d..24489b6b70b 100644
--- a/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h
+++ b/include/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h
@@ -62,6 +62,7 @@ private:
     /* 0x5AC */ u8 field_0x5ac;
     /* 0x5AD */ u8 field_0x5ad;
 };
+
 STATIC_ASSERT(sizeof(daObjSwBallB_c) == 0x5B0);
 
 #endif /* D_A_OBJ_SWBALLB_H */
diff --git a/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h b/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h
index 63bd1e32fbb..50488be664b 100644
--- a/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h
+++ b/include/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.h
@@ -53,6 +53,7 @@ public:
     /* 0x587 */ u8 field_0x587;
     /* 0x588 */ u32 field_0x588;
 };
+
 STATIC_ASSERT(sizeof(daObjSwBallC_c) == 0x58C);
 
 #endif /* D_A_OBJ_SWBALLC_H */
diff --git a/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h b/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h
index fcbce7a8306..fc73480389a 100644
--- a/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h
+++ b/include/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.h
@@ -36,6 +36,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb28 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSwLight_c) == 0xb28);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h b/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h
index 6faee1d8412..14a96515e65 100644
--- a/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h
+++ b/include/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xaa0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSwChain_c) == 0xaa0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h b/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h
index 657da4440fc..d8a611d75d0 100644
--- a/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h
+++ b/include/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.h
@@ -63,6 +63,7 @@ private:
     /* 0x788 */ f32 field_0x788;
     /* 0x78C */ s16 field_0x78c;
 };
+
 STATIC_ASSERT(sizeof(daObjSwHang_c) == 0x790);
 
 #endif /* D_A_OBJ_SWHANG_H */
diff --git a/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h b/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h
index 377ec93c5bf..feb3b1fb58c 100644
--- a/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h
+++ b/include/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.h
@@ -28,6 +28,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x938 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSword_c) == 0x938);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h b/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h
index 5d98c818516..cf3efcaf88c 100644
--- a/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h
+++ b/include/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.h
@@ -53,6 +53,7 @@ public:
     /* 0x83D */ u8 field_0x83d;
     /* 0x83E */ u8 mModelType;
 };
+
 STATIC_ASSERT(sizeof(daObjSwPr_c) == 0x840);
 
 #endif /* D_A_OBJ_SWPROPELLER_H */
diff --git a/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h b/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h
index bc5512a2032..77e9207f3ad 100644
--- a/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h
+++ b/include/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.h
@@ -68,6 +68,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x604 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSwpush) == 0x604);
 
 struct daObj {
diff --git a/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h b/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h
index a28da30db68..24203985be0 100644
--- a/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h
+++ b/include/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.h
@@ -67,6 +67,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5f4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSwpush2) == 0x5f4);
 
 struct daObj {
diff --git a/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h b/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h
index c37d413e7a7..b12c9d57d4d 100644
--- a/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h
+++ b/include/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.h
@@ -47,6 +47,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x600 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSw5_c) == 0x600);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h
index f377f188708..31a5b933c92 100644
--- a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h
+++ b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h
@@ -42,6 +42,7 @@ public:
     /* 0x5EE */ s16 mRotSpeedY;
     /* 0x5F0 */ s16 mCount;
 };
+
 STATIC_ASSERT(sizeof(daObjSwSpinner_c) == 0x5F4);
 
 #endif /* D_A_OBJ_SWSPINNER_H */
diff --git a/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h b/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h
index 24176fd9c75..29fc5d9001b 100644
--- a/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h
+++ b/include/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5e0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSwTurn_c) == 0x5e0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h b/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h
index dd62cba3fc4..2a52b4471dd 100644
--- a/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h
+++ b/include/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.h
@@ -45,6 +45,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9a0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daSyRock_c) == 0x9a0);
 
 class daSyRock_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h b/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h
index 0c54d41ed81..657b72d6c7b 100644
--- a/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h
+++ b/include/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x624 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjSZbridge_c) == 0x624);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h b/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h
index b0c4df252f7..3afa084db5c 100644
--- a/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h
+++ b/include/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.h
@@ -35,6 +35,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x13d4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTaFence_c) == 0x13d4);
 
 class daTaFence_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h b/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h
index 2c9ee82a749..102aabcb32d 100644
--- a/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h
+++ b/include/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x65c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTkraDai_c) == 0x65c);
 
 class daTkraDai_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h b/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h
index ada1519772d..f94676e2b94 100644
--- a/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h
+++ b/include/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.h
@@ -21,6 +21,7 @@ class obj_tatigi_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x1bc0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_tatigi_class) == 0x1bc0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h b/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h
index 0036ec1c384..5b8d704f5f3 100644
--- a/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h
+++ b/include/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.h
@@ -38,6 +38,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa68 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjTEN_c) == 0xa68);
 
 class daObj_TenHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h b/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h
index 9f51963f595..459eeae0f86 100644
--- a/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h
+++ b/include/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.h
@@ -35,6 +35,7 @@ private:
     /* 0x5AE */ u16 mEventBit2;
     /* 0x5B0 */ u8 mHide;
 };
+
 STATIC_ASSERT(sizeof(daObjGake_c) == 0x5B4);
 
 #endif /* D_A_OBJ_TGAKE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h b/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h
index 53d84404ff1..1d0932f515a 100644
--- a/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h
+++ b/include/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x1bbc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjTHASHI_c) == 0x1bbc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h b/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h
index b030f6d0645..25aacf79313 100644
--- a/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h
+++ b/include/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.h
@@ -34,6 +34,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x8c0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjThDoor_c) == 0x8c0);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h b/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h
index 627f69b8675..a39026b0d04 100644
--- a/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h
+++ b/include/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.h
@@ -26,6 +26,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5c0 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTimeFire_c) == 0x5c0);
 
 class daTimeFire_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h b/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h
index 14529dab036..34e7c3e2516 100644
--- a/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h
+++ b/include/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.h
@@ -29,6 +29,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x574 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjTimer) == 0x574);
 
 struct daObj {
diff --git a/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h b/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h
index d2166f1636a..5c4c3df6dd3 100644
--- a/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h
+++ b/include/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.h
@@ -46,6 +46,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xDE4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjTks_c) == 0xDE4);
 
 class daObjTks_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h b/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h
index a24675711ef..e92c7d40c54 100644
--- a/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h
+++ b/include/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h
@@ -31,6 +31,7 @@ private:
     /* 0x574 */ u16 field_0x574;
     /* 0x576 */ u16 field_0x576;
 };
+
 STATIC_ASSERT(sizeof(daObjTMoon_c) == 0x578);
 
 #endif /* D_A_OBJ_TMOON_H */
diff --git a/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h b/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h
index e020e3fc238..beda20fda2b 100644
--- a/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h
+++ b/include/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.h
@@ -30,6 +30,7 @@ private:
     /* 0x578 */ s32 field_0x578;
     /* 0x57C */ Mtx mMtx;
 };
+
 STATIC_ASSERT(sizeof(daObjToaruMaki_c) == 0x5AC);
 
 #endif /* D_A_OBJ_TOARU_MAKI_H */
diff --git a/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h b/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h
index 307f6bb33cb..45cc2ba07ad 100644
--- a/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h
+++ b/include/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.h
@@ -15,6 +15,7 @@ class obj_toby_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x6374 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_toby_class) == 0x6374);
 
 class daObj_Toby_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h b/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h
index 83ba5104b4b..b0f447e7fc3 100644
--- a/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h
+++ b/include/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.h
@@ -33,6 +33,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x600 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjTobyHouse_c) == 0x600);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h b/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h
index 407ceae09c5..cad57c2d76b 100644
--- a/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h
+++ b/include/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.h
@@ -37,6 +37,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xae4 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTogeTrap_c) == 0xae4);
 
 class daTogeTrap_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h b/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h
index ca07d2127bb..89ed3c42ebd 100644
--- a/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h
+++ b/include/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.h
@@ -40,6 +40,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa18 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjTOMBO_c) == 0xa18);
 
 class daObj_TomHIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h b/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h
index c25aabc042c..b05ab911b17 100644
--- a/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h
+++ b/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h
@@ -41,6 +41,7 @@ private:
     /* 0x740 */ WIND_INFLUENCE mWindInfluence;
     /* 0x76C */ f32 mWindPower;
 };
+
 STATIC_ASSERT(sizeof(daObjTrnd_c) == 0x770);
 
 #endif /* D_A_OBJ_TORNADO_H */
diff --git a/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h b/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h
index 49d1fe893e8..2fbe9f7c606 100644
--- a/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h
+++ b/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h
@@ -54,6 +54,7 @@ public:
     /* 0x778 */ bool field_0x778;
     /* 0x778 */ JPABaseEmitter* mParticles[3];
 };
+
 STATIC_ASSERT(sizeof(daObjTrnd2_c) == 0x788);
 
 #endif /* D_A_OBJ_TORNADO2_H */
diff --git a/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h b/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h
index 8d37899be97..6261920d0c6 100644
--- a/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h
+++ b/include/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.h
@@ -15,6 +15,7 @@ class obj_tp_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x784 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_tp_class) == 0x784);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h b/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h
index e2a6c026ce1..ca3b9319627 100644
--- a/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h
+++ b/include/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.h
@@ -25,6 +25,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5cc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTreeSh_c) == 0x5cc);
 
 class daTreeSh_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h b/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h
index 9697d9d1a08..36a79741a1a 100644
--- a/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h
+++ b/include/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.h
@@ -22,6 +22,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5fc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daTwGate_c) == 0x5fc);
 
 class daTwGate_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h b/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h
index a6ac5259ac2..5937dd13b6f 100644
--- a/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h
+++ b/include/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.h
@@ -15,6 +15,7 @@ class obj_udoor_class : public fopAc_ac_c {
 private:
     /* 0x568 */ u8 field_0x568[0x754 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(obj_udoor_class) == 0x754);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h b/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h
index 6bf2ea6114a..9cbe7ac4ba6 100644
--- a/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h
+++ b/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h
@@ -22,6 +22,7 @@ public:
     /* 0x580 */ Mtx mBgMtx;
     /* 0x5B0 */ dBgW* mpBgW;
 };
+
 STATIC_ASSERT(sizeof(obj_usaku_class) == 0x5B4);
 
 #endif /* D_A_OBJ_USAKU_H */
diff --git a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h
index 4078fe8db53..156fbb84240 100644
--- a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h
+++ b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h
@@ -30,5 +30,6 @@ private:
     /* 0x574 */ mDoExt_btkAnm* mpBtk;
     /* 0x578 */ mDoExt_brkAnm* mpBrk;
 };
+
 STATIC_ASSERT(sizeof(daObjVGnd_c) == 0x57C);
 #endif /* D_A_OBJ_VGROUND_H */
diff --git a/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h b/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h
index d18d19dc9b1..f7033755907 100644
--- a/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h
+++ b/include/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h
@@ -135,6 +135,7 @@ private:
     /* 0x2925 */ u8 field_0x2925;
     /* 0x2926 */ u8 field_0x2926;
 };
+
 STATIC_ASSERT(sizeof(daObjVolcBall_c) == 0x2928);
 
 #endif /* D_A_OBJ_VOLCBALL_H */
diff --git a/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h b/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h
index e874e621a55..f79dd3d8932 100644
--- a/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h
+++ b/include/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.h
@@ -63,6 +63,7 @@ private:
     /* 0x960 */ u8 field_0x960;
     /* 0x961 */ u8 field_0x961[0xA1C - 0x961];
 };
+
 STATIC_ASSERT(sizeof(daObjVolcBom_c) == 0xa1c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h b/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h
index b9114614412..dd112130927 100644
--- a/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h
+++ b/include/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.h
@@ -50,6 +50,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x69c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjWarpKBrg_c) == 0x69c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h b/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h
index d5536b17f07..e70bb756709 100644
--- a/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h
+++ b/include/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.h
@@ -36,6 +36,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x640 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjWarpOBrg_c) == 0x640);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h b/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h
index 9f3d4475f6b..1fa2d65643d 100644
--- a/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h
+++ b/include/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.h
@@ -32,6 +32,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x5bc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daWtGate_c) == 0x5bc);
 
 class daWtGate_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h b/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h
index 2e7534b11bf..ecf3b19e48a 100644
--- a/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h
+++ b/include/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.h
@@ -56,6 +56,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xb7c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daWtPillar_c) == 0xb7c);
 
 class daWtPillar_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h b/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h
index 17af9916b03..8aff42ab864 100644
--- a/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h
+++ b/include/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.h
@@ -27,6 +27,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x9cc - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjWaterFall_c) == 0x9cc);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h b/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h
index 4ebf2dfbbab..c80064daac4 100644
--- a/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h
+++ b/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h
@@ -91,6 +91,7 @@ private:
     /* 0x7AC */ f32 mRealRoofY;
     /* 0x7B0 */ cXyz mRoofPos;
 };
+
 STATIC_ASSERT(sizeof(daObjWchain_c) == 0x7BC);
 
 #endif /* D_A_OBJ_WCHAIN_H */
diff --git a/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h b/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h
index d23b6c4aa87..e5b1c719b45 100644
--- a/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h
+++ b/include/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.h
@@ -44,6 +44,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xaf8 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daWdStick_c) == 0xaf8);
 
 class daWdStick_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h
index 83aaf7ec19d..b4021eb1bcb 100644
--- a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h
+++ b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h
@@ -31,6 +31,7 @@ public:
     /* 0x738 */ u8 mDeleteTimer;
     /* 0x739 */ u8 field_0x739;
 };
+
 STATIC_ASSERT(sizeof(obj_web0_class) == 0x73C);
 
 class daObj_Web0_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h
index fff17277ad0..918dc34e59c 100644
--- a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h
+++ b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h
@@ -36,6 +36,7 @@ public:
     /* 0x630 */ dCcD_Cyl mCylCc;
     /* 0x76C */ u8 field_0x76c;
 };
+
 STATIC_ASSERT(sizeof(obj_web1_class) == 0x770);
 
 class daObj_Web1_HIO_c {
diff --git a/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h b/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h
index 88b8e865326..2ff1b97d915 100644
--- a/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h
+++ b/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h
@@ -35,6 +35,7 @@ private:
     /* 0x5AC */ u8 field_0x5AC[0x5B0 - 0x5AC];
     /* 0x5B0 */ u8 field_0x5b0;
 };
+
 STATIC_ASSERT(sizeof(daObjWCover_c) == 0x5B4);
 
 #endif /* D_A_OBJ_WELL_COVER_H */
diff --git a/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h b/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h
index 23d752004c6..491044a3ff6 100644
--- a/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h
+++ b/include/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.h
@@ -39,6 +39,7 @@ public:
     /* 0x836 */ s16 field_0x836;
     /* 0x838 */ u32 field_0x838;
 };
+
 STATIC_ASSERT(sizeof(obj_wflag_class) == 0x83C);
 
 #endif /* D_A_OBJ_WFLAG_H */
diff --git a/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h b/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h
index b955c9fb599..e467a452098 100644
--- a/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h
+++ b/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h
@@ -45,6 +45,7 @@ private:
     /* 0x5C0 */ u32 field_0x5c0;
     /* 0x5C4 */ u8 field_0x5c4;
 };
+
 STATIC_ASSERT(sizeof(daWindStone_c) == 0x5C8);
 
 #endif /* D_A_OBJ_WIND_STONE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h b/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h
index c409f378c8f..d2575dfe81d 100644
--- a/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h
+++ b/include/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.h
@@ -38,6 +38,7 @@ private:
     /* 0x95A */ s16 field_0x95a;
     /* 0x95C */ s16 field_0x95c;
 };
+
 STATIC_ASSERT(sizeof(daObjWPndlm_c) == 0x960);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h b/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h
index 63b02e5434c..a7ebd34ccd2 100644
--- a/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h
+++ b/include/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x974 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjWStatue_c) == 0x974);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h b/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h
index e0e24cf3894..a862cb4f7ee 100644
--- a/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h
+++ b/include/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.h
@@ -39,6 +39,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa3c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObj_YBag_c) == 0xa3c);
 
 class daObj_YBag_Param_c {
diff --git a/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h b/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h
index acc6a225e70..b2d0a659e3b 100644
--- a/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h
+++ b/include/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.h
@@ -36,6 +36,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0xa4c - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjYOUSEI_c) == 0xa4c);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h
index 947eafef519..bc86d689b2b 100644
--- a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h
+++ b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h
@@ -57,6 +57,7 @@ public:
     /* 0x59B */ bool field_0x59b;
     /* 0x59C */ u8 field_0x59c[4];
 };
+
 STATIC_ASSERT(sizeof(obj_ystone_class) == 0x5A0);
 
 #endif /* D_A_OBJ_YSTONE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h b/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h
index fea64fd82fe..232b4d9bd98 100644
--- a/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h
+++ b/include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h
@@ -21,6 +21,7 @@ public:
     /* 80D3F1D0 */ int draw();
     /* 80D3F200 */ int _delete();
 };
+
 STATIC_ASSERT(sizeof(daObjZCloth_c) == 0x92C);
 
 #endif /* D_A_OBJ_ZCLOTH_H */
diff --git a/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h b/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h
index 426884370ac..b19f79d44bf 100644
--- a/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h
+++ b/include/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.h
@@ -40,6 +40,7 @@ private:
     /* 0xE2E */ s16 field_0xe2e;
     /* 0xE30 */ u8 field_0xe30;
 };
+
 STATIC_ASSERT(sizeof(daZdoor_c) == 0xE34);
 
 
diff --git a/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h b/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h
index 0b5ca0ca3e6..9ea061a0df6 100644
--- a/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h
+++ b/include/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.h
@@ -30,6 +30,7 @@ public:
 private:
     /* 0x568 */ u8 field_0x568[0x3e40 - 0x568];
 };
+
 STATIC_ASSERT(sizeof(daObjZraMark_c) == 0x3e40);
 
 class _ZraMark_Hahen_c : public fopAc_ac_c {
diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h
index 728a995a9fe..b0b854bf8f8 100644
--- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h
+++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h
@@ -68,6 +68,7 @@ private:
     /* 0x578 */ actionFunc* mAction;
     /* 0x57C */ Mode_e mMode;
 };
+
 STATIC_ASSERT(sizeof(daObjMirror6Pole_c) == 0x580);
 
 #endif /* D_A_OBJ_MIRROR_6POLE_H */
diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h
index c5728187339..f4b0b21ca6a 100644
--- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h
+++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h
@@ -43,6 +43,7 @@ private:
     /* 0x57C */ dBgW mBgw[2];
     /* 0x6FC */ Mtx mBgMtx;
 };
+
 STATIC_ASSERT(sizeof(daObjMirrorSand_c) == 0x72C);
 
 #endif /* D_A_OBJ_MIRROR_SAND_H */
diff --git a/include/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.h b/include/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.h
index 91207f536c7..d2e686aa0e1 100644
--- a/include/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.h
+++ b/include/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.h
@@ -30,6 +30,7 @@ public:
     /* 80D564A0 */ int wait(void*);
     /* 80D565F0 */ virtual ~daTag_BottleItem_c();
 };
+
 STATIC_ASSERT(sizeof(daTag_BottleItem_c) == 0x57C);
 
 #endif /* D_A_TAG_BOTTLE_ITEM_H */
diff --git a/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h b/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h
index 06b93ecdf98..2a3ea6f9cf8 100644
--- a/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h
+++ b/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h
@@ -13,6 +13,7 @@ public:
 
     /* 0x0568 */ cXyz mVertices[4];
 };
+
 STATIC_ASSERT(sizeof(daTagChgRestart_c) == 0x598);
 
 namespace daTagChgRestart_prm {
diff --git a/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h b/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h
index da8c57da15a..be1174dcc30 100644
--- a/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h
+++ b/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h
@@ -38,6 +38,7 @@ public:
 
     /* 8048C304 */ virtual ~daTag_Evt_c();
 };
+
 STATIC_ASSERT(sizeof(daTag_Evt_c) == 0x5EC);
 
 #endif /* D_A_TAG_EVT_H */
diff --git a/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h b/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h
index 387ddcb32e9..1f5f83a9067 100644
--- a/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h
+++ b/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h
@@ -17,6 +17,7 @@ private:
     /* 0x56C */ u32 mMode;
     /* 0x570 */ s16 mTimer;
 };
+
 STATIC_ASSERT(sizeof(daTagMyna2_c) == 0x574);
 
 #endif /* D_A_TAG_MYNA2_H */
diff --git a/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h b/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h
index 34acda8c206..bd85ea3a5fe 100644
--- a/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h
+++ b/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h
@@ -25,6 +25,7 @@ public:
     /* 0x6E0 */ u32 field_0x6E0;
     /* 0x6E4 */ u32 field_0x6E4;
 };
+
 STATIC_ASSERT(sizeof(daTagPati_c) == 0x6E8);
 
 #endif /* D_A_TAG_PACHI_H */
diff --git a/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h b/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h
index 9653f0081cf..c8c862826e7 100644
--- a/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h
+++ b/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h
@@ -38,6 +38,7 @@ public:
 
     /* 804908CC */ virtual ~daTag_Push_c();
 };
+
 STATIC_ASSERT(sizeof(daTag_Push_c) == 0x574);
 
 #endif /* D_A_TAG_PUSH_H */
diff --git a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp
index 2ee3eae2909..f4ba9bae52d 100644
--- a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp
+++ b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp
@@ -1,143 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_bh
-//
+/**
+ * @file d_a_b_bh.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_bh/d_a_b_bh.h"
 #include "d/cc/d_cc_d.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-
-    static u8 now[48];
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct mDoCPd_c {
-    static u8 m_cpadInfo[256];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daB_BH_HIO_c {
-    /* 805AE26C */ daB_BH_HIO_c();
-    /* 805B3098 */ ~daB_BH_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-};
-
-struct dSv_info_c {
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {
-    /* 805B3054 */ ~csXyz();
-    /* 805B3090 */ csXyz();
-};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dComIfG_play_c {
-    /* 8002C97C */ void getLayerNo(int);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 805B2F54 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct b_bh_class {};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DModel {};
 
 //
 // Forward References:
@@ -260,8 +129,6 @@ extern "C" void __ct__15Z2CreatureEnemyFv();
 extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
 extern "C" void __construct_array();
 extern "C" void _savegpr_21();
 extern "C" void _savegpr_24();
@@ -277,8 +144,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -287,7 +152,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" extern u8 struct_80450C98[4];
@@ -416,25 +280,30 @@ static dCcD_SrcSph tg_sph_src = {
 };
 
 /* 805B330C-805B332C -00001 0020+00 1/0 0/0 0/0 .data            l_daB_BH_Method */
-SECTION_DATA static void* l_daB_BH_Method[8] = {
-    (void*)daB_BH_Create__FP10fopAc_ac_c,
-    (void*)daB_BH_Delete__FP10b_bh_class,
-    (void*)daB_BH_Execute__FP10b_bh_class,
-    (void*)daB_BH_IsDelete__FP10b_bh_class,
-    (void*)daB_BH_Draw__FP10b_bh_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_BH_Method = {
+    (process_method_func)daB_BH_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_BH_Delete__FP10b_bh_class,
+    (process_method_func)daB_BH_Execute__FP10b_bh_class,
+    (process_method_func)daB_BH_IsDelete__FP10b_bh_class,
+    (process_method_func)daB_BH_Draw__FP10b_bh_class,
 };
 
 /* 805B332C-805B335C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_BH */
-SECTION_DATA extern void* g_profile_B_BH[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x020B0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000F4C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00D30000, (void*)&l_daB_BH_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_BH = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_BH,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(b_bh_class),     // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  211,                    // mPriority
+  &l_daB_BH_Method,       // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805B335C-805B3380 000128 0024+00 2/2 0/0 0/0 .data            __vt__12dBgS_ObjAcch */
@@ -1224,7 +1093,8 @@ static asm void daB_BH_Create(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_bh/d_a_b_bh/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -1256,14 +1126,16 @@ extern "C" asm void __dt__8cM3dGAabFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm csXyz::~csXyz() {
+// asm csXyz::~csXyz() {
+extern "C" asm void __dt__5csXyzFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_bh/d_a_b_bh/__dt__5csXyzFv.s"
 }
 #pragma pop
 
 /* 805B3090-805B3094 004F10 0004+00 1/1 0/0 0/0 .text            __ct__5csXyzFv */
-csXyz::csXyz() {
+// csXyz::csXyz() {
+extern "C" asm void __ct__5csXyzFv() {
     /* empty function */
 }
 
diff --git a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp
index ef70ac3fffb..5f62a7bfd6c 100644
--- a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp
+++ b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp
@@ -1,139 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_bq
-//
+/**
+ * @file d_a_b_bq.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_bq/d_a_b_bq.h"
 #include "SSystem/SComponent/c_phase.h"
-#include "Z2AudioLib/Z2Creature.h"
-#include "f_op/f_op_actor_mng.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
+#include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h"
 
-//
-// Types:
-//
 
-struct obj_ystone_class {
-    /* 805BA234 */ void setCurrentPos(cXyz);
-};
-
-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;
-};
-
-class b_bq_class : public fopEn_enemy_c {
-public:
-    /* 805B9B3C */ b_bq_class();
-
-    /* 0x05AC */ request_of_phase_process_class mPhase;
-    /* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
-    /* 0x05B8 */ mDoExt_brkAnm* field_0x5b8;
-    /* 0x05BC */ mDoExt_btkAnm* field_0x5bc;
-    /* 0x05C0 */ s8 field_0x5c0;
-    /* 0x05C4 */ J3DModel* field_0x5c4;
-    /* 0x05C8 */ s8 field_0x5c8;
-    /* 0x05CC */ cXyz field_0x5cc;
-    /* 0x05D8 */ f32 field_0x5d8;
-    /* 0x05DC */ s16 field_0x5dc;
-    /* 0x05E0 */ Z2CreatureEnemy mSound;
-    /* 0x0684 */ Z2SoundObjSimple field_0x684;
-    /* 0x06A4 */ Z2SoundObjSimple field_0x6a4;
-    /* 0x06C4 */ int mAnmID;
-    /* 0x06C8 */ s16 field_0x6c8;
-    /* 0x06CA */ s16 mAction;
-    /* 0x06CC */ s16 mMode;
-    /* 0x06CE */ s16 mAngleToPlayer;
-    /* 0x06D0 */ f32 mDistToPlayer;
-    /* 0x06D4 */ s16 field_0x6d4[5];
-    /* 0x06DE */ s16 field_0x6de;
-    /* 0x06E0 */ int field_0x6e0;
-    /* 0x06E4 */ int field_0x6e4;
-    /* 0x06E8 */ fopAc_ac_c* mpMBactor;
-    /* 0x06EC */ u8 field_0x6ec;
-    /* 0x06ED */ u8 field_0x6ed;
-    /* 0x06F0 */ f32 field_0x6f0;
-    /* 0x06F4 */ s16 field_0x6f4;
-    /* 0x06F6 */ s16 field_0x6f6;
-    /* 0x06F8 */ s8 field_0x6f8;
-    /* 0x06F9 */ u8 field_0x6f9;
-    /* 0x06FA */ u8 field_0x6fa;
-    /* 0x06FB */ u8 field_0x6fb;
-    /* 0x06FC */ u8 field_0x6fc;
-    /* 0x06FE */ s16 field_0x6fe;
-    /* 0x0700 */ dCcD_Stts field_0x700;
-    /* 0x073C */ dCcD_Sph field_0x73c;
-    /* 0x0874 */ dCcD_Stts field_0x874;
-    /* 0x08B0 */ dCcD_Sph field_0x8b0;
-    /* 0x09E8 */ dCcD_Sph field_0x9e8;
-    /* 0x0B20 */ dCcD_Sph field_0xb20[4];
-    /* 0x1000 */ dCcD_Sph field_0x1000;
-    /* 0x1138 */ cXyz field_0x1138;
-    /* 0x1144 */ cXyz field_0x1144;
-    /* 0x1150 */ s8 field_0x1150;
-    /* 0x1151 */ u8 field_0x1151;
-    /* 0x1154 */ dCcU_AtInfo mAtInfo;
-    /* 0x1178 */ f32 field_0x1178;
-    /* 0x117C */ u8 field_0x117C[0x1180 - 0x117C];
-    /* 0x1180 */ u32 field_0x1180;
-    /* 0x1184 */ u32 field_0x1184;
-    /* 0x1188 */ u32 field_0x1188;
-    /* 0x118C */ u32 field_0x118c;
-    /* 0x1190 */ u32 field_0x1190;
-    /* 0x1194 */ u32 field_0x1194[5];
-    /* 0x11A8 */ u32 field_0x11a8[12];
-    /* 0x11D8 */ f32 field_0x11d8;
-    /* 0x11DC */ u8 field_0x11DC[0x11FC - 0x11DC];
-    /* 0x11FC */ s8 field_0x11fc;
-    /* 0x1200 */ u32 field_0x1200[4];
-    /* 0x1210 */ u32 field_0x1210[2];
-    /* 0x1218 */ u8 field_0x1218[0x1220 - 0x1218];
-    /* 0x1220 */ u32 field_0x1220;
-    /* 0x1224 */ u32 field_0x1224;
-    /* 0x1228 */ u32 field_0x1228[4];
-    /* 0x1238 */ s16 field_0x1238;
-    /* 0x123A */ s16 field_0x123a;
-    /* 0x123C */ u8 field_0x123C[0x1240 - 0x123C];
-    /* 0x1240 */ cXyz field_0x1240;
-    /* 0x124C */ cXyz field_0x124c;
-    /* 0x1258 */ cXyz field_0x1258;
-    /* 0x1264 */ cXyz field_0x1264;
-    /* 0x1270 */ cXyz field_0x1270;
-    /* 0x127C */ cXyz field_0x127c;
-    /* 0x1288 */ cXyz field_0x1288;
-    /* 0x1294 */ u8 field_0x1294[0x1298 - 0x1294];
-    /* 0x1298 */ f32 field_0x1298;
-    /* 0x129C */ f32 field_0x129c;
-    /* 0x12A0 */ f32 field_0x12a0;
-    /* 0x12A4 */ f32 field_0x12a4;
-    /* 0x12A8 */ f32 field_0x12a8;
-    /* 0x12AC */ s16 field_0x12ac;
-    /* 0x12AE */ s16 field_0x12ae;
-    /* 0x12B0 */ cXyz field_0x12b0;
-    /* 0x12BC */ cXyz field_0x12bc;
-    /* 0x12C8 */ cXyz field_0x12c8[16];
-    /* 0x1388 */ int field_0x1388;
-    /* 0x138C */ s16 field_0x138c;
-    /* 0x138E */ s16 field_0x138e;
-    /* 0x1390 */ s16 field_0x1390;
-    /* 0x1392 */ u8 field_0x1392;
-    /* 0x1393 */ s8 field_0x1393;
-    /* 0x1394 */ u8 field_0x1394;
-    /* 0x1395 */ u8 field_0x1395;
-    /* 0x1396 */ u8 field_0x1396;
-    /* 0x1397 */ s8 field_0x1397;
-    /* 0x1398 */ f32 field_0x1398;
-    /* 0x139C */ u8 field_0x139c;
-};
 
 //
 // Forward References:
@@ -798,25 +674,30 @@ static dCcD_SrcSph mizu_sph_src = {
 #pragma pop
 
 /* 805BACAC-805BACCC -00001 0020+00 1/0 0/0 0/0 .data            l_daB_BQ_Method */
-SECTION_DATA static void* l_daB_BQ_Method[8] = {
-    (void*)daB_BQ_Create__FP10fopAc_ac_c,
-    (void*)daB_BQ_Delete__FP10b_bq_class,
-    (void*)daB_BQ_Execute__FP10b_bq_class,
-    (void*)daB_BQ_IsDelete__FP10b_bq_class,
-    (void*)daB_BQ_Draw__FP10b_bq_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_BQ_Method = {
+    (process_method_func)daB_BQ_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_BQ_Delete__FP10b_bq_class,
+    (process_method_func)daB_BQ_Execute__FP10b_bq_class,
+    (process_method_func)daB_BQ_IsDelete__FP10b_bq_class,
+    (process_method_func)daB_BQ_Draw__FP10b_bq_class,
 };
 
 /* 805BACCC-805BACFC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_BQ */
-SECTION_DATA extern void* g_profile_B_BQ[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x020C0000, (void*)&g_fpcLf_Method,
-    (void*)0x000013A0, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00D40000, (void*)&l_daB_BQ_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_BQ = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_BQ,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(b_bq_class),     // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  212,                    // mPriority
+  &l_daB_BQ_Method,       // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805BACFC-805BAD08 000488 000C+00 2/2 0/0 0/0 .data            __vt__10cCcD_GStts */
@@ -1433,7 +1314,8 @@ asm void cBgS_LinChk::GetCross() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void cM_scos(s16 param_0) {
+// static asm void cM_scos(s16 param_0) {
+extern "C" asm void cM_scos__Fs() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/cM_scos__Fs.s"
 }
diff --git a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp
index 1b6e80ce7c5..ee3b2ab8696 100644
--- a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp
+++ b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp
@@ -1,394 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_dr
-//
+/**
+ * @file d_a_b_dr.cpp
+ * 
+*/
 
-// #include "rel/d/a/b/d_a_b_dr/d_a_b_dr.h"
-#include "dolphin/types.h"
+#include "rel/d/a/b/d_a_b_dr/d_a_b_dr.h"
 #include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266AE4 */ void operator+(Vec const&) const;
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80267128 */ void atan2sX_Z() const;
-    /* 80267150 */ void atan2sY_XZ() const;
-    /* 805BB0E4 */ ~cXyz();
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTevRegKey {};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 8015F398 */ void checkMasterSwordEquip();
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct daB_DR_c {
-    /* 805BAF80 */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 805BB120 */ void JointCallBack(J3DJoint*, int);
-    /* 805BB16C */ void draw();
-    /* 805BB408 */ void setBck(int, u8, f32, f32);
-    /* 805BB4B4 */ void setActionMode(int, int);
-    /* 805BB4CC */ void mGlider_WindPosSet();
-    /* 805BB540 */ void mBoot_c_tranceSet(bool);
-    /* 805BB64C */ void mStatusONOFF(int);
-    /* 805BB6E8 */ void setSe();
-    /* 805BBFC0 */ void setDeathLightEffect();
-    /* 805BC0B8 */ void chkPartCreate(bool);
-    /* 805BC248 */ void mHabatakiAnmSet(int);
-    /* 805BC57C */ void mGlider_AniSet(bool);
-    /* 805BC8B4 */ void mGliderAtAniSet();
-    /* 805BCA10 */ void tail_hit_check();
-    /* 805BCAD4 */ void week_hit_check();
-    /* 805BCBD0 */ void mTimerClr();
-    /* 805BCBF4 */ void mCountClr();
-    /* 805BCC18 */ void mAllClr();
-    /* 805BCC4C */ void mHeadAngleSet();
-    /* 805BCD7C */ void flapMove(bool);
-    /* 805BCEA4 */ void revolutionMove();
-    /* 805BD05C */ void mPlayerHighCheck();
-    /* 805BD15C */ void mBgFallGroundCheck();
-    /* 805BD3E4 */ void normalHoverMove();
-    /* 805BD5FC */ void executeWait();
-    /* 805BD98C */ void executeFlyWait();
-    /* 805BDBC4 */ void executeTailHit();
-    /* 805BE9B4 */ void executeWeekHit();
-    /* 805BF4C8 */ void mBreathSet();
-    /* 805BF768 */ void mBreathHighSet(bool);
-    /* 805BFA6C */ void mFeintBreath();
-    /* 805BFD88 */ void executeBreathAttack();
-    /* 805C062C */ void executeWindAttack();
-    /* 805C0CAC */ void mGliderMoveSub(f32);
-    /* 805C0EF8 */ void executeGliderAttack();
-    /* 805C1E0C */ void executePillarSearch();
-    /* 805C24BC */ void executePillarWait();
-    /* 805C2BE8 */ void startDemoCheck();
-    /* 805C2CD0 */ void executeDamageDemo();
-    /* 805C3558 */ void executeMiddleDemo();
-    /* 805C36A4 */ void executeDead();
-    /* 805C382C */ void executeBullet();
-    /* 805C39D8 */ void executeParts();
-    /* 805C3CB0 */ void action();
-    /* 805C40E0 */ void action_fire();
-    /* 805C4130 */ void action_parts();
-    /* 805C41A4 */ void mtx_set();
-    /* 805C4684 */ void parts_mtx_set();
-    /* 805C46E0 */ void cc_set();
-    /* 805C4E14 */ void down_cc_set();
-    /* 805C4FB4 */ void demo_skip(int);
-    /* 805C50BC */ void DemoSkipCallBack(void*, int);
-    /* 805C50F0 */ void execute();
-    /* 805C55B0 */ void _delete();
-    /* 805C56A4 */ void CreateHeap();
-    /* 805C5974 */ void create();
-    /* 805C62B0 */ daB_DR_c();
-};
-
-struct daB_DR_HIO_c {
-    /* 805BAE6C */ daB_DR_HIO_c();
-    /* 805C6B94 */ ~daB_DR_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_restart_c {
-    /* 80034F80 */ void setRoom(cXyz const&, s16, s8);
-};
-
-struct dSv_memBit_c {
-    /* 80034934 */ void isDungeonItem(int) const;
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 800352B0 */ void offSwitch(int, int);
-};
-
-struct dSv_event_c {
-    /* 8003498C */ void onEventBit(u16);
-};
-
-struct dSv_danBit_c {
-    /* 80034B98 */ void onSwitch(int);
-    /* 80034BC0 */ void offSwitch(int);
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-    /* 8004D6A4 */ void setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
-                                csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8,
-                                cXyz const*);
-};
-
-struct dMsgFlow_c {
-    /* 80249F00 */ dMsgFlow_c();
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-    /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_SrcCyl {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-    /* 805C6744 */ ~dCcD_Sph();
-    /* 805C6810 */ dCcD_Sph();
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80083830 */ void Move();
-    /* 805C69F0 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 80084460 */ void ChkTgHit();
-    /* 800844F8 */ void GetTgHitObj();
-};
-
-struct dCcD_Cyl {
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-    /* 805C6678 */ dCcD_Cyl();
-    /* 805C6894 */ ~dCcD_Cyl();
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80163028 */ void SetTrimTypeForce(s32);
-    /* 80180AA8 */ void Set(cXyz, cXyz);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 805C6A4C */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 805C6ABC */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-    /* 80077114 */ void SetGroundUpY(f32);
-};
-
-struct dAttention_c {
-    /* 80070844 */ void GetLockonList(s32);
-    /* 800737E4 */ void LockonTruth();
-};
-
-struct dAttList_c {
-    /* 80073864 */ void getActor();
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 805C66FC */ ~cM3dGSph();
-};
-
-struct cM3dGCyl {
-    /* 8026F1DC */ void SetC(cXyz const&);
-    /* 8026F1F8 */ void SetH(f32);
-    /* 8026F200 */ void SetR(f32);
-    /* 805C6960 */ ~cM3dGCyl();
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 805C69A8 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 805C6B4C */ ~cCcD_GStts();
-};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
-
-struct _GXTexObj {};
-
-struct Z2SeqMgr {
-    /* 802AF010 */ void bgmStart(u32, u32, s32);
-    /* 802AF408 */ void bgmStop(u32, s32);
-    /* 802AF49C */ void subBgmStart(u32);
-    /* 802AF884 */ void subBgmStop();
-    /* 802AFB94 */ void bgmStreamPrepare(u32);
-    /* 802AFE18 */ void bgmStreamPlay();
-    /* 802AFF8C */ void changeBgmStatus(s32);
-};
-
-struct JAISoundID {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-    /* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct JGeometry {
-    template <typename A1>
-    struct TVec3 {};
-    /* TVec3<f32> */
-    struct TVec3__template0 {};
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 805C590C */ ~J3DFrameCtrl();
-};
+#include "d/d_camera.h"
 
 //
 // Forward References:
@@ -628,12 +245,6 @@ extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXInverse();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECSquareDistance();
 extern "C" void __construct_array();
 extern "C" void _savegpr_21();
 extern "C" void _savegpr_22();
@@ -651,9 +262,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abs();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -664,12 +272,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
-extern "C" extern u32 __float_nan;
 extern "C" extern u8 struct_80450C98[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void __register_global_object();
@@ -1106,25 +710,30 @@ SECTION_DATA static u8 mParts_EstimateSizeDt[24] = {
 #pragma pop
 
 /* 805C77E4-805C7804 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_DR_Method */
-SECTION_DATA static void* l_daB_DR_Method[8] = {
-    (void*)daB_DR_Create__FP8daB_DR_c,
-    (void*)daB_DR_Delete__FP8daB_DR_c,
-    (void*)daB_DR_Execute__FP8daB_DR_c,
-    (void*)daB_DR_IsDelete__FP8daB_DR_c,
-    (void*)daB_DR_Draw__FP8daB_DR_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_DR_Method = {
+    (process_method_func)daB_DR_Create__FP8daB_DR_c,
+    (process_method_func)daB_DR_Delete__FP8daB_DR_c,
+    (process_method_func)daB_DR_Execute__FP8daB_DR_c,
+    (process_method_func)daB_DR_IsDelete__FP8daB_DR_c,
+    (process_method_func)daB_DR_Draw__FP8daB_DR_c,
 };
 
 /* 805C7804-805C7834 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_DR */
-SECTION_DATA extern void* g_profile_B_DR[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00F70000, (void*)&g_fpcLf_Method,
-    (void*)0x00002860, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00DD0000, (void*)&l_daB_DR_Method,
-    (void*)0x04040000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_DR = {
+  fpcLy_CURRENT_e,        // mLayerID
+  4,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_DR,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_DR_c),       // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  221,                    // mPriority
+  &l_daB_DR_Method,       // sub_method
+  0x04040000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805C7834-805C7840 0005EC 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -1220,7 +829,8 @@ asm void daB_DR_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__4cXyzFv.s"
 }
@@ -3445,7 +3055,8 @@ asm void daB_DR_c::CreateHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__12J3DFrameCtrlFv.s"
 }
@@ -3528,7 +3139,8 @@ asm daB_DR_c::daB_DR_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Cyl::dCcD_Cyl() {
+// asm dCcD_Cyl::dCcD_Cyl() {
+extern "C" asm void __ct__8dCcD_CylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__ct__8dCcD_CylFv.s"
 }
@@ -3538,7 +3150,8 @@ asm dCcD_Cyl::dCcD_Cyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__8cM3dGSphFv.s"
 }
@@ -3548,7 +3161,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::~dCcD_Sph() {
+// asm dCcD_Sph::~dCcD_Sph() {
+extern "C" asm void __dt__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__8dCcD_SphFv.s"
 }
@@ -3558,7 +3172,8 @@ asm dCcD_Sph::~dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::dCcD_Sph() {
+// asm dCcD_Sph::dCcD_Sph() {
+extern "C" asm void __ct__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__ct__8dCcD_SphFv.s"
 }
@@ -3568,7 +3183,8 @@ asm dCcD_Sph::dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Cyl::~dCcD_Cyl() {
+// asm dCcD_Cyl::~dCcD_Cyl() {
+extern "C" asm void __dt__8dCcD_CylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__8dCcD_CylFv.s"
 }
@@ -3578,7 +3194,8 @@ asm dCcD_Cyl::~dCcD_Cyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGCyl::~cM3dGCyl() {
+// asm cM3dGCyl::~cM3dGCyl() {
+extern "C" asm void __dt__8cM3dGCylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__8cM3dGCylFv.s"
 }
@@ -3588,7 +3205,8 @@ asm cM3dGCyl::~cM3dGCyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__8cM3dGAabFv.s"
 }
@@ -3598,7 +3216,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__10dCcD_GSttsFv.s"
 }
@@ -3608,7 +3227,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -3618,7 +3238,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__12dBgS_AcchCirFv.s"
 }
@@ -3638,7 +3259,8 @@ static asm void daB_DR_Create(daB_DR_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/__dt__10cCcD_GSttsFv.s"
 }
diff --git a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp
index 3e658342690..67de631a875 100644
--- a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp
+++ b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp
@@ -1,218 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_dre
-//
+/**
+ * @file d_a_b_dre.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_dre/d_a_b_dre.h"
 #include "dol2asm.h"
+#include "d/d_camera.h"
+#include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
-
-struct cXyz {
-    /* 805C7FCC */ ~cXyz();
-};
-
-struct obj_ystone_class {
-    /* 805CAD2C */ void setCurrentPos(cXyz);
-};
-
-struct csXyz {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct mDoGph_gInf_c {
-    /* 80008078 */ void onBlure();
-};
-
-struct J3DAnmTevRegKey {};
-
-struct J3DMaterialTable {
-    /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
-};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daB_DRE_c {
-    /* 805C7DD4 */ void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
-    /* 805C7EAC */ void CameraSet();
-    /* 805C8008 */ void SetStopingCam();
-    /* 805C808C */ void SetStopCam(cXyz, f32, f32, s16);
-    /* 805C8208 */ void SetCMoveCam(cXyz, f32, f32);
-    /* 805C81B8 */ void SetCMoveCam(cXyz, f32);
-    /* 805C8348 */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32, f32);
-    /* 805C824C */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32);
-    /* 805C8458 */ void SetMoveCam(f32, f32);
-    /* 805C8544 */ void SetReleaseCam();
-    /* 805C85E8 */ void CamAction2();
-    /* 805C8BF8 */ void DrAction2();
-    /* 805C8EDC */ void CamAction();
-    /* 805C9318 */ void Action();
-    /* 805C9378 */ void DrAction();
-    /* 805C9B40 */ void SoundChk();
-    /* 805CA158 */ void Execute();
-    /* 805CA49C */ void SpeedSet();
-    /* 805CA4FC */ void BreathSet();
-    /* 805CA670 */ void Delete();
-    /* 805CA6C0 */ void setBaseMtx();
-    /* 805CA944 */ void create();
-};
-
-struct dVibration_c {
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 800352B0 */ void offSwitch(int, int);
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-    /* 8004368C */ void setPtT(void*);
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-    /* 80181E64 */ void Eye();
-    /* 80181E98 */ void Center();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 805CAC3C */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cBgS_PolyInfo {};
-
-struct _GXTexObj {};
-
-struct JAISoundID {};
-
-struct Vec {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-    /* 802C1B90 */ void setEnemyName(char const*);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JGeometry {
-    template <typename A1>
-    struct TVec3 {};
-    /* TVec3<f32> */
-    struct TVec3__template0 {};
-};
-
-struct J3DModel {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 805C7D6C */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -333,9 +129,6 @@ extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
 extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECSquareDistance();
 extern "C" void _savegpr_22();
 extern "C" void _savegpr_27();
 extern "C" void _savegpr_28();
@@ -344,13 +137,9 @@ extern "C" void _restgpr_22();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u32 __float_nan;
 extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void __register_global_object();
@@ -442,25 +231,30 @@ SECTION_DATA static u8 effId[8] = {
 };
 
 /* 805CAFB4-805CAFD4 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_DRE_Method */
-SECTION_DATA static void* l_daB_DRE_Method[8] = {
-    (void*)daB_DRE_Create__FP10fopAc_ac_c,
-    (void*)daB_DRE_Delete__FP9daB_DRE_c,
-    (void*)daB_DRE_Execute__FP9daB_DRE_c,
-    (void*)daB_DRE_IsDelete__FP9daB_DRE_c,
-    (void*)daB_DRE_Draw__FP9daB_DRE_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_DRE_Method = {
+    (process_method_func)daB_DRE_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_DRE_Delete__FP9daB_DRE_c,
+    (process_method_func)daB_DRE_Execute__FP9daB_DRE_c,
+    (process_method_func)daB_DRE_IsDelete__FP9daB_DRE_c,
+    (process_method_func)daB_DRE_Draw__FP9daB_DRE_c,
 };
 
 /* 805CAFD4-805CB004 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_DRE */
-SECTION_DATA extern void* g_profile_B_DRE[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02150000, (void*)&g_fpcLf_Method,
-    (void*)0x00000930, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E70000, (void*)&l_daB_DRE_Method,
-    (void*)0x00044100, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_DRE = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_DRE,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_DRE_c),      // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  231,                    // mPriority
+  &l_daB_DRE_Method,      // sub_method
+  0x00044100,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805CB004-805CB028 000130 0024+00 2/2 0/0 0/0 .data            __vt__12dBgS_ObjAcch */
@@ -497,7 +291,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/__dt__12J3DFrameCtrlFv.s"
 }
@@ -563,7 +358,8 @@ asm void daB_DRE_c::CameraSet() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/__dt__4cXyzFv.s"
 }
@@ -1541,7 +1337,8 @@ asm void daB_DRE_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -1591,7 +1388,8 @@ static asm void func_805CAD24() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
+// asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
+extern "C" asm void setCurrentPos__16obj_ystone_classF4cXyz() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/setCurrentPos__16obj_ystone_classF4cXyz.s"
 }
diff --git a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp
index 2298b1b81b2..935b4eaf6b3 100644
--- a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp
+++ b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp
@@ -12,47 +12,6 @@
 #include "rel/d/a/d_a_spinner/d_a_spinner.h"
 #include "dol2asm.h"
 
-class daB_DS_HIO_c {
-public:
-    /* 805CB22C */ daB_DS_HIO_c();
-#ifdef NONMATCHING
-    /* 805DC89C */ virtual ~daB_DS_HIO_c() {}
-#else
-    /* 805DC89C */ ~daB_DS_HIO_c();
-#endif
-
-#ifndef NONMATCHING
-    /* 0x00 */ void* _vtable;
-#endif
-    /* 0x04 */ s8 field_0x04;
-    /* 0x08 */ f32 mModelSize;
-    /* 0x0C */ f32 mHandRange;
-    /* 0x10 */ f32 mBreathRange;
-    /* 0x14 */ f32 mGuardSpawnRange;
-    /* 0x18 */ f32 mNoSearchRange;
-    /* 0x1C */ f32 mP2MoveAxis;
-    /* 0x20 */ f32 mP2ModelSize;
-    /* 0x24 */ f32 mP2AttackHeight;
-    /* 0x28 */ s16 mP2FallTime;
-    /* 0x2A */ s16 mPedestalFallTime;
-    /* 0x2C */ s16 mSandFallWaitTime;
-    /* 0x2E */ s16 mP2BulletFireTime;
-    /* 0x30 */ s16 mP2OuterWallAttackTime;
-    /* 0x32 */ s16 mP2TrapCreateWaitTime1;
-    /* 0x34 */ s16 mP2TrapCreateWaitTime2;
-    /* 0x36 */ s16 mP2TrapCreateID1;
-    /* 0x38 */ s16 mP2TrapCreateID2;
-    /* 0x3A */ s16 mHintTime1;
-    /* 0x3C */ s16 mHintTime2;
-    /* 0x3E */ s16 mP2OuterWallTrapSpeed;
-    /* 0x40 */ s16 mTowerTrapSpeed;
-    /* 0x42 */ s16 mP2ApproachAccel;
-    /* 0x44 */ s16 mP2ApproachSpeedMax;
-    /* 0x46 */ s16 mP2ApproachAfterBullet;
-    /* 0x48 */ s16 mP2ApproachDist;
-    /* 0x4A */ s16 mP2Health;
-    /* 0x4C */ bool mP2HealthDebugOn;
-};
 
 //
 // Forward References:
diff --git a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp
index 9e84305db82..0e24ea32be6 100644
--- a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp
+++ b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp
@@ -1,282 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_gg
-//
+/**
+ * @file d_a_b_gg.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_gg/d_a_b_gg.h"
 #include "d/cc/d_cc_d.h"
 #include "dol2asm.h"
+#include "d/d_camera.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
-
-struct csXyz {
-    /* 8026745C */ void operator+=(csXyz&);
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct mDoGph_gInf_c {
-    /* 80008078 */ void onBlure();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct fopEn_enemy_c {};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 8015F398 */ void checkMasterSwordEquip();
-    /* 8015F8E4 */ void cancelBoomerangLockActor(fopAc_ac_c*);
-
-    static u8 m_midnaActor[4];
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct daB_GG_c {
-    /* 805DE464 */ void CreateHeap();
-    /* 805DE650 */ void initCc();
-    /* 805DE7A4 */ void setCcCylinder();
-    /* 805DE9B8 */ void G_setCcCylinder();
-    /* 805DEAD0 */ void MoveCo();
-    /* 805DEB44 */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 805DED58 */ void HeadctrlJoint(J3DJoint*, J3DModel*);
-    /* 805DEF64 */ void SetAnm(int, int, f32, f32);
-    /* 805DF9F4 */ void Yazirushi();
-    /* 805DFA48 */ void SpeedClear();
-    /* 805DFA64 */ void SetAction(u8, u8, u8);
-    /* 805DFA8C */ void GetAction(u8, u8, u8);
-    /* 805DFACC */ void DemoSkip(int);
-    /* 805DFC24 */ void DemoSkipCallBack(void*, int);
-    /* 805DFC58 */ void CameraSet();
-    /* 805DFD78 */ void SetStopingCam();
-    /* 805DFDFC */ void SetStopCam(cXyz, f32, f32, s16);
-    /* 805DFF4C */ void SetMoveCam(cXyz, f32, f32, s16, f32, f32);
-    /* 805E00D4 */ void SetMoveCam1(f32, f32);
-    /* 805E01F8 */ void SetReleaseCam();
-    /* 805E029C */ void St_CamAction();
-    /* 805E0F2C */ void St_DemoAction();
-    /* 805E18E8 */ void Md_CamAction();
-    /* 805E1C28 */ void Md_DemoAction();
-    /* 805E23E8 */ void Gn_CamAction();
-    /* 805E2974 */ void Gn_DemoAction();
-    /* 805E2F44 */ void DemoAction();
-    /* 805E3024 */ void F_WaitAction();
-    /* 805E31E4 */ void F_FookChk();
-    /* 805E3448 */ void F_MoveAction();
-    /* 805E3CAC */ void F_LV7_W_MoveAction();
-    /* 805E3F0C */ void F_AttackAction();
-    /* 805E4914 */ void F_DamageAction();
-    /* 805E5190 */ void AttentionChk();
-    /* 805E5220 */ void FlyAction();
-    /* 805E561C */ void F_A_TargetMove(cXyz);
-    /* 805E53DC */ void F_A_TargetMove(cXyz, u8);
-    /* 805E5808 */ void F_A_MoveAction();
-    /* 805E5D0C */ void F_A_WaitAction();
-    /* 805E5D2C */ void F_A_Action();
-    /* 805E5E78 */ void FookChk();
-    /* 805E608C */ void CutChk();
-    /* 805E6174 */ void G_MoveAction();
-    /* 805E6AB0 */ void FallChk();
-    /* 805E6E30 */ void G_AttackAction();
-    /* 805E73A8 */ void G_DamageAction();
-    /* 805E7D50 */ void G_DeathAction();
-    /* 805E7F50 */ void G_DeathAction1();
-    /* 805E82F0 */ void DeathCam();
-    /* 805E8D48 */ void GroundAction();
-    /* 805E8EE8 */ void StopAction();
-    /* 805E92A0 */ void HitChk();
-    /* 805E9310 */ void Action();
-    /* 805E9418 */ void HeadAction();
-    /* 805E9A28 */ void SetHeadAngle();
-    /* 805E9B48 */ void SoundChk();
-    /* 805EA344 */ void Execute();
-    /* 805EA72C */ void ObjHit();
-    /* 805EA74C */ void At_Check();
-    /* 805EA938 */ void MoveAt();
-    /* 805EA9AC */ void F_AtHit();
-    /* 805EAAFC */ void ChanceTime();
-    /* 805EB028 */ void ArmAngleSet();
-    /* 805EB090 */ void Guard();
-    /* 805EB5E0 */ void Draw();
-    /* 805EB8A8 */ void Delete();
-    /* 805EB910 */ void setBaseMtx();
-    /* 805EB980 */ void setShieldMtx();
-    /* 805EB9DC */ void setSwordMtx();
-    /* 805EBA4C */ void setSwordMtx1();
-    /* 805EBAB8 */ void setHeadMtx();
-    /* 805EBB30 */ void setHeadMtx1();
-    /* 805EBBE4 */ void Create();
-    /* 805EC424 */ daB_GG_c();
-};
-
-struct daB_GG_HIO_c {
-    /* 805DE40C */ daB_GG_HIO_c();
-    /* 805EC9C4 */ ~daB_GG_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_memBit_c {
-    /* 80034918 */ void onDungeonItem(int);
-    /* 80034934 */ void isDungeonItem(int) const;
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 800352B0 */ void offSwitch(int, int);
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-    /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
-    /* 800429A8 */ void onSkipFade();
-};
-
-struct dDlst_shadowControl_c {
-    /* 80055F1C */ void addReal(u32, J3DModel*);
-
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcU_AtInfo {};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-    /* 80181E64 */ void Eye();
-    /* 80181E98 */ void Center();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 805EC654 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 805EC6C4 */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct _GXTexObj {};
-
-struct Z2SeqMgr {
-    /* 802AF49C */ void subBgmStart(u32);
-    /* 802AF884 */ void subBgmStop();
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-    /* 802C1B7C */ void setLinkSearch(bool);
-    /* 802C1B90 */ void setEnemyName(char const*);
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DFrameCtrl {
-    /* 8032842C */ void checkPass(f32);
-};
 
 //
 // Forward References:
@@ -513,9 +245,6 @@ extern "C" void setEnemyName__15Z2CreatureEnemyFPCc();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXInverse();
-extern "C" void PSMTXMultVec();
 extern "C" void __construct_array();
 extern "C" void _savegpr_19();
 extern "C" void _savegpr_22();
@@ -533,8 +262,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -545,10 +272,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
 extern "C" extern u8 struct_80450C98[4];
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
@@ -819,25 +543,30 @@ SECTION_DATA static void* lit_9091[29] = {
 };
 
 /* 805ED5E0-805ED600 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GG_Method */
-SECTION_DATA static void* l_daB_GG_Method[8] = {
-    (void*)daB_GG_Create__FP10fopAc_ac_c,
-    (void*)daB_GG_Delete__FP8daB_GG_c,
-    (void*)daB_GG_Execute__FP8daB_GG_c,
-    (void*)daB_GG_IsDelete__FP8daB_GG_c,
-    (void*)daB_GG_Draw__FP8daB_GG_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_GG_Method = {
+    (process_method_func)daB_GG_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_GG_Delete__FP8daB_GG_c,
+    (process_method_func)daB_GG_Execute__FP8daB_GG_c,
+    (process_method_func)daB_GG_IsDelete__FP8daB_GG_c,
+    (process_method_func)daB_GG_Draw__FP8daB_GG_c,
 };
 
 /* 805ED600-805ED630 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GG */
-SECTION_DATA extern void* g_profile_B_GG[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02140000, (void*)&g_fpcLf_Method,
-    (void*)0x0000116C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E60000, (void*)&l_daB_GG_Method,
-    (void*)0x000C0100, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_GG = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_GG,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_GG_c),       // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  230,                    // mPriority
+  &l_daB_GG_Method,       // sub_method
+  0x000C0100,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805ED630-805ED63C 000240 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -2933,7 +2662,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -2943,7 +2673,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/__dt__12dBgS_AcchCirFv.s"
 }
diff --git a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp
index 8219988c301..79e93a39f3b 100644
--- a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp
+++ b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp
@@ -1,243 +1,16 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_gm
-//
+/**
+ * @file d_a_b_gm.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_gm/d_a_b_gm.h"
 #include "d/cc/d_cc_d.h"
 #include "dol2asm.h"
+#include "d/d_camera.h"
+#include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
 
-struct obj_ystone_class {
-    /* 805F40D0 */ void setCurrentPos(cXyz);
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTextureSRTKey {};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 80011154 */ void updateDL();
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct mDoExt_McaMorf {
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                  mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
-                                  int, void*, u32, u32);
-    /* 800105C8 */ void play(Vec*, u32, s8);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 805F4160 */ void changeDemoMode(u32, int, int, s16);
-};
-
-struct daB_GM_HIO_c {
-    /* 805ED94C */ daB_GM_HIO_c();
-    /* 805F3E64 */ ~daB_GM_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-};
-
-struct dSv_memBit_c {
-    /* 80034918 */ void onDungeonItem(int);
-    /* 80034934 */ void isDungeonItem(int) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-    /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcU_AtInfo {};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 805F3D3C */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 805F3DAC */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct b_gm_foot {
-    /* 805F3AC0 */ ~b_gm_foot();
-    /* 805F3AFC */ b_gm_foot();
-};
-
-struct b_gm_class {
-    /* 805F38E4 */ b_gm_class();
-};
-
-struct _GXTexObj {};
-
-struct Z2SoundObjSimple {
-    /* 802BE844 */ Z2SoundObjSimple();
-};
-
-struct Z2SoundObjBase {
-    /* 802BDFF8 */ void deleteObject();
-};
-
-struct Z2SeqMgr {
-    /* 802AF010 */ void bgmStart(u32, u32, s32);
-    /* 802AF408 */ void bgmStop(u32, s32);
-    /* 802AF49C */ void subBgmStart(u32);
-    /* 802AF884 */ void subBgmStop();
-    /* 802AFB94 */ void bgmStreamPrepare(u32);
-    /* 802AFE18 */ void bgmStreamPlay();
-    /* 802AFF8C */ void changeBgmStatus(s32);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 805F3560 */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -420,8 +193,6 @@ extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
 extern "C" void __construct_array();
 extern "C" void _savegpr_19();
 extern "C" void _savegpr_24();
@@ -437,8 +208,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -447,11 +216,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void __register_global_object();
 
@@ -742,25 +508,30 @@ static dCcD_SrcSph beam_sph_src = {
 #pragma pop
 
 /* 805F46B4-805F46D4 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GM_Method */
-SECTION_DATA static void* l_daB_GM_Method[8] = {
-    (void*)daB_GM_Create__FP10fopAc_ac_c,
-    (void*)daB_GM_Delete__FP10b_gm_class,
-    (void*)daB_GM_Execute__FP10b_gm_class,
-    (void*)daB_GM_IsDelete__FP10b_gm_class,
-    (void*)daB_GM_Draw__FP10b_gm_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_GM_Method = {
+    (process_method_func)daB_GM_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_GM_Delete__FP10b_gm_class,
+    (process_method_func)daB_GM_Execute__FP10b_gm_class,
+    (process_method_func)daB_GM_IsDelete__FP10b_gm_class,
+    (process_method_func)daB_GM_Draw__FP10b_gm_class,
 };
 
 /* 805F46D4-805F4704 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GM */
-SECTION_DATA extern void* g_profile_B_GM[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x020D0000, (void*)&g_fpcLf_Method,
-    (void*)0x00001D08, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00D50000, (void*)&l_daB_GM_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_GM = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_GM,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(b_gm_class),     // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  213,                    // mPriority
+  &l_daB_GM_Method,       // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805F4704-805F4710 000374 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -2091,7 +1862,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gm/d_a_b_gm/__dt__12J3DFrameCtrlFv.s"
 }
@@ -2206,7 +1978,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gm/d_a_b_gm/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -2216,7 +1989,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gm/d_a_b_gm/__dt__12dBgS_AcchCirFv.s"
 }
@@ -2311,7 +2085,8 @@ static asm void func_805F40C8() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
+// asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
+extern "C" asm void setCurrentPos__16obj_ystone_classF4cXyz() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gm/d_a_b_gm/setCurrentPos__16obj_ystone_classF4cXyz.s"
 }
@@ -2333,7 +2108,8 @@ static asm void dComIfGp_particle_set(u16 param_0, cXyz const* param_1, csXyz co
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+// asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+extern "C" asm void changeDemoMode__9daPy_py_cFUliis() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gm/d_a_b_gm/changeDemoMode__9daPy_py_cFUliis.s"
 }
diff --git a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp
index 13351161e3c..a44a4ea7db8 100644
--- a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp
+++ b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp
@@ -1,348 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_gnd
-//
+/**
+ * @file d_a_b_gnd.cpp
+ * 
+*/
 
-// #include "rel/d/a/b/d_a_b_gnd/d_a_b_gnd.h"
-#include "d/cc/d_cc_d.h"
+#include "rel/d/a/b/d_a_b_gnd/d_a_b_gnd.h"
 #include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 806009F8 */ void multVecZero(Vec*);
-
-    static u8 now[48];
-};
-
-struct _GXColor {};
-
-struct mDoGph_gInf_c {
-    /* 80007FD8 */ void fadeOut(f32, _GXColor&);
-};
-
-struct mDoExt_morf_c {
-    /* 806024AC */ void setFrame(f32);
-    /* 806024EC */ void isStop();
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTexPattern {};
-
-struct mDoExt_btpAnm {
-    /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
-    /* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
-};
-
-struct J3DAnmTextureSRTKey {};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct J3DAnmTevRegKey {};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct mDoExt_McaMorf {
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                  mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
-                                  int, void*, u32, u32);
-    /* 800105C8 */ void play(Vec*, u32, s8);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-};
-
-struct mDoExt_3DlineMat_c {};
-
-struct mDoExt_3DlineMatSortPacket {
-    /* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
-};
-
-struct ResTIMG {};
-
-struct dKy_tevstr_c {};
-
-struct mDoExt_3DlineMat1_c {
-    /* 80013360 */ void init(u16, u16, ResTIMG*, int);
-    /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*);
-    /* 80601D24 */ mDoExt_3DlineMat1_c();
-};
-
-struct mDoCPd_c {
-    /* 80602368 */ void getTrigA(u32);
-
-    static u8 m_cpadInfo[256];
-};
-
-struct g_himo_s {
-    /* 80601D40 */ ~g_himo_s();
-    /* 80601DA0 */ g_himo_s();
-};
-
-struct fopEn_enemy_c {
-    /* 80600A1C */ void setDownPos(cXyz const*);
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 8015F398 */ void checkMasterSwordEquip();
-    /* 80602338 */ void cancelOriginalDemo();
-    /* 80602590 */ void changeDemoMode(u32, int, int, s16);
-    /* 806025A4 */ void changeOriginalDemo();
-
-    static u8 m_midnaActor[4];
-};
-
-struct daHorse_c {
-    /* 806025B8 */ void changeDemoMode(u32, int);
-    /* 806025F0 */ void changeOriginalDemo();
-};
-
-struct daB_GND_HIO_c {
-    /* 805F4A4C */ daB_GND_HIO_c();
-    /* 80602230 */ ~daB_GND_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_danBit_c {
-    /* 80034B98 */ void onSwitch(int);
-    /* 80034BE8 */ void isSwitch(int) const;
-};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-    /* 80600A38 */ void operator=(csXyz const&);
-};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B8B4 */ void forceOnEventMove(u32);
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct dMsgFlow_c {
-    /* 80249F00 */ dMsgFlow_c();
-    /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
-    /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct J3DModel {
-    /* 80602404 */ void getAnmMtx(int);
-};
-
-struct dDlst_shadowControl_c {
-    /* 80055F1C */ void addReal(u32, J3DModel*);
-
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcU_AtInfo {};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjGndChk_Spl {
-    /* 800777B0 */ dBgS_ObjGndChk_Spl();
-    /* 80077848 */ ~dBgS_ObjGndChk_Spl();
-};
-
-struct dBgS_ObjAcch {
-    /* 806020D0 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 80602140 */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-    /* 80267D0C */ void SetPos(Vec const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct b_gnd_class {
-    /* 80601960 */ b_gnd_class();
-};
-
-struct _GXTexObj {};
-
-struct Z2StatusMgr {
-    /* 802B61E8 */ void setDemoName(char*);
-};
-
-struct Z2SoundObjSimple {
-    /* 802BE844 */ Z2SoundObjSimple();
-    /* 80601DEC */ ~Z2SoundObjSimple();
-};
-
-struct Z2SoundObjBase {
-    /* 802BDF48 */ ~Z2SoundObjBase();
-    /* 802BDFF8 */ void deleteObject();
-};
-
-struct Z2SeqMgr {
-    /* 802AF010 */ void bgmStart(u32, u32, s32);
-    /* 802AF408 */ void bgmStop(u32, s32);
-    /* 802AFB94 */ void bgmStreamPrepare(u32);
-    /* 802AFE18 */ void bgmStreamPlay();
-    /* 802AFF8C */ void changeBgmStatus(s32);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-    /* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
-    /* 802C1B7C */ void setLinkSearch(bool);
-    /* 802C1B90 */ void setEnemyName(char const*);
-};
-
-struct JPABaseEmitter {
-    /* 8027EC60 */ void deleteAllParticle();
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DLightObj {
-    /* 806021B0 */ J3DLightObj();
-};
-
-struct J3DLightInfo {
-    /* 803256C4 */ void operator=(J3DLightInfo const&);
-};
-
-struct J3DJoint {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 80601468 */ ~J3DFrameCtrl();
-};
+#include "d/d_camera.h"
 
 //
 // Forward References:
@@ -605,9 +268,6 @@ extern "C" void __dl__FPv();
 extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void PSMTXScale();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
 extern "C" void __ptmf_scall();
@@ -629,10 +289,7 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern u8 const j3dDefaultLightInfo[52];
 extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5];
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -645,12 +302,9 @@ extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern u32 g_blackColor;
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
 extern "C" extern u8 pauseTimer__9dScnPly_c[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
@@ -1104,25 +758,30 @@ static dCcD_SrcCyl co_cyl_src = {
 #pragma pop
 
 /* 80602E6C-80602E8C -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GND_Method */
-SECTION_DATA static void* l_daB_GND_Method[8] = {
-    (void*)daB_GND_Create__FP10fopAc_ac_c,
-    (void*)daB_GND_Delete__FP11b_gnd_class,
-    (void*)daB_GND_Execute__FP11b_gnd_class,
-    (void*)daB_GND_IsDelete__FP11b_gnd_class,
-    (void*)daB_GND_Draw__FP11b_gnd_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_GND_Method = {
+    (process_method_func)daB_GND_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_GND_Delete__FP11b_gnd_class,
+    (process_method_func)daB_GND_Execute__FP11b_gnd_class,
+    (process_method_func)daB_GND_IsDelete__FP11b_gnd_class,
+    (process_method_func)daB_GND_Draw__FP11b_gnd_class,
 };
 
 /* 80602E8C-80602EBC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GND */
-SECTION_DATA extern void* g_profile_B_GND[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x020E0000, (void*)&g_fpcLf_Method,
-    (void*)0x00002790, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00D60000, (void*)&l_daB_GND_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_GND = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_GND,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(b_gnd_class),    // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  214,                    // mPriority
+  &l_daB_GND_Method,      // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80602EBC-80602EC8 0004EC 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -3175,7 +2834,8 @@ static asm void daB_GND_Execute(b_gnd_class* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoMtx_stack_c::multVecZero(Vec* param_0) {
+// asm void mDoMtx_stack_c::multVecZero(Vec* param_0) {
+extern "C" asm void multVecZero__14mDoMtx_stack_cFP3Vec() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/multVecZero__14mDoMtx_stack_cFP3Vec.s"
 }
@@ -3186,7 +2846,8 @@ asm void mDoMtx_stack_c::multVecZero(Vec* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void fopEn_enemy_c::setDownPos(cXyz const* param_0) {
+// asm void fopEn_enemy_c::setDownPos(cXyz const* param_0) {
+extern "C" asm void setDownPos__13fopEn_enemy_cFPC4cXyz() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/setDownPos__13fopEn_enemy_cFPC4cXyz.s"
 }
@@ -3196,7 +2857,8 @@ asm void fopEn_enemy_c::setDownPos(cXyz const* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void csXyz::operator=(csXyz const& param_0) {
+// asm void csXyz::operator=(csXyz const& param_0) {
+extern "C" asm void __as__5csXyzFRC5csXyz() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/__as__5csXyzFRC5csXyz.s"
 }
@@ -3242,7 +2904,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/__dt__12J3DFrameCtrlFv.s"
 }
@@ -3272,7 +2935,8 @@ asm b_gnd_class::b_gnd_class() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm mDoExt_3DlineMat1_c::mDoExt_3DlineMat1_c() {
+// asm mDoExt_3DlineMat1_c::mDoExt_3DlineMat1_c() {
+extern "C" asm void __ct__19mDoExt_3DlineMat1_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/__ct__19mDoExt_3DlineMat1_cFv.s"
 }
@@ -3308,7 +2972,8 @@ extern "C" asm void __ct__4cXyzFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm Z2SoundObjSimple::~Z2SoundObjSimple() {
+// asm Z2SoundObjSimple::~Z2SoundObjSimple() {
+extern "C" asm void __dt__16Z2SoundObjSimpleFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/__dt__16Z2SoundObjSimpleFv.s"
 }
@@ -3384,7 +3049,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -3394,7 +3060,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/__dt__12dBgS_AcchCirFv.s"
 }
@@ -3404,7 +3071,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DLightObj::J3DLightObj() {
+// asm J3DLightObj::J3DLightObj() {
+extern "C" asm void __ct__11J3DLightObjFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/__ct__11J3DLightObjFv.s"
 }
@@ -3480,7 +3148,8 @@ static asm void func_80602330() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::cancelOriginalDemo() {
+// asm void daPy_py_c::cancelOriginalDemo() {
+extern "C" asm void cancelOriginalDemo__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/cancelOriginalDemo__9daPy_py_cFv.s"
 }
@@ -3501,7 +3170,8 @@ extern "C" asm void __ct__4cXyzFRC4cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoCPd_c::getTrigA(u32 param_0) {
+// asm void mDoCPd_c::getTrigA(u32 param_0) {
+extern "C" asm void getTrigA__8mDoCPd_cFUl() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/getTrigA__8mDoCPd_cFUl.s"
 }
@@ -3523,7 +3193,8 @@ static asm void dComIfGp_particle_set(u32 param_0, u16 param_1, cXyz const* para
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void J3DModel::getAnmMtx(int param_0) {
+// asm void J3DModel::getAnmMtx(int param_0) {
+extern "C" asm void getAnmMtx__8J3DModelFi() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/getAnmMtx__8J3DModelFi.s"
 }
@@ -3576,7 +3247,8 @@ static asm void daPy_getPlayerActorClass() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoExt_morf_c::setFrame(f32 param_0) {
+// asm void mDoExt_morf_c::setFrame(f32 param_0) {
+extern "C" asm void setFrame__13mDoExt_morf_cFf() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/setFrame__13mDoExt_morf_cFf.s"
 }
@@ -3586,7 +3258,8 @@ asm void mDoExt_morf_c::setFrame(f32 param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoExt_morf_c::isStop() {
+// asm void mDoExt_morf_c::isStop() {
+extern "C" asm void isStop__13mDoExt_morf_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/isStop__13mDoExt_morf_cFv.s"
 }
@@ -3608,7 +3281,8 @@ static asm void dComIfGp_particle_set(u16 param_0, cXyz const* param_1, csXyz co
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+// asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+extern "C" asm void changeDemoMode__9daPy_py_cFUliis() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/changeDemoMode__9daPy_py_cFUliis.s"
 }
@@ -3618,7 +3292,8 @@ asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 pa
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::changeOriginalDemo() {
+// asm void daPy_py_c::changeOriginalDemo() {
+extern "C" asm void changeOriginalDemo__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/changeOriginalDemo__9daPy_py_cFv.s"
 }
@@ -3628,7 +3303,8 @@ asm void daPy_py_c::changeOriginalDemo() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daHorse_c::changeDemoMode(u32 param_0, int param_1) {
+// asm void daHorse_c::changeDemoMode(u32 param_0, int param_1) {
+extern "C" asm void changeDemoMode__9daHorse_cFUli() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/changeDemoMode__9daHorse_cFUli.s"
 }
@@ -3660,7 +3336,8 @@ extern "C" asm void __as__4cXyzFRC4cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daHorse_c::changeOriginalDemo() {
+// asm void daHorse_c::changeOriginalDemo() {
+extern "C" asm void changeOriginalDemo__9daHorse_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/changeOriginalDemo__9daHorse_cFv.s"
 }
@@ -3690,7 +3367,8 @@ static asm void dComIfGp_getPlayerCameraID(int param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void dComIfGp_getPlayer(int param_0) {
+// static asm void dComIfGp_getPlayer(int param_0) {
+extern "C" asm void dComIfGp_getPlayer__Fi() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/dComIfGp_getPlayer__Fi.s"
 }
diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp
index ffbbbba8b8f..b7e92e37512 100644
--- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp
+++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp
@@ -8,42 +8,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/com/d_com_inf_game.h"
 
-#define RES_IS_MODEL 0x13
-
-enum daB_GO_ANM {
-    /* 0x04 */ ANM_ATTACK = 4,
-    /* 0x05 */ ANM_DAMAGE_01,
-    /* 0x06 */ ANM_DAMAGE_02,
-    /* 0x07 */ ANM_DEAD_01,
-    /* 0x08 */ ANM_DEAD_02,
-    /* 0x09 */ ANM_FALL,
-    /* 0x0A */ ANM_START_L,
-    /* 0x0B */ ANM_START_R,
-    /* 0x0C */ ANM_STEP,
-    /* 0x0D */ ANM_TRAP,
-    /* 0x0E */ ANM_WAIT_02,
-    /* 0x0F */ ANM_WAIT_03,
-    /* 0x10 */ ANM_WALK,
-};
-
-enum daB_GO_Action {
-    /* 0x0 */ ACT_WAIT,
-    /* 0x1 */ ACT_WALK,
-    /* 0x2 */ ACT_ATTACK,
-};
-
-class daB_GO_HIO_c {
-public:
-    /* 806031AC */ daB_GO_HIO_c();
-    /* 80603F9C */ virtual ~daB_GO_HIO_c() {}
-
-    /* 0x04 */ s8 field_0x4;
-    /* 0x08 */ f32 mSmallSize;
-    /* 0x0C */ f32 mNormalSpeed;
-    /* 0x10 */ f32 mAttackInitRange;
-    /* 0x14 */ bool mDisplayModelImage;
-};
-
 /* 806031AC-806031EC 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__12daB_GO_HIO_cFv */
 daB_GO_HIO_c::daB_GO_HIO_c() {
     field_0x4 = -1;
diff --git a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp
index 3e8cebbca7b..e8c124c3213 100644
--- a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp
+++ b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp
@@ -8,20 +8,7 @@
 #include "d/com/d_com_inf_game.h"
 #include "rel/d/a/b/d_a_b_go/d_a_b_go.h"
 
-class daB_GOS_HIO_c {
-public:
-    /* 8060426C */ daB_GOS_HIO_c();
-    /* 80605320 */ virtual ~daB_GOS_HIO_c() {}
 
-    /* 0x4 */ s8 field_0x4;
-    /* 0x8 */ f32 mSize;
-    /* 0xC */ f32 mNormalSpeed;
-};
-
-struct b_gos_j_info {
-    s16 joint_no;
-    f32 field_0x4;
-};
 
 /* 8060541C-80605514 000000 00F8+00 1/1 0/0 0/0 .data            j_info */
 static b_gos_j_info j_info[] = {
diff --git a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp
index aff0e9fd081..5277217fddd 100644
--- a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp
+++ b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp
@@ -1,388 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_mgn
-//
+/**
+ * @file d_a_b_mgn.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_mgn/d_a_b_mgn.h"
 #include "dol2asm.h"
+#include "d/d_camera.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
 
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-};
 
-struct Vec {};
-
-struct cXyz {
-    /* 80266AE4 */ void operator+(Vec const&) const;
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 8060F864 */ cXyz();
-    /* 8060FD78 */ ~cXyz();
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CDD4 */ void transM(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE70 */ void scaleM(cXyz const&);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct mDoGph_gInf_c {
-    /* 80008078 */ void onBlure();
-};
-
-struct J3DAnmTextureSRTKey {};
-
-struct J3DAnmTevRegKey {};
-
-struct J3DMaterialTable {
-    /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*);
-    /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
-};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-};
-
-struct fopEn_enemy_c {};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 8060FDB4 */ void checkNowWolf();
-
-    static u8 m_midnaActor[4];
-};
-
-struct daObjBHASHI_c {
-    /* 80577500 */ void Obj_Damage(cXyz);
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct daB_MGN_c {
-    /* 8060577C */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8060584C */ void JointCallBack(J3DJoint*, int);
-    /* 80605898 */ void draw();
-    /* 80605D78 */ void setDashSmokeEffect();
-    /* 8060601C */ void setBackJumpEffect();
-    /* 806062C0 */ void setSlideSmokeEffect();
-    /* 80606424 */ void setBodySlideEffect();
-    /* 806065D4 */ void setOpeningEffect();
-    /* 80606754 */ void setStepEffect();
-    /* 8060688C */ void setFallAttackEffect();
-    /* 80606A10 */ void setHeadLightEffect();
-    /* 80606AEC */ void setHeadHitEffect();
-    /* 80606C6C */ void setHideSmokeEffect(cXyz*, u8);
-    /* 80606D60 */ void calcHideSmokeEffect();
-    /* 806071C4 */ void drawHideSmokeEffect();
-    /* 8060729C */ void setBloodEffect();
-    /* 80607498 */ void calcBloodMove();
-    /* 8060778C */ void checkDownBeforeBG();
-    /* 80607924 */ void setBck(int, u8, f32, f32);
-    /* 806079CC */ void checkBck(int);
-    /* 80607A2C */ void setActionMode(int, int);
-    /* 80607A80 */ void setExitMode(int);
-    /* 80607B50 */ void onBodyShield();
-    /* 80607B80 */ void offBodyShield();
-    /* 80607BB0 */ void onBodySlideAt();
-    /* 80607BFC */ void offBodySlideAt();
-    /* 80607C20 */ void checkHitSlideAt();
-    /* 80607CB0 */ void onBodyFallAt();
-    /* 80607CE4 */ void offBodyFallAt();
-    /* 80607D08 */ void onBodyCo();
-    /* 80607D44 */ void offBodyCo();
-    /* 80607D7C */ void getNearHitPos(cXyz*);
-    /* 8060819C */ void damage_check();
-    /* 80608738 */ void calcJointAngle(s16);
-    /* 806087A8 */ void executeCircle();
-    /* 80608EF8 */ void executeDash();
-    /* 80609D70 */ void executeThrown();
-    /* 8060A670 */ void setDownEnd();
-    /* 8060A72C */ void executeDown();
-    /* 8060ACB8 */ void executeDownDamage();
-    /* 8060B028 */ void executeDownBiteDamage();
-    /* 8060B430 */ void executeWarp();
-    /* 8060B544 */ void executeFall();
-    /* 8060BE6C */ void demo_skip(int);
-    /* 8060C034 */ void DemoSkipCallBack(void*, int);
-    /* 8060C068 */ void executeOpening();
-    /* 8060D078 */ void executeDeath();
-    /* 8060D880 */ void executeJump();
-    /* 8060DAC0 */ void checkStartJump();
-    /* 8060DDA0 */ void action();
-    /* 8060E158 */ void mtx_set();
-    /* 8060E1D0 */ void cc_set();
-    /* 8060E820 */ void execute();
-    /* 8060EA38 */ void _delete();
-    /* 8060EAE0 */ void CreateHeap();
-    /* 8060F0D0 */ void create();
-};
-
-struct daB_MGN_HIO_c {
-    /* 8060572C */ daB_MGN_HIO_c();
-    /* 8060F8D0 */ ~daB_MGN_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-    /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
-    /* 800429A8 */ void onSkipFade();
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcU_AtInfo {};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-    /* 8060F5D8 */ ~dCcD_Sph();
-    /* 8060F6A4 */ dCcD_Sph();
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80083830 */ void Move();
-    /* 8060F728 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 800842C0 */ void ChkAtHit();
-    /* 80084358 */ void GetAtHitObj();
-    /* 80084460 */ void ChkTgHit();
-    /* 800844F8 */ void GetTgHitObj();
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-    /* 80181500 */ void GetForceLockOnActor();
-    /* 80181534 */ void ForceLockOn(fopAc_ac_c*);
-    /* 8018159C */ void ForceLockOff(fopAc_ac_c*);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 8060F784 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 8060F7F4 */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 8060F548 */ ~cM3dGSph();
-};
-
-struct cM3dGPla {
-    /* 806078DC */ ~cM3dGPla();
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 8060F590 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {
-    /* 80263A48 */ void GetAc();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 8060F888 */ ~cCcD_GStts();
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-    /* 80074618 */ void GetActorPointer(int) const;
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct _GXTexObj {};
-
-struct Z2SeqMgr {
-    /* 802AF010 */ void bgmStart(u32, u32, s32);
-    /* 802AF408 */ void bgmStop(u32, s32);
-    /* 802AFB94 */ void bgmStreamPrepare(u32);
-    /* 802AFE18 */ void bgmStreamPlay();
-    /* 802AFEDC */ void bgmStreamStop(u32);
-    /* 802AFF8C */ void changeBgmStatus(s32);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JPABaseEmitter {
-    /* 8027EC60 */ void deleteAllParticle();
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct JGeometry {
-    template <typename A1>
-    struct TVec3 {};
-    /* TVec3<f32> */
-    struct TVec3__template0 {};
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 8060F068 */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -612,11 +239,6 @@ extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
 extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
 extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECSquareDistance();
 extern "C" void __construct_array();
 extern "C" void _savegpr_19();
 extern "C" void _savegpr_20();
@@ -638,9 +260,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abs();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -649,11 +268,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern u32 __float_nan;
 extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
@@ -989,25 +605,30 @@ SECTION_DATA static void* lit_7854[11] = {
 };
 
 /* 80610364-80610384 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_MGN_Method */
-SECTION_DATA static void* l_daB_MGN_Method[8] = {
-    (void*)daB_MGN_Create__FP9daB_MGN_c,
-    (void*)daB_MGN_Delete__FP9daB_MGN_c,
-    (void*)daB_MGN_Execute__FP9daB_MGN_c,
-    (void*)daB_MGN_IsDelete__FP9daB_MGN_c,
-    (void*)daB_MGN_Draw__FP9daB_MGN_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_MGN_Method = {
+    (process_method_func)daB_MGN_Create__FP9daB_MGN_c,
+    (process_method_func)daB_MGN_Delete__FP9daB_MGN_c,
+    (process_method_func)daB_MGN_Execute__FP9daB_MGN_c,
+    (process_method_func)daB_MGN_IsDelete__FP9daB_MGN_c,
+    (process_method_func)daB_MGN_Draw__FP9daB_MGN_c,
 };
 
 /* 80610384-806103B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_MGN */
-SECTION_DATA extern void* g_profile_B_MGN[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02160000, (void*)&g_fpcLf_Method,
-    (void*)0x000026CC, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E80000, (void*)&l_daB_MGN_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_MGN = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_MGN,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_MGN_c),      // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  232,                    // mPriority
+  &l_daB_MGN_Method,      // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 806103B4-806103C0 000320 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -1509,7 +1130,8 @@ asm void daB_MGN_c::checkDownBeforeBG() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGPla::~cM3dGPla() {
+// asm cM3dGPla::~cM3dGPla() {
+extern "C" asm void __dt__8cM3dGPlaFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__8cM3dGPlaFv.s"
 }
@@ -2577,7 +2199,8 @@ asm void daB_MGN_c::CreateHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__12J3DFrameCtrlFv.s"
 }
@@ -2622,7 +2245,8 @@ asm void daB_MGN_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__8cM3dGSphFv.s"
 }
@@ -2632,7 +2256,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__8cM3dGAabFv.s"
 }
@@ -2642,7 +2267,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::~dCcD_Sph() {
+// asm dCcD_Sph::~dCcD_Sph() {
+extern "C" asm void __dt__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__8dCcD_SphFv.s"
 }
@@ -2652,7 +2278,8 @@ asm dCcD_Sph::~dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::dCcD_Sph() {
+// asm dCcD_Sph::dCcD_Sph() {
+extern "C" asm void __ct__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__ct__8dCcD_SphFv.s"
 }
@@ -2662,7 +2289,8 @@ asm dCcD_Sph::dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__10dCcD_GSttsFv.s"
 }
@@ -2672,7 +2300,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -2682,14 +2311,16 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__12dBgS_AcchCirFv.s"
 }
 #pragma pop
 
 /* 8060F864-8060F868 00A224 0004+00 1/1 0/0 0/0 .text            __ct__4cXyzFv */
-cXyz::cXyz() {
+// cXyz::cXyz() {
+extern "C" asm void __ct__4cXyzFv() {
     /* empty function */
 }
 
@@ -2707,7 +2338,8 @@ static asm void daB_MGN_Create(daB_MGN_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__10cCcD_GSttsFv.s"
 }
@@ -2774,7 +2406,8 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/__dt__4cXyzFv.s"
 }
@@ -2784,7 +2417,8 @@ asm cXyz::~cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::checkNowWolf() {
+// asm void daPy_py_c::checkNowWolf() {
+extern "C" asm void checkNowWolf__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/checkNowWolf__9daPy_py_cFv.s"
 }
diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp
index 5865738745b..60799f99f90 100644
--- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp
+++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp
@@ -19,20 +19,6 @@
 #include "rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h"
 #include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h"
 
-class daB_OB_HIO_c {
-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;
-};
 
 //
 // Forward References:
@@ -582,25 +568,30 @@ static dCcD_SrcSph core_sph_src = {
 #pragma pop
 
 /* 8061B3DC-8061B3FC -00001 0020+00 1/0 0/0 0/0 .data            l_daB_OB_Method */
-SECTION_DATA static void* l_daB_OB_Method[8] = {
-    (void*)daB_OB_Create__FP10fopAc_ac_c,
-    (void*)daB_OB_Delete__FP10b_ob_class,
-    (void*)daB_OB_Execute__FP10b_ob_class,
-    (void*)daB_OB_IsDelete__FP10b_ob_class,
-    (void*)daB_OB_Draw__FP10b_ob_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_OB_Method = {
+    (process_method_func)daB_OB_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_OB_Delete__FP10b_ob_class,
+    (process_method_func)daB_OB_Execute__FP10b_ob_class,
+    (process_method_func)daB_OB_IsDelete__FP10b_ob_class,
+    (process_method_func)daB_OB_Draw__FP10b_ob_class,
 };
 
 /* 8061B3FC-8061B42C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_OB */
-SECTION_DATA extern void* g_profile_B_OB[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00F30000, (void*)&g_fpcLf_Method,
-    (void*)0x00005DE4, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00D90000, (void*)&l_daB_OB_Method,
-    (void*)0x000C4000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_OB = {
+  fpcLy_CURRENT_e,        // mLayerID
+  4,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_OB,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  0x00005DE4,             // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  217,                    // mPriority
+  &l_daB_OB_Method,       // sub_method
+  0x000C4000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 8061B42C-8061B438 000388 000C+00 2/2 0/0 0/0 .data            __vt__10cCcD_GStts */
diff --git a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp
index 107c746dea0..a91914594ad 100644
--- a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp
+++ b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp
@@ -181,25 +181,30 @@ static dCcD_SrcSph cc_sph_src = {
 };
 
 /* 8061DAEC-8061DB0C -00001 0020+00 1/0 0/0 0/0 .data            l_daB_OH_Method */
-SECTION_DATA static void* l_daB_OH_Method[8] = {
-    (void*)daB_OH_Create__FP10fopAc_ac_c,
-    (void*)daB_OH_Delete__FP10b_oh_class,
-    (void*)daB_OH_Execute__FP10b_oh_class,
-    (void*)daB_OH_IsDelete__FP10b_oh_class,
-    (void*)daB_OH_Draw__FP10b_oh_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_OH_Method = {
+    (process_method_func)daB_OH_Create__FP10fopAc_ac_c,
+    (process_method_func)daB_OH_Delete__FP10b_oh_class,
+    (process_method_func)daB_OH_Execute__FP10b_oh_class,
+    (process_method_func)daB_OH_IsDelete__FP10b_oh_class,
+    (process_method_func)daB_OH_Draw__FP10b_oh_class,
 };
 
 /* 8061DB0C-8061DB3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_OH */
-SECTION_DATA extern void* g_profile_B_OH[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0003FFFD,
-    (void*)0x00D20000, (void*)&g_fpcLf_Method,
-    (void*)0x00001F88, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00DA0000, (void*)&l_daB_OH_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_OH = {
+  fpcLy_CURRENT_e,        // mLayerID
+  3,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_OH,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(b_oh_class),     // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  218,                    // mPriority
+  &l_daB_OH_Method,       // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 8061DB3C-8061DB48 0000C0 000C+00 3/3 0/0 0/0 .data            __vt__8cM3dGAab */
diff --git a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp
index 09289133f6f..b6a52237a4d 100644
--- a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp
+++ b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp
@@ -1,388 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_tn
-//
+/**
+ * @file d_a_b_tn.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_tn/d_a_b_tn.h"
 #include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-    /* 8062D91C */ csXyz();
-    /* 8062E590 */ ~csXyz();
-};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 8062D920 */ cXyz();
-    /* 8062E5CC */ ~cXyz();
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CDD4 */ void transM(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTevRegKey {};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-};
-
-struct fopEn_enemy_c {};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 8015F8D0 */ void getThrowBoomerangActor();
-    /* 8062E608 */ void checkNowWolf();
-
-    static u8 m_midnaActor[4];
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-    /* 806223A0 */ void operator=(dCcD_Sph const&);
-    /* 80622674 */ ~dCcD_Sph();
-    /* 8062D678 */ dCcD_Sph();
-};
-
-struct daB_TN_c {
-    /* 8061EC58 */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8061ED10 */ void JointCallBack(J3DJoint*, int);
-    /* 8061ED5C */ void calcNeckAngle();
-    /* 8061EE14 */ void calcWaistAngle();
-    /* 8061EEC8 */ void draw();
-    /* 8061F200 */ void setBreakPart(int);
-    /* 8061F31C */ void setBreakHeadPart(int);
-    /* 8061F3D0 */ void setPartLandEffect(int, int);
-    /* 8061F520 */ void calcShieldMove();
-    /* 8061F9F4 */ void calcSwordMoveA();
-    /* 8061FD7C */ void calcSwordMoveB();
-    /* 8061FFE0 */ void calcOtherPartMove(int);
-    /* 8062070C */ void calcPartMove();
-    /* 806208C8 */ void setBck(int, u8, f32, f32);
-    /* 8062096C */ void checkBck(int);
-    /* 806209C8 */ void setActionMode(int, int);
-    /* 806209E0 */ void setSwordAtBit(int);
-    /* 80620AE4 */ void setSwordAtBreak(int);
-    /* 80620B4C */ void setBodyShield();
-    /* 80620E90 */ void checkNormalAttackAble();
-    /* 80620FA0 */ void getCutType();
-    /* 80621070 */ void setDamage(dCcD_Sph*, int);
-    /* 8062138C */ void setShieldEffect(dCcD_Sph*);
-    /* 806213FC */ void damage_check();
-    /* 806227D0 */ void checkMoveArea();
-    /* 80622B60 */ void checkMoveAngle();
-    /* 80622BE0 */ void setAttackBlurEffect(int);
-    /* 80622CE4 */ void setArmorBreakEffect(int);
-    /* 80622F64 */ void demo_skip(int);
-    /* 8062318C */ void DemoSkipCallBack(void*, int);
-    /* 806231C0 */ void executeRoomDemo();
-    /* 80623920 */ void executeOpening();
-    /* 806246E8 */ void executeWaitH();
-    /* 806247D8 */ void setAwaitSound();
-    /* 80624890 */ void executeChaseH();
-    /* 80625394 */ void checkStartAttackH();
-    /* 806255F0 */ void executeAttackH();
-    /* 80625C74 */ void executeAttackShieldH();
-    /* 80625E40 */ void executeGuardH();
-    /* 80626034 */ void executeDamageH();
-    /* 80626320 */ void executeChangeDemo();
-    /* 80627100 */ void executeZakoChangeDemo();
-    /* 80627790 */ void setWalkDir();
-    /* 8062799C */ void initChaseL(int);
-    /* 80627CBC */ void checkAttackAble();
-    /* 80627D3C */ void checkNextMove();
-    /* 8062868C */ void executeChaseL();
-    /* 806292F8 */ void executeAttackL();
-    /* 80629D20 */ void executeAttackShieldL();
-    /* 80629FB0 */ void executeGuardL();
-    /* 8062A3D0 */ void executeDamageL();
-    /* 8062A71C */ void executeYoroke();
-    /* 8062A950 */ void executeEnding();
-    /* 8062B344 */ void executeZakoEnding();
-    /* 8062B6A8 */ void action();
-    /* 8062BA5C */ void mtx_set();
-    /* 8062BDCC */ void cc_set();
-    /* 8062C5B4 */ void execute();
-    /* 8062C7C8 */ void _delete();
-    /* 8062C868 */ void CreateHeap();
-    /* 8062CD78 */ void create();
-    /* 8062D2F0 */ daB_TN_c();
-};
-
-struct daB_TN_HIO_c {
-    /* 8061EBEC */ daB_TN_HIO_c();
-    /* 8062D98C */ ~daB_TN_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_memBit_c {
-    /* 80034918 */ void onDungeonItem(int);
-    /* 80034934 */ void isDungeonItem(int) const;
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 800349BC */ void isEventBit(u16) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                                cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-    /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
-    /* 800429A8 */ void onSkipFade();
-};
-
-struct dDlst_shadowControl_c {
-    /* 80055F1C */ void addReal(u32, J3DModel*);
-
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcU_AtInfo {};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-    /* 8062D624 */ dCcD_Stts();
-    /* 8062D6FC */ ~dCcD_Stts();
-};
-
-struct dCcD_SrcCps {};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80083830 */ void Move();
-    /* 8062D78C */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 800842C0 */ void ChkAtHit();
-    /* 80084460 */ void ChkTgHit();
-    /* 800844F8 */ void GetTgHitObj();
-    /* 80084658 */ void ChkCoHit();
-    /* 800846F0 */ void GetCoHitObj();
-    /* 8062242C */ void operator=(dCcD_GObjInf const&);
-};
-
-struct dCcD_Cps {
-    /* 800847D0 */ void Set(dCcD_SrcCps const&);
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-    /* 80181E64 */ void Eye();
-    /* 80181E98 */ void Center();
-};
-
-struct dBomb_c {
-    /* 8003201C */ void checkInsectBombMove(fopAc_ac_c*);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 8062D7E8 */ dBgS_ObjAcch();
-    /* 8062D83C */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 8062D8AC */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-    /* 80077114 */ void SetGroundUpY(f32);
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 80622740 */ ~cM3dGSph();
-};
-
-struct cM3dGCps {
-    /* 8026EF88 */ cM3dGCps();
-    /* 8026F000 */ void Set(cXyz const&, cXyz const&, f32);
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 80622788 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {
-    /* 80263A48 */ void GetAc();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 8062D944 */ ~cCcD_GStts();
-};
-
-struct _GXTexObj {};
-
-struct Z2SeqMgr {
-    /* 802AF49C */ void subBgmStart(u32);
-    /* 802AF884 */ void subBgmStop();
-    /* 802AFB94 */ void bgmStreamPrepare(u32);
-    /* 802AFE18 */ void bgmStreamPlay();
-    /* 802AFEDC */ void bgmStreamStop(u32);
-    /* 802B1DF4 */ void changeSubBgmStatus(s32);
-};
-
-struct JAISoundID {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-    /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-    /* 802C1B7C */ void setLinkSearch(bool);
-    /* 802C1B90 */ void setEnemyName(char const*);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct JGeometry {
-    template <typename A1>
-    struct TVec3 {};
-    /* TVec3<f32> */
-    struct TVec3__template0 {};
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 8062CD10 */ ~J3DFrameCtrl();
-};
+#include "d/d_camera.h"
 
 //
 // Forward References:
@@ -623,11 +246,6 @@ extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECSquareDistance();
 extern "C" void __copy();
 extern "C" void __construct_array();
 extern "C" void _savegpr_18();
@@ -652,10 +270,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abs();
-extern "C" void strcmp();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cps[36];
@@ -667,12 +281,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern u32 __float_nan;
-extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void __register_global_object();
@@ -1181,25 +791,30 @@ SECTION_DATA static u8 tn2_brk_index[12] = {
 #pragma pop
 
 /* 8062EF10-8062EF30 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_TN_Method */
-SECTION_DATA static void* l_daB_TN_Method[8] = {
-    (void*)daB_TN_Create__FP8daB_TN_c,
-    (void*)daB_TN_Delete__FP8daB_TN_c,
-    (void*)daB_TN_Execute__FP8daB_TN_c,
-    (void*)daB_TN_IsDelete__FP8daB_TN_c,
-    (void*)daB_TN_Draw__FP8daB_TN_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_TN_Method = {
+    (process_method_func)daB_TN_Create__FP8daB_TN_c,
+    (process_method_func)daB_TN_Delete__FP8daB_TN_c,
+    (process_method_func)daB_TN_Execute__FP8daB_TN_c,
+    (process_method_func)daB_TN_IsDelete__FP8daB_TN_c,
+    (process_method_func)daB_TN_Draw__FP8daB_TN_c,
 };
 
 /* 8062EF30-8062EF60 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_TN */
-SECTION_DATA extern void* g_profile_B_TN[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02130000, (void*)&g_fpcLf_Method,
-    (void*)0x00005630, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E10000, (void*)&l_daB_TN_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_TN = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_TN,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_TN_c),       // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  225,                    // mPriority
+  &l_daB_TN_Method,       // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 8062EF60-8062EF6C 00065C 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -1996,7 +1611,8 @@ asm void daB_TN_c::damage_check() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dCcD_Sph::operator=(dCcD_Sph const& param_0) {
+// asm void dCcD_Sph::operator=(dCcD_Sph const& param_0) {
+extern "C" asm void __as__8dCcD_SphFRC8dCcD_Sph() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__as__8dCcD_SphFRC8dCcD_Sph.s"
 }
@@ -2006,7 +1622,8 @@ asm void dCcD_Sph::operator=(dCcD_Sph const& param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dCcD_GObjInf::operator=(dCcD_GObjInf const& param_0) {
+// asm void dCcD_GObjInf::operator=(dCcD_GObjInf const& param_0) {
+extern "C" asm void __as__12dCcD_GObjInfFRC12dCcD_GObjInf() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__as__12dCcD_GObjInfFRC12dCcD_GObjInf.s"
 }
@@ -2016,7 +1633,8 @@ asm void dCcD_GObjInf::operator=(dCcD_GObjInf const& param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::~dCcD_Sph() {
+// asm dCcD_Sph::~dCcD_Sph() {
+extern "C" asm void __dt__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__8dCcD_SphFv.s"
 }
@@ -2026,7 +1644,8 @@ asm dCcD_Sph::~dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__8cM3dGSphFv.s"
 }
@@ -2036,7 +1655,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__8cM3dGAabFv.s"
 }
@@ -3308,7 +2928,8 @@ asm void daB_TN_c::CreateHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__12J3DFrameCtrlFv.s"
 }
@@ -3364,7 +2985,8 @@ asm daB_TN_c::daB_TN_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Stts::dCcD_Stts() {
+// asm dCcD_Stts::dCcD_Stts() {
+extern "C" asm void __ct__9dCcD_SttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__ct__9dCcD_SttsFv.s"
 }
@@ -3374,7 +2996,8 @@ asm dCcD_Stts::dCcD_Stts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::dCcD_Sph() {
+// asm dCcD_Sph::dCcD_Sph() {
+extern "C" asm void __ct__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__ct__8dCcD_SphFv.s"
 }
@@ -3384,7 +3007,8 @@ asm dCcD_Sph::dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Stts::~dCcD_Stts() {
+// asm dCcD_Stts::~dCcD_Stts() {
+extern "C" asm void __dt__9dCcD_SttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__9dCcD_SttsFv.s"
 }
@@ -3394,7 +3018,8 @@ asm dCcD_Stts::~dCcD_Stts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__10dCcD_GSttsFv.s"
 }
@@ -3404,7 +3029,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::dBgS_ObjAcch() {
+extern "C" asm void __ct__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__ct__12dBgS_ObjAcchFv.s"
 }
@@ -3414,7 +3040,8 @@ asm dBgS_ObjAcch::dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -3424,19 +3051,22 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__12dBgS_AcchCirFv.s"
 }
 #pragma pop
 
 /* 8062D91C-8062D920 00EE1C 0004+00 1/1 0/0 0/0 .text            __ct__5csXyzFv */
-csXyz::csXyz() {
+// csXyz::csXyz() {
+extern "C" asm void __ct__5csXyzFv() {
     /* empty function */
 }
 
 /* 8062D920-8062D924 00EE20 0004+00 1/1 0/0 0/0 .text            __ct__4cXyzFv */
-cXyz::cXyz() {
+// cXyz::cXyz() {
+extern "C" asm void __ct__4cXyzFv() {
     /* empty function */
 }
 
@@ -3454,7 +3084,8 @@ static asm void daB_TN_Create(daB_TN_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__10cCcD_GSttsFv.s"
 }
@@ -3557,7 +3188,8 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm csXyz::~csXyz() {
+// asm csXyz::~csXyz() {
+extern "C" asm void __dt__5csXyzFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__5csXyzFv.s"
 }
@@ -3567,7 +3199,8 @@ asm csXyz::~csXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/__dt__4cXyzFv.s"
 }
@@ -3577,7 +3210,8 @@ asm cXyz::~cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::checkNowWolf() {
+// asm void daPy_py_c::checkNowWolf() {
+extern "C" asm void checkNowWolf__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/checkNowWolf__9daPy_py_cFv.s"
 }
diff --git a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp
index 777f7c29606..0c12561dc7f 100644
--- a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp
+++ b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp
@@ -243,10 +243,6 @@ extern "C" void checkPass__12J3DFrameCtrlFf();
 extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
 extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
 extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
-// extern "C" void PSMTXCopy();
-// extern "C" void PSMTXTrans();
-// extern "C" void PSVECSquareMag();
-// extern "C" void PSVECSquareDistance();
 extern "C" void __construct_array();
 extern "C" void _savegpr_22();
 extern "C" void _savegpr_23();
@@ -264,10 +260,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-// extern "C" void abs();
-// extern "C" void strcmp();
-// extern "C" extern void* g_fopAc_Method[8];
-// extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -277,11 +269,8 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-// extern "C" extern u8 g_env_light[4880];
-// extern "C" extern u8 j3dSys[284];
 extern "C" extern u8 j3dZModeTable[96];
 extern "C" u8 sincosTable___5JMath[65536];
-// extern "C" extern u32 __float_nan;
 extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
 extern "C" extern u8 struct_80450C98[4];
 extern "C" extern u8 pauseTimer__9dScnPly_c[4];
@@ -709,25 +698,30 @@ SECTION_DATA static u8 yo_sph_pos_addy2[12] = {
 #pragma pop
 
 /* 80639E58-80639E78 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_YO_Method */
-SECTION_DATA static void* l_daB_YO_Method[8] = {
-    (void*)daB_YO_Create__FP8daB_YO_c,
-    (void*)daB_YO_Delete__FP8daB_YO_c,
-    (void*)daB_YO_Execute__FP8daB_YO_c,
-    (void*)daB_YO_IsDelete__FP8daB_YO_c,
-    (void*)daB_YO_Draw__FP8daB_YO_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_YO_Method = {
+    (process_method_func)daB_YO_Create__FP8daB_YO_c,
+    (process_method_func)daB_YO_Delete__FP8daB_YO_c,
+    (process_method_func)daB_YO_Execute__FP8daB_YO_c,
+    (process_method_func)daB_YO_IsDelete__FP8daB_YO_c,
+    (process_method_func)daB_YO_Draw__FP8daB_YO_c,
 };
 
 /* 80639E78-80639EA8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_YO */
-SECTION_DATA extern void* g_profile_B_YO[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02110000, (void*)&g_fpcLf_Method,
-    (void*)0x00001B88, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00DF0000, (void*)&l_daB_YO_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_YO = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_YO,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  0x00001B88,             // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  223,                    // mPriority
+  &l_daB_YO_Method,       // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80639EA8-80639EB4 000448 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
diff --git a/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp b/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp
index 07a194bb2f9..d3028e7acf0 100644
--- a/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp
+++ b/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp
@@ -1,206 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_yo_ice
-//
+/**
+ * @file d_a_b_yo_ice.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.h"
 #include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {
-    /* 80267404 */ void operator+(csXyz&);
-};
-
-struct cXyz {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct J3DModel {};
-
-struct daMirror_c {
-    /* 8003194C */ void entry(J3DModel*);
-};
-
-struct daB_YO_c {
-    /* 8062FBEC */ void onIceBreak(u16);
-    /* 8063DC54 */ void getIceCenterPos();
-};
-
-struct daB_YOI_c {
-    /* 8063A17C */ void draw();
-    /* 8063A2D8 */ void setActionMode(int, int);
-    /* 8063A2E4 */ void damage_check();
-    /* 8063A480 */ void setOperate(int);
-    /* 8063A628 */ void setWeight(u8);
-    /* 8063A638 */ void setBreakIceEffect();
-    /* 8063A6F8 */ void setWallBreakIceEffect();
-    /* 8063A79C */ void setApperEffect();
-    /* 8063A824 */ void setApperEffect2();
-    /* 8063A8C8 */ void setLandingEffect();
-    /* 8063A96C */ void executeFirst();
-    /* 8063ABC0 */ void getSingleFallPos();
-    /* 8063ACCC */ void executeRiseUp();
-    /* 8063B238 */ void executeSingleFall();
-    /* 8063BB40 */ void executeYose();
-    /* 8063C3F0 */ void executeYoseFall();
-    /* 8063C76C */ void executeDemoRevival();
-    /* 8063C900 */ void executeDamage();
-    /* 8063CC90 */ void executeDeath();
-    /* 8063CD14 */ void crack_execute();
-    /* 8063CD90 */ void action();
-    /* 8063D0C8 */ void mtx_set();
-    /* 8063D1B0 */ void cc_set();
-    /* 8063D350 */ void execute();
-    /* 8063D45C */ void _delete();
-    /* 8063D4F8 */ void CreateHeap();
-    /* 8063D5D0 */ void create();
-    /* 8063D8FC */ daB_YOI_c();
-};
-
-struct daB_YOI_HIO_c {
-    /* 8063A14C */ daB_YOI_HIO_c();
-    /* 8063DBD0 */ ~daB_YOI_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-};
-
-struct dKy_tevstr_c {};
-
-struct J3DModelData {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B8B4 */ void forceOnEventMove(u32);
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcCyl {};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80083830 */ void Move();
-    /* 8063DB0C */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 80084460 */ void ChkTgHit();
-    /* 800844F8 */ void GetTgHitObj();
-};
-
-struct dCcD_Cyl {
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-};
-
-struct dCamera_c {
-    /* 80181500 */ void GetForceLockOnActor();
-    /* 80181534 */ void ForceLockOn(fopAc_ac_c*);
-    /* 8018159C */ void ForceLockOff(fopAc_ac_c*);
-    /* 80181E64 */ void Eye();
-    /* 80181E98 */ void Center();
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-};
-
-struct cM3dGCyl {
-    /* 8026F1DC */ void SetC(cXyz const&);
-    /* 8026F1F8 */ void SetH(f32);
-    /* 8026F200 */ void SetR(f32);
-    /* 8063DA7C */ ~cM3dGCyl();
-};
-
-struct cM3dGAab {
-    /* 8063DAC4 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_Stts {
-    /* 8026395C */ void ClrCcMove();
-};
-
-struct cCcD_GStts {
-    /* 8063DB88 */ ~cCcD_GStts();
-};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
-
-struct Z2SoundObjSimple {
-    /* 802BE844 */ Z2SoundObjSimple();
-};
-
-struct Z2SoundObjBase {
-    /* 802BDFF8 */ void deleteObject();
-};
-
-struct Vec {};
-
-struct Z2Creature {
-    /* 802C03C8 */ Z2Creature();
-    /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
+#include "d/d_camera.h"
 //
 // Forward References:
 //
@@ -322,9 +127,6 @@ extern "C" void __ct__16Z2SoundObjSimpleFv();
 extern "C" void __ct__10Z2CreatureFv();
 extern "C" void init__10Z2CreatureFP3VecP3VecUcUc();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECSquareDistance();
 extern "C" void _savegpr_26();
 extern "C" void _savegpr_27();
 extern "C" void _savegpr_28();
@@ -333,8 +135,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_CylAttr[25];
@@ -342,9 +142,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern u32 __float_nan;
 extern "C" void onIceBreak__8daB_YO_cFUs();
 extern "C" void __register_global_object();
 
@@ -509,25 +307,30 @@ SECTION_DATA static void* lit_4909[8] = {
 };
 
 /* 8063DF50-8063DF70 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_YOI_Method */
-SECTION_DATA static void* l_daB_YOI_Method[8] = {
-    (void*)daB_YOI_Create__FP9daB_YOI_c,
-    (void*)daB_YOI_Delete__FP9daB_YOI_c,
-    (void*)daB_YOI_Execute__FP9daB_YOI_c,
-    (void*)daB_YOI_IsDelete__FP9daB_YOI_c,
-    (void*)daB_YOI_Draw__FP9daB_YOI_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_YOI_Method = {
+    (process_method_func)daB_YOI_Create__FP9daB_YOI_c,
+    (process_method_func)daB_YOI_Delete__FP9daB_YOI_c,
+    (process_method_func)daB_YOI_Execute__FP9daB_YOI_c,
+    (process_method_func)daB_YOI_IsDelete__FP9daB_YOI_c,
+    (process_method_func)daB_YOI_Draw__FP9daB_YOI_c,
 };
 
 /* 8063DF70-8063DFA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_YOI */
-SECTION_DATA extern void* g_profile_B_YOI[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02120000, (void*)&g_fpcLf_Method,
-    (void*)0x00000B3C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E00000, (void*)&l_daB_YOI_Method,
-    (void*)0x00044000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_YOI = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_YOI,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_YOI_c),      // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  224,                    // mPriority
+  &l_daB_YOI_Method,      // sub_method
+  0x00044000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 8063DFA0-8063DFAC 0001FC 000C+00 2/2 0/0 0/0 .data            __vt__10cCcD_GStts */
@@ -1325,7 +1128,8 @@ asm daB_YOI_c::daB_YOI_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGCyl::~cM3dGCyl() {
+// asm cM3dGCyl::~cM3dGCyl() {
+extern "C" asm void __dt__8cM3dGCylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice/__dt__8cM3dGCylFv.s"
 }
@@ -1335,7 +1139,8 @@ asm cM3dGCyl::~cM3dGCyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice/__dt__8cM3dGAabFv.s"
 }
@@ -1345,7 +1150,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice/__dt__10dCcD_GSttsFv.s"
 }
@@ -1365,7 +1171,8 @@ static asm void daB_YOI_Create(daB_YOI_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice/__dt__10cCcD_GSttsFv.s"
 }
@@ -1400,7 +1207,8 @@ REGISTER_CTORS(0x8063DC18, __sinit_d_a_b_yo_ice_cpp);
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daB_YO_c::getIceCenterPos() {
+// asm void daB_YO_c::getIceCenterPos() {
+extern "C" asm void getIceCenterPos__8daB_YO_cFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice/getIceCenterPos__8daB_YO_cFv.s"
 }
diff --git a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp
index 89ddc342360..5c92819f0ac 100644
--- a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp
+++ b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp
@@ -1,421 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_zant
-//
+/**
+ * @file d_a_b_zant.cpp
+ * 
+*/
 
-// #include "rel/d/a/b/d_a_b_zant/d_a_b_zant.h"
+#include "rel/d/a/b/d_a_b_zant/d_a_b_zant.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80266B84 */ void operator*(f32) const;
-    /* 8063E568 */ ~cXyz();
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CDD4 */ void transM(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTextureSRTKey {};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct J3DAnmTevRegKey {};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 8015F398 */ void checkMasterSwordEquip();
-    /* 8015F8D0 */ void getThrowBoomerangActor();
-};
-
-struct J3DModel {};
-
-struct daMirror_c {
-    /* 8003194C */ void entry(J3DModel*);
-};
-
-struct J3DJoint {};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-    /* 8063F0F4 */ void operator=(dCcD_Sph const&);
-    /* 8063F3C8 */ ~dCcD_Sph();
-    /* 8064E76C */ dCcD_Sph();
-};
-
-struct daB_ZANT_c {
-    /* 8063E19C */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8063E264 */ void JointCallBack(J3DJoint*, int);
-    /* 8063E2B0 */ void draw();
-    /* 8063E5C4 */ void setBck(int, u8, f32, f32);
-    /* 8063E668 */ void checkBck(int);
-    /* 8063E6C4 */ void setActionMode(int, int);
-    /* 8063E6F8 */ void checkBigDamage();
-    /* 8063E79C */ void checkDamageType();
-    /* 8063E810 */ void setDamageSe(dCcD_Sph*, int);
-    /* 8063E938 */ void damage_check();
-    /* 8063F524 */ void ice_damage_check();
-    /* 8063F84C */ void setNextDamageMode(int);
-    /* 8063FAB4 */ void checkAvoidWeapon(int);
-    /* 8063FF6C */ void setTgHitBit(int);
-    /* 8063FFAC */ void setCoHitBit(int);
-    /* 8063FFEC */ void setTgShield(int);
-    /* 806400BC */ void setTgType(u32);
-    /* 806400C8 */ void setZantMessage(int);
-    /* 80640104 */ void doZantMessage();
-    /* 80640180 */ void setIceLandingEffect(int);
-    /* 80640310 */ void setWaterBubble();
-    /* 806403D4 */ void setMonkeyFallEffect();
-    /* 80640478 */ void setLastRollEffect();
-    /* 80640654 */ void getMagicSpeed();
-    /* 80640664 */ void getMagicWaterSpeed();
-    /* 80640674 */ void executeSmallAttack();
-    /* 80640C20 */ void calcScale(int);
-    /* 80640D14 */ void executeWarp();
-    /* 806412A8 */ void executeDamage();
-    /* 806414E4 */ void executeConfuse();
-    /* 80641640 */ void executeOpening();
-    /* 806427EC */ void executeFly();
-    /* 80642EC8 */ void executeFlyGround();
-    /* 806430E0 */ void checkSwimLinkNearMouth();
-    /* 806432F8 */ void checkSwimLinkNear();
-    /* 8064350C */ void executeHook();
-    /* 80643690 */ void executeWater();
-    /* 80644074 */ void executeSwim();
-    /* 80644A3C */ void executeSimaJump();
-    /* 80645014 */ void executeIceDemo();
-    /* 8064524C */ void executeIceJump();
-    /* 80645DA4 */ void executeIceStep();
-    /* 8064687C */ void executeIceDamage();
-    /* 806471CC */ void setFarPillarPos();
-    /* 806473E4 */ void setNearPillarPos();
-    /* 80647468 */ void setNextPillarInfo(int);
-    /* 806474F4 */ void setNextPillarPos();
-    /* 80647A34 */ void checkPillarSwing();
-    /* 80647AC8 */ void executeMonkey();
-    /* 806481F4 */ void executeMonkeyFall();
-    /* 80648544 */ void executeMonkeyDamage();
-    /* 80648778 */ void setLastWarp(int, int);
-    /* 80648F64 */ void executeLastStartDemo();
-    /* 806494A8 */ void executeLastAttack();
-    /* 8064A58C */ void executeLastTired();
-    /* 8064A688 */ void executeLastDamage();
-    /* 8064AC8C */ void executeLastEndDemo();
-    /* 8064B270 */ void calcMahojinAnime();
-    /* 8064B49C */ void calcRoomChangeCamera(int);
-    /* 8064B69C */ void initNextRoom();
-    /* 8064B868 */ void executeRoomChange();
-    /* 8064C1C0 */ void setBaseActionMode(int);
-    /* 8064C5A8 */ void action();
-    /* 8064CB1C */ void mtx_set();
-    /* 8064CD0C */ void cc_set();
-    /* 8064CFA8 */ void cc_ice_set();
-    /* 8064DA48 */ void execute();
-    /* 8064DB70 */ void _delete();
-    /* 8064DC04 */ void CreateHeap();
-    /* 8064E190 */ void create();
-};
-
-struct daB_ZANT_HIO_c {
-    /* 8063E10C */ daB_ZANT_HIO_c();
-    /* 8064E994 */ ~daB_ZANT_HIO_c();
-};
-
-struct daB_ZANTZ_c {
-    /* 80650854 */ void setSnortEffect(int);
-    /* 80650B7C */ void setMouthMode(u8);
-    /* 80650D0C */ void setAppearMode(u8);
-};
-
-struct daAlink_c {
-    /* 80112474 */ void checkIronBallThrowMode() const;
-    /* 801124B4 */ void checkIronBallThrowReturnMode() const;
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_restart_c {
-    /* 80034F80 */ void setRoom(cXyz const&, s16, s8);
-};
-
-struct dSv_memBit_c {
-    /* 80034918 */ void onDungeonItem(int);
-};
-
-struct dSv_info_c {
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dSv_danBit_c {
-    /* 80034B98 */ void onSwitch(int);
-    /* 80034BC0 */ void offSwitch(int);
-};
-
-struct dStage_roomControl_c {
-    static u8 mStatus[65792];
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D6A4 */ void setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
-                                csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8,
-                                cXyz const*);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dDlst_shadowControl_c {
-    /* 80055F1C */ void addReal(u32, J3DModel*);
-
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcU_AtInfo {};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcCyl {};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80083830 */ void Move();
-    /* 8064E7F0 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 800842C0 */ void ChkAtHit();
-    /* 80084358 */ void GetAtHitObj();
-    /* 80084460 */ void ChkTgHit();
-    /* 800844F8 */ void GetTgHitObj();
-    /* 800845B0 */ void getHitSeID(u8, int);
-    /* 8063F180 */ void operator=(dCcD_GObjInf const&);
-};
-
-struct dCcD_Cyl {
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-    /* 80181E64 */ void Eye();
-    /* 80181E98 */ void Center();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjGndChk_All {
-    /* 800778E8 */ ~dBgS_ObjGndChk_All();
-};
-
-struct dBgS_ObjGndChk {
-    /* 80641230 */ ~dBgS_ObjGndChk();
-};
-
-struct dBgS_ObjAcch {
-    /* 8064E84C */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 8064E8BC */ ~dBgS_AcchCir();
-};
-
-struct dBgS {
-    /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&);
-};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct dAttention_c {
-    /* 8007353C */ void LockonTarget(s32);
-    /* 800737E4 */ void LockonTruth();
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 8063F494 */ ~cM3dGSph();
-};
-
-struct cM3dGCyl {
-    /* 8026F1DC */ void SetC(cXyz const&);
-    /* 8026F1F8 */ void SetH(f32);
-    /* 8026F200 */ void SetR(f32);
-    /* 8064E724 */ ~cM3dGCyl();
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 8063F4DC */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {
-    /* 80263A48 */ void GetAc();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 8064E94C */ ~cCcD_GStts();
-};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
-
-struct _GXTexObj {};
-
-struct Z2StatusMgr {
-    /* 802B61E8 */ void setDemoName(char*);
-};
-
-struct Z2SeqMgr {
-    /* 802AF010 */ void bgmStart(u32, u32, s32);
-    /* 802AF408 */ void bgmStop(u32, s32);
-    /* 802AFF8C */ void changeBgmStatus(s32);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-    /* 802C1B90 */ void setEnemyName(char const*);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 8064E128 */ ~J3DFrameCtrl();
-};
+#include "d/d_camera.h"
 
 //
 // Forward References:
@@ -684,11 +274,6 @@ extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSubtract();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECSquareDistance();
 extern "C" void __copy();
 extern "C" void __construct_array();
 extern "C" void __cvt_fp2unsigned();
@@ -710,9 +295,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abs();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
@@ -725,14 +307,8 @@ extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" u8 mStatus__20dStage_roomControl_c[65792];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern u8 data_804505F0[8];
-extern "C" extern u32 __float_nan;
-extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
-extern "C" extern u8 mNoChangeRoom__20dStage_roomControl_c[4];
 extern "C" extern u8 pauseTimer__9dScnPly_c[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void __register_global_object();
@@ -1279,25 +855,30 @@ SECTION_DATA static u8 ice_sph_jnt[132] = {
 };
 
 /* 8064F4AC-8064F4CC -00001 0020+00 1/0 0/0 0/0 .data            l_daB_ZANT_Method */
-SECTION_DATA static void* l_daB_ZANT_Method[8] = {
-    (void*)daB_ZANT_Create__FP10daB_ZANT_c,
-    (void*)daB_ZANT_Delete__FP10daB_ZANT_c,
-    (void*)daB_ZANT_Execute__FP10daB_ZANT_c,
-    (void*)daB_ZANT_IsDelete__FP10daB_ZANT_c,
-    (void*)daB_ZANT_Draw__FP10daB_ZANT_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_ZANT_Method = {
+    (process_method_func)daB_ZANT_Create__FP10daB_ZANT_c,
+    (process_method_func)daB_ZANT_Delete__FP10daB_ZANT_c,
+    (process_method_func)daB_ZANT_Execute__FP10daB_ZANT_c,
+    (process_method_func)daB_ZANT_IsDelete__FP10daB_ZANT_c,
+    (process_method_func)daB_ZANT_Draw__FP10daB_ZANT_c,
 };
 
 /* 8064F4CC-8064F4FC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_ZANT */
-SECTION_DATA extern void* g_profile_B_ZANT[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00F90000, (void*)&g_fpcLf_Method,
-    (void*)0x000038BC, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E20000, (void*)&l_daB_ZANT_Method,
-    (void*)0x00040000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_ZANT = {
+  fpcLy_CURRENT_e,              // mLayerID
+  4,                            // mListID
+  fpcPi_CURRENT_e,              // mListPrio
+  PROC_B_ZANT,                  // mProcName
+  &g_fpcLf_Method.mBase,        // sub_method
+  sizeof(daB_ZANT_c),           // mSize
+  0,                            // mSizeOther
+  0,                            // mParameters
+  &g_fopAc_Method.base,         // sub_method
+  226,                          // mPriority
+  &l_daB_ZANT_Method,           // sub_method
+  0x00040000,                   // mStatus
+  fopAc_ENEMY_e,                // mActorType
+  fopAc_CULLBOX_CUSTOM_e,       // cullType
 };
 
 /* 8064F4FC-8064F508 000670 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -1466,7 +1047,8 @@ asm void daB_ZANT_c::draw() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__4cXyzFv.s"
 }
@@ -1706,7 +1288,8 @@ asm void daB_ZANT_c::damage_check() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dCcD_Sph::operator=(dCcD_Sph const& param_0) {
+// asm void dCcD_Sph::operator=(dCcD_Sph const& param_0) {
+extern "C" asm void __as__8dCcD_SphFRC8dCcD_Sph() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__as__8dCcD_SphFRC8dCcD_Sph.s"
 }
@@ -1716,7 +1299,8 @@ asm void dCcD_Sph::operator=(dCcD_Sph const& param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dCcD_GObjInf::operator=(dCcD_GObjInf const& param_0) {
+// asm void dCcD_GObjInf::operator=(dCcD_GObjInf const& param_0) {
+extern "C" asm void __as__12dCcD_GObjInfFRC12dCcD_GObjInf() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__as__12dCcD_GObjInfFRC12dCcD_GObjInf.s"
 }
@@ -1726,7 +1310,8 @@ asm void dCcD_GObjInf::operator=(dCcD_GObjInf const& param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::~dCcD_Sph() {
+// asm dCcD_Sph::~dCcD_Sph() {
+extern "C" asm void __dt__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__8dCcD_SphFv.s"
 }
@@ -1736,7 +1321,8 @@ asm dCcD_Sph::~dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__8cM3dGSphFv.s"
 }
@@ -1746,7 +1332,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__8cM3dGAabFv.s"
 }
@@ -2068,7 +1655,8 @@ asm void daB_ZANT_c::executeWarp() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjGndChk::~dBgS_ObjGndChk() {
+// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() {
+extern "C" asm void __dt__14dBgS_ObjGndChkFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__14dBgS_ObjGndChkFv.s"
 }
@@ -3526,7 +3114,8 @@ asm void daB_ZANT_c::CreateHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__12J3DFrameCtrlFv.s"
 }
@@ -3563,7 +3152,8 @@ asm void daB_ZANT_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGCyl::~cM3dGCyl() {
+// asm cM3dGCyl::~cM3dGCyl() {
+extern "C" asm void __dt__8cM3dGCylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__8cM3dGCylFv.s"
 }
@@ -3573,7 +3163,8 @@ asm cM3dGCyl::~cM3dGCyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::dCcD_Sph() {
+// asm dCcD_Sph::dCcD_Sph() {
+extern "C" asm void __ct__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__ct__8dCcD_SphFv.s"
 }
@@ -3583,7 +3174,8 @@ asm dCcD_Sph::dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__10dCcD_GSttsFv.s"
 }
@@ -3593,7 +3185,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -3603,7 +3196,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__12dBgS_AcchCirFv.s"
 }
@@ -3623,7 +3217,8 @@ static asm void daB_ZANT_Create(daB_ZANT_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/__dt__10cCcD_GSttsFv.s"
 }
diff --git a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp
index f32f3e66093..09fb35872f5 100644
--- a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp
+++ b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp
@@ -1,178 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_zant_magic
-//
+/**
+ * @file d_a_b_zant_magic.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
-struct cXyz {
-    /* 80266B84 */ void operator*(f32) const;
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 8015F398 */ void checkMasterSwordEquip();
-};
-
-struct daB_ZANT_c {
-    /* 80640654 */ void getMagicSpeed();
-    /* 80640664 */ void getMagicWaterSpeed();
-};
-
-struct daB_ZANTM_c {
-    /* 8064F778 */ void draw();
-    /* 8064F7D4 */ void setMagicEffect();
-    /* 8064F938 */ void setMagicHitEffect();
-    /* 8064FA50 */ void executeSmall();
-    /* 8064FD6C */ void cc_set();
-    /* 8064FE6C */ void execute();
-    /* 8064FF2C */ bool _delete();
-    /* 8064FF54 */ void create();
-    /* 806500A8 */ daB_ZANTM_c();
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-
-    static u8 mParticleTracePCB[4 + 4 /* padding */];
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_SrcCps {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80083830 */ void Move();
-    /* 806502E0 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800842C0 */ void ChkAtHit();
-    /* 80084460 */ void ChkTgHit();
-};
-
-struct dCcD_Cps {
-    /* 800847D0 */ void Set(dCcD_SrcCps const&);
-    /* 80084824 */ void CalcAtVec();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 8065033C */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 806503AC */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 80650250 */ ~cM3dGSph();
-};
-
-struct cM3dGCps {
-    /* 8026EF88 */ cM3dGCps();
-    /* 8026F000 */ void Set(cXyz const&, cXyz const&, f32);
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 80650298 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 8065043C */ ~cCcD_GStts();
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct JAISoundID {};
-
-struct Vec {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-    /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
 
 //
 // Forward References:
@@ -250,7 +84,6 @@ extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz();
 extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
 extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
 extern "C" void _savegpr_23();
 extern "C" void _savegpr_26();
 extern "C" void _savegpr_27();
@@ -259,8 +92,6 @@ extern "C" void _restgpr_23();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cps[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -270,7 +101,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
 extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */];
@@ -595,25 +425,30 @@ asm void daB_ZANTM_c::create() {
 
 /* ############################################################################################## */
 /* 806505E4-80650604 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_ZANTM_Method */
-SECTION_DATA static void* l_daB_ZANTM_Method[8] = {
-    (void*)daB_ZANTM_Create__FP11daB_ZANTM_c,
-    (void*)daB_ZANTM_Delete__FP11daB_ZANTM_c,
-    (void*)daB_ZANTM_Execute__FP11daB_ZANTM_c,
-    (void*)daB_ZANTM_IsDelete__FP11daB_ZANTM_c,
-    (void*)daB_ZANTM_Draw__FP11daB_ZANTM_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_ZANTM_Method = {
+    (process_method_func)daB_ZANTM_Create__FP11daB_ZANTM_c,
+    (process_method_func)daB_ZANTM_Delete__FP11daB_ZANTM_c,
+    (process_method_func)daB_ZANTM_Execute__FP11daB_ZANTM_c,
+    (process_method_func)daB_ZANTM_IsDelete__FP11daB_ZANTM_c,
+    (process_method_func)daB_ZANTM_Draw__FP11daB_ZANTM_c,
 };
 
 /* 80650604-80650634 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_ZANTM */
-SECTION_DATA extern void* g_profile_B_ZANTM[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00FA0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000C0C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E30000, (void*)&l_daB_ZANTM_Method,
-    (void*)0x00040100, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_ZANTM = {
+  fpcLy_CURRENT_e,        // mLayerID
+  4,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_ZANTM,           // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_ZANTM_c),    // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  227,                    // mPriority
+  &l_daB_ZANTM_Method,    // sub_method
+  0x00040100,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80650634-80650640 00014C 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -678,7 +513,8 @@ asm daB_ZANTM_c::daB_ZANTM_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/__dt__8cM3dGSphFv.s"
 }
@@ -688,7 +524,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/__dt__8cM3dGAabFv.s"
 }
@@ -698,7 +535,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/__dt__10dCcD_GSttsFv.s"
 }
@@ -708,7 +546,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -718,7 +557,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/__dt__12dBgS_AcchCirFv.s"
 }
@@ -739,7 +579,8 @@ static asm void daB_ZANTM_Create(daB_ZANTM_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/__dt__10cCcD_GSttsFv.s"
 }
diff --git a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp
index 9dbad0d3f19..d62ac7b62dd 100644
--- a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp
+++ b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp
@@ -1,240 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_zant_mobile
-//
+/**
+ * @file d_a_b_zant_mobile.cpp
+ * 
+*/
 
 #include "rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct cXyz {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTevRegKey {};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daB_ZANTZ_c {
-    /* 806507B0 */ void draw();
-    /* 80650854 */ void setSnortEffect(int);
-    /* 806508E0 */ void calcSnortEffect();
-    /* 80650B7C */ void setMouthMode(u8);
-    /* 80650D0C */ void setAppearMode(u8);
-    /* 806510C0 */ void getGroundPos();
-    /* 8065127C */ void action();
-    /* 80651B1C */ void cc_set();
-    /* 80651C20 */ void execute();
-    /* 80651D1C */ void _delete();
-    /* 80651DC4 */ void CreateHeap();
-    /* 80652038 */ void create();
-};
-
-struct daB_ZANTZ_HIO_c {
-    /* 8065078C */ daB_ZANTZ_HIO_c();
-    /* 8065268C */ ~daB_ZANTZ_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_SrcCyl {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-    /* 806524D4 */ ~dCcD_Sph();
-    /* 806525A0 */ dCcD_Sph();
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 80084658 */ void ChkCoHit();
-    /* 800846F0 */ void GetCoHitObj();
-};
-
-struct dCcD_Cyl {
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-    /* 806522F4 */ ~dCcD_Cyl();
-    /* 806523C0 */ dCcD_Cyl();
-};
-
-struct dBgW_Base {};
-
-struct dBgW {
-    /* 8007B970 */ dBgW();
-    /* 8007B9C0 */ void Move();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjGndChk {
-    /* 80651204 */ ~dBgS_ObjGndChk();
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS {
-    /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*);
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 80652624 */ ~cM3dGSph();
-};
-
-struct cM3dGCyl {
-    /* 8026F1DC */ void SetC(cXyz const&);
-    /* 8026F1F8 */ void SetH(f32);
-    /* 8026F200 */ void SetR(f32);
-    /* 80652444 */ ~cM3dGCyl();
-};
-
-struct cM3dGAab {
-    /* 8065248C */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {
-    /* 80263A48 */ void GetAc();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cBgD_t {};
-
-struct cBgW {
-    /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]);
-};
-
-struct cBgS_PolyInfo {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 80074250 */ void Release(dBgW_Base*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-    /* 80074618 */ void GetActorPointer(int) const;
-};
-
-struct JAISoundID {};
-
-struct Vec {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-    /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 80651FD0 */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -348,7 +120,6 @@ extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
 extern "C" void __construct_array();
 extern "C" void _savegpr_24();
 extern "C" void _savegpr_26();
@@ -356,9 +127,6 @@ extern "C" void _savegpr_28();
 extern "C" void _restgpr_24();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
-extern "C" void abs();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -368,7 +136,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void __register_global_object();
@@ -402,25 +169,30 @@ SECTION_DATA static u8 data_8065281C[68] = {
 };
 
 /* 80652860-80652880 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_ZANTZ_Method */
-SECTION_DATA static void* l_daB_ZANTZ_Method[8] = {
-    (void*)daB_ZANTZ_Create__FP11daB_ZANTZ_c,
-    (void*)daB_ZANTZ_Delete__FP11daB_ZANTZ_c,
-    (void*)daB_ZANTZ_Execute__FP11daB_ZANTZ_c,
-    (void*)daB_ZANTZ_IsDelete__FP11daB_ZANTZ_c,
-    (void*)daB_ZANTZ_Draw__FP11daB_ZANTZ_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daB_ZANTZ_Method = {
+    (process_method_func)daB_ZANTZ_Create__FP11daB_ZANTZ_c,
+    (process_method_func)daB_ZANTZ_Delete__FP11daB_ZANTZ_c,
+    (process_method_func)daB_ZANTZ_Execute__FP11daB_ZANTZ_c,
+    (process_method_func)daB_ZANTZ_IsDelete__FP11daB_ZANTZ_c,
+    (process_method_func)daB_ZANTZ_Draw__FP11daB_ZANTZ_c,
 };
 
 /* 80652880-806528B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_ZANTZ */
-SECTION_DATA extern void* g_profile_B_ZANTZ[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00F80000, (void*)&g_fpcLf_Method,
-    (void*)0x00000D14, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00E40000, (void*)&l_daB_ZANTZ_Method,
-    (void*)0x00040000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_B_ZANTZ = {
+  fpcLy_CURRENT_e,        // mLayerID
+  4,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_B_ZANTZ,           // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daB_ZANTZ_c),    // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  228,                    // mPriority
+  &l_daB_ZANTZ_Method,    // sub_method
+  0x00040000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 806528B0-806528BC 0000D4 000C+00 3/3 0/0 0/0 .data            __vt__8cM3dGSph */
@@ -680,7 +452,8 @@ asm void daB_ZANTZ_c::getGroundPos() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjGndChk::~dBgS_ObjGndChk() {
+// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() {
+extern "C" asm void __dt__14dBgS_ObjGndChkFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__dt__14dBgS_ObjGndChkFv.s"
 }
@@ -908,7 +681,8 @@ asm void daB_ZANTZ_c::CreateHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__dt__12J3DFrameCtrlFv.s"
 }
@@ -953,7 +727,8 @@ asm void daB_ZANTZ_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Cyl::~dCcD_Cyl() {
+// asm dCcD_Cyl::~dCcD_Cyl() {
+extern "C" asm void __dt__8dCcD_CylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__dt__8dCcD_CylFv.s"
 }
@@ -963,7 +738,8 @@ asm dCcD_Cyl::~dCcD_Cyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Cyl::dCcD_Cyl() {
+// asm dCcD_Cyl::dCcD_Cyl() {
+extern "C" asm void __ct__8dCcD_CylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__ct__8dCcD_CylFv.s"
 }
@@ -973,7 +749,8 @@ asm dCcD_Cyl::dCcD_Cyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGCyl::~cM3dGCyl() {
+// asm cM3dGCyl::~cM3dGCyl() {
+extern "C" asm void __dt__8cM3dGCylFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__dt__8cM3dGCylFv.s"
 }
@@ -983,7 +760,8 @@ asm cM3dGCyl::~cM3dGCyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__dt__8cM3dGAabFv.s"
 }
@@ -993,7 +771,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::~dCcD_Sph() {
+// asm dCcD_Sph::~dCcD_Sph() {
+extern "C" asm void __dt__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__dt__8dCcD_SphFv.s"
 }
@@ -1003,7 +782,8 @@ asm dCcD_Sph::~dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::dCcD_Sph() {
+// asm dCcD_Sph::dCcD_Sph() {
+extern "C" asm void __ct__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__ct__8dCcD_SphFv.s"
 }
@@ -1013,7 +793,8 @@ asm dCcD_Sph::dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile/__dt__8cM3dGSphFv.s"
 }
diff --git a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp
index d5ecd8d3ead..4b9df677148 100644
--- a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp
+++ b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp
@@ -1,113 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_L7demo_dr
-//
+/**
+ * @file d_a_L7demo_dr.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.h"
 #include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct cXyz {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daDr_c {
-    /* 805A9238 */ void setAction(void (daDr_c::*)());
-    /* 805A92DC */ void action();
-    /* 805A9304 */ void mtx_set();
-    /* 805A93D4 */ void draw();
-    /* 805A9478 */ void wait();
-    /* 805A963C */ void pl_walk();
-    /* 805A9914 */ void pl_turn();
-    /* 805A9A34 */ void bridge_destroy();
-    /* 805A9D10 */ void bridge_destroy2();
-    /* 805A9EE4 */ void execute();
-    /* 805A9FFC */ void _delete();
-    /* 805AA084 */ void CreateHeap();
-    /* 805AA19C */ void check_start();
-    /* 805AA224 */ void create();
-};
-
-struct dVibration_c {
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dComIfG_play_c {
-    /* 8002C97C */ void getLayerNo(int);
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AA8 */ void Set(cXyz, cXyz);
-};
-
-struct Vec {};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-};
+#include "d/d_camera.h"
 
 //
 // Forward References:
@@ -134,7 +32,6 @@ extern "C" void check_start__6daDr_cFv();
 extern "C" void create__6daDr_cFv();
 extern "C" static void daDr_Create__FP6daDr_c();
 extern "C" extern char const* const d_a_L7demo_dr__stringBase0;
-extern "C" extern void* g_profile_DR[12];
 
 //
 // External References:
@@ -175,18 +72,14 @@ extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP
 extern "C" void __ct__15Z2CreatureEnemyFv();
 extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc();
 extern "C" void* __nw__FUl();
-extern "C" void PSMTXCopy();
 extern "C" void __ptmf_test();
 extern "C" void __ptmf_scall();
 extern "C" void _savegpr_28();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 
 //
 // Declarations:
@@ -650,22 +543,30 @@ static asm void daDr_Create(daDr_c* param_0) {
 
 /* ############################################################################################## */
 /* 805AA524-805AA544 -00001 0020+00 1/0 0/0 0/0 .data            l_daDr_Method */
-SECTION_DATA static void* l_daDr_Method[8] = {
-    (void*)daDr_Create__FP6daDr_c,
-    (void*)daDr_Delete__FP6daDr_c,
-    (void*)daDr_Execute__FP6daDr_c,
-    (void*)daDr_IsDelete__FP6daDr_c,
-    (void*)daDr_Draw__FP6daDr_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daDr_Method = {
+    (process_method_func)daDr_Create__FP6daDr_c,
+    (process_method_func)daDr_Delete__FP6daDr_c,
+    (process_method_func)daDr_Execute__FP6daDr_c,
+    (process_method_func)daDr_IsDelete__FP6daDr_c,
+    (process_method_func)daDr_Draw__FP6daDr_c,
 };
 
 /* 805AA544-805AA574 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DR */
-SECTION_DATA extern void* g_profile_DR[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,     (void*)0x02030000, (void*)&g_fpcLf_Method,
-    (void*)0x0000065C, (void*)NULL,           (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00CE0000, (void*)&l_daDr_Method, (void*)0x00040000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_DR = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_DR,                // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daDr_c),         // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  206,                    // mPriority
+  &l_daDr_Method,         // sub_method
+  0x00040000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805AA4C8-805AA4C8 000074 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp
index 6b91105ecd7..d09c47b117d 100644
--- a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp
+++ b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp
@@ -1,100 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_L7low_dr
-//
+/**
+ * @file d_a_L7low_dr.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_L7low_dr/d_a_L7low_dr.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct cXyz {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daL7lowDr_c {
-    /* 805AA5F8 */ void setAction(void (daL7lowDr_c::*)());
-    /* 805AA69C */ void action();
-    /* 805AA748 */ void _delete();
-    /* 805AA7B8 */ void mtx_set();
-    /* 805AA828 */ void fly();
-    /* 805AABF8 */ void execute();
-    /* 805AAC5C */ void CreateHeap();
-    /* 805AAD58 */ void create();
-    /* 805AAEA8 */ void draw();
-};
-
-struct dSv_memBit_c {
-    /* 80034934 */ void isDungeonItem(int) const;
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 800349BC */ void isEventBit(u16) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct Vec {};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
 
 //
 // Forward References:
@@ -116,7 +27,6 @@ extern "C" void draw__11daL7lowDr_cFv();
 extern "C" static void daL7lowDr_Draw__FP11daL7lowDr_c();
 extern "C" static bool daL7lowDr_IsDelete__FP11daL7lowDr_c();
 extern "C" extern char const* const d_a_L7low_dr__stringBase0;
-extern "C" extern void* g_profile_L7lowDr[12];
 
 //
 // External References:
@@ -149,18 +59,13 @@ extern "C" void cLib_targetAngleY__FPC3VecPC3Vec();
 extern "C" void __ct__15Z2CreatureEnemyFv();
 extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc();
 extern "C" void* __nw__FUl();
-extern "C" void PSMTXCopy();
-extern "C" void PSVECAdd();
 extern "C" void __ptmf_test();
 extern "C" void __ptmf_scall();
 extern "C" void _savegpr_28();
 extern "C" void _restgpr_28();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
 
 //
@@ -439,25 +344,30 @@ static bool daL7lowDr_IsDelete(daL7lowDr_c* param_0) {
 
 /* ############################################################################################## */
 /* 805AAFC4-805AAFE4 -00001 0020+00 1/0 0/0 0/0 .data            l_daL7lowDr_Method */
-SECTION_DATA static void* l_daL7lowDr_Method[8] = {
-    (void*)daL7lowDr_Create__FP11daL7lowDr_c,
-    (void*)daL7lowDr_Delete__FP11daL7lowDr_c,
-    (void*)daL7lowDr_Execute__FP11daL7lowDr_c,
-    (void*)daL7lowDr_IsDelete__FP11daL7lowDr_c,
-    (void*)daL7lowDr_Draw__FP11daL7lowDr_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daL7lowDr_Method = {
+    (process_method_func)daL7lowDr_Create__FP11daL7lowDr_c,
+    (process_method_func)daL7lowDr_Delete__FP11daL7lowDr_c,
+    (process_method_func)daL7lowDr_Execute__FP11daL7lowDr_c,
+    (process_method_func)daL7lowDr_IsDelete__FP11daL7lowDr_c,
+    (process_method_func)daL7lowDr_Draw__FP11daL7lowDr_c,
 };
 
 /* 805AAFE4-805AB014 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_L7lowDr */
-SECTION_DATA extern void* g_profile_L7lowDr[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02040000, (void*)&g_fpcLf_Method,
-    (void*)0x00000644, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00CF0000, (void*)&l_daL7lowDr_Method,
-    (void*)0x00040000, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_L7lowDr = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_L7lowDr,           // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daL7lowDr_c),    // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  207,                    // mPriority
+  &l_daL7lowDr_Method,    // sub_method
+  0x00040000,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp
index 6e89685a154..552b387cef1 100644
--- a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp
+++ b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp
@@ -1,174 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_L7op_demo_dr
-//
+/**
+ * @file d_a_L7op_demo_dr.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.h"
 #include "dol2asm.h"
+#include "d/d_camera.h"
 
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct Vec {};
-
-struct cXyz {
-    /* 8026702C */ bool operator==(Vec const&) const;
-    /* 805ADDD8 */ void abs(Vec const&) const;
-    /* 805ADEEC */ cXyz(cXyz const&);
-    /* 805ADF2C */ void operator=(cXyz const&);
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-    /* 805ADF08 */ void multVecZero(Vec*);
-
-    static u8 now[48];
-};
-
-struct mDoExt_morf_c {
-    /* 805ADDA8 */ void isStop();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 805ADD78 */ void changeDemoPos0(cXyz const*);
-    /* 805ADD94 */ void changeDemoMode(u32, int, int, s16);
-};
-
-struct daL7ODR_c {
-    /* 805AB098 */ void setAction(void (daL7ODR_c::*)());
-    /* 805AB13C */ void action();
-    /* 805AB164 */ void setDrAction(void (daL7ODR_c::*)());
-    /* 805AB208 */ void dr_action();
-    /* 805AB230 */ void mtx_set();
-    /* 805AB2E8 */ void draw();
-    /* 805AB3F0 */ void wait();
-    /* 805AB520 */ void pl_walk();
-    /* 805ABC2C */ void setZoomOutCamPos(cXyz&, cXyz&, f32);
-    /* 805ABCF8 */ void dr_wait();
-    /* 805ABE0C */ void dr_fly();
-    /* 805AD7B4 */ void execute();
-    /* 805AD87C */ void _delete();
-    /* 805AD90C */ void CreateHeap();
-    /* 805ADA2C */ void check_start();
-    /* 805ADAC0 */ void create();
-};
-
-struct dVibration_c {
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_restart_c {
-    /* 80034F80 */ void setRoom(cXyz const&, s16, s8);
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180AA8 */ void Set(cXyz, cXyz);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 805ADCD8 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cBgS_PolyInfo {};
-
-struct _GXTexObj {};
-
-struct Z2SeqMgr {
-    /* 802AF49C */ void subBgmStart(u32);
-    /* 802AF884 */ void subBgmStop();
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DModel {};
 
 //
 // Forward References:
@@ -272,24 +110,16 @@ extern "C" void __ct__15Z2CreatureEnemyFv();
 extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
-extern "C" void PSVECAdd();
-extern "C" void PSVECScale();
-extern "C" void PSVECSquareDistance();
 extern "C" void __ptmf_test();
 extern "C" void __ptmf_scall();
 extern "C" void _savegpr_28();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern u32 __float_nan;
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 
 //
@@ -1138,25 +968,30 @@ SECTION_DATA static void* lit_4841[3] = {
 };
 
 /* 805AE0F4-805AE114 -00001 0020+00 1/0 0/0 0/0 .data            l_daL7ODR_Method */
-SECTION_DATA static void* l_daL7ODR_Method[8] = {
-    (void*)daL7ODR_Create__FP9daL7ODR_c,
-    (void*)daL7ODR_Delete__FP9daL7ODR_c,
-    (void*)daL7ODR_Execute__FP9daL7ODR_c,
-    (void*)daL7ODR_IsDelete__FP9daL7ODR_c,
-    (void*)daL7ODR_Draw__FP9daL7ODR_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daL7ODR_Method = {
+    (process_method_func)daL7ODR_Create__FP9daL7ODR_c,
+    (process_method_func)daL7ODR_Delete__FP9daL7ODR_c,
+    (process_method_func)daL7ODR_Execute__FP9daL7ODR_c,
+    (process_method_func)daL7ODR_IsDelete__FP9daL7ODR_c,
+    (process_method_func)daL7ODR_Draw__FP9daL7ODR_c,
 };
 
 /* 805AE114-805AE144 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_L7ODR */
-SECTION_DATA extern void* g_profile_L7ODR[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02050000, (void*)&g_fpcLf_Method,
-    (void*)0x000008B8, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00DE0000, (void*)&l_daL7ODR_Method,
-    (void*)0x00040100, (void*)0x020E0000,
+extern actor_process_profile_definition g_profile_L7ODR = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_L7ODR,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daL7ODR_c),      // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  222,                    // mPriority
+  &l_daL7ODR_Method,      // sub_method
+  0x00040100,             // mStatus
+  fopAc_ENEMY_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 805AE144-805AE168 00008C 0024+00 2/2 0/0 0/0 .data            __vt__12dBgS_ObjAcch */
@@ -1186,7 +1021,8 @@ asm void daL7ODR_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -1227,7 +1063,8 @@ static asm void func_805ADD70() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::changeDemoPos0(cXyz const* param_0) {
+// asm void daPy_py_c::changeDemoPos0(cXyz const* param_0) {
+extern "C" asm void changeDemoPos0__9daPy_py_cFPC4cXyz() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/changeDemoPos0__9daPy_py_cFPC4cXyz.s"
 }
@@ -1237,7 +1074,8 @@ asm void daPy_py_c::changeDemoPos0(cXyz const* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+// asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+extern "C" asm void changeDemoMode__9daPy_py_cFUliis() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/changeDemoMode__9daPy_py_cFUliis.s"
 }
@@ -1247,7 +1085,8 @@ asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 pa
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoExt_morf_c::isStop() {
+// asm void mDoExt_morf_c::isStop() {
+extern "C" asm void isStop__13mDoExt_morf_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/isStop__13mDoExt_morf_cFv.s"
 }
@@ -1257,7 +1096,8 @@ asm void mDoExt_morf_c::isStop() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void cXyz::abs(Vec const& param_0) const {
+// asm void cXyz::abs(Vec const& param_0) const {
+extern "C" asm void abs__4cXyzCFRC3Vec() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/abs__4cXyzCFRC3Vec.s"
 }
@@ -1267,7 +1107,8 @@ asm void cXyz::abs(Vec const& param_0) const {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::cXyz(cXyz const& param_0) {
+// asm cXyz::cXyz(cXyz const& param_0) {
+extern "C" asm void __ct__4cXyzFRC4cXyz() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/__ct__4cXyzFRC4cXyz.s"
 }
@@ -1278,7 +1119,8 @@ asm cXyz::cXyz(cXyz const& param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoMtx_stack_c::multVecZero(Vec* param_0) {
+// asm void mDoMtx_stack_c::multVecZero(Vec* param_0) {
+extern "C" asm void multVecZero__14mDoMtx_stack_cFP3Vec() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/multVecZero__14mDoMtx_stack_cFP3Vec.s"
 }
@@ -1288,7 +1130,8 @@ asm void mDoMtx_stack_c::multVecZero(Vec* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void cXyz::operator=(cXyz const& param_0) {
+// asm void cXyz::operator=(cXyz const& param_0) {
+extern "C" asm void __as__4cXyzFRC4cXyz() {
     nofralloc
 #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/__as__4cXyzFRC4cXyz.s"
 }
diff --git a/rel/d/a/d_a_arrow/d_a_arrow.cpp b/rel/d/a/d_a_arrow/d_a_arrow.cpp
index 4c6d0c9f430..1bdd5895649 100644
--- a/rel/d/a/d_a_arrow/d_a_arrow.cpp
+++ b/rel/d/a/d_a_arrow/d_a_arrow.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_arrow
-//
+/**
+ * @file d_a_arrow.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_arrow/d_a_arrow.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -1483,25 +1483,30 @@ SECTION_DATA static void* lit_5716[3] = {
 #endif
 
 /* 8049DE8C-8049DEAC -00001 0020+00 1/0 0/0 0/0 .data            l_daArrowMethodTable */
-SECTION_DATA static void* l_daArrowMethodTable[8] = {
-    (void*)daArrow_create__FP9daArrow_c,
-    (void*)daArrow_delete__FP9daArrow_c,
-    (void*)daArrow_execute__FP9daArrow_c,
-    (void*)NULL,
-    (void*)daArrow_draw__FP9daArrow_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daArrowMethodTable = {
+    (process_method_func)daArrow_create__FP9daArrow_c,
+    (process_method_func)daArrow_delete__FP9daArrow_c,
+    (process_method_func)daArrow_execute__FP9daArrow_c,
+    0,
+    (process_method_func)daArrow_draw__FP9daArrow_c,
 };
 
 /* 8049DEAC-8049DEDC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ARROW */
-SECTION_DATA extern void* g_profile_ARROW[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0009FFFD,
-    (void*)0x03080000, (void*)&g_fpcLf_Method,
-    (void*)0x00000A34, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02EE0000, (void*)&l_daArrowMethodTable,
-    (void*)0x00060000, (void*)0x050E0000,
+extern actor_process_profile_definition g_profile_ARROW = {
+  fpcLy_CURRENT_e,        // mLayerID
+  9,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_ARROW,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  0x00000A34,             // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  750,                    // mPriority
+  &l_daArrowMethodTable,  // sub_method
+  0x00060000,             // mStatus
+  fopAc_UNK_GROUP_5_e,    // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 8049DEDC-8049DEE8 0000D0 000C+00 3/3 0/0 0/0 .data            __vt__10cCcD_GStts */
@@ -2430,7 +2435,8 @@ asm cPhs__Step daArrow_c::create() {
 #endif
 
 /* 8049D808-8049D80C 003C88 0004+00 1/0 0/0 0/0 .text            cleanup__18dPa_levelEcallBackFv */
-void dPa_levelEcallBack::cleanup() {
+// void dPa_levelEcallBack::cleanup() {
+extern "C" asm void cleanup__18dPa_levelEcallBackFv() {
     /* empty function */
 }
 
@@ -2519,19 +2525,22 @@ extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter() {
 
 /* 8049DC4C-8049DC50 0040CC 0004+00 2/0 0/0 0/0 .text
  * executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter         */
-void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) {
+// void JPAEmitterCallBack::executeAfter(JPABaseEmitter* param_0) {
+extern "C" asm void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter() {
     /* empty function */
 }
 
 /* 8049DC50-8049DC54 0040D0 0004+00 2/0 0/0 0/0 .text draw__18JPAEmitterCallBackFP14JPABaseEmitter
  */
-void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) {
+// void JPAEmitterCallBack::draw(JPABaseEmitter* param_0) {
+extern "C" asm void draw__18JPAEmitterCallBackFP14JPABaseEmitter() {
     /* empty function */
 }
 
 /* 8049DC54-8049DC58 0040D4 0004+00 2/0 0/0 0/0 .text
  * drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter            */
-void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) {
+// void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) {
+extern "C" asm void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() {
     /* empty function */
 }
 
diff --git a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp
index 994804a2e5c..084fd36ca9e 100644
--- a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp
+++ b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_balloon_2D
-//
+/**
+ * @file d_a_balloon_2D.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
@@ -15,15 +15,7 @@
 #include "m_Do/m_Do_lib.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
-struct JMSMesgEntry_c {};
-
-struct ResTIMG {};
-
-struct JKRExpHeap {};
 
 //
 // Forward References:
@@ -758,25 +750,30 @@ asm void daBalloon2D_c::setHIO(bool param_0) {
 
 /* ############################################################################################## */
 /* 806556D8-806556F8 -00001 0020+00 1/0 0/0 0/0 .data            daBalloon2D_METHODS */
-SECTION_DATA static void* daBalloon2D_METHODS[8] = {
-    (void*)daBalloon2D_create__FP13daBalloon2D_c,
-    (void*)daBalloon2D_destroy__FP13daBalloon2D_c,
-    (void*)daBalloon2D_execute__FP13daBalloon2D_c,
-    (void*)NULL,
-    (void*)daBalloon2D_draw__FP13daBalloon2D_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daBalloon2D_METHODS = {
+    (process_method_func)daBalloon2D_create__FP13daBalloon2D_c,
+    (process_method_func)daBalloon2D_destroy__FP13daBalloon2D_c,
+    (process_method_func)daBalloon2D_execute__FP13daBalloon2D_c,
+    0,
+    (process_method_func)daBalloon2D_draw__FP13daBalloon2D_c,
 };
 
 /* 806556F8-80655728 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BALLOON2D */
-SECTION_DATA extern void* g_profile_BALLOON2D[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0003FFFD,
-    (void*)0x005A0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000748, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02FD0000, (void*)&daBalloon2D_METHODS,
-    (void*)0x00040000, (void*)NULL,
+extern actor_process_profile_definition g_profile_BALLOON2D = {
+  fpcLy_CURRENT_e,        // mLayerID
+  3,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_BALLOON2D,         // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(JMSMesgEntry_c), // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  765,                    // mPriority
+  &daBalloon2D_METHODS,   // sub_method
+  0x00040000,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_0_e,      // cullType
 };
 
 /* 80655728-80655734 000118 000C+00 1/1 0/0 0/0 .data            __vt__12dDlst_base_c */
diff --git a/rel/d/a/d_a_bd/d_a_bd.cpp b/rel/d/a/d_a_bd/d_a_bd.cpp
index 6fef0d3f57e..0dd5f45d6ad 100644
--- a/rel/d/a/d_a_bd/d_a_bd.cpp
+++ b/rel/d/a/d_a_bd/d_a_bd.cpp
@@ -1,133 +1,13 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_bd
-//
+/**
+ * @file d_a_bd.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_bd/d_a_bd.h"
 #include "d/cc/d_cc_d.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTextureSRTKey {};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct mDoExt_McaMorf {
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                  mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
-                                  int, void*, u32, u32);
-    /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
-    /* 800105C8 */ void play(Vec*, u32, s8);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daBd_HIO_c {
-    /* 804D6C4C */ daBd_HIO_c();
-    /* 804D9CB8 */ ~daBd_HIO_c();
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 804D9C48 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-};
-
-struct csXyz {};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D0C */ void SetPos(Vec const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
-
-struct bd_class {};
-
-struct Z2SoundObjSimple {
-    /* 802BE844 */ Z2SoundObjSimple();
-};
-
-struct Z2SoundObjBase {
-    /* 802BDFF8 */ void deleteObject();
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 804D97D4 */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -234,8 +114,6 @@ extern "C" void __ct__16Z2SoundObjSimpleFv();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
 extern "C" void _savegpr_21();
 extern "C" void _savegpr_27();
 extern "C" void _savegpr_28();
@@ -244,8 +122,6 @@ extern "C" void _restgpr_21();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -253,7 +129,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" extern u8 g_Counter[12 + 4 /* padding */];
 extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" void __register_global_object();
@@ -363,22 +238,30 @@ static dCcD_SrcSph cc_sph_src = {
 };
 
 /* 804DA274-804DA294 -00001 0020+00 1/0 0/0 0/0 .data            l_daBd_Method */
-SECTION_DATA static void* l_daBd_Method[8] = {
-    (void*)daBd_Create__FP10fopAc_ac_c,
-    (void*)daBd_Delete__FP8bd_class,
-    (void*)daBd_Execute__FP8bd_class,
-    (void*)daBd_IsDelete__FP8bd_class,
-    (void*)daBd_Draw__FP8bd_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daBd_Method = {
+    (process_method_func)daBd_Create__FP10fopAc_ac_c,
+    (process_method_func)daBd_Delete__FP8bd_class,
+    (process_method_func)daBd_Execute__FP8bd_class,
+    (process_method_func)daBd_IsDelete__FP8bd_class,
+    (process_method_func)daBd_Draw__FP8bd_class,
 };
 
 /* 804DA294-804DA2C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BD */
-SECTION_DATA extern void* g_profile_BD[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0008FFFD,     (void*)0x03000000, (void*)&g_fpcLf_Method,
-    (void*)0x000009EC, (void*)NULL,           (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02CE0000, (void*)&l_daBd_Method, (void*)0x000C4100, (void*)NULL,
+extern actor_process_profile_definition g_profile_BD = {
+  fpcLy_CURRENT_e,       // mLayerID
+  8,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_BD,               // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(bd_class),      // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  718,                   // mPriority
+  &l_daBd_Method,        // sub_method
+  0x000C4100,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 804DA2C4-804DA2D0 00033C 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGSph */
@@ -1103,7 +986,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bd/d_a_bd/__dt__12J3DFrameCtrlFv.s"
 }
@@ -1189,7 +1073,8 @@ extern "C" asm void __dt__8cM3dGAabFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bd/d_a_bd/__dt__12dBgS_ObjAcchFv.s"
 }
diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp
index d31a4c5370c..7cd1e88d337 100644
--- a/rel/d/a/d_a_bg/d_a_bg.cpp
+++ b/rel/d/a/d_a_bg/d_a_bg.cpp
@@ -1,80 +1,16 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_bg
-//
+/**
+ * @file d_a_bg.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_bg/d_a_bg.h"
-#include "d/bg/d_bg_w.h"
-#include "d/bg/d_bg_w_kcol.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
+#include "rel/d/a/d_a_grass/d_a_grass.h"
 #include "dol2asm.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "string.h"
 
-//
-// Types:
-//
-
-struct daGrass_c {
-    /* 800319C8 */ static void deleteRoomGrass(int);
-    /* 80031A20 */ static void deleteRoomFlower(int);
-};
-
-class daBg_btkAnm_c {
-public:
-    /* 80457F34 */ int create(J3DModelData*, J3DAnmTextureSRTKey*, int);
-    /* 80458088 */ void entry(J3DModelData*);
-    /* 804580CC */ void play();
-
-    void entryFrame() { mpBtk->entryFrame(); }
-    void playspeed(f32 speed) { mpBtk->setPlaySpeed(speed); }
-
-    /* 0x0 */ mDoExt_btkAnm* mpBtk;
-    /* 0x4 */ u8 field_0x4;
-};
-
-class daBg_brkAnm_c {
-public:
-    /* 804580F0 */ int create(J3DModelData*, J3DAnmTevRegKey*, int);
-    /* 80458230 */ void entry(J3DModelData*);
-    /* 80458274 */ void play();
-
-    void entryFrame() { mpBrk->entryFrame(); }
-    void entryFrame(f32 frame) { mpBrk->entryFrame(frame); }
-    f32 getEndFrame() { return mpBrk->getEndFrame(); }
-
-    /* 0x0 */ mDoExt_brkAnm* mpBrk;
-    /* 0x4 */ u8 field_0x4;
-};
-
-struct daBg_unkData {
-    /* 0x00 */ J3DModel* mpBgModel;
-    /* 0x04 */ daBg_btkAnm_c* mpBgBtk;
-    /* 0x08 */ daBg_brkAnm_c* mpBgBrk;
-    /* 0x0C */ dKy_tevstr_c* mpTevStr;
-    /* 0x10 */ f32 mBtkAnmSpeed;
-};  // Size: 0x14
-
-class daBg_c : public fopAc_ac_c {
-public:
-    /* 80457BF8 */ const char* setArcName();
-    /* 804582B8 */ int createHeap();
-    /* 80458788 */ ~daBg_c();
-    /* 804588C4 */ int draw();
-    /* 8045906C */ int create();
-
-    inline int execute();
-
-private:
-    /* 0x568 */ u8 field_0x568[0x570 - 0x568];
-    /* 0x570 */ daBg_unkData mBgData[6];
-    /* 0x5E8 */ dBgW* mpBgW;
-    /* 0x5EC */ dBgWKCol* mpKCol;
-    /* 0x5F0 */ u8 field_0x5f0;
-    /* 0x5F0 */ u8 field_0x5f1;
-};  // Size: 0x5F4
-
 //
 // Forward References:
 //
@@ -700,7 +636,7 @@ daBg_c::~daBg_c() {
     int roomNo = fopAcM_GetParam(this);
 
     if (heap != NULL && mpBgW != NULL) {
-        dComIfG_Bgsp().Release(mpBgW);
+        dComIfG_Bgsp().Release((dBgW_Base*)mpBgW);
         dStage_roomControl_c::setBgW(roomNo, NULL);
     }
 
diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp
index a4759df874b..c43520f99d7 100644
--- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp
+++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_bg_obj
-//
+/**
+ * @file d_a_bg_obj.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_bg_obj/d_a_bg_obj.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -319,11 +319,6 @@ SECTION_DEAD static char const* const stringBase_8045CA86 = "データブロッ
  */
 // close-ish
 #ifdef NONMATCHING
-struct spec_dat {
-    u16 field_0x0;
-    u16 field_0x2;
-    u8 field_0x4;
-};
 
 int daBgObj_c::spec_data_c::Set(void* i_ptr) {
     spec_dat* data = (spec_dat*)i_ptr;
diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp
index 14251a814ac..7e4401b6598 100644
--- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp
+++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_boomerang
-//
+/**
+ * @file d_a_boomerang.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_boomerang/d_a_boomerang.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
@@ -11,18 +11,6 @@
 #include "m_Do/m_Do_lib.h"
 #include "rel/d/a/d_a_mirror/d_a_mirror.h"
 
-//
-// Types:
-//
-
-struct daBoomerang_HIO_c0 {
-    static u16 const m_lockWaitTime;
-    static f32 const m_minCircleR;
-    static f32 const m_middleCircleR;
-    static f32 const m_maxCircleR;
-    static f32 const m_scale;
-    static f32 const m_lockWindScale;
-};
 
 //
 // Forward References:
@@ -1434,25 +1422,30 @@ SECTION_DATA static void* lit_6006[3] = {
 #pragma pop
 
 /* 804A2BC8-804A2BE8 -00001 0020+00 1/0 0/0 0/0 .data            l_daBoomerang_Method */
-SECTION_DATA static void* l_daBoomerang_Method[8] = {
-    (void*)daBoomerang_Create__FP10fopAc_ac_c,
-    (void*)daBoomerang_Delete__FP13daBoomerang_c,
-    (void*)daBoomerang_Execute__FP13daBoomerang_c,
-    (void*)NULL,
-    (void*)daBoomerang_Draw__FP13daBoomerang_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daBoomerang_Method = {
+    (process_method_func)daBoomerang_Create__FP10fopAc_ac_c,
+    (process_method_func)daBoomerang_Delete__FP13daBoomerang_c,
+    (process_method_func)daBoomerang_Execute__FP13daBoomerang_c,
+    0,
+    (process_method_func)daBoomerang_Draw__FP13daBoomerang_c,
 };
 
 /* 804A2BE8-804A2C18 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BOOMERANG */
-SECTION_DATA extern void* g_profile_BOOMERANG[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0006FFFD,
-    (void*)0x00FE0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000DE4, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02AE0000, (void*)&l_daBoomerang_Method,
-    (void*)0x00060000, (void*)0x05000000,
+extern actor_process_profile_definition g_profile_BOOMERANG = {
+  fpcLy_CURRENT_e,       // mLayerID
+  6,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_BOOMERANG,        // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  0x00000DE4,            // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  686,                   // mPriority
+  &l_daBoomerang_Method, // sub_method
+  0x00060000,            // mStatus
+  fopAc_UNK_GROUP_5_e,   // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 804A2C18-804A2C24 00013C 000C+00 1/1 0/0 0/0 .data            __vt__12dDlst_base_c */
diff --git a/rel/d/a/d_a_bullet/d_a_bullet.cpp b/rel/d/a/d_a_bullet/d_a_bullet.cpp
index 2babb2ba9bf..f2eb6352a39 100644
--- a/rel/d/a/d_a_bullet/d_a_bullet.cpp
+++ b/rel/d/a/d_a_bullet/d_a_bullet.cpp
@@ -1,147 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_bullet
-//
+/**
+ * @file d_a_bullet.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_bullet/d_a_bullet.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct cXyz {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CE70 */ void scaleM(cXyz const&);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daBullet_c {
-    /* 8065594C */ ~daBullet_c();
-    /* 80655B08 */ void create();
-    /* 80655E5C */ void CreateHeap();
-    /* 80655EDC */ void Delete();
-    /* 80655F10 */ void Execute();
-    /* 806560FC */ void Draw();
-    /* 80656160 */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80656180 */ void getResName();
-    /* 80656198 */ void getBmdName();
-    /* 806561B0 */ void getTypeFromParam();
-    /* 806561D0 */ void initialize();
-    /* 80656378 */ void setProcess(int (daBullet_c::*)(void*));
-    /* 80656420 */ void wait(void*);
-    /* 806564B8 */ void move(void*);
-
-    static u8 const mCcDObjInfo[48];
-    static u8 mCcDSph[64];
-};
-
-struct daBullet_Param_c {
-    /* 806566A8 */ ~daBullet_Param_c();
-
-    static u8 const m[24];
-};
-
-struct dKy_tevstr_c {};
-
-struct J3DModelData {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int);
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80655D90 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 80655DEC */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 80655D20 */ ~dBgS_AcchCir();
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct dBgS {
-    /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&);
-    /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&);
-};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGSph {
-    /* 80655C90 */ ~cM3dGSph();
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 80655CD8 */ ~cM3dGAab();
-};
-
-struct cCcD_GStts {
-    /* 806565D0 */ ~cCcD_GStts();
-};
-
-struct cBgS_GndChk {
-    /* 80267C1C */ cBgS_GndChk();
-    /* 80267C94 */ ~cBgS_GndChk();
-};
-
-struct J3DModel {};
 
 //
 // Forward References:
@@ -221,13 +86,10 @@ extern "C" void __dt__11cBgS_GndChkFv();
 extern "C" void __dt__13cBgS_PolyInfoFv();
 extern "C" void __dt__8cM3dGCirFv();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
 extern "C" void __ptmf_test();
 extern "C" void __ptmf_scall();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -235,9 +97,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
-extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
 extern "C" void __register_global_object();
 
 //
@@ -281,25 +141,30 @@ SECTION_DATA static void* lit_3933[3] = {
 };
 
 /* 806567EC-8065680C -00001 0020+00 1/0 0/0 0/0 .data            daBullet_MethodTable */
-SECTION_DATA static void* daBullet_MethodTable[8] = {
-    (void*)daBullet_Create__FPv,
-    (void*)daBullet_Delete__FPv,
-    (void*)daBullet_Execute__FPv,
-    (void*)daBullet_IsDelete__FPv,
-    (void*)daBullet_Draw__FPv,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daBullet_MethodTable = {
+    (process_method_func)daBullet_Create__FPv,
+    (process_method_func)daBullet_Delete__FPv,
+    (process_method_func)daBullet_Execute__FPv,
+    (process_method_func)daBullet_IsDelete__FPv,
+    (process_method_func)daBullet_Draw__FPv,
 };
 
 /* 8065680C-8065683C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BULLET */
-SECTION_DATA extern void* g_profile_BULLET[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0008FFFD,
-    (void*)0x02E60000, (void*)&g_fpcLf_Method,
-    (void*)0x0000095C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02EF0000, (void*)&daBullet_MethodTable,
-    (void*)0x00044000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_BULLET = {
+  fpcLy_CURRENT_e,        // mLayerID
+  8,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_BULLET,            // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daBullet_c),     // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  751,                    // mPriority
+  &daBullet_MethodTable,  // sub_method
+  0x00044000,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 8065683C-80656860 0000B0 0024+00 3/3 0/0 0/0 .data            __vt__12dBgS_ObjAcch */
@@ -381,7 +246,8 @@ asm void daBullet_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bullet/d_a_bullet/__dt__8cM3dGSphFv.s"
 }
@@ -391,7 +257,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bullet/d_a_bullet/__dt__8cM3dGAabFv.s"
 }
@@ -401,7 +268,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bullet/d_a_bullet/__dt__12dBgS_AcchCirFv.s"
 }
@@ -411,7 +279,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bullet/d_a_bullet/__dt__10dCcD_GSttsFv.s"
 }
@@ -421,7 +290,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bullet/d_a_bullet/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -659,7 +529,8 @@ static bool daBullet_IsDelete(void* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_bullet/d_a_bullet/__dt__10cCcD_GSttsFv.s"
 }
diff --git a/rel/d/a/d_a_canoe/d_a_canoe.cpp b/rel/d/a/d_a_canoe/d_a_canoe.cpp
index 3833fe1dffa..6e245110ab1 100644
--- a/rel/d/a/d_a_canoe/d_a_canoe.cpp
+++ b/rel/d/a/d_a_canoe/d_a_canoe.cpp
@@ -1,24 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_canoe
-//
+/**
+ * @file d_a_canoe.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_canoe/d_a_canoe.h"
 #include "dol2asm.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
 
-//
-// Types:
-//
 
-struct daTagWaterFall_c {
-    /* 80D64768 */ void checkHitWaterFall(cXyz);
-};
-
-struct daObjGOMIKABE_c {
-    /* 80BFE52C */ void BreakSet();
-};
 
 //
 // Forward References:
@@ -388,25 +378,30 @@ asm void daCanoe_c::create() {
 
 /* ############################################################################################## */
 /* 804DD734-804DD754 -00001 0020+00 1/0 0/0 0/0 .data            l_daCanoe_Method */
-SECTION_DATA static void* l_daCanoe_Method[8] = {
-    (void*)daCanoe_Create__FP10fopAc_ac_c,
-    (void*)daCanoe_Delete__FP9daCanoe_c,
-    (void*)daCanoe_Execute__FP9daCanoe_c,
-    (void*)NULL,
-    (void*)daCanoe_Draw__FP9daCanoe_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daCanoe_Method = {
+    (process_method_func)daCanoe_Create__FP10fopAc_ac_c,
+    (process_method_func)daCanoe_Delete__FP9daCanoe_c,
+    (process_method_func)daCanoe_Execute__FP9daCanoe_c,
+    0,
+    (process_method_func)daCanoe_Draw__FP9daCanoe_c,
 };
 
 /* 804DD754-804DD784 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_CANOE */
-SECTION_DATA extern void* g_profile_CANOE[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00ED0000, (void*)&g_fpcLf_Method,
-    (void*)0x000014DC, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02D40000, (void*)&l_daCanoe_Method,
-    (void*)0x00044100, (void*)0x030E0000,
+extern actor_process_profile_definition g_profile_CANOE = {
+  fpcLy_CURRENT_e,         // mLayerID
+  4,                       // mListID
+  fpcPi_CURRENT_e,         // mListPrio
+  PROC_CANOE,              // mProcName
+  &g_fpcLf_Method.mBase,   // sub_method
+  sizeof(daCanoe_c),       // mSize
+  0,                       // mSizeOther
+  0,                       // mParameters
+  &g_fopAc_Method.base,    // sub_method
+  724,                     // mPriority
+  &l_daCanoe_Method,       // sub_method
+  0x00044100,              // mStatus
+  fopAc_ENV_e,             // mActorType
+  fopAc_CULLBOX_CUSTOM_e,  // cullType
 };
 
 /* 804DD784-804DD790 000094 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGPla */
diff --git a/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp b/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp
index 1580fb5ff34..105af0fb3ee 100644
--- a/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp
+++ b/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp
@@ -1,110 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_coach_2D
-//
+/**
+ * @file d_a_coach_2D.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_coach_2D/d_a_coach_2D.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct mDoHIO_entry_c {
-    /* 80657794 */ ~mDoHIO_entry_c();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daCoach2D_c {
-    struct c_list {
-        /* 806569CC */ void draw();
-        /* 806577DC */ ~c_list();
-    };
-
-    /* 80656A38 */ void createHeap();
-    /* 80656D18 */ void create();
-    /* 80656D94 */ void destroy();
-    /* 80656DE4 */ void draw();
-    /* 80656E94 */ void execute();
-    /* 80656ED0 */ void drawMeter();
-    /* 8065722C */ void initiate();
-    /* 80657260 */ void update();
-    /* 80657490 */ void setBrkAnime(bool);
-    /* 80657824 */ ~daCoach2D_c();
-};
-
-struct daCoach2D_HIO_c {
-    /* 80657738 */ ~daCoach2D_HIO_c();
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int);
-    /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int);
-};
-
-struct JUtility {
-    struct TColor {};
-};
-
-struct dMsgScrnLight_c {
-    /* 80245934 */ dMsgScrnLight_c(u8, u8);
-    /* 80245F90 */ void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor,
-                             JUtility::TColor);
-};
-
-struct dMsgObject_c {
-    /* 8023822C */ void getStatus();
-};
-
-struct dDlst_base_c {
-    /* 80657734 */ void draw();
-};
-
-struct dDlst_list_c {
-    /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
-};
-
-struct JKRExpHeap {};
-
-struct JKRArchive {};
-
-struct J2DGrafContext {};
-
-struct J2DScreen {
-    /* 802F8498 */ J2DScreen();
-    /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
-    /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
-    /* 802F9690 */ void animation();
-};
-
-struct J2DPane {
-    /* 802F7100 */ void getBounds();
-};
-
-struct J2DAnmLoaderDataBase {
-    /* 80308A6C */ void load(void const*);
-};
-
-struct CPaneMgrAlpha {
-    /* 802555C8 */ void show();
-    /* 80255608 */ void hide();
-    /* 802557D0 */ void setAlphaRate(f32);
-};
-
-struct CPaneMgr {
-    /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
-    /* 802545B0 */ void paneTrans(f32, f32);
-    /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
-};
-
 //
 // Forward References:
 //
@@ -136,7 +37,6 @@ extern "C" extern char const* const d_a_coach_2D__stringBase0;
 // External References:
 //
 
-SECTION_INIT void memcpy();
 extern "C" void __ct__10fopAc_ac_cFv();
 extern "C" void __dt__10fopAc_ac_cFv();
 extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
@@ -167,8 +67,6 @@ extern "C" void _savegpr_25();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_25();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" extern u8 g_meter2_info[248];
 extern "C" void __register_global_object();
@@ -384,25 +282,30 @@ asm void daCoach2D_c::setBrkAnime(bool param_0) {
 
 /* ############################################################################################## */
 /* 806579F8-80657A18 -00001 0020+00 1/0 0/0 0/0 .data            daCoach2D_METHODS */
-SECTION_DATA static void* daCoach2D_METHODS[8] = {
-    (void*)daCoach2D_create__FP11daCoach2D_c,
-    (void*)daCoach2D_destroy__FP11daCoach2D_c,
-    (void*)daCoach2D_execute__FP11daCoach2D_c,
-    (void*)NULL,
-    (void*)daCoach2D_draw__FP11daCoach2D_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daCoach2D_METHODS = {
+    (process_method_func)daCoach2D_create__FP11daCoach2D_c,
+    (process_method_func)daCoach2D_destroy__FP11daCoach2D_c,
+    (process_method_func)daCoach2D_execute__FP11daCoach2D_c,
+    0,
+    (process_method_func)daCoach2D_draw__FP11daCoach2D_c,
 };
 
 /* 80657A18-80657A48 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_COACH2D */
-SECTION_DATA extern void* g_profile_COACH2D[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0003FFFD,
-    (void*)0x00590000, (void*)&g_fpcLf_Method,
-    (void*)0x00000784, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02FC0000, (void*)&daCoach2D_METHODS,
-    (void*)0x00040000, (void*)NULL,
+extern actor_process_profile_definition g_profile_COACH2D = {
+  fpcLy_CURRENT_e,       // mLayerID
+  3,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_COACH2D,          // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(daCoach2D_c),   // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  764,                   // mPriority
+  &daCoach2D_METHODS,    // sub_method
+  0x00040000,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 80657A48-80657A54 0000AC 000C+00 1/1 0/0 0/0 .data            __vt__12dDlst_base_c */
@@ -471,7 +374,8 @@ static asm void daCoach2D_draw(daCoach2D_c* param_0) {
 #pragma pop
 
 /* 80657734-80657738 000E54 0004+00 1/0 0/0 0/0 .text            draw__12dDlst_base_cFv */
-void dDlst_base_c::draw() {
+// void dDlst_base_c::draw() {
+extern "C" void draw__12dDlst_base_cFv() {
     /* empty function */
 }
 
@@ -504,7 +408,8 @@ asm daCoach2D_HIO_c::~daCoach2D_HIO_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm mDoHIO_entry_c::~mDoHIO_entry_c() {
+// asm mDoHIO_entry_c::~mDoHIO_entry_c() {
+extern "C" asm void __dt__14mDoHIO_entry_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_coach_2D/d_a_coach_2D/__dt__14mDoHIO_entry_cFv.s"
 }
diff --git a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp
index 26a7e25f648..5abb8904c08 100644
--- a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp
+++ b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp
@@ -1,111 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_coach_fire
-//
+/**
+ * @file d_a_coach_fire.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_coach_fire/d_a_coach_fire.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daNpcCoach_c {
-    /* 8099DBA4 */ void deleteFireArrow(unsigned int);
-    /* 8099DCE8 */ void deleteFireArrowFromList(unsigned int);
-};
-
-struct daCoachFire_c {
-    /* 80657B78 */ void create_init();
-    /* 80657C48 */ void initBaseMtx();
-    /* 80657CA8 */ void setBaseMtx();
-    /* 80657D2C */ void initCcSphere();
-
-    static u8 const M_attr[16];
-};
-
-struct dPa_levelEcallBack {};
-
-struct dKy_tevstr_c {};
-
-struct csXyz {};
-
-struct _GXColor {};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-
-    static u8 mParticleTracePCB[4 + 4 /* padding */];
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 8065833C */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 80084460 */ void ChkTgHit();
-};
-
-struct dAttention_c {
-    /* 8007353C */ void LockonTarget(s32);
-    /* 800737E4 */ void LockonTruth();
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 806582AC */ ~cM3dGSph();
-};
-
-struct cM3dGAab {
-    /* 806582F4 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 80658398 */ ~cCcD_GStts();
-};
-
-struct LIGHT_INFLUENCE {};
 
 //
 // Forward References:
@@ -155,13 +55,8 @@ extern "C" void __mi__4cXyzCFRC3Vec();
 extern "C" void SetC__8cM3dGSphFRC4cXyz();
 extern "C" void SetR__8cM3dGSphFf();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECScale();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -318,25 +213,30 @@ static bool daCoachFire_IsDelete(daCoachFire_c* param_0) {
 
 /* ############################################################################################## */
 /* 8065845C-8065847C -00001 0020+00 1/0 0/0 0/0 .data            l_daCoachFire_Method */
-SECTION_DATA static void* l_daCoachFire_Method[8] = {
-    (void*)daCoachFire_Create__FP10fopAc_ac_c,
-    (void*)daCoachFire_Delete__FP13daCoachFire_c,
-    (void*)daCoachFire_Execute__FP13daCoachFire_c,
-    (void*)daCoachFire_IsDelete__FP13daCoachFire_c,
-    (void*)daCoachFire_Draw__FP13daCoachFire_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daCoachFire_Method = {
+    (process_method_func)daCoachFire_Create__FP10fopAc_ac_c,
+    (process_method_func)daCoachFire_Delete__FP13daCoachFire_c,
+    (process_method_func)daCoachFire_Execute__FP13daCoachFire_c,
+    (process_method_func)daCoachFire_IsDelete__FP13daCoachFire_c,
+    (process_method_func)daCoachFire_Draw__FP13daCoachFire_c,
 };
 
 /* 8065847C-806584AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_COACH_FIRE */
-SECTION_DATA extern void* g_profile_COACH_FIRE[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0003FFFD,
-    (void*)0x00580000, (void*)&g_fpcLf_Method,
-    (void*)0x00000714, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x014C0000, (void*)&l_daCoachFire_Method,
-    (void*)0x00044000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_COACH_FIRE = {
+  fpcLy_CURRENT_e,        // mLayerID
+  3,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_COACH_FIRE,        // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daCoachFire_c),  // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  332,                    // mPriority
+  &l_daCoachFire_Method,  // sub_method
+  0x00044000,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 806584AC-806584B8 000050 000C+00 3/3 0/0 0/0 .data            __vt__10cCcD_GStts */
@@ -392,7 +292,8 @@ static asm void daCoachFire_Create(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_coach_fire/d_a_coach_fire/__dt__8cM3dGSphFv.s"
 }
@@ -402,7 +303,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_coach_fire/d_a_coach_fire/__dt__8cM3dGAabFv.s"
 }
@@ -412,7 +314,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_coach_fire/d_a_coach_fire/__dt__10dCcD_GSttsFv.s"
 }
@@ -422,7 +325,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_coach_fire/d_a_coach_fire/__dt__10cCcD_GSttsFv.s"
 }
diff --git a/rel/d/a/d_a_cow/d_a_cow.cpp b/rel/d/a/d_a_cow/d_a_cow.cpp
index f192cdf03f7..d854f878219 100644
--- a/rel/d/a/d_a_cow/d_a_cow.cpp
+++ b/rel/d/a/d_a_cow/d_a_cow.cpp
@@ -1,346 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_cow
-//
+/**
+ * @file d_a_cow.cpp
+ * 
+*/
 
-// #include "rel/d/a/d_a_cow/d_a_cow.h"
+#include "rel/d/a/d_a_cow/d_a_cow.h"
 #include "dolphin/types.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266AE4 */ void operator+(Vec const&) const;
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80658A68 */ ~cXyz();
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTexPattern {};
-
-struct mDoExt_btpAnm {
-    /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
-    /* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {
-    /* 802C03C8 */ Z2Creature();
-    /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daPy_py_c {
-    /* 80662D84 */ void checkNowWolf();
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct daCow_c {
-    /* 806585CC */ void calcRunAnime(int);
-    /* 80658730 */ void setBck(int, u8, f32, f32);
-    /* 806587D4 */ void checkBck(int);
-    /* 80658830 */ void setEffect();
-    /* 80658AA4 */ void isChaseCowGame();
-    /* 80658B10 */ void setCarryStatus();
-    /* 80658C18 */ void setActetcStatus();
-    /* 80658C78 */ void checkNadeNadeFinish();
-    /* 80658CA4 */ void checkNadeNade();
-    /* 80658CD0 */ void setSeSnort();
-    /* 80658D3C */ void setRushVibration(int);
-    /* 80658DB8 */ void checkThrow();
-    /* 80658E98 */ void setBodyAngle(s16);
-    /* 80658F94 */ void setBodyAngle2(s16);
-    /* 806590E8 */ void checkProcess(void (daCow_c::*)());
-    /* 80659114 */ void setProcess(void (daCow_c::*)(), int);
-    /* 806591BC */ void damage_check();
-    /* 8065945C */ void setEnterCow20();
-    /* 80659540 */ void setEnterCow10();
-    /* 80659630 */ void setGroundAngle();
-    /* 80659970 */ void checkRun();
-    /* 806599C0 */ void checkNearCowRun();
-    /* 80659ADC */ void action_wait();
-    /* 8065A0E8 */ void action_eat();
-    /* 8065A594 */ void action_moo();
-    /* 8065A8A4 */ void action_shake();
-    /* 8065ACC8 */ void checkNearWolf();
-    /* 8065AD2C */ void checkPlayerWait();
-    /* 8065ADB0 */ void checkPlayerSurprise();
-    /* 8065AE88 */ void checkPlayerPos();
-    /* 8065B034 */ void checkBeforeBg();
-    /* 8065B760 */ void checkOutOfGate(cXyz);
-    /* 8065B8A8 */ void getCowshedAngle();
-    /* 8065B8D8 */ void getCowshedDist();
-    /* 8065BA30 */ void checkCowIn(f32, f32);
-    /* 8065BB34 */ void checkCowInOwn(int);
-    /* 8065BC68 */ void action_run();
-    /* 8065C32C */ void checkCurringPen();
-    /* 8065C508 */ void setCowInCage();
-    /* 8065C680 */ void setEnterCount();
-    /* 8065C70C */ void action_enter();
-    /* 8065CFBC */ void isAngry();
-    /* 8065D03C */ void isGuardFad();
-    /* 8065D0B8 */ void setAngryHit();
-    /* 8065D17C */ void checkBeforeBgAngry(s16);
-    /* 8065D230 */ void setRedTev();
-    /* 8065D29C */ void setAngryTurn();
-    /* 8065D2F0 */ void action_angry();
-    /* 8065DC08 */ void calcCatchPos(f32, int);
-    /* 8065DE70 */ void executeCrazyWait();
-    /* 8065DF40 */ void executeCrazyDash();
-    /* 8065E6BC */ void initCrazyBeforeCatch(int);
-    /* 8065E6E8 */ void executeCrazyBeforeCatch();
-    /* 8065E7D0 */ void initCrazyCatch(int);
-    /* 8065E888 */ void executeCrazyCatch();
-    /* 8065EAF4 */ void initCrazyThrow(int);
-    /* 8065EBF0 */ void executeCrazyThrow();
-    /* 8065F088 */ void initCrazyAttack(int);
-    /* 8065F144 */ void executeCrazyAttack();
-    /* 8065F308 */ void initCrazyAway(int);
-    /* 8065F37C */ void executeCrazyAway();
-    /* 8065F6E0 */ void executeCrazyEnd();
-    /* 8065F744 */ void initCrazyBack(int);
-    /* 8065F7DC */ void executeCrazyBack();
-    /* 8065FE50 */ void action_crazy();
-    /* 8066010C */ void executeCrazyBack2();
-    /* 80660544 */ void action_thrown();
-    /* 806607B8 */ void checkWolfBusters();
-    /* 806608F0 */ void action_wolf();
-    /* 806612DC */ void action_damage();
-    /* 806613EC */ void action();
-    /* 80661580 */ void setMtx();
-    /* 806615EC */ void setAttnPos();
-    /* 80661720 */ void setCollisions();
-    /* 80661940 */ void Execute();
-    /* 80661AF0 */ void CreateHeap();
-    /* 80661D24 */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80661D44 */ void initialize();
-    /* 80662228 */ void create();
-    /* 80662710 */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80662920 */ void ctrlJointCallBack(J3DJoint*, int);
-    /* 8066296C */ void Draw();
-    /* 80662BE4 */ void Delete();
-    /* 80662D70 */ void getShapeAngle();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-};
-
-struct dSv_event_c {
-    /* 800349BC */ void isEventBit(u16) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPath {};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F40 */ void SetWallR(f32);
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 806625B4 */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct dPaPo_c {
-    /* 80050C9C */ void init(dBgS_Acch*, f32, f32);
-};
-
-struct dPaPoT_c {
-    /* 8005115C */ void setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
-                                     cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32,
-                                     f32);
-
-    static u8 m_emitterTwoData[36];
-};
-
-struct dEvent_manager_c {
-    /* 800483E8 */ void getRunEventName();
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dComIfG_play_c {
-    /* 8002C97C */ void getLayerNo(int);
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-    /* 806623D4 */ ~dCcD_Sph();
-    /* 806624A0 */ dCcD_Sph();
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80083830 */ void Move();
-    /* 80662624 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 80084460 */ void ChkTgHit();
-    /* 800844F8 */ void GetTgHitObj();
-    /* 80084658 */ void ChkCoHit();
-    /* 800846F0 */ void GetCoHitObj();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 80662680 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dAttention_c {
-    /* 8007353C */ void LockonTarget(s32);
-    /* 800737E4 */ void LockonTruth();
-};
-
-struct dAttLook_c {
-    /* 80073D08 */ void request(fopAc_ac_c*, f32, f32, f32, s16, int);
-};
-
-struct camera_class {};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 80662524 */ ~cM3dGSph();
-};
-
-struct cM3dGPla {
-    /* 806596E4 */ ~cM3dGPla();
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 8066256C */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {
-    /* 80263A48 */ void GetAc();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_Stts {
-    /* 8026395C */ void ClrCcMove();
-};
-
-struct cCcD_GStts {
-    /* 80662C68 */ ~cCcD_GStts();
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct _GXTexObj {};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 80661CDC */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -565,12 +231,6 @@ extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXMultVec();
-extern "C" void PSMTXMultVecSR();
-extern "C" void PSVECSubtract();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECSquareDistance();
 extern "C" void __construct_array();
 extern "C" void __ptmf_test();
 extern "C" void __ptmf_cmpr();
@@ -591,10 +251,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abs();
-extern "C" void strcmp();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 m_emitterTwoData__8dPaPoT_c[36];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -604,13 +260,10 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
 extern "C" extern u8 g_meter2_info[248];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */];
-extern "C" extern u32 __float_nan;
 extern "C" void __register_global_object();
 
 //
@@ -875,7 +528,8 @@ asm void daCow_c::setEffect() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__4cXyzFv.s"
 }
@@ -1774,25 +1428,30 @@ SECTION_DATA static void* lit_8188[3] = {
 };
 
 /* 80663390-806633B0 -00001 0020+00 1/0 0/0 0/0 .data            daCow_MethodTable */
-SECTION_DATA static void* daCow_MethodTable[8] = {
-    (void*)daCow_Create__FPv,
-    (void*)daCow_Delete__FPv,
-    (void*)daCow_Execute__FPv,
-    (void*)daCow_IsDelete__FPv,
-    (void*)daCow_Draw__FPv,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daCow_MethodTable = {
+    (process_method_func)daCow_Create__FPv,
+    (process_method_func)daCow_Delete__FPv,
+    (process_method_func)daCow_Execute__FPv,
+    (process_method_func)daCow_IsDelete__FPv,
+    (process_method_func)daCow_Draw__FPv,
 };
 
 /* 806633B0-806633E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_COW */
-SECTION_DATA extern void* g_profile_COW[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01060000, (void*)&g_fpcLf_Method,
-    (void*)0x00000D40, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02B40000, (void*)&daCow_MethodTable,
-    (void*)0x00040100, (void*)0x040E0000,
+extern actor_process_profile_definition g_profile_COW = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_COW,               // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daCow_c),        // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  692,                    // mPriority
+  &daCow_MethodTable,     // sub_method
+  0x00040100,             // mStatus
+  fopAc_NPC_e,            // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 806633E0-806633EC 000488 000C+00 2/2 0/0 0/0 .data            __vt__10cCcD_GStts */
@@ -1871,7 +1530,8 @@ asm void daCow_c::setGroundAngle() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGPla::~cM3dGPla() {
+// asm cM3dGPla::~cM3dGPla() {
+extern "C" asm void __dt__8cM3dGPlaFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__8cM3dGPlaFv.s"
 }
@@ -2944,7 +2604,8 @@ asm void daCow_c::CreateHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__12J3DFrameCtrlFv.s"
 }
@@ -3013,7 +2674,8 @@ asm void daCow_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::~dCcD_Sph() {
+// asm dCcD_Sph::~dCcD_Sph() {
+extern "C" asm void __dt__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__8dCcD_SphFv.s"
 }
@@ -3023,7 +2685,8 @@ asm dCcD_Sph::~dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Sph::dCcD_Sph() {
+// asm dCcD_Sph::dCcD_Sph() {
+extern "C" asm void __ct__8dCcD_SphFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__ct__8dCcD_SphFv.s"
 }
@@ -3033,7 +2696,8 @@ asm dCcD_Sph::dCcD_Sph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__8cM3dGSphFv.s"
 }
@@ -3043,7 +2707,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__8cM3dGAabFv.s"
 }
@@ -3053,7 +2718,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__12dBgS_AcchCirFv.s"
 }
@@ -3063,7 +2729,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__10dCcD_GSttsFv.s"
 }
@@ -3073,7 +2740,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -3172,7 +2840,8 @@ static bool daCow_IsDelete(void* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/__dt__10cCcD_GSttsFv.s"
 }
@@ -3273,7 +2942,8 @@ asm void daCow_c::getShapeAngle() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::checkNowWolf() {
+// asm void daPy_py_c::checkNowWolf() {
+extern "C" asm void checkNowWolf__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_cow/d_a_cow/checkNowWolf__9daPy_py_cFv.s"
 }
diff --git a/rel/d/a/d_a_cstaF/d_a_cstaF.cpp b/rel/d/a/d_a_cstaF/d_a_cstaF.cpp
index 95e9010a88b..4e2d4b9829d 100644
--- a/rel/d/a/d_a_cstaF/d_a_cstaF.cpp
+++ b/rel/d/a/d_a_cstaF/d_a_cstaF.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_cstaF
-//
+/**
+ * @file d_a_cstaF.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_cstaF/d_a_cstaF.h"
 #include "dol2asm.h"
@@ -379,25 +379,30 @@ static dCcD_SrcCyl l_cylSrc = {
 };
 
 /* 804DF9E4-804DFA04 -00001 0020+00 1/0 0/0 0/0 .data            l_daCstaF_Method */
-SECTION_DATA static void* l_daCstaF_Method[8] = {
-    (void*)daCstaF_Create__FP10fopAc_ac_c,
-    (void*)daCstaF_Delete__FP9daCstaF_c,
-    (void*)daCstaF_Execute__FP9daCstaF_c,
-    (void*)NULL,
-    (void*)daCstaF_Draw__FP9daCstaF_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daCstaF_Method = {
+    (process_method_func)daCstaF_Create__FP10fopAc_ac_c,
+    (process_method_func)daCstaF_Delete__FP9daCstaF_c,
+    (process_method_func)daCstaF_Execute__FP9daCstaF_c,
+    0,
+    (process_method_func)daCstaF_Draw__FP9daCstaF_c,
 };
 
 /* 804DFA04-804DFA34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_CSTAF */
-SECTION_DATA extern void* g_profile_CSTAF[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0003FFFD,
-    (void*)0x00BB0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000B38, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01100000, (void*)&l_daCstaF_Method,
-    (void*)0x00040520, (void*)0x030E0000,
+extern actor_process_profile_definition g_profile_CSTAF = {
+  fpcLy_CURRENT_e,        // mLayerID
+  3,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_CSTAF,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  0x00000B38,             // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  272,                    // mPriority
+  &l_daCstaF_Method,      // sub_method
+  0x00040520,             // mStatus
+  fopAc_ENV_e,            // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 804DFA34-804DFA40 000094 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGPla */
diff --git a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp
index 38a1bf231bf..6b06e7f3da2 100644
--- a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp
+++ b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_cstatue
-//
+/**
+ * @file d_a_cstatue.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_cstatue/d_a_cstatue.h"
 #include "dol2asm.h"
@@ -433,25 +433,30 @@ static dCcD_SrcSph l_sphSrc = {
 #pragma pop
 
 /* 80667AA0-80667AC0 -00001 0020+00 1/0 0/0 0/0 .data            l_daCstatue_Method */
-SECTION_DATA static void* l_daCstatue_Method[8] = {
-    (void*)daCstatue_Create__FP10fopAc_ac_c,
-    (void*)daCstatue_Delete__FP11daCstatue_c,
-    (void*)daCstatue_Execute__FP11daCstatue_c,
-    (void*)NULL,
-    (void*)daCstatue_Draw__FP11daCstatue_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daCstatue_Method = {
+    (process_method_func)daCstatue_Create__FP10fopAc_ac_c,
+    (process_method_func)daCstatue_Delete__FP11daCstatue_c,
+    (process_method_func)daCstatue_Execute__FP11daCstatue_c,
+    0,
+    (process_method_func)daCstatue_Draw__FP11daCstatue_c,
 };
 
 /* 80667AC0-80667AF0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_CSTATUE */
-SECTION_DATA extern void* g_profile_CSTATUE[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01980000, (void*)&g_fpcLf_Method,
-    (void*)0x00000B2C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x010F0000, (void*)&l_daCstatue_Method,
-    (void*)0x00060520, (void*)0x030E0000,
+extern actor_process_profile_definition g_profile_CSTATUE = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_CSTATUE,           // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  0x00000B2C,             // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  271,                    // mPriority
+  &l_daCstatue_Method,    // sub_method
+  0x00060520,             // mStatus
+  fopAc_ENV_e,            // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80667AF0-80667AFC 000140 000C+00 4/4 0/0 0/0 .data            __vt__8cM3dGPla */
diff --git a/rel/d/a/d_a_demo00/d_a_demo00.cpp b/rel/d/a/d_a_demo00/d_a_demo00.cpp
index 030dffa51c7..19ba95f4aae 100644
--- a/rel/d/a/d_a_demo00/d_a_demo00.cpp
+++ b/rel/d/a/d_a_demo00/d_a_demo00.cpp
@@ -1,293 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_demo00
-//
+/**
+ * @file d_a_demo00.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_demo00/d_a_demo00.h"
 #include "dol2asm.h"
+#include "d/d_camera.h"
 
-//
-// Types:
-//
 
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
 
-struct _GXColor {};
 
-struct mDoGph_gInf_c {
-    /* 80007FD8 */ void fadeOut(f32, _GXColor&);
-    /* 800080D0 */ void fadeOut(f32);
-
-    static u8 mFrameBufferTimg[4];
-};
-
-struct J3DSkinDeform {
-    /* 8032C96C */ J3DSkinDeform();
-};
-
-struct J3DDeformData {};
-
-struct J3DModel {
-    /* 80327A2C */ void setDeformData(J3DDeformData*, u32);
-    /* 80327AA0 */ void setSkinDeform(J3DSkinDeform*, u32);
-};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266AE4 */ void operator+(Vec const&) const;
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80266B84 */ void operator*(f32) const;
-    /* 8026706C */ bool operator!=(Vec const&) const;
-    /* 80267128 */ void atan2sX_Z() const;
-    /* 804A449C */ ~cXyz();
-    /* 804A871C */ cXyz();
-};
-
-struct mDoExt_invisibleModel {
-    /* 8000E53C */ void create(J3DModel*, u8);
-    /* 8000E7C0 */ void entryDL(cXyz*);
-};
-
-struct J3DAnmTextureSRTKey {};
-
-struct J3DAnmTexPattern {};
-
-struct J3DAnmTevRegKey {};
-
-struct J3DAnmColor {};
-
-struct J3DMaterialTable {
-    /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);
-    /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*);
-    /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*);
-    /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
-};
-
-struct mDoExt_btpAnm {
-    /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
-    /* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
-};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_bpkAnm {
-    /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16);
-    /* 8000D518 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct J3DAnmCluster {};
-
-struct mDoExt_blkAnm {
-    /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {
-    /* 802C03C8 */ Z2Creature();
-    /* 802C0420 */ ~Z2Creature();
-    /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 80011154 */ void updateDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct mDoExt_McaMorf {};
-
-struct mDoExt_3DlineMat_c {};
-
-struct mDoExt_3DlineMatSortPacket {
-    /* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
-};
-
-struct ResTIMG {};
-
-struct dKy_tevstr_c {};
-
-struct mDoExt_3DlineMat1_c {
-    /* 80013360 */ void init(u16, u16, ResTIMG*, int);
-    /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*);
-};
-
-struct mDoExt_3DlineMat0_c {
-    /* 800125E0 */ void init(u16, u16, int);
-    /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*);
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct fopAcM_wt_c {
-    static u8 mWaterCheck[84 + 4 /* padding */];
-};
-
-struct demo_s1_ke_s {
-    /* 804A4420 */ ~demo_s1_ke_s();
-    /* 804A86B4 */ demo_s1_ke_s();
-};
-
-struct daMP_c {
-    /* 80031AD0 */ void daMP_c_THPPlayerPlay();
-    /* 80031B24 */ void daMP_c_THPPlayerPause();
-};
-
-struct daDemo00_resID_c {
-    /* 804A430C */ void reset();
-};
-
-struct daDemo00_model_c {
-    /* 804A4338 */ void reset();
-};
-
-struct dDemo_actor_c {
-    /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*);
-};
-
-struct daDemo00_c {
-    /* 804A4388 */ ~daDemo00_c();
-    /* 804A45A0 */ void setBaseMtx();
-    /* 804A4948 */ void setShadowSize();
-    /* 804A4F74 */ void createHeap();
-    /* 804A5798 */ void actStandby(dDemo_actor_c*);
-    /* 804A594C */ void actPerformance(dDemo_actor_c*);
-    /* 804A604C */ void actLeaving(dDemo_actor_c*);
-    /* 804A6F94 */ void draw();
-    /* 804A7BA8 */ void execute();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_event_tmp_flag_c {
-    static u8 const tempBitLabels[370 + 2 /* padding */];
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 8003498C */ void onEventBit(u16);
-};
-
-struct dStage_roomControl_c {
-    static u8 mDemoArcName[10 + 2 /* padding */];
-};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-    /* 8003C400 */ void getIDRes(char const*, u16, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct cBgS_PolyInfo {};
-
-struct csXyz {};
-
-struct dPa_control_c {
-    /* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*,
-                                       cXyz const*, s8);
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dDemo_object_c {
-    /* 80039088 */ void getActor(u8);
-};
-
-struct dDemo_c {
-    static u8 m_object[4];
-};
-
-struct dCamera_c {
-    /* 80181170 */ void StartBlure(int, fopAc_ac_c*, f32, f32);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-};
-
-struct dBgS_CamGndChk_Wtr {
-    /* 80077A00 */ dBgS_CamGndChk_Wtr();
-    /* 80077A98 */ ~dBgS_CamGndChk_Wtr();
-};
-
-struct cM3dGPla {
-    /* 804A44D8 */ ~cM3dGPla();
-};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct _GXTexObj {};
-
-struct JUTNameTab {
-    /* 802DEAF8 */ void getName(u16) const;
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DMaterial {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 804A5750 */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -442,13 +164,6 @@ extern "C" void removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor();
 extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
 extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
 extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSubtract();
-extern "C" void PSVECSquareMag();
-extern "C" void PSVECSquareDistance();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
 extern "C" void __ptmf_scall();
@@ -466,28 +181,20 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void strcmp();
 extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
 extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5];
 extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5];
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */];
 extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
 extern "C" extern u8 g_Counter[12 + 4 /* padding */];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern u32 g_blackColor;
 extern "C" extern u32 g_saftyWhiteColor;
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
-extern "C" extern u32 __float_nan;
 extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
-extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
 extern "C" u8 m_object__7dDemo_c[4];
 extern "C" void __register_global_object();
 
@@ -539,7 +246,8 @@ asm demo_s1_ke_s::~demo_s1_ke_s() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_demo00/d_a_demo00/__dt__4cXyzFv.s"
 }
@@ -767,25 +475,30 @@ SECTION_DATA static void* lit_6395[26] = {
 };
 
 /* 804A8B94-804A8BB4 -00001 0020+00 1/0 0/0 0/0 .data            l_daDemo00_Method */
-SECTION_DATA static void* l_daDemo00_Method[8] = {
-    (void*)daDemo00_Create__FP10fopAc_ac_c,
-    (void*)daDemo00_Delete__FP10daDemo00_c,
-    (void*)daDemo00_Execute__FP10daDemo00_c,
-    (void*)daDemo00_IsDelete__FP10daDemo00_c,
-    (void*)daDemo00_Draw__FP10daDemo00_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daDemo00_Method = {
+    (process_method_func)daDemo00_Create__FP10fopAc_ac_c,
+    (process_method_func)daDemo00_Delete__FP10daDemo00_c,
+    (process_method_func)daDemo00_Execute__FP10daDemo00_c,
+    (process_method_func)daDemo00_IsDelete__FP10daDemo00_c,
+    (process_method_func)daDemo00_Draw__FP10daDemo00_c,
 };
 
 /* 804A8BB4-804A8BE4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DEMO00 */
-SECTION_DATA extern void* g_profile_DEMO00[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02CE0000, (void*)&g_fpcLf_Method,
-    (void*)0x0000292C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02AD0000, (void*)&l_daDemo00_Method,
-    (void*)0x00044000, (void*)NULL,
+extern actor_process_profile_definition g_profile_DEMO00 = {
+  fpcLy_CURRENT_e,       // mLayerID
+  7,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_DEMO00,           // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(daDemo00_c),    // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  685,                   // mPriority
+  &l_daDemo00_Method,    // sub_method
+  0x00044000,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 804A8BE4-804A8BF8 000224 0014+00 1/1 0/0 0/0 .data            __vt__18mDoExt_3DlineMat_c */
@@ -811,7 +524,8 @@ SECTION_DATA extern void* __vt__8cM3dGPla[3] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGPla::~cM3dGPla() {
+// asm cM3dGPla::~cM3dGPla() {
+extern "C" asm void __dt__8cM3dGPlaFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_demo00/d_a_demo00/__dt__8cM3dGPlaFv.s"
 }
@@ -1021,7 +735,8 @@ asm void daDemo00_c::createHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_demo00/d_a_demo00/__dt__12J3DFrameCtrlFv.s"
 }
@@ -1722,7 +1437,8 @@ asm demo_s1_ke_s::demo_s1_ke_s() {
 #pragma pop
 
 /* 804A871C-804A8720 0044FC 0004+00 2/2 0/0 0/0 .text            __ct__4cXyzFv */
-cXyz::cXyz() {
+// cXyz::cXyz() {
+extern "C" asm void __ct__4cXyzFv() {
     /* empty function */
 }
 
diff --git a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp
index 573da9fb9c6..f6788937e1f 100644
--- a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp
+++ b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp
@@ -1,160 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_demo_item
-//
+/**
+ * @file d_a_demo_item.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_demo_item/d_a_demo_item.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct leafdraw_class {};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daItemBase_c {
-    /* 80037A64 */ void hide();
-    /* 80037ACC */ void chkDraw();
-    /* 80037AF4 */ void chkDead();
-    /* 80144724 */ void DeleteBase(char const*);
-    /* 8014474C */ bool clothCreate();
-    /* 80144B94 */ void DrawBase();
-    /* 80144C30 */ void RotateYBase();
-    /* 80144CC4 */ void settingBeforeDraw();
-    /* 80144D70 */ void setShadow();
-    /* 80144EDC */ void animEntry();
-    /* 8014503C */ void animPlay(f32, f32, f32, f32, f32, f32);
-    /* 80145144 */ void chkFlag(int);
-    /* 80145164 */ void getTevFrm();
-    /* 80145180 */ void getBtpFrm();
-    /* 8014519C */ void getShadowSize();
-    /* 801451B4 */ void getCollisionH();
-    /* 801451D0 */ void getCollisionR();
-};
-
-struct daDitem_c {
-    /* 804DFBCC */ bool __CreateHeap();
-    /* 804DFBD4 */ void CreateInit();
-    /* 804DFC98 */ void action();
-    /* 804DFD10 */ void actionStart();
-    /* 804E00DC */ void actionEvent();
-    /* 804E0A50 */ void actionWaitLightEnd();
-    /* 804E0B40 */ void actionEnd();
-    /* 804E0B60 */ void setInsectEffect();
-    /* 804E0C44 */ void followInsectEffect();
-    /* 804E0CB0 */ void endInsectEffect();
-    /* 804E0D44 */ void onEventReg(int, int);
-    /* 804E0DB4 */ void set_pos();
-    /* 804E105C */ void anim_control();
-    /* 804E1098 */ void initEffectLight();
-    /* 804E10D0 */ void settingEffectLight();
-    /* 804E111C */ void set_mtx();
-    /* 804E11D4 */ void setTevStr();
-    /* 804E122C */ void setListStart();
-    /* 804E1230 */ void draw_WOOD_STICK();
-};
-
-struct dSv_event_c {
-    /* 800349BC */ void isEventBit(u16) const;
-    /* 800349E0 */ void setEventReg(u16, u8);
-    /* 80034A04 */ void getEventReg(u16) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct J3DModelData {};
-
-struct cXyz {
-    /* 804E00A0 */ ~cXyz();
-};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dPa_levelEcallBack {};
-
-struct dPa_followEcallBack {
-    /* 80049580 */ dPa_followEcallBack(u8, u8);
-};
-
-struct csXyz {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct dItem_data {
-    static void* item_resource[1530];
-};
-
-struct dComIfG_play_c {
-    /* 8002C97C */ void getLayerNo(int);
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 804E164C */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-};
-
-struct create_tag_class {};
-
-struct cM3dGCyl {
-    /* 804E15BC */ ~cM3dGCyl();
-};
-
-struct cM3dGAab {
-    /* 804E1604 */ ~cM3dGAab();
-};
-
-struct Z2SoundObjSimple {
-    /* 802BE844 */ Z2SoundObjSimple();
-};
-
-struct Z2SoundObjBase {
-    /* 802BDFF8 */ void deleteObject();
-};
-
-struct LIGHT_INFLUENCE {};
-
-struct JUTNameTab {
-    /* 802DEAF8 */ void getName(u16) const;
-};
 
 //
 // Forward References:
@@ -254,15 +106,10 @@ extern "C" void deleteObject__14Z2SoundObjBaseFv();
 extern "C" void __ct__16Z2SoundObjSimpleFv();
 extern "C" void __dl__FPv();
 extern "C" void getName__10JUTNameTabCFUs();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
 extern "C" void _savegpr_28();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void strcmp();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" void* item_resource__10dItem_data[1530];
@@ -272,7 +119,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
 extern "C" void __register_global_object();
 
@@ -359,7 +205,8 @@ asm void daDitem_c::actionStart() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_demo_item/d_a_demo_item/__dt__4cXyzFv.s"
 }
@@ -792,25 +639,30 @@ static asm void daDitem_Delete(daDitem_c* param_0) {
 
 /* ############################################################################################## */
 /* 804E1B10-804E1B30 -00001 0020+00 1/0 0/0 0/0 .data            l_daDitem_Method */
-SECTION_DATA static void* l_daDitem_Method[8] = {
-    (void*)daDitem_Create__FP9daDitem_c,
-    (void*)daDitem_Delete__FP9daDitem_c,
-    (void*)daDitem_Execute__FP9daDitem_c,
-    (void*)NULL,
-    (void*)daDitem_Draw__FP9daDitem_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daDitem_Method = {
+    (process_method_func)daDitem_Create__FP9daDitem_c,
+    (process_method_func)daDitem_Delete__FP9daDitem_c,
+    (process_method_func)daDitem_Execute__FP9daDitem_c,
+    0,
+    (process_method_func)daDitem_Draw__FP9daDitem_c,
 };
 
 /* 804E1B30-804E1B60 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Demo_Item */
-SECTION_DATA extern void* g_profile_Demo_Item[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x021D0000, (void*)&g_fpcLf_Method,
-    (void*)0x000009C8, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00F10000, (void*)&l_daDitem_Method,
-    (void*)0x00060000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_Demo_Item = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_Demo_Item,         // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daDitem_c),      // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  241,                    // mPriority
+  &l_daDitem_Method,      // sub_method
+  0x00060000,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 804E1B60-804E1B6C 000050 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGCyl */
@@ -875,7 +727,8 @@ static asm void daDitem_Create(daDitem_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGCyl::~cM3dGCyl() {
+// asm cM3dGCyl::~cM3dGCyl() {
+extern "C" asm void __dt__8cM3dGCylFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_demo_item/d_a_demo_item/__dt__8cM3dGCylFv.s"
 }
@@ -885,7 +738,8 @@ asm cM3dGCyl::~cM3dGCyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_demo_item/d_a_demo_item/__dt__8cM3dGAabFv.s"
 }
@@ -895,7 +749,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_demo_item/d_a_demo_item/__dt__12dBgS_ObjAcchFv.s"
 }
diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp
index 4d5bb07a61e..0a3318a778e 100644
--- a/rel/d/a/d_a_do/d_a_do.cpp
+++ b/rel/d/a/d_a_do/d_a_do.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_do
-//
+/**
+ * @file d_a_do.cpp
+ * 
+*/
 
 // See d_a_do_NONMATCHING.cpp
 
@@ -330,22 +330,30 @@ static dCcD_SrcSph cc_sph_src = {
 };
 
 /* 8066F1CC-8066F1EC -00001 0020+00 1/0 0/0 0/0 .data            l_daDo_Method */
-SECTION_DATA static void* l_daDo_Method[8] = {
-    (void*)daDo_Create__FP10fopAc_ac_c,
-    (void*)daDo_Delete__FP8do_class,
-    (void*)daDo_Execute__FP8do_class,
-    (void*)daDo_IsDelete__FP8do_class,
-    (void*)daDo_Draw__FP8do_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daDo_Method = {
+    (process_method_func)daDo_Create__FP10fopAc_ac_c,
+    (process_method_func)daDo_Delete__FP8do_class,
+    (process_method_func)daDo_Execute__FP8do_class,
+    (process_method_func)daDo_IsDelete__FP8do_class,
+    (process_method_func)daDo_Draw__FP8do_class,
 };
 
 /* 8066F1EC-8066F21C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DO */
-SECTION_DATA extern void* g_profile_DO[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,     (void*)0x010C0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000CC4, (void*)NULL,           (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02BB0000, (void*)&l_daDo_Method, (void*)0x08044000, (void*)0x04000000,
+extern actor_process_profile_definition g_profile_DO = {
+  fpcLy_CURRENT_e,       // mLayerID
+  7,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_DO,               // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  0x00000CC4,            // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  699,                   // mPriority
+  &l_daDo_Method,        // sub_method
+  0x08044000,            // mStatus
+  fopAc_NPC_e,           // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 8066F21C-8066F228 000260 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGSph */
diff --git a/rel/d/a/d_a_fr/d_a_fr.cpp b/rel/d/a/d_a_fr/d_a_fr.cpp
index 38b92fff95f..35b26556de0 100644
--- a/rel/d/a/d_a_fr/d_a_fr.cpp
+++ b/rel/d/a/d_a_fr/d_a_fr.cpp
@@ -1,179 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_fr
-//
+/**
+ * @file d_a_fr.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_fr/d_a_fr.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTextureSRTKey {};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct Vec {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct mDoExt_McaMorf {
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                  mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
-                                  int, void*, u32, u32);
-    /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
-    /* 800105C8 */ void play(Vec*, u32, s8);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-};
-
-struct fr_class {};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daFr_HIO_c {
-    /* 805198EC */ daFr_HIO_c();
-    /* 8051B920 */ ~daFr_HIO_c();
-};
-
-struct dKy_tevstr_c {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80266B84 */ void operator*(f32) const;
-};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dMsgFlow_c {
-    /* 80249F00 */ dMsgFlow_c();
-    /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
-    /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjGndChk_Spl {
-    /* 800777B0 */ dBgS_ObjGndChk_Spl();
-    /* 80077848 */ ~dBgS_ObjGndChk_Spl();
-};
-
-struct dBgS_ObjAcch {
-    /* 8051B8B0 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-};
-
-struct csXyz {};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGSph {
-    /* 8051B820 */ ~cM3dGSph();
-};
-
-struct cM3dGAab {
-    /* 8051B868 */ ~cM3dGAab();
-};
-
-struct cBgS_PolyInfo {};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
-
-struct _GXTexObj {};
-
-struct JAISoundID {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8051B550 */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -281,19 +114,12 @@ extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSquareMag();
 extern "C" void _savegpr_27();
 extern "C" void _savegpr_28();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void strcmp();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -302,10 +128,8 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern void* calc_mtx[1 + 1 /* padding */];
-extern "C" extern u32 __float_nan;
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void __register_global_object();
 
@@ -388,22 +212,30 @@ SECTION_DATA static void* lit_4226[51] = {
 };
 
 /* 8051BB60-8051BB80 -00001 0020+00 1/0 0/0 0/0 .data            l_daFr_Method */
-SECTION_DATA static void* l_daFr_Method[8] = {
-    (void*)daFr_Create__FP10fopAc_ac_c,
-    (void*)daFr_Delete__FP8fr_class,
-    (void*)daFr_Execute__FP8fr_class,
-    (void*)daFr_IsDelete__FP8fr_class,
-    (void*)daFr_Draw__FP8fr_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daFr_Method = {
+    (process_method_func)daFr_Create__FP10fopAc_ac_c,
+    (process_method_func)daFr_Delete__FP8fr_class,
+    (process_method_func)daFr_Execute__FP8fr_class,
+    (process_method_func)daFr_IsDelete__FP8fr_class,
+    (process_method_func)daFr_Draw__FP8fr_class,
 };
 
 /* 8051BB80-8051BBB0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_FR */
-SECTION_DATA extern void* g_profile_FR[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0008FFFD,     (void*)0x02E20000, (void*)&g_fpcLf_Method,
-    (void*)0x000009E8, (void*)NULL,           (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00EB0000, (void*)&l_daFr_Method, (void*)0x08040100, (void*)0x04000000,
+extern actor_process_profile_definition g_profile_FR = {
+  fpcLy_CURRENT_e,       // mLayerID
+  8,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_FR,               // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(fr_class),      // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  235,                   // mPriority
+  &l_daFr_Method,        // sub_method
+  0x08040100,            // mStatus
+  fopAc_NPC_e,           // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 8051BBB0-8051BBBC 00011C 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGSph */
@@ -937,7 +769,8 @@ static asm void useHeapIfrt(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_fr/d_a_fr/__dt__12J3DFrameCtrlFv.s"
 }
@@ -978,7 +811,8 @@ static asm void daFr_Create(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_fr/d_a_fr/__dt__8cM3dGSphFv.s"
 }
@@ -988,7 +822,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_fr/d_a_fr/__dt__8cM3dGAabFv.s"
 }
@@ -998,7 +833,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_fr/d_a_fr/__dt__12dBgS_ObjAcchFv.s"
 }
diff --git a/rel/d/a/d_a_grass/d_a_grass.cpp b/rel/d/a/d_a_grass/d_a_grass.cpp
index 46d91a5475b..5458e55fe60 100644
--- a/rel/d/a/d_a_grass/d_a_grass.cpp
+++ b/rel/d/a/d_a_grass/d_a_grass.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_grass
-//
+/**
+ * @file d_a_grass.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_grass/d_a_grass.h"
 #include "SSystem/SComponent/c_counter.h"
@@ -2289,25 +2289,30 @@ SECTION_DATA static void* data_80527800[16] = {
 };
 
 /* 80527840-80527860 -00001 0020+00 1/0 0/0 0/0 .data            daGrass_METHODS */
-SECTION_DATA static void* daGrass_METHODS[8] = {
-    (void*)daGrass_create__FP9daGrass_c,
-    (void*)daGrass_Delete__FP9daGrass_c,
-    (void*)daGrass_execute__FP9daGrass_c,
-    (void*)NULL,
-    (void*)daGrass_draw__FP9daGrass_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daGrass_METHODS = {
+    (process_method_func)daGrass_create__FP9daGrass_c,
+    (process_method_func)daGrass_Delete__FP9daGrass_c,
+    (process_method_func)daGrass_execute__FP9daGrass_c,
+    0,
+    (process_method_func)daGrass_draw__FP9daGrass_c,
 };
 
 /* 80527860-80527890 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_GRASS */
-SECTION_DATA extern void* g_profile_GRASS[12] = {
-    (void*)0xFFFFFFFD, (void*)0x000BFFFD,
-    (void*)0x03100000, (void*)&g_fpcLf_Method,
-    (void*)0x00000570, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00080000, (void*)&daGrass_METHODS,
-    (void*)0x00060000, (void*)NULL,
+extern actor_process_profile_definition g_profile_GRASS = {
+  fpcLy_CURRENT_e,       // mLayerID
+  11,                    // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_GRASS,            // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  0x00000570,            // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  8,                     // mPriority
+  &daGrass_METHODS,      // sub_method
+  0x00060000,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 80527890-805278A4 0046B8 0014+00 2/2 0/0 0/0 .data            __vt__16dFlower_packet_c */
@@ -3180,10 +3185,6 @@ int daGrass_c::create() {
         csXyz(-7, 0, 40), csXyz(-35, 0, 15),  csXyz(23, 0, 32),
     };
 
-    struct offset_data {
-        /* 0x0 */ u8 num;
-        /* 0x4 */ csXyz* set_type;
-    };
 
     static offset_data l_offsetData[] = {
         {3, l_setType2}, {7, l_setType0},  {21, l_setType1}, {7, l_setType0},
diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp
index 2361391855d..acd008994ba 100644
--- a/rel/d/a/d_a_horse/d_a_horse.cpp
+++ b/rel/d/a/d_a_horse/d_a_horse.cpp
@@ -1,132 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_horse
-//
+/**
+ * @file d_a_horse.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_horse/d_a_horse.h"
 #include "d/d_stage.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct mDoCPd_c {
-    static u8 m_cpadInfo[256];
-};
-
-struct daTagHstop_c {
-    static u8 m_top[4 + 4 /* padding */];
-};
-
-struct daHorse_hio_c0 {
-    static u8 const m[292];
-};
-
-struct daCow_c {
-    /* 8065CFBC */ void isAngry();
-    /* 8065D0B8 */ void setAngryHit();
-};
-
-struct daAlink_c {
-    struct daAlink_ANM {};
-
-    /* 8009DA60 */ void checkStageName(char const*);
-    /* 800A21E0 */ void getMoveBGActorName(cBgS_PolyInfo&, int);
-    /* 800AC558 */ void checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM) const;
-    /* 800ECDC4 */ void checkHorseWaitLashAnime() const;
-    /* 800ECF04 */ void checkHorseLieAnime() const;
-    /* 800ECF5C */ void checkHorseSubjectivity() const;
-    /* 800ED0D4 */ void getHorseReinHandPos(cXyz*, cXyz*);
-
-    static u8 const m_handLeftInSidePos[12];
-    static u8 const m_handRightInSidePos[12];
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dPath {};
-
-struct dPa_levelEcallBack {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dPaPo_c {
-    /* 80050C9C */ void init(dBgS_Acch*, f32, f32);
-};
-
-struct dPaPoF_c {
-    /* 800512E8 */ void setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
-                                      cXyz const*, cXyz const*, cXyz const*, cXyz const*,
-                                      csXyz const*, cXyz const*, s8, f32, f32);
-
-    static u8 m_typeFourData[60];
-    static u8 m_emitterFourData[60 + 28 /* padding */];
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dEvent_manager_c {
-    /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int);
-    /* 80047F5C */ void getMyNowCutName(int);
-    /* 800480EC */ void getMySubstanceP(int, char const*, int);
-    /* 8004817C */ void cutEnd(int);
-    /* 800483E0 */ void getGoal();
-};
-
-struct dDemo_object_c {
-    /* 80039088 */ void getActor(u8);
-};
-
-struct dDemo_c {
-    static u8 m_object[4];
-};
-
-struct dDemo_actor_c {
-    /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*);
-};
-
-struct dComIfG_play_c {
-    /* 8002C97C */ void getLayerNo(int);
-};
-
-struct dCcMassS_Mng {
-    /* 80085D98 */ void Set(cCcD_Obj*, u8);
-};
-
-struct dBgS_HorseAcch {
-    /* 80845274 */ ~dBgS_HorseAcch();
-};
-
-struct dAttention_c {
-    /* 80070844 */ void GetLockonList(s32);
-    /* 800737E4 */ void LockonTruth();
-};
-
-struct dAttList_c {
-    /* 80073864 */ void getActor();
-};
-
-struct camera_class {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
 //
 // Forward References:
 //
@@ -896,25 +776,30 @@ SECTION_DATA static u8 reinLineColor[4] = {
 };
 
 /* 80845A34-80845A54 -00001 0020+00 1/0 0/0 0/0 .data            l_daHorse_Method */
-SECTION_DATA static void* l_daHorse_Method[8] = {
-    (void*)daHorse_Create__FP10fopAc_ac_c,
-    (void*)daHorse_Delete__FP9daHorse_c,
-    (void*)daHorse_Execute__FP9daHorse_c,
-    (void*)NULL,
-    (void*)daHorse_Draw__FP9daHorse_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daHorse_Method = {
+    (process_method_func)daHorse_Create__FP10fopAc_ac_c,
+    (process_method_func)daHorse_Delete__FP9daHorse_c,
+    (process_method_func)daHorse_Execute__FP9daHorse_c,
+    0,
+    (process_method_func)daHorse_Draw__FP9daHorse_c,
 };
 
 /* 80845A54-80845A84 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_HORSE */
-SECTION_DATA extern void* g_profile_HORSE[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00EE0000, (void*)&g_fpcLf_Method,
-    (void*)0x00001904, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x005A0000, (void*)&l_daHorse_Method,
-    (void*)0x00060000, (void*)0x050E0000,
+extern actor_process_profile_definition g_profile_HORSE = {
+  fpcLy_CURRENT_e,        // mLayerID
+  4,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_HORSE,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daHorse_c),      // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  90,                     // mPriority
+  &l_daHorse_Method,      // sub_method
+  0x00060000,             // mStatus
+  fopAc_UNK_GROUP_5_e,    // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80845A84-80845A90 0001B0 000C+00 2/2 0/0 0/0 .data            __vt__16daPy_frameCtrl_c */
diff --git a/rel/d/a/d_a_kago/d_a_kago.cpp b/rel/d/a/d_a_kago/d_a_kago.cpp
index e9be8d14754..3dac5340c48 100644
--- a/rel/d/a/d_a_kago/d_a_kago.cpp
+++ b/rel/d/a/d_a_kago/d_a_kago.cpp
@@ -1,401 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_kago
-//
+/**
+ * @file d_a_kago.cpp
+ * 
+*/
 
-// #include "rel/d/a/d_a_kago/d_a_kago.h"
-#include "dolphin/types.h"
+#include "rel/d/a/d_a_kago/d_a_kago.h"
 #include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266AE4 */ void operator+(Vec const&) const;
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80266B84 */ void operator*(f32) const;
-    /* 80849924 */ ~cXyz();
-    /* 80854A28 */ cXyz();
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Z2Creature {};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
-    /* 800110B0 */ void play(u32, s8);
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-};
-
-struct mDoCPd_c {
-    static u8 m_cpadInfo[256];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daTagWaterFall_c {
-    /* 80D64768 */ void checkHitWaterFall(cXyz);
-};
-
-struct daPy_py_c {
-    /* 8015F914 */ void setPlayerDamage(int, int);
-    /* 80854AE0 */ void getMidnaActor();
-
-    static u8 m_midnaActor[4];
-};
-
-struct daObj_Balloon_c {
-    /* 80BA80F4 */ void saveBestScore();
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct daKago_c {
-    /* 80849660 */ void getBckName(int);
-    /* 808496F0 */ void setBck(int, u8, f32, f32);
-    /* 80849798 */ void checkBck(int);
-    /* 808497F8 */ void draw();
-    /* 80849980 */ void executeBalloonMenu();
-    /* 80849BA8 */ void checkGroundHeight(cXyz, f32*);
-    /* 8084A070 */ void checkRoofHeight(cXyz);
-    /* 8084A210 */ void checkMoveHeight();
-    /* 8084A2A8 */ void checkSizeBg();
-    /* 8084A6DC */ bool getBeforeGroundHeight(u8);
-    /* 8084A6E4 */ void demo_skip(int);
-    /* 8084AA64 */ void DemoSkipCallBack(void*, int);
-    /* 8084AA98 */ void setActionMode(int, int);
-    /* 8084AAAC */ void setMidnaTagPos();
-    /* 8084AB40 */ void setMidnaRideOn();
-    /* 8084AB8C */ void setPlayerRideOn();
-    /* 8084ABC8 */ void setRideOff();
-    /* 8084AC2C */ void searchNearPassPoint();
-    /* 8084AE78 */ void setSceneChange(int);
-    /* 8084AF40 */ void createBalloonScore();
-    /* 8084AFB0 */ void startBalloonScore();
-    /* 8084B024 */ void endBalloonScore();
-    /* 8084B088 */ void checkNextPath(cXyz);
-    /* 8084B108 */ void checkHeight();
-    /* 8084B134 */ void checkYaguraPos(cXyz);
-    /* 8084B1E0 */ void checkWallHitFall(int);
-    /* 8084B56C */ void checkAttackStart();
-    /* 8084B5DC */ void getValueY(f32);
-    /* 8084B6F4 */ void getValueX(f32);
-    /* 8084B718 */ void getValueAbsX(f32);
-    /* 8084B744 */ void flySpeedCalcLockOn();
-    /* 8084B96C */ void flySpeedCalc(s16, int);
-    /* 8084C078 */ void checkFlySceneChange();
-    /* 8084C178 */ void setFlyAway();
-    /* 8084C204 */ void setFlyAnime();
-    /* 8084C2CC */ void executeFly();
-    /* 8084C8FC */ void executeStagger();
-    /* 8084D108 */ void executeWait();
-    /* 8084D354 */ void calcAttackMove(int);
-    /* 8084D50C */ void executeAttack();
-    /* 8084DA18 */ void calcCircleCamera(int);
-    /* 8084DBFC */ void executeEvent();
-    /* 8084DD18 */ void initPerchDemo();
-    /* 8084E2D4 */ void executePerchDemo();
-    /* 8084F09C */ void PerchDemoAwayForward();
-    /* 8084FA58 */ void executePerch();
-    /* 8084FAA8 */ void executeEvent2();
-    /* 8084FB50 */ void initFirstDemo();
-    /* 80850384 */ void executeFirstDemo();
-    /* 808513E4 */ void executePerch2();
-    /* 80851434 */ void executeLandingLakeHairia();
-    /* 80851DEC */ void executeLandingBoartHouse();
-    /* 808525B0 */ void executeLanding();
-    /* 80852610 */ void moveDemoFly();
-    /* 80852D90 */ void setFlyEffect();
-    /* 80852F14 */ void setDashEffect();
-    /* 808530A4 */ void setDamageEffect();
-    /* 80853228 */ void setDashBlurEffect(int);
-    /* 80853460 */ void setWallHitEffect(cXyz, int);
-    /* 8085350C */ void setSibukiEffect();
-    /* 8085366C */ void setDashSibukiEffect();
-    /* 80853730 */ void setWaterFallEffect();
-    /* 8085392C */ void setFlySound();
-    /* 80853BCC */ void action();
-    /* 80853EF0 */ void mtx_set();
-    /* 80853FB0 */ void cc_set();
-    /* 80854058 */ void execute();
-    /* 80854190 */ void _delete();
-    /* 80854220 */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 808542DC */ void JointCallBack(J3DJoint*, int);
-    /* 80854328 */ void CreateHeap();
-    /* 808544D8 */ void create();
-};
-
-struct daKago_HIO_c {
-    /* 808495AC */ daKago_HIO_c();
-    /* 80854A4C */ ~daKago_HIO_c();
-};
-
-struct daE_YM_c {
-    /* 808123C4 */ void setLockByCargo();
-};
-
-struct daBalloon2D_c {
-    /* 80653FC0 */ void setScoreCount(u32);
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-    /* 8006FB10 */ void StartQuake(int, int, cXyz);
-    /* 8006FD94 */ void StopQuake(int);
-};
-
-struct dSv_memBit_c {
-    /* 80034810 */ void onSwitch(int);
-    /* 80034860 */ void isSwitch(int) const;
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 8003498C */ void onEventBit(u16);
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPath {};
-
-struct dPa_levelEcallBack {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dMsgObject_c {
-    /* 80238440 */ void getSelectCursorPos();
-};
-
-struct dMsgFlow_c {
-    /* 80249F00 */ dMsgFlow_c();
-    /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
-    /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
-    /* 8024A4C4 */ void remove();
-    /* 8024A540 */ void getNowMsgNo();
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-    /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dComIfG_play_c {
-    /* 8002C97C */ void getLayerNo(int);
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcSph {};
-
-struct dCcD_Sph {
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80163028 */ void SetTrimTypeForce(s32);
-    /* 80163D50 */ void ModeFix(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180C68 */ void Reset();
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-    /* 80181E64 */ void Eye();
-};
-
-struct dBgS_RoofChk {
-    /* 80078FF4 */ dBgS_RoofChk();
-    /* 80079090 */ ~dBgS_RoofChk();
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjGndChk_Spl {
-    /* 800777B0 */ dBgS_ObjGndChk_Spl();
-    /* 80077848 */ ~dBgS_ObjGndChk_Spl();
-};
-
-struct dBgS_ObjAcch {
-    /* 808549B8 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-};
-
-struct cBgS_PolyInfo {};
-
-struct dBgS {
-    /* 80074CBC */ void GetSpecialCode(cBgS_PolyInfo const&);
-    /* 8007549C */ void RoofChk(dBgS_RoofChk*);
-};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct dAttention_c {
-    /* 8007353C */ void LockonTarget(s32);
-    /* 800737E4 */ void LockonTruth();
-};
-
-struct cM3dGSph {
-    /* 8026F648 */ void SetC(cXyz const&);
-    /* 8026F708 */ void SetR(f32);
-    /* 80854928 */ ~cM3dGSph();
-};
-
-struct cM3dGPla {
-    /* 8084A694 */ ~cM3dGPla();
-};
-
-struct cM3dGAab {
-    /* 80854970 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-    /* 80074618 */ void GetActorPointer(int) const;
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct _GXTexObj {};
-
-struct Z2StatusMgr {
-    /* 802B61E8 */ void setDemoName(char*);
-};
-
-struct Z2CreatureEnemy {
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C1094 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct JGeometry {
-    template <typename A1>
-    struct TVec3 {};
-    /* TVec3<f32> */
-    struct TVec3__template0 {};
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DFrameCtrl {
-    /* 8032842C */ void checkPass(f32);
-};
+#include "d/d_camera.h"
 
 //
 // Forward References:
@@ -622,11 +232,6 @@ extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSquareDistance();
 extern "C" void __construct_array();
 extern "C" void _savegpr_24();
 extern "C" void _savegpr_25();
@@ -640,10 +245,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void abs();
-extern "C" void strcmp();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -654,12 +255,8 @@ extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern u32 __float_nan;
-extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void setScoreCount__13daBalloon2D_cFUl();
@@ -896,25 +493,30 @@ SECTION_DATA static void* lit_7982[11] = {
 };
 
 /* 80854EBC-80854EDC -00001 0020+00 1/0 0/0 0/0 .data            l_daKago_Method */
-SECTION_DATA static void* l_daKago_Method[8] = {
-    (void*)daKago_Create__FP8daKago_c,
-    (void*)daKago_Delete__FP8daKago_c,
-    (void*)daKago_Execute__FP8daKago_c,
-    (void*)daKago_IsDelete__FP8daKago_c,
-    (void*)daKago_Draw__FP8daKago_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daKago_Method = {
+    (process_method_func)daKago_Create__FP8daKago_c,
+    (process_method_func)daKago_Delete__FP8daKago_c,
+    (process_method_func)daKago_Execute__FP8daKago_c,
+    (process_method_func)daKago_IsDelete__FP8daKago_c,
+    (process_method_func)daKago_Draw__FP8daKago_c,
 };
 
 /* 80854EDC-80854F0C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KAGO */
-SECTION_DATA extern void* g_profile_KAGO[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00F40000, (void*)&g_fpcLf_Method,
-    (void*)0x00000BA4, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02B50000, (void*)&l_daKago_Method,
-    (void*)0x00044000, (void*)0x040E0000,
+extern actor_process_profile_definition g_profile_KAGO = {
+  fpcLy_CURRENT_e,        // mLayerID
+  4,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_KAGO,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daKago_c),       // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  693,                    // mPriority
+  &l_daKago_Method,       // sub_method
+  0x00044000,             // mStatus
+  fopAc_NPC_e,            // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80854F0C-80854F18 0001C0 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGSph */
@@ -1029,7 +631,8 @@ asm void daKago_c::draw() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_kago/d_a_kago/__dt__4cXyzFv.s"
 }
@@ -1192,7 +795,8 @@ asm void daKago_c::checkSizeBg() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGPla::~cM3dGPla() {
+// asm cM3dGPla::~cM3dGPla() {
+extern "C" asm void __dt__8cM3dGPlaFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_kago/d_a_kago/__dt__8cM3dGPlaFv.s"
 }
@@ -2597,7 +2201,8 @@ asm void daKago_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGSph::~cM3dGSph() {
+// asm cM3dGSph::~cM3dGSph() {
+extern "C" asm void __dt__8cM3dGSphFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_kago/d_a_kago/__dt__8cM3dGSphFv.s"
 }
@@ -2607,7 +2212,8 @@ asm cM3dGSph::~cM3dGSph() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_kago/d_a_kago/__dt__8cM3dGAabFv.s"
 }
@@ -2617,14 +2223,16 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_kago/d_a_kago/__dt__12dBgS_ObjAcchFv.s"
 }
 #pragma pop
 
 /* 80854A28-80854A2C 00B568 0004+00 1/1 0/0 0/0 .text            __ct__4cXyzFv */
-cXyz::cXyz() {
+// cXyz::cXyz() {
+extern "C" asm void __ct__4cXyzFv() {
     /* empty function */
 }
 
@@ -2687,7 +2295,8 @@ static asm void func_80854AD8() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::getMidnaActor() {
+// asm void daPy_py_c::getMidnaActor() {
+extern "C" asm void getMidnaActor__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_kago/d_a_kago/getMidnaActor__9daPy_py_cFv.s"
 }
diff --git a/rel/d/a/d_a_mant/d_a_mant.cpp b/rel/d/a/d_a_mant/d_a_mant.cpp
index d46ba372706..08c7c4b165a 100644
--- a/rel/d/a/d_a_mant/d_a_mant.cpp
+++ b/rel/d/a/d_a_mant/d_a_mant.cpp
@@ -1,85 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_mant
-//
+/**
+ * @file d_a_mant.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_mant/d_a_mant.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct mant_j_s {
-    /* 80862AC0 */ ~mant_j_s();
-    /* 80862B3C */ mant_j_s();
-};
-
-struct mant_class {};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daMant_packet_c {
-    /* 80861298 */ void draw();
-    /* 80862BA4 */ ~daMant_packet_c();
-};
-
-struct dKy_tevstr_c {};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266AE4 */ void operator+(Vec const&) const;
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80266B84 */ void operator*(f32) const;
-    /* 80861F60 */ ~cXyz();
-    /* 80862C40 */ cXyz();
-};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-};
-
-struct cBgS_GndChk {
-    /* 80267D0C */ void SetPos(Vec const*);
-};
-
-struct cBgS {
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DSys {
-    /* 8031073C */ void reinitGX();
-};
-
-struct J3DShape {
-    static u8 sOldVcdVatCmd[4];
-};
-
-struct J3DPacket;
-struct J3DDrawBuffer {
-    /* 8032548C */ void entryImm(J3DPacket*, u16);
-};
-
-struct J3DPacket {
-    /* 80312750 */ bool entry(J3DDrawBuffer*);
-};
-
 //
 // Forward References:
 //
@@ -136,42 +62,6 @@ extern "C" void __dl__FPv();
 extern "C" void reinitGX__6J3DSysFv();
 extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer();
 extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs();
-extern "C" void DCStoreRangeNoSync();
-extern "C" void PSMTXConcat();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSquareMag();
-extern "C" void GXSetVtxDesc();
-extern "C" void GXClearVtxDesc();
-extern "C" void GXSetVtxAttrFmt();
-extern "C" void GXSetArray();
-extern "C" void GXSetTexCoordGen2();
-extern "C" void GXSetNumTexGens();
-extern "C" void GXSetCullMode();
-extern "C" void GXSetNumChans();
-extern "C" void GXSetChanCtrl();
-extern "C" void GXInitTexObjCI();
-extern "C" void GXInitTexObjLOD();
-extern "C" void GXLoadTexObj();
-extern "C" void GXInitTlutObj();
-extern "C" void GXLoadTlut();
-extern "C" void GXSetNumIndStages();
-extern "C" void GXSetTevColorIn();
-extern "C" void GXSetTevAlphaIn();
-extern "C" void GXSetTevColorOp();
-extern "C" void GXSetTevAlphaOp();
-extern "C" void GXSetTevColor();
-extern "C" void GXSetTevKColor();
-extern "C" void GXSetTevKColorSel();
-extern "C" void GXSetTevKAlphaSel();
-extern "C" void GXSetTevSwapMode();
-extern "C" void GXSetAlphaCompare();
-extern "C" void GXSetTevOrder();
-extern "C" void GXSetNumTevStages();
-extern "C" void GXSetZMode();
-extern "C" void GXSetZCompLoc();
-extern "C" void GXCallDisplayList();
-extern "C" void GXLoadPosMtxImm();
-extern "C" void GXLoadNrmMtxImm();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
 extern "C" void _savegpr_19();
@@ -184,15 +74,10 @@ extern "C" void _restgpr_24();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__9J3DPacket[5];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern void* calc_mtx[1 + 1 /* padding */];
-extern "C" extern u32 __float_nan;
 extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
 
 //
@@ -2819,7 +2704,8 @@ static asm void joint_control(mant_class* param_0, mant_j_s* param_1, int param_
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_mant/d_a_mant/__dt__4cXyzFv.s"
 }
@@ -3060,25 +2946,30 @@ COMPILER_STRIP_GATE(0x80862D1C, &lit_4539);
 #pragma pop
 
 /* 8086BF08-8086BF28 -00001 0020+00 1/0 0/0 0/0 .data            l_daMant_Method */
-SECTION_DATA static void* l_daMant_Method[8] = {
-    (void*)daMant_Create__FP10fopAc_ac_c,
-    (void*)daMant_Delete__FP10mant_class,
-    (void*)daMant_Execute__FP10mant_class,
-    (void*)daMant_IsDelete__FP10mant_class,
-    (void*)daMant_Draw__FP10mant_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daMant_Method = {
+    (process_method_func)daMant_Create__FP10fopAc_ac_c,
+    (process_method_func)daMant_Delete__FP10mant_class,
+    (process_method_func)daMant_Execute__FP10mant_class,
+    (process_method_func)daMant_IsDelete__FP10mant_class,
+    (process_method_func)daMant_Draw__FP10mant_class,
 };
 
 /* 8086BF28-8086BF58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MANT */
-SECTION_DATA extern void* g_profile_MANT[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0008FFFD,
-    (void*)0x02F30000, (void*)&g_fpcLf_Method,
-    (void*)0x000039A4, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00EA0000, (void*)&l_daMant_Method,
-    (void*)0x00044000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_MANT = {
+  fpcLy_CURRENT_e,         // mLayerID
+  8,                       // mListID
+  fpcPi_CURRENT_e,         // mListPrio
+  PROC_MANT,               // mProcName
+  &g_fpcLf_Method.mBase,   // sub_method
+  sizeof(mant_class),      // mSize
+  0,                       // mSizeOther
+  0,                       // mParameters
+  &g_fopAc_Method.base,    // sub_method
+  234,                     // mPriority
+  &l_daMant_Method,        // sub_method
+  0x00044000,              // mStatus
+  fopAc_ACTOR_e,           // mActorType
+  fopAc_CULLBOX_CUSTOM_e,  // cullType
 };
 
 /* 8086BF58-8086BF6C 009238 0014+00 2/2 0/0 0/0 .data            __vt__15daMant_packet_c */
@@ -3131,6 +3022,7 @@ asm daMant_packet_c::~daMant_packet_c() {
 #pragma pop
 
 /* 80862C40-80862C44 001A20 0004+00 2/2 0/0 0/0 .text            __ct__4cXyzFv */
-cXyz::cXyz() {
+// cXyz::cXyz() {
+extern "C" asm void __ct__4cXyzFv() {
     /* empty function */
 }
diff --git a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp
index 97531be2c3b..75ad7911ebc 100644
--- a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp
+++ b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp
@@ -1,133 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_mg_fish
-//
+/**
+ * @file d_a_mg_fish.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_mg_fish/d_a_mg_fish.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct mDoCPd_c {
-    static u8 m_cpadInfo[256];
-};
-
-struct daPy_py_c {
-    /* 8015F4F0 */ void setLookPos(cXyz*);
-};
-
-struct daMg_Fish_HIO_c {
-    /* 80529D2C */ daMg_Fish_HIO_c();
-    /* 805360A8 */ ~daMg_Fish_HIO_c();
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-};
-
-struct dSv_info_c {
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 8003498C */ void onEventBit(u16);
-    /* 800349E0 */ void setEventReg(u16, u8);
-    /* 80034A04 */ void getEventReg(u16) const;
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjGndChk_Spl {
-    /* 800777B0 */ dBgS_ObjGndChk_Spl();
-    /* 80077848 */ ~dBgS_ObjGndChk_Spl();
-};
-
-struct dBgS_ObjGndChk {
-    /* 8052BAB8 */ ~dBgS_ObjGndChk();
-};
-
-struct dBgS_ObjAcch {
-    /* 80535E94 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 80535F04 */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
 
 //
 // Forward References:
@@ -701,25 +579,30 @@ SECTION_DATA static u8 fish_max[44] = {
 #pragma pop
 
 /* 80536A6C-80536A8C -00001 0020+00 1/0 0/0 0/0 .data            l_daMg_Fish_Method */
-SECTION_DATA static void* l_daMg_Fish_Method[8] = {
-    (void*)daMg_Fish_Create__FP10fopAc_ac_c,
-    (void*)daMg_Fish_Delete__FP13mg_fish_class,
-    (void*)daMg_Fish_Execute__FP13mg_fish_class,
-    (void*)daMg_Fish_IsDelete__FP13mg_fish_class,
-    (void*)daMg_Fish_Draw__FP13mg_fish_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daMg_Fish_Method = {
+    (process_method_func)daMg_Fish_Create__FP10fopAc_ac_c,
+    (process_method_func)daMg_Fish_Delete__FP13mg_fish_class,
+    (process_method_func)daMg_Fish_Execute__FP13mg_fish_class,
+    (process_method_func)daMg_Fish_IsDelete__FP13mg_fish_class,
+    (process_method_func)daMg_Fish_Draw__FP13mg_fish_class,
 };
 
 /* 80536A8C-80536ABC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MG_FISH */
-SECTION_DATA extern void* g_profile_MG_FISH[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01360000, (void*)&g_fpcLf_Method,
-    (void*)0x00000C50, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02D00000, (void*)&l_daMg_Fish_Method,
-    (void*)0x00040100, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_MG_FISH = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_MG_FISH,           // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  0x00000C50,             // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  720,                    // mPriority
+  &l_daMg_Fish_Method,    // sub_method
+  0x00040100,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80536ABC-80536AC8 000618 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -1406,7 +1289,8 @@ static asm void get_ground_y(mg_fish_class* param_0, cXyz* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjGndChk::~dBgS_ObjGndChk() {
+// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() {
+extern "C" asm void __dt__14dBgS_ObjGndChkFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_fish/d_a_mg_fish/__dt__14dBgS_ObjGndChkFv.s"
 }
diff --git a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp
index f9c67c9ecc7..e3266e7b7ff 100644
--- a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp
+++ b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_mg_fshop
-//
+/**
+ * @file d_a_mg_fshop.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_mg_fshop/d_a_mg_fshop.h"
 #include "d/bg/d_bg_w.h"
@@ -3418,25 +3418,30 @@ SECTION_DATA static u8 check_kind[8] = {
 };
 
 /* 808708BC-808708DC -00001 0020+00 1/0 0/0 0/0 .data            l_daFshop_Method */
-SECTION_DATA static void* l_daFshop_Method[8] = {
-    (void*)daFshop_Create__FP10fopAc_ac_c,
-    (void*)daFshop_Delete__FP11fshop_class,
-    (void*)daFshop_Execute__FP11fshop_class,
-    (void*)daFshop_IsDelete__FP11fshop_class,
-    (void*)daFshop_Draw__FP11fshop_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daFshop_Method = {
+    (process_method_func)daFshop_Create__FP10fopAc_ac_c,
+    (process_method_func)daFshop_Delete__FP11fshop_class,
+    (process_method_func)daFshop_Execute__FP11fshop_class,
+    (process_method_func)daFshop_IsDelete__FP11fshop_class,
+    (process_method_func)daFshop_Draw__FP11fshop_class,
 };
 
 /* 808708DC-8087090C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_FSHOP */
-SECTION_DATA extern void* g_profile_FSHOP[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01370000, (void*)&g_fpcLf_Method,
-    (void*)0x00006B80, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02D10000, (void*)&l_daFshop_Method,
-    (void*)0x00044000, (void*)NULL,
+extern actor_process_profile_definition g_profile_FSHOP = {
+  fpcLy_CURRENT_e,       // mLayerID
+  7,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_FSHOP,            // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  0x00006B80,            // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  721,                   // mPriority
+  &l_daFshop_Method,     // sub_method
+  0x00044000,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 8087090C-80870918 000688 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
diff --git a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp
index 6a7e47b2c4a..e54423aa0e8 100644
--- a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp
+++ b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp
@@ -1,295 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_mg_rod
-//
+/**
+ * @file d_a_mg_rod.cpp
+ * 
+*/
 
-// #include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h"
+#include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h"
+
+#include "d/d_camera.h"
 #include "dol2asm.h"
 #include "d/cc/d_cc_d.h"
 
-//
-// Types:
-//
-
-struct wd_ss {};
-
-struct request_of_phase_process_class {};
-
-struct mg_hook_s {
-    /* 804BAF78 */ ~mg_hook_s();
-    /* 804BAFD8 */ mg_hook_s();
-};
-
-struct mg_fish_class {};
-
-struct mDoMtx_stack_c {
-    /* 8000CCC8 */ void push();
-    /* 8000CD14 */ void pop();
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-
-    static u8 now[48];
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DModelData {};
-
-struct J3DAnmTransform {};
-
-struct mDoExt_McaMorf {
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                  mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
-                                  int, void*, u32, u32);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-};
-
-struct mDoExt_3DlineMat_c {};
-
-struct mDoExt_3DlineMatSortPacket {
-    /* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
-};
-
-struct dKy_tevstr_c {};
-
-struct _GXColor {};
-
-struct mDoExt_3DlineMat0_c {
-    /* 800125E0 */ void init(u16, u16, int);
-    /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*);
-};
-
-struct mDoCPd_c {
-    /* 804BB4C0 */ void getTrigZ(u32);
-    /* 804BB4DC */ void getTrigA(u32);
-
-    static u8 m_cpadInfo[256];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct dmg_rod_class {
-    /* 804BAC0C */ dmg_rod_class();
-};
-
-struct dmg_rod_HIO_c {
-    /* 804A95EC */ dmg_rod_HIO_c();
-    /* 804BB070 */ ~dmg_rod_HIO_c();
-};
-
-struct daPy_py_c {
-    /* 8015EA20 */ void checkFishingRodItem(int);
-    /* 804BB294 */ void cancelOriginalDemo();
-    /* 804BB2F0 */ void changeDemoMode(u32, int, int, s16);
-    /* 804BB304 */ void changeOriginalDemo();
-};
-
-struct daObjLife_c {
-    /* 804CDD7C */ void actionInitWait2();
-};
-
-struct daAlink_c {
-    /* 800B9340 */ void checkEquipAnime() const;
-    /* 800F3E4C */ void checkFishingRodGrab(fopAc_ac_c*) const;
-    /* 800F3F38 */ void checkCanoeFishingRodGrabOrPut() const;
-};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-};
-
-struct dSv_player_item_record_c {
-    /* 80033F7C */ void getBombNum(u8) const;
-};
-
-struct dSv_player_item_max_c {
-    /* 800340F8 */ void getBombNum(u8) const;
-};
-
-struct dSv_player_item_c {
-    /* 80033030 */ void getItem(int, bool) const;
-    /* 80033494 */ void setEmptyBottle();
-    /* 80033A50 */ void setEmptyBombBagItemIn(u8, u8, bool);
-};
-
-struct dSv_info_c {
-    /* 800354E0 */ void onItem(int, int);
-};
-
-struct dSv_fishing_info_c {
-    /* 800344FC */ void addFishCount(u8);
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 8003498C */ void onEventBit(u16);
-    /* 800349A4 */ void offEventBit(u16);
-    /* 800349BC */ void isEventBit(u16) const;
-    /* 800349E0 */ void setEventReg(u16, u8);
-    /* 80034A04 */ void getEventReg(u16) const;
-};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {
-    /* 804BB020 */ csXyz();
-    /* 802673F4 */ csXyz(s16, s16, s16);
-    /* 804BB178 */ ~csXyz();
-};
-
-struct dPa_control_c {
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dMsgObject_c {
-    /* 80238440 */ void getSelectCursorPos();
-};
-
-struct dMsgFlow_c {
-    /* 80249F00 */ dMsgFlow_c();
-    /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
-    /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
-    /* 8024A4C4 */ void remove();
-};
-
-struct dMeter2Info_c {
-    /* 8021C970 */ void setMeterString(s32);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dComIfG_play_c {
-    /* 8002B36C */ void setItemBombNumCount(u8, s16);
-};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-    /* 80078EE0 */ void SetRope();
-};
-
-struct dBgS_ObjGndChk_Spl {
-    /* 800777B0 */ dBgS_ObjGndChk_Spl();
-    /* 80077848 */ ~dBgS_ObjGndChk_Spl();
-};
-
-struct dBgS_ObjAcch {
-    /* 804BAE98 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 804BAF08 */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct dAttLook_c {
-    /* 80073D08 */ void request(fopAc_ac_c*, f32, f32, f32, s16, int);
-};
-
-struct camera_class {};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-    /* 80267D0C */ void SetPos(Vec const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-    /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
-};
-
-struct Z2SeqMgr {
-    /* 802AF49C */ void subBgmStart(u32);
-    /* 802AFF8C */ void changeBgmStatus(s32);
-    /* 802B2A88 */ void changeFishingBgm(s32);
-};
-
-struct Z2Creature {
-    /* 802C03C8 */ Z2Creature();
-    /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
 //
 // Forward References:
 //
@@ -537,9 +256,6 @@ extern "C" void __ct__10Z2CreatureFv();
 extern "C" void init__10Z2CreatureFP3VecP3VecUcUc();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void PSMTXMultVec();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
 extern "C" void __cvt_fp2unsigned();
@@ -564,8 +280,6 @@ extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5];
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -575,13 +289,10 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" extern u8 g_meter2_info[248];
 extern "C" extern u8 g_Counter[12 + 4 /* padding */];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" extern u8 struct_80450C98[4];
 extern "C" extern u8 cDmr_SkipInfo[4];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
@@ -977,25 +688,30 @@ static dCcD_SrcSph cc_sph_src = {
 };
 
 /* 804BBAAC-804BBACC -00001 0020+00 1/0 0/0 0/0 .data            l_dmg_rod_Method */
-SECTION_DATA static void* l_dmg_rod_Method[8] = {
-    (void*)dmg_rod_Create__FP10fopAc_ac_c,
-    (void*)dmg_rod_Delete__FP13dmg_rod_class,
-    (void*)dmg_rod_Execute__FP13dmg_rod_class,
-    (void*)dmg_rod_IsDelete__FP13dmg_rod_class,
-    (void*)dmg_rod_Draw__FP13dmg_rod_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_dmg_rod_Method = {
+    (process_method_func)dmg_rod_Create__FP10fopAc_ac_c,
+    (process_method_func)dmg_rod_Delete__FP13dmg_rod_class,
+    (process_method_func)dmg_rod_Execute__FP13dmg_rod_class,
+    (process_method_func)dmg_rod_IsDelete__FP13dmg_rod_class,
+    (process_method_func)dmg_rod_Draw__FP13dmg_rod_class,
 };
 
 /* 804BBACC-804BBAFC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MG_ROD */
-SECTION_DATA extern void* g_profile_MG_ROD[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0008FFFD,
-    (void*)0x02E40000, (void*)&g_fpcLf_Method,
-    (void*)0x00001690, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01B60000, (void*)&l_dmg_rod_Method,
-    (void*)0x00060000, (void*)NULL,
+extern actor_process_profile_definition g_profile_MG_ROD = {
+  fpcLy_CURRENT_e,            // mLayerID
+  8,                          // mListID
+  fpcPi_CURRENT_e,            // mListPrio
+  PROC_MG_ROD,                // mProcName
+  &g_fpcLf_Method.mBase,      // sub_method
+  sizeof(dmg_rod_class),      // mSize
+  0,                          // mSizeOther
+  0,                          // mParameters
+  &g_fopAc_Method.base,       // sub_method
+  438,                        // mPriority
+  &l_dmg_rod_Method,          // sub_method
+  0x00060000,                 // mStatus
+  fopAc_ACTOR_e,              // mActorType
+  fopAc_CULLBOX_0_e,          // cullType
 };
 
 /* 804BBAFC-804BBB08 0002AC 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -3189,7 +2905,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -3199,7 +2916,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/__dt__12dBgS_AcchCirFv.s"
 }
@@ -3226,7 +2944,8 @@ asm mg_hook_s::mg_hook_s() {
 #pragma pop
 
 /* 804BB020-804BB024 011B20 0004+00 1/1 0/0 0/0 .text            __ct__5csXyzFv */
-csXyz::csXyz() {
+// csXyz::csXyz() {
+extern "C" asm void __ct__5csXyzFv() {
     /* empty function */
 }
 
@@ -3306,7 +3025,8 @@ static asm void func_804BB170() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm csXyz::~csXyz() {
+// asm csXyz::~csXyz() {
+extern "C" asm void __dt__5csXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/__dt__5csXyzFv.s"
 }
@@ -3389,7 +3109,8 @@ static asm void dComIfGp_getPlayerCameraID(int param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void dComIfGp_getPlayer(int param_0) {
+// static asm void dComIfGp_getPlayer(int param_0) {
+extern "C" asm void dComIfGp_getPlayer__Fi() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/dComIfGp_getPlayer__Fi.s"
 }
@@ -3399,7 +3120,8 @@ static asm void dComIfGp_getPlayer(int param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::cancelOriginalDemo() {
+// asm void daPy_py_c::cancelOriginalDemo() {
+extern "C" asm void cancelOriginalDemo__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/cancelOriginalDemo__9daPy_py_cFv.s"
 }
@@ -3430,7 +3152,8 @@ extern "C" asm void __ct__4cXyzFRC4cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void JMAFastSqrt(f32 param_0) {
+// static asm void JMAFastSqrt(f32 param_0) {
+extern "C" static asm void JMAFastSqrt__Ff() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/JMAFastSqrt__Ff.s"
 }
@@ -3440,7 +3163,8 @@ static asm void JMAFastSqrt(f32 param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+// asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) {
+extern "C" asm void changeDemoMode__9daPy_py_cFUliis() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/changeDemoMode__9daPy_py_cFUliis.s"
 }
@@ -3450,7 +3174,8 @@ asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 pa
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::changeOriginalDemo() {
+// asm void daPy_py_c::changeOriginalDemo() {
+extern "C" asm void changeOriginalDemo__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/changeOriginalDemo__9daPy_py_cFv.s"
 }
@@ -3460,7 +3185,8 @@ asm void daPy_py_c::changeOriginalDemo() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void mDoAud_seStart(u32 param_0, Vec const* param_1, u32 param_2, s8 param_3) {
+// static asm void mDoAud_seStart(u32 param_0, Vec const* param_1, u32 param_2, s8 param_3) {
+extern "C" static asm void mDoAud_seStart__FUlPC3VecUlSc() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/mDoAud_seStart__FUlPC3VecUlSc.s"
 }
@@ -3470,7 +3196,8 @@ static asm void mDoAud_seStart(u32 param_0, Vec const* param_1, u32 param_2, s8
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void cM_ssin(s16 param_0) {
+// static asm void cM_ssin(s16 param_0) {
+extern "C" asm void cM_ssin__Fs() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/cM_ssin__Fs.s"
 }
@@ -3502,7 +3229,8 @@ extern "C" asm void __as__4cXyzFRC4cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoCPd_c::getTrigZ(u32 param_0) {
+// asm void mDoCPd_c::getTrigZ(u32 param_0) {
+extern "C" asm void getTrigZ__8mDoCPd_cFUl() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/getTrigZ__8mDoCPd_cFUl.s"
 }
@@ -3512,7 +3240,8 @@ asm void mDoCPd_c::getTrigZ(u32 param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoCPd_c::getTrigA(u32 param_0) {
+// asm void mDoCPd_c::getTrigA(u32 param_0) {
+extern "C" asm void getTrigA__8mDoCPd_cFUl() {
     nofralloc
 #include "asm/rel/d/a/d_a_mg_rod/d_a_mg_rod/getTrigA__8mDoCPd_cFUl.s"
 }
diff --git a/rel/d/a/d_a_midna/d_a_midna.cpp b/rel/d/a/d_a_midna/d_a_midna.cpp
index 7a7b1df8710..dbd2cc5ec02 100644
--- a/rel/d/a/d_a_midna/d_a_midna.cpp
+++ b/rel/d/a/d_a_midna/d_a_midna.cpp
@@ -1,101 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_midna
-//
+/**
+ * @file d_a_midna.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_midna/d_a_midna.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct J3DMaterial {};
-
-struct daMidna_matAnm_c {
-    /* 804BC218 */ void init();
-    /* 804BC248 */ void calc(J3DMaterial*) const;
-    /* 804C63E0 */ ~daMidna_matAnm_c();
-};
-
-struct daMidna_hio_c0 {
-    static u8 const m[32];
-};
-
-struct daMidna_McaMorfCB1_c {
-    /* 804BC36C */ void execute(u16, J3DTransformInfo*);
-    /* 804C6398 */ ~daMidna_McaMorfCB1_c();
-};
-
-struct daAlink_c {
-    /* 800A3F98 */ void initDemoBck(mDoExt_bckAnm**, char const*);
-    /* 800A9248 */ void simpleAnmPlay(J3DAnmBase*);
-    /* 800B4908 */ void getMetamorphoseNearDis() const;
-    /* 800B4918 */ void getMetamorphoseFarDis() const;
-    /* 800B4928 */ void getMetamorphoseFarAngle() const;
-    /* 800C03A0 */ void checkCloudSea();
-    /* 800CB694 */ void initShadowScaleLight();
-    /* 800CBA38 */ void moveShadowScaleLight();
-    /* 80129958 */ void checkMidnaUseAbility() const;
-    /* 80133D6C */ void getWolfTagJumpTime() const;
-    /* 80133EF0 */ void checkMidnaLockJumpPoint() const;
-    /* 801371A0 */ void checkMidnaDisappearMode() const;
-    /* 801391DC */ void getWolfLockActorEnd();
-};
-
-struct dMsgObject_c {
-    /* 802383A4 */ void isMouthCheck();
-};
-
-struct dDemo_object_c {
-    /* 80039088 */ void getActor(u8);
-};
-
-struct dDemo_c {
-    static u8 m_object[4];
-};
-
-struct dDemo_actor_c {
-    /* 8003819C */ void getPrm_Morf();
-    /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*);
-};
-
-struct J3DTexNoAnm {
-    /* 804BD140 */ ~J3DTexNoAnm();
-    /* 804BD188 */ J3DTexNoAnm();
-    /* 804C634C */ void calc(u16*) const;
-};
-
-struct J3DTexMtxAnm {
-    /* 804BD1AC */ ~J3DTexMtxAnm();
-    /* 804BD1E8 */ J3DTexMtxAnm();
-};
-
-struct J3DTevKColorAnm {
-    /* 804BD098 */ ~J3DTevKColorAnm();
-    /* 804BD0D4 */ J3DTevKColorAnm();
-};
-
-struct J3DTevColorAnm {
-    /* 804BD0EC */ ~J3DTevColorAnm();
-    /* 804BD128 */ J3DTevColorAnm();
-};
-
-struct J3DMaterialAnm {
-    /* 8032C320 */ void initialize();
-    /* 8032C3C4 */ void calc(J3DMaterial*) const;
-};
-
-struct J3DMatColorAnm {
-    /* 804BD200 */ ~J3DMatColorAnm();
-    /* 804BD23C */ J3DMatColorAnm();
-};
-
-struct J3DAnmLoaderDataBaseFlag {};
-
-struct J3DAnmLoaderDataBase {
-    /* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag);
-};
 
 //
 // Forward References:
@@ -643,25 +553,30 @@ SECTION_DATA static void* lit_4662[3] = {
 };
 
 /* 804C6C40-804C6C60 -00001 0020+00 1/0 0/0 0/0 .data            l_daMidna_Method */
-SECTION_DATA static void* l_daMidna_Method[8] = {
-    (void*)daMidna_Create__FP10fopAc_ac_c,
-    (void*)daMidna_Delete__FP9daMidna_c,
-    (void*)daMidna_Execute__FP9daMidna_c,
-    (void*)NULL,
-    (void*)daMidna_Draw__FP9daMidna_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daMidna_Method = {
+    (process_method_func)daMidna_Create__FP10fopAc_ac_c,
+    (process_method_func)daMidna_Delete__FP9daMidna_c,
+    (process_method_func)daMidna_Execute__FP9daMidna_c,
+    0,
+    (process_method_func)daMidna_Draw__FP9daMidna_c,
 };
 
 /* 804C6C60-804C6C90 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MIDNA */
-SECTION_DATA extern void* g_profile_MIDNA[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0006FFFD,
-    (void*)0x00FF0000, (void*)&g_fpcLf_Method,
-    (void*)0x000009E0, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x005C0000, (void*)&l_daMidna_Method,
-    (void*)0x00060000, (void*)0x03000000,
+extern actor_process_profile_definition g_profile_MIDNA = {
+  fpcLy_CURRENT_e,              // mLayerID
+  6,                            // mListID
+  fpcPi_CURRENT_e,              // mListPrio
+  PROC_MIDNA,                   // mProcName
+  &g_fpcLf_Method.mBase,        // sub_method
+  sizeof(daMidna_c),            // mSize
+  0,                            // mSizeOther
+  0,                            // mParameters
+  &g_fopAc_Method.base,         // sub_method
+  92,                           // mPriority
+  &l_daMidna_Method,            // sub_method
+  0x00060000,                   // mStatus
+  fopAc_ENV_e,                  // mActorType
+  fopAc_CULLBOX_0_e,            // cullType
 };
 
 /* 804C6C90-804C6C9C 00005C 000C+00 1/1 0/0 0/0 .data            __vt__25mDoExt_McaMorfCallBack1_c
@@ -727,7 +642,8 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevKColorAnm::~J3DTevKColorAnm() {
+// asm J3DTevKColorAnm::~J3DTevKColorAnm() {
+extern "C" asm void __dt__15J3DTevKColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__dt__15J3DTevKColorAnmFv.s"
 }
@@ -737,7 +653,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevKColorAnm::J3DTevKColorAnm() {
+// asm J3DTevKColorAnm::J3DTevKColorAnm() {
+extern "C" asm void __ct__15J3DTevKColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__ct__15J3DTevKColorAnmFv.s"
 }
@@ -747,7 +664,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevColorAnm::~J3DTevColorAnm() {
+// asm J3DTevColorAnm::~J3DTevColorAnm() {
+extern "C" asm void __dt__14J3DTevColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__dt__14J3DTevColorAnmFv.s"
 }
@@ -757,7 +675,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevColorAnm::J3DTevColorAnm() {
+// asm J3DTevColorAnm::J3DTevColorAnm() {
+extern "C" asm void __ct__14J3DTevColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__ct__14J3DTevColorAnmFv.s"
 }
@@ -767,7 +686,8 @@ asm J3DTevColorAnm::J3DTevColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexNoAnm::~J3DTexNoAnm() {
+// asm J3DTexNoAnm::~J3DTexNoAnm() {
+extern "C" asm void __dt__11J3DTexNoAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__dt__11J3DTexNoAnmFv.s"
 }
@@ -777,7 +697,8 @@ asm J3DTexNoAnm::~J3DTexNoAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexNoAnm::J3DTexNoAnm() {
+// asm J3DTexNoAnm::J3DTexNoAnm() {
+extern "C" asm void __ct__11J3DTexNoAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__ct__11J3DTexNoAnmFv.s"
 }
@@ -787,7 +708,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexMtxAnm::~J3DTexMtxAnm() {
+// asm J3DTexMtxAnm::~J3DTexMtxAnm() {
+extern "C" asm void __dt__12J3DTexMtxAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__dt__12J3DTexMtxAnmFv.s"
 }
@@ -797,7 +719,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexMtxAnm::J3DTexMtxAnm() {
+// asm J3DTexMtxAnm::J3DTexMtxAnm() {
+extern "C" asm void __ct__12J3DTexMtxAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__ct__12J3DTexMtxAnmFv.s"
 }
@@ -807,7 +730,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DMatColorAnm::~J3DMatColorAnm() {
+// asm J3DMatColorAnm::~J3DMatColorAnm() {
+extern "C" asm void __dt__14J3DMatColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__dt__14J3DMatColorAnmFv.s"
 }
@@ -817,7 +741,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DMatColorAnm::J3DMatColorAnm() {
+// asm J3DMatColorAnm::J3DMatColorAnm() {
+extern "C" asm void __ct__14J3DMatColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/__ct__14J3DMatColorAnmFv.s"
 }
@@ -2034,7 +1959,8 @@ static asm void daMidna_Delete(daMidna_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void J3DTexNoAnm::calc(u16* param_0) const {
+// asm void J3DTexNoAnm::calc(u16* param_0) const {
+extern "C" asm void calc__11J3DTexNoAnmCFPUs() {
     nofralloc
 #include "asm/rel/d/a/d_a_midna/d_a_midna/calc__11J3DTexNoAnmCFPUs.s"
 }
diff --git a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp
index 57e967fbb72..718bb54f1fa 100644
--- a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp
+++ b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp
@@ -1,68 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_movie_player
-//
+/**
+ * @file d_a_movie_player.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_movie_player/d_a_movie_player.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
-//
-// Types:
-//
-
-struct mDoGph_gInf_c {
-    /* 800080D0 */ void fadeOut(f32);
-    /* 80878534 */ void fadeIn(f32);
-    /* 80878558 */ void isFade();
-    /* 80878D10 */ void setFrameRate(u16);
-};
-
-struct daMP_THPReadBuffer {};
-
-struct daMP_Dlst_base_c {
-    /* 80878DB8 */ void draw();
-    /* 80878FD8 */ daMP_Dlst_base_c();
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dDlst_base_c {
-    /* 80879014 */ dDlst_base_c();
-    /* 80879024 */ void draw();
-};
-
-struct dDlst_list_c {
-    /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
-    /* 80878E34 */ void set2DOpa(dDlst_base_c*);
-};
-
-struct dComIfG_play_c {
-    /* 80878A64 */ void getEvent();
-};
-
-struct THPVideoInfo {};
-
-struct THPAudioInfo {};
-
-struct JUTVideo {
-    /* 808788BC */ void getRenderMode() const;
-    /* 808788C4 */ void getManager();
-
-    static u8 sManager[4];
-};
-
-struct JFWDisplay {
-    /* 80878D44 */ void setFrameRate(u16);
-    /* 80878D54 */ void getManager();
-
-    static u8 sManager[4];
-};
-
-struct JASMixMode {};
-
 //
 // Forward References:
 //
@@ -224,7 +168,6 @@ extern "C" void LCEnable();
 extern "C" void LCDisable();
 extern "C" void VIGetNextField();
 extern "C" void AIGetDSPSampleRate();
-extern "C" void GXClearVtxDesc();
 extern "C" void GXDrawDone();
 extern "C" void GXInvalidateTexAll();
 extern "C" static void i_GXEnd();
@@ -1741,7 +1684,8 @@ static asm void daMP_THPPlayerDrawCurrentFrame(_GXRenderModeObj const* param_0,
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoGph_gInf_c::fadeIn(f32 param_0) {
+// asm void mDoGph_gInf_c::fadeIn(f32 param_0) {
+extern "C" asm void fadeIn__13mDoGph_gInf_cFf() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/fadeIn__13mDoGph_gInf_cFf.s"
 }
@@ -1751,7 +1695,8 @@ asm void mDoGph_gInf_c::fadeIn(f32 param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoGph_gInf_c::isFade() {
+// asm void mDoGph_gInf_c::isFade() {
+extern "C" asm void isFade__13mDoGph_gInf_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/isFade__13mDoGph_gInf_cFv.s"
 }
@@ -1832,7 +1777,8 @@ static asm void daMP_ActivePlayer_Init(char const* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void JUTVideo::getRenderMode() const {
+// asm void JUTVideo::getRenderMode() const {
+extern "C" asm void getRenderMode__8JUTVideoCFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/getRenderMode__8JUTVideoCFv.s"
 }
@@ -1842,7 +1788,8 @@ asm void JUTVideo::getRenderMode() const {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void JUTVideo::getManager() {
+// asm void JUTVideo::getManager() {
+extern "C" asm void getManager__8JUTVideoFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/getManager__8JUTVideoFv.s"
 }
@@ -1928,7 +1875,8 @@ static asm void dComIfGp_event_reset() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dComIfG_play_c::getEvent() {
+// asm void dComIfG_play_c::getEvent() {
+extern "C" asm void getEvent__14dComIfG_play_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/getEvent__14dComIfG_play_cFv.s"
 }
@@ -2020,7 +1968,8 @@ asm void daMP_c::daMP_c_Init() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoGph_gInf_c::setFrameRate(u16 param_0) {
+// asm void mDoGph_gInf_c::setFrameRate(u16 param_0) {
+extern "C" asm void setFrameRate__13mDoGph_gInf_cFUs() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/setFrameRate__13mDoGph_gInf_cFUs.s"
 }
@@ -2030,7 +1979,8 @@ asm void mDoGph_gInf_c::setFrameRate(u16 param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void JFWDisplay::setFrameRate(u16 param_0) {
+// asm void JFWDisplay::setFrameRate(u16 param_0) {
+extern "C" asm void setFrameRate__10JFWDisplayFUs() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/setFrameRate__10JFWDisplayFUs.s"
 }
@@ -2040,7 +1990,8 @@ asm void JFWDisplay::setFrameRate(u16 param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void JFWDisplay::getManager() {
+// asm void JFWDisplay::getManager() {
+extern "C" asm void getManager__10JFWDisplayFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/getManager__10JFWDisplayFv.s"
 }
@@ -2095,7 +2046,8 @@ asm void daMP_c::daMP_c_Draw() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-static asm void dComIfGd_set2DOpa(dDlst_base_c* param_0) {
+// static asm void dComIfGd_set2DOpa(dDlst_base_c* param_0) {
+extern "C" static asm void dComIfGd_set2DOpa__FP12dDlst_base_c() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/dComIfGd_set2DOpa__FP12dDlst_base_c.s"
 }
@@ -2105,7 +2057,8 @@ static asm void dComIfGd_set2DOpa(dDlst_base_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dDlst_list_c::set2DOpa(dDlst_base_c* param_0) {
+// asm void dDlst_list_c::set2DOpa(dDlst_base_c* param_0) {
+extern "C" asm void set2DOpa__12dDlst_list_cFP12dDlst_base_c() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/set2DOpa__12dDlst_list_cFP12dDlst_base_c.s"
 }
@@ -2214,22 +2167,30 @@ REGISTER_CTORS(0x80878FB0, __sinit_d_a_movie_player_cpp);
 
 /* ############################################################################################## */
 /* 80879534-80879554 -00001 0020+00 1/0 0/0 0/0 .data            daMP_METHODS */
-SECTION_DATA static void* daMP_METHODS[8] = {
-    (void*)daMP_c_Callback_Init__6daMP_cFP10fopAc_ac_c,
-    (void*)daMP_c_Callback_Finish__6daMP_cFP6daMP_c,
-    (void*)daMP_c_Callback_Main__6daMP_cFP6daMP_c,
-    (void*)daMP_Callback_Dummy__FP6daMP_c,
-    (void*)daMP_c_Callback_Draw__6daMP_cFP6daMP_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daMP_METHODS = {
+    (process_method_func)daMP_c_Callback_Init__6daMP_cFP10fopAc_ac_c,
+    (process_method_func)daMP_c_Callback_Finish__6daMP_cFP6daMP_c,
+    (process_method_func)daMP_c_Callback_Main__6daMP_cFP6daMP_c,
+    (process_method_func)daMP_Callback_Dummy__FP6daMP_c,
+    (process_method_func)daMP_c_Callback_Draw__6daMP_cFP6daMP_c,
 };
 
 /* 80879554-80879584 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MOVIE_PLAYER */
-SECTION_DATA extern void* g_profile_MOVIE_PLAYER[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,    (void*)0x02E00000, (void*)&g_fpcLf_Method,
-    (void*)0x00000580, (void*)NULL,          (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00090000, (void*)&daMP_METHODS, (void*)0x0006C000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_MOVIE_PLAYER = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_MOVIE_PLAYER,      // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daMP_c),         // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  9,                      // mPriority
+  &daMP_METHODS,          // sub_method
+  0x0006C000,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80879584-80879590 000150 000C+00 1/1 0/0 0/0 .data            __vt__16daMP_Dlst_base_c */
@@ -2261,14 +2222,16 @@ SECTION_DATA extern void* __vt__12dDlst_base_c[3] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dDlst_base_c::dDlst_base_c() {
+// asm dDlst_base_c::dDlst_base_c() {
+extern "C" asm void __ct__12dDlst_base_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/__ct__12dDlst_base_cFv.s"
 }
 #pragma pop
 
 /* 80879024-80879028 006944 0004+00 1/0 0/0 0/0 .text            draw__12dDlst_base_cFv */
-void dDlst_base_c::draw() {
+// void dDlst_base_c::draw() {
+extern "C" void draw__12dDlst_base_cFv() {
     /* empty function */
 }
 
diff --git a/rel/d/a/d_a_myna/d_a_myna.cpp b/rel/d/a/d_a_myna/d_a_myna.cpp
index 2e122b34cde..b27b22fd96e 100644
--- a/rel/d/a/d_a_myna/d_a_myna.cpp
+++ b/rel/d/a/d_a_myna/d_a_myna.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_myna
-//
+/**
+ * @file d_a_myna.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_myna/d_a_myna.h"
 #include "d/a/d_a_player.h"
diff --git a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp
index b0513c3fff0..75beff94b43 100644
--- a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp
+++ b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp
@@ -533,25 +533,30 @@ SECTION_DATA static void* lit_5987[3] = {
 };
 
 /* 804CC590-804CC5B0 -00001 0020+00 1/0 0/0 0/0 .data            l_daNbombMethod */
-SECTION_DATA static void* l_daNbombMethod[8] = {
-    (void*)daNbomb_Create__FP10fopAc_ac_c,
-    (void*)daNbomb_Delete__FP9daNbomb_c,
-    (void*)daNbomb_Execute__FP9daNbomb_c,
-    (void*)NULL,
-    (void*)daNbomb_Draw__FP9daNbomb_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daNbombMethod = {
+    (process_method_func)daNbomb_Create__FP10fopAc_ac_c,
+    (process_method_func)daNbomb_Delete__FP9daNbomb_c,
+    (process_method_func)daNbomb_Execute__FP9daNbomb_c,
+    0,
+    (process_method_func)daNbomb_Draw__FP9daNbomb_c,
 };
 
 /* 804CC5B0-804CC5E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NBOMB */
-SECTION_DATA extern void* g_profile_NBOMB[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02210000, (void*)&g_fpcLf_Method,
-    (void*)0x00000C44, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x010E0000, (void*)&l_daNbombMethod,
-    (void*)0x00040100, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_NBOMB = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_NBOMB,             // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  0x00000C44,             // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  270,                    // mPriority
+  &l_daNbombMethod,       // sub_method
+  0x00040100,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 804CC5E0-804CC5EC 000108 000C+00 5/5 0/0 0/0 .data            __vt__8cM3dGPla */
diff --git a/rel/d/a/d_a_ni/d_a_ni.cpp b/rel/d/a/d_a_ni/d_a_ni.cpp
index bb333eb49d6..f3cf7b98603 100644
--- a/rel/d/a/d_a_ni/d_a_ni.cpp
+++ b/rel/d/a/d_a_ni/d_a_ni.cpp
@@ -1,237 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_ni
-//
+/**
+ * @file d_a_ni.cpp
+ * 
+*/
 
-// #include "rel/d/a/d_a_ni/d_a_ni.h"
+#include "rel/d/a/d_a_ni/d_a_ni.h"
 #include "d/cc/d_cc_d.h"
 #include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct ni_class {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD9C */ void transM(f32, f32, f32);
-    /* 8000CE38 */ void scaleM(f32, f32, f32);
-
-    static u8 now[48];
-};
-
-struct _GXColor {};
-
-struct mDoGph_gInf_c {
-    /* 80007FD8 */ void fadeOut(f32, _GXColor&);
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTextureSRTKey {};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct mDoExt_McaMorf {
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                  mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
-                                  int, void*, u32, u32);
-    /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
-    /* 800105C8 */ void play(Vec*, u32, s8);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-};
-
-struct mDoCPd_c {
-    static u8 m_cpadInfo[256];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct fopAcM_gc_c {
-    /* 8001DCBC */ void gndCheck(cXyz const*);
-
-    static f32 mGroundY;
-};
-
-struct daPy_py_c {
-    /* 8015F89C */ void checkBoomerangCharge();
-};
-
-struct daNi_HIO_c {
-    /* 8094BC2C */ daNi_HIO_c();
-    /* 80951118 */ ~daNi_HIO_c();
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 800349BC */ void isEventBit(u16) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {};
-
-struct dPa_control_c {
-    struct level_c {
-        /* 8004B8B4 */ void forceOnEventMove(u32);
-        /* 8004B918 */ void getEmitter(u32);
-    };
-
-    /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
-                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
-                            _GXColor const*, cXyz const*, f32);
-};
-
-struct dMsgFlow_c {
-    /* 80249F00 */ dMsgFlow_c();
-    /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
-    /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dDlst_shadowControl_c {
-    static u8 mSimpleTexObj[32];
-};
-
-struct dCcU_AtInfo {};
-
-struct dCamera_c {
-    /* 801614AC */ void Start();
-    /* 801614D0 */ void Stop();
-    /* 8016300C */ void SetTrimSize(s32);
-    /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
-    /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16);
-};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjGndChk_Spl {
-    /* 800777B0 */ dBgS_ObjGndChk_Spl();
-    /* 80077848 */ ~dBgS_ObjGndChk_Spl();
-};
-
-struct dBgS_ObjAcch {
-    /* 80950FF0 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_CamLinChk {
-    /* 80077DA4 */ dBgS_CamLinChk();
-    /* 80077E00 */ ~dBgS_CamLinChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 80951060 */ ~dBgS_AcchCir();
-};
-
-struct dBgS {};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 80076AAC */ void CrrPos(dBgS&);
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_LinChk {};
-
-struct cBgS_GndChk {
-    /* 80267D28 */ void SetPos(cXyz const*);
-};
-
-struct cBgS {
-    /* 800743B4 */ void LineCross(cBgS_LinChk*);
-    /* 800744A0 */ void GroundCross(cBgS_GndChk*);
-};
-
-struct _GXTexObj {};
-
-struct Z2SoundObjSimple {
-    /* 802BE844 */ Z2SoundObjSimple();
-};
-
-struct Z2SoundObjBase {
-    /* 802BDFF8 */ void deleteObject();
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DSys {
-    static u8 mCurrentMtx[48];
-};
-
-struct J3DModel {};
-
-struct J3DJoint {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 8032842C */ void checkPass(f32);
-    /* 80950AE8 */ ~J3DFrameCtrl();
-};
+#include "d/d_camera.h"
 
 //
 // Forward References:
@@ -388,8 +163,6 @@ extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void checkPass__12J3DFrameCtrlFf();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
 extern "C" void _savegpr_22();
 extern "C" void _savegpr_24();
 extern "C" void _savegpr_26();
@@ -402,8 +175,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -414,12 +185,9 @@ extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" extern u32 g_blackColor;
-extern "C" extern void* calc_mtx[1 + 1 /* padding */];
 extern "C" f32 mGroundY__11fopAcM_gc_c;
 extern "C" void __register_global_object();
 
@@ -582,22 +350,30 @@ static dCcD_SrcSph cc_sph_src = {
 };
 
 /* 80951480-809514A0 -00001 0020+00 1/0 0/0 0/0 .data            l_daNi_Method */
-SECTION_DATA static void* l_daNi_Method[8] = {
-    (void*)daNi_Create__FP10fopAc_ac_c,
-    (void*)daNi_Delete__FP8ni_class,
-    (void*)daNi_Execute__FP8ni_class,
-    (void*)daNi_IsDelete__FP8ni_class,
-    (void*)daNi_Draw__FP8ni_class,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daNi_Method = {
+    (process_method_func)daNi_Create__FP10fopAc_ac_c,
+    (process_method_func)daNi_Delete__FP8ni_class,
+    (process_method_func)daNi_Execute__FP8ni_class,
+    (process_method_func)daNi_IsDelete__FP8ni_class,
+    (process_method_func)daNi_Draw__FP8ni_class,
 };
 
 /* 809514A0-809514D0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NI */
-SECTION_DATA extern void* g_profile_NI[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,     (void*)0x01080000, (void*)&g_fpcLf_Method,
-    (void*)0x00000B0C, (void*)NULL,           (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02B70000, (void*)&l_daNi_Method, (void*)0x080C4000, (void*)0x04000000,
+extern actor_process_profile_definition g_profile_NI = {
+  fpcLy_CURRENT_e,       // mLayerID
+  7,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_NI,               // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(ni_class),      // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  695,                   // mPriority
+  &l_daNi_Method,        // sub_method
+  0x080C4000,            // mStatus
+  fopAc_NPC_e,           // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 809514D0-809514DC 0001A0 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -1635,7 +1411,8 @@ static asm void useHeapInit(fopAc_ac_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_ni/d_a_ni/__dt__12J3DFrameCtrlFv.s"
 }
@@ -1716,7 +1493,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_ni/d_a_ni/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -1726,7 +1504,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_ni/d_a_ni/__dt__12dBgS_AcchCirFv.s"
 }
diff --git a/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp b/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp
index bde1dee58ed..69a8d7ccccf 100644
--- a/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp
+++ b/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp
@@ -1,47 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_passer_mng
-//
+/**
+ * @file d_a_passer_mng.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_passer_mng/d_a_passer_mng.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daPasserMng_c {
-    /* 80D45738 */ void execute();
-    /* 80D4597C */ void getPasserParam();
-    /* 80D45E14 */ void getLuggageParamHigh(u32);
-    /* 80D46768 */ void create();
-    /* 80D467C0 */ void create_init();
-
-    static void* mGroupTbl[4];
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 800349BC */ void isEventBit(u16) const;
-};
-
-struct dPath {};
-
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-};
-
-struct cXyz {};
-
-struct Vec {};
 
 //
 // Forward References:
@@ -58,7 +22,6 @@ extern "C" void create__13daPasserMng_cFv();
 extern "C" void create_init__13daPasserMng_cFv();
 extern "C" void func_80D46B9C(void* _this, int, int);
 extern "C" void* mGroupTbl__13daPasserMng_c[4];
-extern "C" extern void* g_profile_PASSER_MNG[12];
 
 //
 // External References:
@@ -89,8 +52,6 @@ extern "C" void _savegpr_29();
 extern "C" void _restgpr_25();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 
@@ -312,23 +273,27 @@ extern "C" asm void func_80D46B9C(void* _this, int param_0, int param_1) {
 
 /* ############################################################################################## */
 /* 80D46DB0-80D46DD0 -00001 0020+00 1/0 0/0 0/0 .data            l_daPasserMng_Method */
-SECTION_DATA static void* l_daPasserMng_Method[8] = {
-    (void*)daPasserMng_Create__FP10fopAc_ac_c,
-    (void*)daPasserMng_Delete__FP13daPasserMng_c,
-    (void*)daPasserMng_Execute__FP13daPasserMng_c,
-    (void*)daPasserMng_IsDelete__FP13daPasserMng_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daPasserMng_Method = {
+    (process_method_func)daPasserMng_Create__FP10fopAc_ac_c,
+    (process_method_func)daPasserMng_Delete__FP13daPasserMng_c,
+    (process_method_func)daPasserMng_Execute__FP13daPasserMng_c,
+    (process_method_func)daPasserMng_IsDelete__FP13daPasserMng_c,
 };
 
 /* 80D46DD0-80D46E00 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_PASSER_MNG */
-SECTION_DATA extern void* g_profile_PASSER_MNG[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x028E0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000598, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01950000, (void*)&l_daPasserMng_Method,
-    (void*)0x00040100, (void*)NULL,
+extern actor_process_profile_definition g_profile_PASSER_MNG = {
+  fpcLy_CURRENT_e,       // mLayerID
+  7,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_PASSER_MNG,       // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(daPasserMng_c), // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  405,                   // mPriority
+  &l_daPasserMng_Method, // sub_method
+  0x00040100,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
diff --git a/rel/d/a/d_a_path_line/d_a_path_line.cpp b/rel/d/a/d_a_path_line/d_a_path_line.cpp
index 649d8efdc32..59cf88d37dc 100644
--- a/rel/d/a/d_a_path_line/d_a_path_line.cpp
+++ b/rel/d/a/d_a_path_line/d_a_path_line.cpp
@@ -1,33 +1,28 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_path_line
-//
+/**
+ * @file d_a_path_line.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_path_line/d_a_path_line.h"
+#include "f_op/f_op_actor_mng.h"
 #include "dol2asm.h"
 
-//
-// Forward References:
-//
-
-extern "C" extern void* g_profile_PATH_LINE[13];
-
-//
-// External References:
-//
-
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-
-//
-// Declarations:
-//
-
 /* ############################################################################################## */
 /* 80485780-804857B4 -00001 0034+00 0/0 0/0 1/0 .data            g_profile_PATH_LINE */
-SECTION_DATA extern void* g_profile_PATH_LINE[13] = {
-    (void*)0xFFFFFFFD, (void*)0x0009FFFD, (void*)0x03090000, (void*)&g_fpcLf_Method,
-    (void*)0x00000574, (void*)NULL,       (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02F60000, (void*)NULL,       (void*)0x00060000, (void*)0x05000000,
-    (void*)NULL,
+extern actor_process_profile_definition2 g_profile_PATH_LINE = {
+  fpcLy_CURRENT_e,       // mLayerID
+  9,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_PATH_LINE,        // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  0x00000574,            // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  758,                   // mPriority
+  NULL,                  // sub_method
+  0x00060000,            // mStatus
+  fopAc_UNK_GROUP_5_e,   // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
+  0                      // field_0x30
 };
diff --git a/rel/d/a/d_a_peru/d_a_peru.cpp b/rel/d/a/d_a_peru/d_a_peru.cpp
index 260a8681570..8048fbfca13 100644
--- a/rel/d/a/d_a_peru/d_a_peru.cpp
+++ b/rel/d/a/d_a_peru/d_a_peru.cpp
@@ -1,417 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_peru
-//
+/**
+ * @file d_a_peru.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_peru/d_a_peru.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct csXyz {
-    /* 80D4AFCC */ ~csXyz();
-    /* 80D4B6B8 */ csXyz();
-};
-
-struct mDoMtx_stack_c {
-    /* 8000CF0C */ void ZXYrotS(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct mDoExt_McaMorfCallBack2_c {};
-
-struct mDoExt_McaMorfCallBack1_c {};
-
-struct J3DAnmTransform {};
-
-struct J3DModelData {};
-
-struct Vec {};
-
-struct Z2Creature {
-    /* 802C03C8 */ Z2Creature();
-    /* 802C0420 */ ~Z2Creature();
-    /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
-};
-
-struct mDoExt_McaMorfSO {
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
-                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
-                                    int, Z2Creature*, u32, u32);
-    /* 80011310 */ void stopZelAnime();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80D4AF90 */ ~cXyz();
-    /* 80D4B7B8 */ cXyz();
-};
-
-struct daTag_EvtArea_c {
-    /* 80D4BFD4 */ void chkPointInArea(cXyz);
-    /* 8048C94C */ void chkPointInArea(cXyz, cXyz);
-};
-
-struct daPy_py_c {
-    /* 80D4C034 */ void checkNowWolf();
-};
-
-struct daNpcT_faceMotionAnmData_c {};
-
-struct daNpcT_MotionSeqMngr_c {
-    struct sequenceStepData_c {};
-
-    /* 80145898 */ void initialize();
-    /* 80D4B7BC */ ~daNpcT_MotionSeqMngr_c();
-};
-
-struct daNpcT_evtData_c {};
-
-struct daNpcT_motionAnmData_c {};
-
-struct J3DJoint {};
-
-struct daPeru_c {
-    /* 80D46EEC */ ~daPeru_c();
-    /* 80D46FCC */ void create();
-    /* 80D4720C */ void CreateHeap();
-    /* 80D4765C */ void typeInitialize();
-    /* 80D47750 */ void Delete();
-    /* 80D47784 */ void Execute();
-    /* 80D477A4 */ void Draw();
-    /* 80D47840 */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80D47860 */ void ctrlJointCallBack(J3DJoint*, int);
-    /* 80D478B8 */ void isDelete();
-    /* 80D478EC */ void reset();
-    /* 80D47B20 */ void setParam();
-    /* 80D47C4C */ void setAfterTalkMotion();
-    /* 80D47CAC */ void srchActors();
-    /* 80D47D5C */ void evtTalk();
-    /* 80D47E48 */ void evtCutProc();
-    /* 80D47F10 */ void action();
-    /* 80D47F5C */ void setAttnPos();
-    /* 80D481A4 */ void setCollision();
-    /* 80D4835C */ bool drawDbgInfo();
-    /* 80D48364 */ void setAction(int (daPeru_c::*)(int), int);
-    /* 80D48414 */ void wait(int);
-    /* 80D486A0 */ void is_AppearDemo_start();
-    /* 80D48720 */ void _AppearDemoTag_delete();
-    /* 80D48750 */ void talk(int);
-    /* 80D48A7C */ void jump_st(int);
-    /* 80D48C58 */ void jump_ed(int);
-    /* 80D48E34 */ void sniff(int);
-    /* 80D48FA8 */ void demo_appear(int);
-    /* 80D4910C */ void demo_walk_to_link(int);
-    /* 80D492A8 */ void demo_walk_circle(int);
-    /* 80D49418 */ void demo_walk_to_window(int);
-    /* 80D4971C */ void demo_walk_to_pathway(int);
-    /* 80D499AC */ void cutAppear(int);
-    /* 80D49A40 */ void _cutAppear_Init(int const&);
-    /* 80D4A334 */ void _cutAppear_Main(int const&);
-    /* 80D4A840 */ void _catdoor_open();
-    /* 80D4A920 */ void _catdoor_open_demoskip();
-    /* 80D4A984 */ void cutAppear_skip(int);
-    /* 80D4AA18 */ void _cutAppear_skip_Init(int const&);
-    /* 80D4AAF0 */ void _cutAppear_skip_Main(int const&);
-    /* 80D4BE2C */ daPeru_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
-                            daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
-                            daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
-                            daNpcT_evtData_c const*, char**);
-    /* 80D4BEC4 */ bool getEyeballMaterialNo();
-    /* 80D4BECC */ s32 getHeadJointNo();
-    /* 80D4BED4 */ s32 getNeckJointNo();
-    /* 80D4BEDC */ bool getBackboneJointNo();
-    /* 80D4BEE4 */ void checkChangeJoint(int);
-    /* 80D4BEF4 */ void checkRemoveJoint(int);
-    /* 80D4BF04 */ void beforeMove();
-
-    static void* mCutNameList[3];
-    static u8 mCutList[36];
-};
-
-struct daPeru_Param_c {
-    /* 80D4BF7C */ ~daPeru_Param_c();
-
-    static u8 const m[152];
-};
-
-struct daObjCatDoor_c {
-    /* 80BC42B8 */ void attr() const;
-    /* 80BC4454 */ void setBaseMtx();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-};
-
-struct _GXColorS10 {};
-
-struct J3DModel {};
-
-struct daNpcT_c {
-    /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
-    /* 801483F8 */ void loadRes(s8 const*, char const**);
-    /* 801484AC */ void deleteRes(s8 const*, char const**);
-    /* 8014852C */ void execute();
-    /* 8014886C */ void draw(int, int, f32, _GXColorS10*, f32, int, int, int);
-    /* 801490D4 */ void ctrlBtk();
-    /* 80149190 */ void setMtx();
-    /* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8014997C */ void evtProc();
-    /* 80149BB4 */ void setFootPos();
-    /* 80149D7C */ void setFootPrtcl(cXyz*, f32, f32);
-    /* 8014A05C */ bool checkCullDraw();
-    /* 8014A064 */ void twilight();
-    /* 8014A0B0 */ void evtOrder();
-    /* 8014A324 */ void clrParam();
-    /* 8014A388 */ void setFaceMotionAnm(int, bool);
-    /* 8014A628 */ void setMotionAnm(int, f32, int);
-    /* 8014AA18 */ void setAngle(s16);
-    /* 8014ABD0 */ void chkActorInSight(fopAc_ac_c*, f32, s16);
-    /* 8014B338 */ void srchPlayerActor();
-    /* 8014B648 */ void step(s16, int, int, int, int);
-    /* 8014BBF0 */ void initTalk(int, fopAc_ac_c**);
-    /* 8014BC78 */ void talkProc(int*, int, fopAc_ac_c**, int);
-    /* 8014BEE4 */ void getEvtAreaTagP(int, int);
-    /* 80D4AC08 */ ~daNpcT_c();
-    /* 80D4B2B4 */ daNpcT_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
-                            daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
-                            daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
-                            daNpcT_evtData_c const*, char**);
-    /* 80D4BCAC */ void ctrlSubFaceMotion(int);
-    /* 80D4BCB0 */ s32 getFootLJointNo();
-    /* 80D4BCB8 */ s32 getFootRJointNo();
-    /* 80D4BCC0 */ bool getEyeballLMaterialNo();
-    /* 80D4BCC8 */ bool getEyeballRMaterialNo();
-    /* 80D4BCD0 */ void afterJntAnm(int);
-    /* 80D4BCD4 */ bool checkChangeEvt();
-    /* 80D4BCDC */ bool evtEndProc();
-    /* 80D4BCE4 */ void afterMoved();
-    /* 80D4BCE8 */ bool chkXYItems();
-    /* 80D4BCF0 */ void decTmr();
-    /* 80D4BD08 */ void drawOtherMdl();
-    /* 80D4BD0C */ void drawGhost();
-    /* 80D4BD10 */ bool afterSetFaceMotionAnm(int, int, f32, int);
-    /* 80D4BD18 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80D4BD20 */ void getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
-    /* 80D4BD50 */ void getMotionAnm(daNpcT_motionAnmData_c);
-    /* 80D4BD80 */ void changeAnm(int*, int*);
-    /* 80D4BD84 */ void changeBck(int*, int*);
-    /* 80D4BD88 */ void changeBtp(int*, int*);
-    /* 80D4BD8C */ void changeBtk(int*, int*);
-
-    static u8 mCcDCyl[68];
-};
-
-struct daNpcT_Path_c {
-    /* 80145C40 */ void initialize();
-    /* 80D4B11C */ ~daNpcT_Path_c();
-};
-
-struct daNpcT_MatAnm_c {
-    /* 80145764 */ void initialize();
-};
-
-struct daNpcT_JntAnm_c {
-    /* 80146C98 */ void initialize();
-    /* 80146CD8 */ void setParam(fopAc_ac_c*, J3DModel*, cXyz*, int, int, int, f32, f32, f32, f32,
-                                 f32, f32, f32, f32, f32, f32, cXyz*);
-    /* 80147C38 */ void calcJntRad(f32, f32, f32);
-    /* 80D4B6BC */ ~daNpcT_JntAnm_c();
-    /* 80D4B988 */ void setEyeAngleY(cXyz, s16, int, f32, s16);
-    /* 80D4BAA4 */ void setEyeAngleX(cXyz, f32, s16);
-};
-
-struct daNpcT_DmgStagger_c {
-    /* 80147E3C */ void calc(int);
-};
-
-struct daNpcT_ActorMngr_c {
-    /* 801456D4 */ void initialize();
-    /* 801456E0 */ void entry(fopAc_ac_c*);
-    /* 801456FC */ void remove();
-    /* 80145708 */ void getActorP();
-    /* 80D4B008 */ ~daNpcT_ActorMngr_c();
-    /* 80D4B278 */ daNpcT_ActorMngr_c();
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dMsgFlow_c {
-    /* 80249F00 */ dMsgFlow_c();
-    /* 80249F48 */ ~dMsgFlow_c();
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dEvent_manager_c {
-    /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int);
-    /* 80047D4C */ void getIsAddvance(int);
-    /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int);
-    /* 800480EC */ void getMySubstanceP(int, char const*, int);
-    /* 8004817C */ void cutEnd(int);
-    /* 800487F0 */ void ChkPresentEnd();
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcCyl {};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80D4B874 */ ~dCcD_GStts();
-};
-
-struct dCcD_Cyl {
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-    /* 80D4B050 */ ~dCcD_Cyl();
-    /* 80D4B164 */ dCcD_Cyl();
-};
-
-struct dBgW_Base {};
-
-struct dBgS_PolyPassChk {
-    /* 80078E68 */ void SetObj();
-};
-
-struct dBgS_ObjAcch {
-    /* 80D4B8D0 */ ~dBgS_ObjAcch();
-};
-
-struct dBgS_LinChk {
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077CDC */ ~dBgS_LinChk();
-};
-
-struct dBgS_GndChk {
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ ~dBgS_GndChk();
-};
-
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F40 */ void SetWallR(f32);
-    /* 80D4B804 */ ~dBgS_AcchCir();
-};
-
-struct dBgS_Acch {
-    /* 80075F94 */ ~dBgS_Acch();
-    /* 800760A0 */ dBgS_Acch();
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-};
-
-struct cM3dGCyl {
-    /* 8026F1DC */ void SetC(cXyz const&);
-    /* 8026F1F8 */ void SetH(f32);
-    /* 8026F200 */ void SetR(f32);
-    /* 80D4B1E8 */ ~cM3dGCyl();
-};
-
-struct cM3dGCir {
-    /* 8026EF18 */ ~cM3dGCir();
-};
-
-struct cM3dGAab {
-    /* 80D4B230 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 80D4ABC0 */ ~cCcD_GStts();
-};
-
-struct cBgW_BgId {
-    /* 802681D4 */ void ChkUsed() const;
-};
-
-struct cBgS_PolyInfo {
-    /* 802680B0 */ ~cBgS_PolyInfo();
-};
-
-struct cBgS_GndChk {
-    /* 80267C1C */ cBgS_GndChk();
-    /* 80267C94 */ ~cBgS_GndChk();
-};
-
-struct cBgS {
-    /* 80074250 */ void Release(dBgW_Base*);
-};
-
-struct JAISoundID {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct J3DTexNoAnm {
-    /* 80D47548 */ ~J3DTexNoAnm();
-    /* 80D47590 */ J3DTexNoAnm();
-    /* 80D4AB90 */ void calc(u16*) const;
-};
-
-struct J3DTexMtxAnm {
-    /* 80D475B4 */ ~J3DTexMtxAnm();
-    /* 80D475F0 */ J3DTexMtxAnm();
-};
-
-struct J3DTevKColorAnm {
-    /* 80D474A0 */ ~J3DTevKColorAnm();
-    /* 80D474DC */ J3DTevKColorAnm();
-};
-
-struct J3DTevColorAnm {
-    /* 80D474F4 */ ~J3DTevColorAnm();
-    /* 80D47530 */ J3DTevColorAnm();
-};
-
-struct J3DMaterialAnm {
-    /* 8032C320 */ void initialize();
-};
-
-struct J3DMatColorAnm {
-    /* 80D47608 */ ~J3DMatColorAnm();
-    /* 80D47644 */ J3DMatColorAnm();
-};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 80D4B940 */ ~J3DFrameCtrl();
-};
-
-struct J3DAnmTexPattern {
-    /* 8032AF50 */ void getTexNo(u16, u16*) const;
-};
-
 //
 // Forward References:
 //
@@ -541,7 +135,6 @@ extern "C" u8 mCutList__8daPeru_c[36];
 // External References:
 //
 
-SECTION_INIT void memset();
 extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz();
 extern "C" void
 __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl();
@@ -645,10 +238,6 @@ extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
 extern "C" void getTexNo__16J3DAnmTexPatternCFUsPUs();
 extern "C" void initialize__14J3DMaterialAnmFv();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXMultVec();
-extern "C" void PSVECAdd();
-extern "C" void PSVECSquareMag();
 extern "C" void __destroy_arr();
 extern "C" void __construct_array();
 extern "C" void __ptmf_test();
@@ -667,8 +256,6 @@ extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" u8 mCcDCyl__8daNpcT_c[68];
@@ -679,9 +266,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" extern void* __vt__14J3DMaterialAnm[4];
 extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 j3dSys[284];
-extern "C" extern u32 __float_nan;
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz();
 extern "C" void attr__14daObjCatDoor_cCFv();
@@ -1023,25 +607,30 @@ SECTION_DATA static void* lit_5846[3] = {
 };
 
 /* 80D4C61C-80D4C63C -00001 0020+00 1/0 0/0 0/0 .data            daPeru_MethodTable */
-SECTION_DATA static void* daPeru_MethodTable[8] = {
-    (void*)daPeru_Create__FPv,
-    (void*)daPeru_Delete__FPv,
-    (void*)daPeru_Execute__FPv,
-    (void*)daPeru_IsDelete__FPv,
-    (void*)daPeru_Draw__FPv,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daPeru_MethodTable = {
+    (process_method_func)daPeru_Create__FPv,
+    (process_method_func)daPeru_Delete__FPv,
+    (process_method_func)daPeru_Execute__FPv,
+    (process_method_func)daPeru_IsDelete__FPv,
+    (process_method_func)daPeru_Draw__FPv,
 };
 
 /* 80D4C63C-80D4C66C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_PERU */
-SECTION_DATA extern void* g_profile_PERU[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01070000, (void*)&g_fpcLf_Method,
-    (void*)0x0000112C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02B60000, (void*)&daPeru_MethodTable,
-    (void*)0x08044108, (void*)0x040E0000,
+extern actor_process_profile_definition g_profile_PERU = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_PERU,              // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daPeru_c),       // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  694,                    // mPriority
+  &daPeru_MethodTable,    // sub_method
+  0x08044108,             // mStatus
+  fopAc_NPC_e,            // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
 /* 80D4C66C-80D4C678 000490 000C+00 2/2 0/0 0/0 .data            __vt__11J3DTexNoAnm */
@@ -1293,7 +882,8 @@ asm void daPeru_c::CreateHeap() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevKColorAnm::~J3DTevKColorAnm() {
+// asm J3DTevKColorAnm::~J3DTevKColorAnm() {
+extern "C" asm void __dt__15J3DTevKColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__15J3DTevKColorAnmFv.s"
 }
@@ -1303,7 +893,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevKColorAnm::J3DTevKColorAnm() {
+// asm J3DTevKColorAnm::J3DTevKColorAnm() {
+extern "C" asm void __ct__15J3DTevKColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__ct__15J3DTevKColorAnmFv.s"
 }
@@ -1313,7 +904,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevColorAnm::~J3DTevColorAnm() {
+// asm J3DTevColorAnm::~J3DTevColorAnm() {
+extern "C" asm void __dt__14J3DTevColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__14J3DTevColorAnmFv.s"
 }
@@ -1323,7 +915,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTevColorAnm::J3DTevColorAnm() {
+// asm J3DTevColorAnm::J3DTevColorAnm() {
+extern "C" asm void __ct__14J3DTevColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__ct__14J3DTevColorAnmFv.s"
 }
@@ -1333,7 +926,8 @@ asm J3DTevColorAnm::J3DTevColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexNoAnm::~J3DTexNoAnm() {
+// asm J3DTexNoAnm::~J3DTexNoAnm() {
+extern "C" asm void __dt__11J3DTexNoAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__11J3DTexNoAnmFv.s"
 }
@@ -1343,7 +937,8 @@ asm J3DTexNoAnm::~J3DTexNoAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexNoAnm::J3DTexNoAnm() {
+// asm J3DTexNoAnm::J3DTexNoAnm() {
+extern "C" asm void __ct__11J3DTexNoAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__ct__11J3DTexNoAnmFv.s"
 }
@@ -1353,7 +948,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexMtxAnm::~J3DTexMtxAnm() {
+// asm J3DTexMtxAnm::~J3DTexMtxAnm() {
+extern "C" asm void __dt__12J3DTexMtxAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__12J3DTexMtxAnmFv.s"
 }
@@ -1363,7 +959,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DTexMtxAnm::J3DTexMtxAnm() {
+// asm J3DTexMtxAnm::J3DTexMtxAnm() {
+extern "C" asm void __ct__12J3DTexMtxAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__ct__12J3DTexMtxAnmFv.s"
 }
@@ -1373,7 +970,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DMatColorAnm::~J3DMatColorAnm() {
+// asm J3DMatColorAnm::~J3DMatColorAnm() {
+extern "C" asm void __dt__14J3DMatColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__14J3DMatColorAnmFv.s"
 }
@@ -1383,7 +981,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DMatColorAnm::J3DMatColorAnm() {
+// asm J3DMatColorAnm::J3DMatColorAnm() {
+extern "C" asm void __ct__14J3DMatColorAnmFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__ct__14J3DMatColorAnmFv.s"
 }
@@ -2180,7 +1779,8 @@ static bool daPeru_IsDelete(void* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void J3DTexNoAnm::calc(u16* param_0) const {
+// asm void J3DTexNoAnm::calc(u16* param_0) const {
+extern "C" asm void calc__11J3DTexNoAnmCFPUs() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/calc__11J3DTexNoAnmCFPUs.s"
 }
@@ -2190,7 +1790,8 @@ asm void J3DTexNoAnm::calc(u16* param_0) const {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
+// asm cCcD_GStts::~cCcD_GStts() {
+extern "C" asm void __dt__10cCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__10cCcD_GSttsFv.s"
 }
@@ -2200,7 +1801,8 @@ asm cCcD_GStts::~cCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm daNpcT_c::~daNpcT_c() {
+// asm daNpcT_c::~daNpcT_c() {
+extern "C" asm void __dt__8daNpcT_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__8daNpcT_cFv.s"
 }
@@ -2210,7 +1812,8 @@ asm daNpcT_c::~daNpcT_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cXyz::~cXyz() {
+// asm cXyz::~cXyz() {
+extern "C" asm void __dt__4cXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__4cXyzFv.s"
 }
@@ -2220,7 +1823,8 @@ asm cXyz::~cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm csXyz::~csXyz() {
+// asm csXyz::~csXyz() {
+extern "C" asm void __dt__5csXyzFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__5csXyzFv.s"
 }
@@ -2230,7 +1834,8 @@ asm csXyz::~csXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() {
+// asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() {
+extern "C" asm void __dt__18daNpcT_ActorMngr_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__18daNpcT_ActorMngr_cFv.s"
 }
@@ -2240,7 +1845,8 @@ asm daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Cyl::~dCcD_Cyl() {
+// asm dCcD_Cyl::~dCcD_Cyl() {
+extern "C" asm void __dt__8dCcD_CylFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__8dCcD_CylFv.s"
 }
@@ -2250,7 +1856,8 @@ asm dCcD_Cyl::~dCcD_Cyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm daNpcT_Path_c::~daNpcT_Path_c() {
+// asm daNpcT_Path_c::~daNpcT_Path_c() {
+extern "C" asm void __dt__13daNpcT_Path_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__13daNpcT_Path_cFv.s"
 }
@@ -2260,7 +1867,8 @@ asm daNpcT_Path_c::~daNpcT_Path_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_Cyl::dCcD_Cyl() {
+// asm dCcD_Cyl::dCcD_Cyl() {
+extern "C" asm void __ct__8dCcD_CylFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__ct__8dCcD_CylFv.s"
 }
@@ -2270,7 +1878,8 @@ asm dCcD_Cyl::dCcD_Cyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGCyl::~cM3dGCyl() {
+// asm cM3dGCyl::~cM3dGCyl() {
+extern "C" asm void __dt__8cM3dGCylFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__8cM3dGCylFv.s"
 }
@@ -2280,7 +1889,8 @@ asm cM3dGCyl::~cM3dGCyl() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
+// asm cM3dGAab::~cM3dGAab() {
+extern "C" asm void __dt__8cM3dGAabFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__8cM3dGAabFv.s"
 }
@@ -2290,7 +1900,8 @@ asm cM3dGAab::~cM3dGAab() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm daNpcT_ActorMngr_c::daNpcT_ActorMngr_c() {
+// asm daNpcT_ActorMngr_c::daNpcT_ActorMngr_c() {
+extern "C" asm void __ct__18daNpcT_ActorMngr_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__ct__18daNpcT_ActorMngr_cFv.s"
 }
@@ -2314,7 +1925,8 @@ extern "C" asm void __ct__8daNpcT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_mot
 #pragma pop
 
 /* 80D4B6B8-80D4B6BC 0048B8 0004+00 1/1 0/0 0/0 .text            __ct__5csXyzFv */
-csXyz::csXyz() {
+// csXyz::csXyz() {
+extern "C" asm void __ct__5csXyzFv() {
     /* empty function */
 }
 
@@ -2322,14 +1934,16 @@ csXyz::csXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm daNpcT_JntAnm_c::~daNpcT_JntAnm_c() {
+// asm daNpcT_JntAnm_c::~daNpcT_JntAnm_c() {
+extern "C" asm void __dt__15daNpcT_JntAnm_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__15daNpcT_JntAnm_cFv.s"
 }
 #pragma pop
 
 /* 80D4B7B8-80D4B7BC 0049B8 0004+00 1/1 0/0 0/0 .text            __ct__4cXyzFv */
-cXyz::cXyz() {
+// cXyz::cXyz() {
+extern "C" asm void __ct__4cXyzFv() {
     /* empty function */
 }
 
@@ -2337,7 +1951,8 @@ cXyz::cXyz() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() {
+// asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() {
+extern "C" asm void __dt__22daNpcT_MotionSeqMngr_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__22daNpcT_MotionSeqMngr_cFv.s"
 }
@@ -2347,7 +1962,8 @@ asm daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_AcchCir::~dBgS_AcchCir() {
+// asm dBgS_AcchCir::~dBgS_AcchCir() {
+extern "C" asm void __dt__12dBgS_AcchCirFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__12dBgS_AcchCirFv.s"
 }
@@ -2357,7 +1973,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
+// asm dCcD_GStts::~dCcD_GStts() {
+extern "C" asm void __dt__10dCcD_GSttsFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__10dCcD_GSttsFv.s"
 }
@@ -2367,7 +1984,8 @@ asm dCcD_GStts::~dCcD_GStts() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
+extern "C" asm void __dt__12dBgS_ObjAcchFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__12dBgS_ObjAcchFv.s"
 }
@@ -2377,7 +1995,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/__dt__12J3DFrameCtrlFv.s"
 }
@@ -2399,14 +2018,16 @@ extern "C" asm void setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daNpcT_JntAnm_c::setEyeAngleX(cXyz param_0, f32 param_1, s16 param_2) {
+// asm void daNpcT_JntAnm_c::setEyeAngleX(cXyz param_0, f32 param_1, s16 param_2) {
+extern "C" asm void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs.s"
 }
 #pragma pop
 
 /* 80D4BCAC-80D4BCB0 004EAC 0004+00 1/0 0/0 0/0 .text            ctrlSubFaceMotion__8daNpcT_cFi */
-void daNpcT_c::ctrlSubFaceMotion(int param_0) {
+// void daNpcT_c::ctrlSubFaceMotion(int param_0) {
+extern "C" asm void ctrlSubFaceMotion__8daNpcT_cFi() {
     /* empty function */
 }
 
@@ -2465,19 +2086,22 @@ extern "C" bool chkXYItems__8daNpcT_cFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daNpcT_c::decTmr() {
+// asm void daNpcT_c::decTmr() {
+extern "C" asm void decTmr__8daNpcT_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/decTmr__8daNpcT_cFv.s"
 }
 #pragma pop
 
 /* 80D4BD08-80D4BD0C 004F08 0004+00 1/0 0/0 0/0 .text            drawOtherMdl__8daNpcT_cFv */
-void daNpcT_c::drawOtherMdl() {
+// void daNpcT_c::drawOtherMdl() {
+extern "C" asm void drawOtherMdl__8daNpcT_cFv() {
     /* empty function */
 }
 
 /* 80D4BD0C-80D4BD10 004F0C 0004+00 1/0 0/0 0/0 .text            drawGhost__8daNpcT_cFv */
-void daNpcT_c::drawGhost() {
+// void daNpcT_c::drawGhost() {
+extern "C" asm void drawGhost__8daNpcT_cFv() {
     /* empty function */
 }
 
@@ -2499,7 +2123,8 @@ extern "C" bool afterSetMotionAnm__8daNpcT_cFiifi() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daNpcT_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) {
+// asm void daNpcT_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) {
+extern "C" asm void getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c.s"
 }
@@ -2510,29 +2135,34 @@ asm void daNpcT_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) {
+// asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) {
+extern "C" asm void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c.s"
 }
 #pragma pop
 
 /* 80D4BD80-80D4BD84 004F80 0004+00 1/0 0/0 0/0 .text            changeAnm__8daNpcT_cFPiPi */
-void daNpcT_c::changeAnm(int* param_0, int* param_1) {
+// void daNpcT_c::changeAnm(int* param_0, int* param_1) {
+extern "C" asm void changeAnm__8daNpcT_cFPiPi() {
     /* empty function */
 }
 
 /* 80D4BD84-80D4BD88 004F84 0004+00 1/0 0/0 0/0 .text            changeBck__8daNpcT_cFPiPi */
-void daNpcT_c::changeBck(int* param_0, int* param_1) {
+// void daNpcT_c::changeBck(int* param_0, int* param_1) {
+extern "C" asm void changeBck__8daNpcT_cFPiPi() {
     /* empty function */
 }
 
 /* 80D4BD88-80D4BD8C 004F88 0004+00 1/0 0/0 0/0 .text            changeBtp__8daNpcT_cFPiPi */
-void daNpcT_c::changeBtp(int* param_0, int* param_1) {
+// void daNpcT_c::changeBtp(int* param_0, int* param_1) {
+extern "C" asm void changeBtp__8daNpcT_cFPiPi() {
     /* empty function */
 }
 
 /* 80D4BD8C-80D4BD90 004F8C 0004+00 1/0 0/0 0/0 .text            changeBtk__8daNpcT_cFPiPi */
-void daNpcT_c::changeBtk(int* param_0, int* param_1) {
+// void daNpcT_c::changeBtk(int* param_0, int* param_1) {
+extern "C" asm void changeBtk__8daNpcT_cFPiPi() {
     /* empty function */
 }
 
@@ -2660,7 +2290,8 @@ static asm void func_80D4BFCC() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) {
+// asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) {
+extern "C" asm void chkPointInArea__15daTag_EvtArea_cF4cXyz() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/chkPointInArea__15daTag_EvtArea_cF4cXyz.s"
 }
@@ -2670,7 +2301,8 @@ asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_py_c::checkNowWolf() {
+// asm void daPy_py_c::checkNowWolf() {
+extern "C" asm void checkNowWolf__9daPy_py_cFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_peru/d_a_peru/checkNowWolf__9daPy_py_cFv.s"
 }
diff --git a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp
index 23ee17fca42..18d3619bfee 100644
--- a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp
+++ b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp
@@ -1,79 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_ppolamp
-//
+/**
+ * @file d_a_ppolamp.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_ppolamp/d_a_ppolamp.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct J3DModelData {};
-
-struct J3DAnmTransform {};
-
-struct mDoExt_bckAnm {
-    /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
-    /* 8000D9CC */ void entry(J3DModelData*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daPPolamp_c {
-    /* 80D4C958 */ ~daPPolamp_c();
-    /* 80D4C9FC */ void create();
-    /* 80D4CB24 */ void execute();
-    /* 80D4CB84 */ void draw();
-    /* 80D4CCF0 */ void Delete();
-    /* 80D4CD24 */ void setModelMtx();
-    /* 80D4CDA8 */ void setPclModelMtx();
-    /* 80D4CE9C */ void createHeap();
-    /* 80D4CFB0 */ void moveSwing();
-    /* 80D4D10C */ void initParam();
-};
-
-struct dKy_tevstr_c {};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-    /* 80267128 */ void atan2sX_Z() const;
-    /* 80267150 */ void atan2sY_XZ() const;
-};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct J3DModel {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 80D4D1CC */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -125,16 +57,10 @@ extern "C" void cM_rndFX__Ff();
 extern "C" void cLib_chaseF__FPfff();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void PSMTXMultVec();
 extern "C" void _savegpr_27();
 extern "C" void _restgpr_27();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 
 //
 // Declarations:
@@ -161,25 +87,30 @@ SECTION_DEAD static char const* const stringBase_80D4D2C8 = "PPolamp";
 SECTION_DATA static void* l_arcName = (void*)&d_a_ppolamp__stringBase0;
 
 /* 80D4D2D4-80D4D2F4 -00001 0020+00 1/0 0/0 0/0 .data            daPPolamp_METHODS */
-SECTION_DATA static void* daPPolamp_METHODS[8] = {
-    (void*)daPPolamp_create__FP11daPPolamp_c,
-    (void*)daPPolamp_Delete__FP11daPPolamp_c,
-    (void*)daPPolamp_execute__FP11daPPolamp_c,
-    (void*)NULL,
-    (void*)daPPolamp_draw__FP11daPPolamp_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daPPolamp_METHODS = {
+    (process_method_func)daPPolamp_create__FP11daPPolamp_c,
+    (process_method_func)daPPolamp_Delete__FP11daPPolamp_c,
+    (process_method_func)daPPolamp_execute__FP11daPPolamp_c,
+    0,
+    (process_method_func)daPPolamp_draw__FP11daPPolamp_c,
 };
 
 /* 80D4D2F4-80D4D324 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_PPolamp */
-SECTION_DATA extern void* g_profile_PPolamp[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01020000, (void*)&g_fpcLf_Method,
-    (void*)0x000005AC, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02D70000, (void*)&daPPolamp_METHODS,
-    (void*)0x00040180, (void*)0x030C0000,
+extern actor_process_profile_definition g_profile_PPolamp = {
+  fpcLy_CURRENT_e,       // mLayerID
+  7,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_PPolamp,          // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(daPPolamp_c),   // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  727,                   // mPriority
+  &daPPolamp_METHODS,    // sub_method
+  0x00040180,            // mStatus
+  fopAc_ENV_e,           // mActorType
+  fopAc_CULLBOX_12_e,    // cullType
 };
 
 /* 80D4D324-80D4D330 000054 000C+00 3/3 0/0 0/0 .data            __vt__12J3DFrameCtrl */
@@ -498,7 +429,8 @@ static asm void daPPolamp_create(daPPolamp_c* param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_ppolamp/d_a_ppolamp/__dt__12J3DFrameCtrlFv.s"
 }
diff --git a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp
index 72e394b2fd2..53d9b9206e4 100644
--- a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp
+++ b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_scene_exit
-//
+/**
+ * @file d_a_scene_exit.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h"
 #include "dol2asm.h"
@@ -16,7 +16,6 @@ extern "C" void checkWork__8daScex_cFv();
 extern "C" static void daScex_Create__FP10fopAc_ac_c();
 extern "C" static void daScex_Execute__FP8daScex_c();
 extern "C" void execute__8daScex_cFv();
-extern "C" extern void* g_profile_SCENE_EXIT[13];
 
 //
 // External References:
@@ -194,24 +193,27 @@ asm int daScex_c::execute() {
 
 /* ############################################################################################## */
 /* 80485CAC-80485CCC -00001 0020+00 1/0 0/0 0/0 .data            l_daScex_Method */
-SECTION_DATA static void* l_daScex_Method[8] = {
-    (void*)daScex_Create__FP10fopAc_ac_c,
-    (void*)NULL,
-    (void*)daScex_Execute__FP8daScex_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daScex_Method = {
+    (process_method_func)daScex_Create__FP10fopAc_ac_c,
+    0,
+    (process_method_func)daScex_Execute__FP8daScex_c,
 };
 
 /* 80485CCC-80485D00 -00001 0034+00 0/0 0/0 1/0 .data            g_profile_SCENE_EXIT */
-SECTION_DATA extern void* g_profile_SCENE_EXIT[13] = {
-    (void*)0xFFFFFFFD, (void*)0x000AFFFD,
-    (void*)0x030C0000, (void*)&g_fpcLf_Method,
-    (void*)0x0000059C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02F90000, (void*)&l_daScex_Method,
-    (void*)0x00060000, (void*)0x05000000,
-    (void*)NULL,
+extern actor_process_profile_definition2 g_profile_SCENE_EXIT = {
+  fpcLy_CURRENT_e,       // mLayerID
+  10,                    // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_SCENE_EXIT,       // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  0x0000059C,            // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  761,                   // mPriority
+  &l_daScex_Method,      // sub_method
+  0x00060000,            // mStatus
+  fopAc_UNK_GROUP_5_e,   // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
+  0                      // field_0x30
 };
diff --git a/rel/d/a/d_a_spinner/d_a_spinner.cpp b/rel/d/a/d_a_spinner/d_a_spinner.cpp
index 5f8d55dfa0e..8c9781ebd59 100644
--- a/rel/d/a/d_a_spinner/d_a_spinner.cpp
+++ b/rel/d/a/d_a_spinner/d_a_spinner.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_spinner
-//
+/**
+ * @file d_a_spinner.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_spinner/d_a_spinner.h"
 #include "dol2asm.h"
@@ -309,25 +309,30 @@ static dCcD_SrcCyl l_cylSrc = {
 };
 
 /* 804D4EEC-804D4F0C -00001 0020+00 1/0 0/0 0/0 .data            l_daSpinner_Method */
-SECTION_DATA static void* l_daSpinner_Method[8] = {
-    (void*)daSpinner_Create__FP10fopAc_ac_c,
-    (void*)daSpinner_Delete__FP11daSpinner_c,
-    (void*)daSpinner_Execute__FP11daSpinner_c,
-    (void*)NULL,
-    (void*)daSpinner_Draw__FP11daSpinner_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daSpinner_Method = {
+    (process_method_func)daSpinner_Create__FP10fopAc_ac_c,
+    (process_method_func)daSpinner_Delete__FP11daSpinner_c,
+    (process_method_func)daSpinner_Execute__FP11daSpinner_c,
+    0,
+    (process_method_func)daSpinner_Draw__FP11daSpinner_c,
 };
 
 /* 804D4F0C-804D4F3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SPINNER */
-SECTION_DATA extern void* g_profile_SPINNER[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0004FFFD,
-    (void*)0x00F20000, (void*)&g_fpcLf_Method,
-    (void*)0x00000ABC, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02AF0000, (void*)&l_daSpinner_Method,
-    (void*)0x00060000, (void*)0x05000000,
+extern actor_process_profile_definition g_profile_SPINNER = {
+  fpcLy_CURRENT_e,       // mLayerID
+  4,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_SPINNER,          // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  0x00000ABC,            // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  687,                   // mPriority
+  &l_daSpinner_Method,   // sub_method
+  0x00060000,            // mStatus
+  fopAc_UNK_GROUP_5_e,   // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 804D4F3C-804D4F48 000094 000C+00 4/4 0/0 0/0 .data            __vt__8cM3dGPla */
diff --git a/rel/d/a/d_a_suspend/d_a_suspend.cpp b/rel/d/a/d_a_suspend/d_a_suspend.cpp
index 6ef89e6ba5b..f78b856f053 100644
--- a/rel/d/a/d_a_suspend/d_a_suspend.cpp
+++ b/rel/d/a/d_a_suspend/d_a_suspend.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_suspend
-//
+/**
+ * @file d_a_suspend.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_suspend/d_a_suspend.h"
 #include "d/d_procname.h"
diff --git a/rel/d/a/d_a_swBall/d_a_swBall.cpp b/rel/d/a/d_a_swBall/d_a_swBall.cpp
index d5cad95ef3e..d7bb1812aff 100644
--- a/rel/d/a/d_a_swBall/d_a_swBall.cpp
+++ b/rel/d/a/d_a_swBall/d_a_swBall.cpp
@@ -1,40 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_swBall
-//
+/**
+ * @file d_a_swBall.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_swBall/d_a_swBall.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daSwBall_c {
-    /* 80D4E054 */ void checkArea_sub(fopAc_ac_c*);
-    /* 80D4E194 */ void checkArea();
-    /* 80D4E248 */ void search_ball();
-    /* 80D4E374 */ void Create();
-    /* 80D4E42C */ void create();
-    /* 80D4E494 */ void execute();
-    /* 80D4E524 */ void actionRun();
-    /* 80D4E6C4 */ void actionStop();
-    /* 80D4E6C8 */ void PutCrrPos();
-    /* 80D4E90C */ bool _delete();
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 800352B0 */ void offSwitch(int, int);
-};
-
-struct cXyz {};
-
-struct Vec {};
 
 //
 // Forward References:
@@ -55,7 +26,6 @@ extern "C" static void daSwBall_Execute__FP10daSwBall_c();
 extern "C" static void daSwBall_Delete__FP10daSwBall_c();
 extern "C" static void daSwBall_Create__FP10fopAc_ac_c();
 extern "C" void func_80D4E974(void* _this, u8*);
-extern "C" extern void* g_profile_SwBall[12];
 
 //
 // External References:
@@ -77,8 +47,6 @@ extern "C" void _savegpr_25();
 extern "C" void _savegpr_28();
 extern "C" void _restgpr_25();
 extern "C" void _restgpr_28();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 
 //
@@ -324,23 +292,26 @@ extern "C" asm void func_80D4E974(void* _this, u8* param_0) {
 
 /* ############################################################################################## */
 /* 80D4E9FC-80D4EA1C -00001 0020+00 1/0 0/0 0/0 .data            l_daSwBall_Method */
-SECTION_DATA static void* l_daSwBall_Method[8] = {
-    (void*)daSwBall_Create__FP10fopAc_ac_c,
-    (void*)daSwBall_Delete__FP10daSwBall_c,
-    (void*)daSwBall_Execute__FP10daSwBall_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daSwBall_Method = {
+    (process_method_func)daSwBall_Create__FP10fopAc_ac_c,
+    (process_method_func)daSwBall_Delete__FP10daSwBall_c,
+    (process_method_func)daSwBall_Execute__FP10daSwBall_c,
 };
 
 /* 80D4EA1C-80D4EA4C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SwBall */
-SECTION_DATA extern void* g_profile_SwBall[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x017E0000, (void*)&g_fpcLf_Method,
-    (void*)0x000005A0, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02260000, (void*)&l_daSwBall_Method,
-    (void*)0x00040000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_SwBall = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_SwBall,            // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daSwBall_c),     // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  550,                    // mPriority
+  &l_daSwBall_Method,     // sub_method
+  0x00040000,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
diff --git a/rel/d/a/d_a_swLBall/d_a_swLBall.cpp b/rel/d/a/d_a_swLBall/d_a_swLBall.cpp
index fca1d9b558c..8f686e2528f 100644
--- a/rel/d/a/d_a_swLBall/d_a_swLBall.cpp
+++ b/rel/d/a/d_a_swLBall/d_a_swLBall.cpp
@@ -1,42 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_swLBall
-//
+/**
+ * @file d_a_swLBall.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_swLBall/d_a_swLBall.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daSwLBall_c {
-    /* 80D4EB8C */ void checkArea_sub(fopAc_ac_c*);
-    /* 80D4ECCC */ void checkArea();
-    /* 80D4ED80 */ void search_lb();
-    /* 80D4EEAC */ void Create();
-    /* 80D4EEF8 */ void create();
-    /* 80D4EF60 */ void execute();
-    /* 80D4F008 */ void actionInit();
-    /* 80D4F080 */ void actionRun();
-    /* 80D4F220 */ void actionStop();
-    /* 80D4F224 */ void PutCrrPos();
-    /* 80D4F444 */ bool _delete();
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 800352B0 */ void offSwitch(int, int);
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct cXyz {};
-
-struct Vec {};
 
 //
 // Forward References:
@@ -58,7 +27,6 @@ extern "C" static void daSwLBall_Execute__FP11daSwLBall_c();
 extern "C" static void daSwLBall_Delete__FP11daSwLBall_c();
 extern "C" static void daSwLBall_Create__FP10fopAc_ac_c();
 extern "C" void func_80D4F4AC(void* _this, u8*);
-extern "C" extern void* g_profile_SwLBall[12];
 
 //
 // External References:
@@ -81,8 +49,6 @@ extern "C" void _savegpr_26();
 extern "C" void _savegpr_28();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 
 //
@@ -352,23 +318,26 @@ extern "C" asm void func_80D4F4AC(void* _this, u8* param_0) {
 
 /* ############################################################################################## */
 /* 80D4F54C-80D4F56C -00001 0020+00 1/0 0/0 0/0 .data            l_daSwLBall_Method */
-SECTION_DATA static void* l_daSwLBall_Method[8] = {
-    (void*)daSwLBall_Create__FP10fopAc_ac_c,
-    (void*)daSwLBall_Delete__FP11daSwLBall_c,
-    (void*)daSwLBall_Execute__FP11daSwLBall_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daSwLBall_Method = {
+    (process_method_func)daSwLBall_Create__FP10fopAc_ac_c,
+    (process_method_func)daSwLBall_Delete__FP11daSwLBall_c,
+    (process_method_func)daSwLBall_Execute__FP11daSwLBall_c,
 };
 
 /* 80D4F56C-80D4F59C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SwLBall */
-SECTION_DATA extern void* g_profile_SwLBall[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x017D0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000578, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02250000, (void*)&l_daSwLBall_Method,
-    (void*)0x00040000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_SwLBall = {
+  fpcLy_CURRENT_e,        // mLayerID
+  7,                      // mListID
+  fpcPi_CURRENT_e,        // mListPrio
+  PROC_SwLBall,           // mProcName
+  &g_fpcLf_Method.mBase,  // sub_method
+  sizeof(daSwLBall_c),    // mSize
+  0,                      // mSizeOther
+  0,                      // mParameters
+  &g_fopAc_Method.base,   // sub_method
+  549,                    // mPriority
+  &l_daSwLBall_Method,    // sub_method
+  0x00040000,             // mStatus
+  fopAc_ACTOR_e,          // mActorType
+  fopAc_CULLBOX_CUSTOM_e, // cullType
 };
diff --git a/rel/d/a/d_a_swc00/d_a_swc00.cpp b/rel/d/a/d_a_swc00/d_a_swc00.cpp
index b60c249fc4d..c61738dbcc7 100644
--- a/rel/d/a/d_a_swc00/d_a_swc00.cpp
+++ b/rel/d/a/d_a_swc00/d_a_swc00.cpp
@@ -1,31 +1,13 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_swc00
-//
+/**
+ * @file d_a_swc00.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_swc00/d_a_swc00.h"
 #include "dol2asm.h"
 #include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-//
-// Types:
-//
-
-class daSwc00_c : public fopAc_ac_c {
-public:
-    /* 805A15FC */ int execute();
-    /* 805A18E8 */ void event_proc_call();
-    /* 805A19A4 */ void actionWait();
-    /* 805A1A28 */ void actionOrderEvent();
-    /* 805A1A94 */ void actionEvent();
-    /* 805A1AF0 */ void actionDead();
-    
-    /* 0x568 */ cXyz field_0x568;
-    /* 0x574 */ cXyz field_0x574;
-    /* 0x580 */ u16 mEventID;
-    /* 0x582 */ u8 mAction;
-};
 
 //
 // Forward References:
@@ -43,7 +25,6 @@ extern "C" static bool daSwc00_IsDelete__FP9daSwc00_c();
 extern "C" static bool daSwc00_Delete__FP9daSwc00_c();
 extern "C" static void daSwc00_Create__FP10fopAc_ac_c();
 extern "C" extern char const* const d_a_swc00__stringBase0;
-extern "C" extern void* g_profile_SWC00[12];
 
 //
 // External References:
@@ -376,25 +357,29 @@ COMPILER_STRIP_GATE(0x805A1DA8, &lit_3995);
 #pragma pop
 
 /* 805A1ED4-805A1EF4 -00001 0020+00 1/0 0/0 0/0 .data            l_daSwc00_Method */
-SECTION_DATA static void* l_daSwc00_Method[8] = {
-    (void*)daSwc00_Create__FP10fopAc_ac_c,
-    (void*)daSwc00_Delete__FP9daSwc00_c,
-    (void*)daSwc00_Execute__FP9daSwc00_c,
-    (void*)daSwc00_IsDelete__FP9daSwc00_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daSwc00_Method = {
+    (process_method_func)daSwc00_Create__FP10fopAc_ac_c,
+    (process_method_func)daSwc00_Delete__FP9daSwc00_c,
+    (process_method_func)daSwc00_Execute__FP9daSwc00_c,
+    (process_method_func)daSwc00_IsDelete__FP9daSwc00_c,
 };
 
 /* 805A1EF4-805A1F24 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SWC00 */
-SECTION_DATA extern void* g_profile_SWC00[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02250000, (void*)&g_fpcLf_Method,
-    (void*)0x00000588, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01150000, (void*)&l_daSwc00_Method,
-    (void*)0x00040000, (void*)NULL,
+extern actor_process_profile_definition g_profile_SWC00 = {
+  fpcLy_CURRENT_e,       // mLayerID
+  7,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_SWC00,            // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(daSwc00_c),     // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  277,                   // mPriority
+  &l_daSwc00_Method,     // sub_method
+  0x00040000,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 805A1DAC-805A1DAC 000018 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp
index cad59469afc..0c68165ce6a 100644
--- a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp
+++ b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp
@@ -1,123 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_swhit0
-//
+/**
+ * @file d_a_swhit0.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_swhit0/d_a_swhit0.h"
 #include "d/cc/d_cc_d.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTevRegKey {};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct J3DModelData {};
-
-struct J3DAnmTransform {};
-
-struct mDoExt_bckAnm {
-    /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
-    /* 8000D9CC */ void entry(J3DModelData*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daSwhit0_c {
-    /* 80485FF8 */ void getSwNo();
-    /* 80486004 */ void getSwNo2();
-    /* 80486010 */ void getEvNo();
-    /* 8048602C */ void getTimer();
-    /* 80486048 */ void getType();
-    /* 80486064 */ void makeEventId();
-    /* 804860EC */ void CreateHeap();
-    /* 80486214 */ void CreateInit();
-    /* 804863B0 */ void create();
-    /* 8048668C */ void checkHit();
-    /* 80486704 */ void setCombackTimer();
-    /* 80486788 */ void endCombackTimer();
-    /* 80486800 */ void onSwitch();
-    /* 80486858 */ void offSwitch();
-    /* 804868A8 */ void DemoProc();
-    /* 804869C4 */ void orderEvent();
-    /* 80486ABC */ void actionOffWait();
-    /* 80486BC4 */ void actionToOnReady();
-    /* 80486C28 */ void actionToOnOrder();
-    /* 80486CE4 */ void actionToOnDemo();
-    /* 80486D88 */ void actionToOnDemo2();
-    /* 80486EC4 */ void actionSwWait();
-    /* 80486FC0 */ void actionOnWait();
-    /* 804870E0 */ void setDrawMtx();
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 800352B0 */ void offSwitch(int, int);
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A441C */ void setLightTevColorType(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dEvt_control_c {
-    /* 80042468 */ void reset();
-};
-
-struct dEvent_manager_c {
-    /* 80047514 */ void getEventIdx(char const*, u8, s32);
-    /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8);
-    /* 80047930 */ void isMapToolCamera(u8, s32);
-    /* 80047A78 */ void endCheck(s16);
-    /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int);
-    /* 80047D4C */ void getIsAddvance(int);
-    /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int);
-    /* 8004817C */ void cutEnd(int);
-};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct JMath {
-    static u8 sincosTable_[65536];
-};
-
-struct J3DModel {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 80486644 */ ~J3DFrameCtrl();
-};
 
 //
 // Forward References:
@@ -202,12 +91,8 @@ extern "C" void SetC__8cM3dGSphFRC4cXyz();
 extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
 extern "C" void __dl__FPv();
 extern "C" void init__12J3DFrameCtrlFs();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -215,7 +100,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
 extern "C" u8 sincosTable___5JMath[65536];
 extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 
@@ -382,25 +266,30 @@ SECTION_DATA static void* lit_4230[11] = {
 };
 
 /* 8048743C-8048745C -00001 0020+00 1/0 0/0 0/0 .data            l_daSwhit0_Method */
-SECTION_DATA static void* l_daSwhit0_Method[8] = {
-    (void*)daSwhit0_Create__FP10fopAc_ac_c,
-    (void*)daSwhit0_Delete__FP10daSwhit0_c,
-    (void*)daSwhit0_Execute__FP10daSwhit0_c,
-    (void*)NULL,
-    (void*)daSwhit0_Draw__FP10daSwhit0_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daSwhit0_Method = {
+    (process_method_func)daSwhit0_Create__FP10fopAc_ac_c,
+    (process_method_func)daSwhit0_Delete__FP10daSwhit0_c,
+    (process_method_func)daSwhit0_Execute__FP10daSwhit0_c,
+    0,
+    (process_method_func)daSwhit0_Draw__FP10daSwhit0_c,
 };
 
 /* 8048745C-8048748C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SWHIT0 */
-SECTION_DATA extern void* g_profile_SWHIT0[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0008FFFD,
-    (void*)0x02E70000, (void*)&g_fpcLf_Method,
-    (void*)0x0000075C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01140000, (void*)&l_daSwhit0_Method,
-    (void*)0x00044100, (void*)NULL,
+extern actor_process_profile_definition g_profile_SWHIT0 = {
+  fpcLy_CURRENT_e,       // mLayerID
+  8,                     // mListID
+  fpcPi_CURRENT_e,       // mListPrio
+  PROC_SWHIT0,           // mProcName
+  &g_fpcLf_Method.mBase, // sub_method
+  sizeof(daSwhit0_c),    // mSize
+  0,                     // mSizeOther
+  0,                     // mParameters
+  &g_fopAc_Method.base,  // sub_method
+  276,                   // mPriority
+  &l_daSwhit0_Method,    // sub_method
+  0x00044100,            // mStatus
+  fopAc_ACTOR_e,         // mActorType
+  fopAc_CULLBOX_0_e,     // cullType
 };
 
 /* 8048748C-80487498 0000D0 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGSph */
@@ -460,7 +349,8 @@ extern "C" asm void __dt__8cM3dGAabFv() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_swhit0/d_a_swhit0/__dt__12J3DFrameCtrlFv.s"
 }
diff --git a/rel/d/a/d_a_talk/d_a_talk.cpp b/rel/d/a/d_a_talk/d_a_talk.cpp
index a984d663452..6b324fca8c9 100644
--- a/rel/d/a/d_a_talk/d_a_talk.cpp
+++ b/rel/d/a/d_a_talk/d_a_talk.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_talk
-//
+/**
+ * @file d_a_talk.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_talk/d_a_talk.h"
 #include "d/msg/d_msg_object.h"
diff --git a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp
index 4b3f4682c10..0351937eb30 100644
--- a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp
+++ b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp
@@ -21,12 +21,6 @@ void daTbox2_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-struct res_info {
-    /* 0x0 */ int bmd_no;
-    /* 0x4 */ int bck_no;
-    /* 0x8 */ int dzb_id;
-    /* 0xC */ int dzb_no;
-};
 
 /* 80498160-80498180 000000 0020+00 4/4 0/0 0/0 .rodata          l_resInfo */
 static const res_info l_resInfo[] = {
diff --git a/rel/d/a/d_a_title/d_a_title.cpp b/rel/d/a/d_a_title/d_a_title.cpp
index d2c8a4f33a5..77a5b192bed 100644
--- a/rel/d/a/d_a_title/d_a_title.cpp
+++ b/rel/d/a/d_a_title/d_a_title.cpp
@@ -1,187 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_title
-//
+/**
+ * @file d_a_title.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_title/d_a_title.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
-//
-// Types:
-//
-
-struct scene_class {};
-
-struct request_of_phase_process_class {};
-
-struct mDoRst {
-    static u8 mResetData[4 + 4 /* padding */];
-};
-
-struct mDoGph_gInf_c {
-    static u8 mFader[4];
-};
-
-struct J3DMaterialTable {};
-
-struct J3DAnmTextureSRTKey {};
-
-struct mDoExt_btkAnm {
-    /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
-    /* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct J3DAnmTevRegKey {};
-
-struct mDoExt_brkAnm {
-    /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
-    /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct J3DAnmColor {};
-
-struct mDoExt_bpkAnm {
-    /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16);
-    /* 8000D518 */ void entry(J3DMaterialTable*, f32);
-};
-
-struct J3DModelData {};
-
-struct J3DAnmTransform {};
-
-struct mDoExt_bckAnm {
-    /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
-    /* 8000D9CC */ void entry(J3DModelData*, f32);
-};
-
-struct mDoExt_baseAnm {
-    /* 8000D428 */ void play();
-};
-
-struct JKRHeap {
-    /* 802CE438 */ void becomeCurrentHeap();
-    /* 802CE448 */ void destroy();
-};
-
-struct mDoDvdThd_mountArchive_c {
-    /* 80015E14 */ void create(char const*, u8, JKRHeap*);
-};
-
-struct mDoCPd_c {
-    static u8 m_cpadInfo[256];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daTitle_c {
-    /* 80D66B54 */ void CreateHeap();
-    /* 80D66CDC */ void create();
-    /* 80D66E7C */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80D66E9C */ void Execute();
-    /* 80D66F34 */ void KeyWaitAnm();
-    /* 80D67010 */ void loadWait_init();
-    /* 80D6701C */ void loadWait_proc();
-    /* 80D672E0 */ void logoDispWaitInit();
-    /* 80D672EC */ void logoDispWait();
-    /* 80D67350 */ void logoDispAnmInit();
-    /* 80D6737C */ void logoDispAnm();
-    /* 80D674A8 */ void keyWaitInit();
-    /* 80D674B4 */ void keyWait();
-    /* 80D67544 */ void nextScene_init();
-    /* 80D67550 */ void nextScene_proc();
-    /* 80D675EC */ void fastLogoDispInit();
-    /* 80D676AC */ void fastLogoDisp();
-    /* 80D676F4 */ void getDemoPrm();
-    /* 80D67768 */ void Draw();
-    /* 80D6786C */ void Delete();
-};
-
-struct daTit_HIO_c {
-    /* 80D66B0C */ daTit_HIO_c();
-    /* 80D67A08 */ ~daTit_HIO_c();
-};
-
-struct dStage_roomControl_c {
-    static u8 mProcID[4];
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dMenu_Collect3D_c {
-    static f32 mViewOffsetY[1 + 1 /* padding */];
-};
-
-struct dDlst_base_c {
-    /* 80D67A04 */ void draw();
-};
-
-struct dDlst_list_c {
-    /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
-};
-
-struct dDlst_daTitle_c {
-    /* 80D679C8 */ void draw();
-    /* 80D67B30 */ ~dDlst_daTitle_c();
-};
-
-struct dDemo_object_c {
-    /* 80039088 */ void getActor(u8);
-};
-
-struct dDemo_c {
-    static u8 m_object[4];
-};
-
-struct JAISoundID {};
-
-struct Vec {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct JKRExpHeap {
-    /* 802CEE2C */ void create(u32, JKRHeap*, bool);
-};
-
-struct JKRArchive {};
-
-struct J3DModel {};
-
-struct J3DFrameCtrl {
-    /* 803283FC */ void init(s16);
-    /* 80D67B78 */ ~J3DFrameCtrl();
-};
-
-struct J2DTextBox {
-    /* 80300658 */ void getStringPtr() const;
-    /* 8030074C */ void setString(s16, char const*, ...);
-};
-
-struct J2DGrafContext {};
-
-struct J2DScreen {
-    /* 802F8498 */ J2DScreen();
-    /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
-    /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
-};
-
-struct CPaneMgrAlpha {
-    /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
-    /* 80255878 */ void alphaAnime(s16, u8, u8, u8);
-    /* 80255964 */ void alphaAnimeLoop(s16, u8, u8, u8);
-};
 
 //
 // Forward References:
@@ -267,17 +91,13 @@ extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
 extern "C" void getStringPtr__10J2DTextBoxCFv();
 extern "C" void setString__10J2DTextBoxFsPCce();
 extern "C" void init__12J3DFrameCtrlFs();
-extern "C" void PSMTXTrans();
 extern "C" void __ptmf_scall();
 extern "C" void _savegpr_26();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 j3dSys[284];
 extern "C" extern u32 g_blackColor;
 extern "C" f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */];
 extern "C" u8 mFader__13mDoGph_gInf_c[4];
@@ -418,25 +238,30 @@ SECTION_DATA static u8 daTitleProc[72] = {
 };
 
 /* 80D67CF0-80D67D10 -00001 0020+00 1/0 0/0 0/0 .data            l_daTitle_Method */
-SECTION_DATA static void* l_daTitle_Method[8] = {
-    (void*)daTitle_Create__FP10fopAc_ac_c,
-    (void*)daTitle_Delete__FP9daTitle_c,
-    (void*)daTitle_Execute__FP9daTitle_c,
-    (void*)NULL,
-    (void*)daTitle_Draw__FP9daTitle_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daTitle_Method = {
+    (process_method_func)daTitle_Create__FP10fopAc_ac_c,
+    (process_method_func)daTitle_Delete__FP9daTitle_c,
+    (process_method_func)daTitle_Execute__FP9daTitle_c,
+    0,
+    (process_method_func)daTitle_Draw__FP9daTitle_c,
 };
 
 /* 80D67D10-80D67D40 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TITLE */
-SECTION_DATA extern void* g_profile_TITLE[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02E10000, (void*)&g_fpcLf_Method,
-    (void*)0x00000608, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x000A0000, (void*)&l_daTitle_Method,
-    (void*)0x00044000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_TITLE = {
+  fpcLy_CURRENT_e,         // mLayerID
+  7,                       // mListID
+  fpcPi_CURRENT_e,         // mListPrio
+  PROC_TITLE,              // mProcName
+  &g_fpcLf_Method.mBase,   // sub_method
+  sizeof(daTitle_c),       // mSize
+  0,                       // mSizeOther
+  0,                       // mParameters
+  &g_fopAc_Method.base,    // sub_method
+  10,                      // mPriority
+  &l_daTitle_Method,       // sub_method
+  0x00044000,              // mStatus
+  fopAc_ACTOR_e,           // mActorType
+  fopAc_CULLBOX_CUSTOM_e,  // cullType
 };
 
 /* 80D67D40-80D67D50 000100 0010+00 2/2 0/0 0/0 .data            __vt__15dDlst_daTitle_c */
@@ -790,7 +615,8 @@ asm void dDlst_daTitle_c::draw() {
 #pragma pop
 
 /* 80D67A04-80D67A08 000FE4 0004+00 1/0 0/0 0/0 .text            draw__12dDlst_base_cFv */
-void dDlst_base_c::draw() {
+// void dDlst_base_c::draw() {
+extern "C" void draw__12dDlst_base_cFv() {
     /* empty function */
 }
 
@@ -833,7 +659,8 @@ asm dDlst_daTitle_c::~dDlst_daTitle_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DFrameCtrl::~J3DFrameCtrl() {
+// asm J3DFrameCtrl::~J3DFrameCtrl() {
+extern "C" asm void __dt__12J3DFrameCtrlFv() {
     nofralloc
 #include "asm/rel/d/a/d_a_title/d_a_title/__dt__12J3DFrameCtrlFv.s"
 }
diff --git a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp
index e2b4a0cad90..7dccec3d596 100644
--- a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp
+++ b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_vrbox2
-//
+/**
+ * @file d_a_vrbox2.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_vrbox2/d_a_vrbox2.h"
 #include "d/com/d_com_inf_game.h"
@@ -9,22 +9,6 @@
 #include "d/kankyo/d_kankyo_rain.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
-
-class vrbox2_class : public fopAc_ac_c {
-public:
-    /* 0x568 */ u8 field_0x568[0x56C - 0x568];
-    /* 0x56C */ J3DModel* mpKumoModel;
-    /* 0x570 */ u8 field_0x570[0x574 - 0x570];
-    /* 0x574 */ J3DModel* model2;
-    /* 0x578 */ J3DModel* model2_und;
-    /* 0x57C */ u8 field_0x57C[0x580 - 0x57C];
-    /* 0x580 */ mDoExt_btkAnm mSunBtk;
-    /* 0x598 */ J3DModel* mpKasumimModel;
-    /* 0x59C */ u8 field_0x59C[0x5A0 - 0x59C];
-};
 
 //
 // Forward References:
diff --git a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp
index 5143dc372de..d2f90500fbc 100644
--- a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp
+++ b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_ykgr
-//
+/**
+ * @file d_a_ykgr.cpp
+ * 
+*/
 
 #include "rel/d/a/d_a_ykgr/d_a_ykgr.h"
 #include "f_op/f_op_actor.h"
@@ -9,10 +9,6 @@
 #include "dol2asm.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-//
-// Types:
-//
-
 //
 // Forward References:
 //
diff --git a/tools/add_class_comments.py b/tools/add_class_comments.py
index 74f3e6db6d7..df85e38ca53 100644
--- a/tools/add_class_comments.py
+++ b/tools/add_class_comments.py
@@ -31,7 +31,7 @@ def process_file(file_path):
                 class_name = match.group(1)
                 # Check if Doxygen comment is missing
                 if not doxygen_comment_pattern.search(''.join(lines[max(0, i-3):i])):
-                    doxygen_comment = f"""/**\n * @ingroup actors-tags\n * @class {class_name}\n * @brief\n *\n * @details\n *\n */\n"""
+                    doxygen_comment = f"""/**\n * @ingroup actors-unsorted\n * @class {class_name}\n * @brief\n *\n * @details\n *\n */\n"""
                     lines.insert(i, doxygen_comment)
                 
                 # Stop after processing the first class declaration
diff --git a/tools/setup_actor.py b/tools/setup_actor.py
index 48e986fc0b4..fd11d7d537d 100644
--- a/tools/setup_actor.py
+++ b/tools/setup_actor.py
@@ -139,7 +139,20 @@ weak_funcs = {
     "asm void daNpcT_JntAnm_c::lookActor(fopAc_ac_c* param_0, f32 param_1, u8 param_2)" : "lookActor__15daNpcT_JntAnm_cFP10fopAc_ac_cfUc",
     "asm daNpcCd_c::~daNpcCd_c()": "__dt__9daNpcCd_cFv",
     "asm void daNpcT_Path_c::getDstPos(cXyz param_0, cXyz* param_1)": "getDstPos__13daNpcT_Path_cF4cXyzP4cXyz",
-    "asm void daDitem_c::setOffsetPos(cXyz param_0)": "setOffsetPos__9daDitem_cF4cXyz"
+    "asm void daDitem_c::setOffsetPos(cXyz param_0)": "setOffsetPos__9daDitem_cF4cXyz",
+    "asm void mDoMtx_stack_c::multVecZero(Vec* param_0)": "multVecZero__14mDoMtx_stack_cFP3Vec",
+    "asm void csXyz::operator=(csXyz const& param_0": "__as__5csXyzFRC5csXyz",
+    "asm void fopEn_enemy_c::setDownPos(cXyz const* param_0)": "setDownPos__13fopEn_enemy_cFPC4cXyz",
+    "asm mDoExt_3DlineMat1_c::mDoExt_3DlineMat1_c()": "__ct__19mDoExt_3DlineMat1_cFv",
+    "asm Z2SoundObjSimple::~Z2SoundObjSimple()": "__dt__16Z2SoundObjSimpleFv",
+    "asm void mDoCPd_c::getTrigA(u32 param_0)": "getTrigA__8mDoCPd_cFUl",
+    "asm void J3DModel::getAnmMtx(int param_0)": "getAnmMtx__8J3DModelFi",
+    "asm void daHorse_c::changeDemoMode(u32 param_0, int param_1)": "changeDemoMode__9daHorse_cFUli",
+    "asm void daHorse_c::changeOriginalDemo()": "changeOriginalDemo__9daHorse_cFv",
+    "asm void dCcD_Sph::operator=(dCcD_Sph const& param_0)": "__as__8dCcD_SphFRC8dCcD_Sph",
+    "asm dCcD_Stts::dCcD_Stts()": "__ct__9dCcD_SttsFv",
+    "asm dCcD_Stts::~dCcD_Stts()": "__dt__9dCcD_SttsFv",
+    "asm void cXyz::abs(Vec const& param_0) const": "abs__4cXyzCFRC3Vec"
 }
 
 # list of known external references to be replaced to avoid symbol collision
@@ -219,12 +232,16 @@ external_refs = [
     "extern \"C\" void C_MTXLightOrtho();",
     "extern \"C\" void strcat();",
     "extern \"C\" void pow();",
-    "extern \"C\" extern u8 mStayNo__20dStage_roomControl_c[4];",
+    # "extern \"C\" extern u8 mStayNo__20dStage_roomControl_c[4];",
     "extern \"C\" void OSReport_Error();",
-    "extern \"C\" extern u32 g_blackColor;",
+    # "extern \"C\" extern u32 g_blackColor;",
     "extern \"C\" void PSMTXMultVecSR();",
     "extern \"C\" void strlen();",
-    "extern \"C\" extern u32 g_saftyWhiteColor;",
+    # "extern \"C\" extern u32 g_saftyWhiteColor;",
+    "extern \"C\" void PSMTXQuat();",
+    "extern \"C\" void GXInitTexObjCI();",
+    "extern \"C\" void GXInitTlutObj();",
+    "extern \"C\" void GXLoadTlut();",
 ]
 
 types = [
@@ -465,6 +482,39 @@ types = [
     "struct daNpc_Len_c",
     "struct dSv_player_status_b_c",
     "struct daNpc_Maro_c",
+    "struct dSv_restart_c",
+    "struct J3DSkinDeform",
+    "struct J3DDeformData",
+    "struct J3DAnmCluster",
+    "struct mDoExt_blkAnm",
+    "struct daMP_c",
+    "struct dDemo_actor_c",
+    "struct dStage_roomControl_c",
+    "struct dDemo_object_c",
+    "struct dDemo_c",
+    "struct J3DMaterial",
+    "struct leafdraw_class",
+    "struct mDoExt_MtxCalcOldFrame",
+    "struct mDoExt_AnmRatioPack",
+    "struct daPy_frameCtrl_c",
+    "struct daPy_actorKeep_c",
+    "struct Quaternion",
+    "struct J3DTransformInfo",
+    "struct J3DMtxCalcNoAnmBase",
+    "struct J3DMtxCalcNoAnm",
+    "struct J3DMtxCalcNoAnm__template0",
+    "struct J3DMtxCalcJ3DSysInitMaya",
+    "struct J3DMtxCalcCalcTransformMaya",
+    "struct J3DMtxCalc",
+    "struct daTagWaterFall_c",
+    "struct daObj_Balloon_c",
+    "struct daE_YM_c",
+    "struct daBalloon2D_c",
+    "struct daObjLife_c",
+    "struct daAlink_c",
+    "struct dSv_player_item_record_c",
+    "struct dSv_player_item_max_c",
+    "struct dSv_fishing_info_c",
 ]
 
 class ActorSetupManager:
@@ -522,9 +572,9 @@ class ActorSetupManager:
         for line in self.lines:
             if any(ref in line for ref in external_refs):
                 # leave calc_mtx in unless d_camera was included
-                # if "extern \"C\" extern void* calc_mtx[1 + 1 /* padding */];" in line and not any("d/d_camera.h" in header for header in self.include_headers):
-                #     new_lines.append(line)
-                #     continue
+                if "extern \"C\" extern void* calc_mtx[1 + 1 /* padding */];" in line and not any("d/d_camera.h" in header for header in self.include_headers):
+                    new_lines.append(line)
+                    continue
 
                 # leave g_dComIfG_gameInfo in unless npc actor
                 if "extern \"C\" extern u8 g_dComIfG_gameInfo[122384];" in line and "npc" not in self.filename and not any("d/a/obj/d_a_obj_carry/d_a_obj_carry.h" in header for header in self.include_headers):
@@ -579,7 +629,7 @@ class ActorSetupManager:
                         # might fail if a tu has more than 1 actor
                         self.actor_name = stripped_line.split(" ")[1]
 
-                        if "d_a_e" in self.filename:
+                        if "d_a_e" in self.filename or "d_a_b" in self.filename:
                             self.actor_class_type = "enemy"
                             stripped_line = stripped_line.replace(" {"," : public fopEn_enemy_c {")
                         else:
@@ -675,7 +725,7 @@ class ActorSetupManager:
                     elif self.actor_class_type == "actor":
                         new_lines.append(f"    /* 0x568 */ u8 field_0x568[{final_class_size} - 0x568];\n")
 
-                    new_lines.append("};\n")
+                    new_lines.append("};\n\n")
                     new_lines.append(f"STATIC_ASSERT(sizeof({self.actor_name}) == {final_class_size});\n")
                 else:
                     in_class = True
diff --git a/tools/setup_profile.py b/tools/setup_profile.py
index a253de5ffb6..11dba6a31ee 100644
--- a/tools/setup_profile.py
+++ b/tools/setup_profile.py
@@ -1038,4 +1038,4 @@ def setup_profile_cli(file_path):
     setup_profile(file_path)
 
 if __name__ == "__main__":
-    setup_profile()
+    setup_profile_cli()