Remove (ActorFunc) casts in initvars (#1571)

* Remove `(ActorFunc)` casts in initvars, use `/**/` trick for format

Achieved by using the following regex:

(ActorInit.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*\n\};)

replaced with

$1$2/**/ $3$4/**/ $5$6/**/ $7$8/**/ $9$10/**/ $11$12/**/ $13$14/**/ $15$16/**/ $17$18/**/ $19

plus a change from /**/ to #if 0 #endif in docs/

* Manual fixes

docs/tutorial/beginning_decomp.md

@@ -638,19 +638,19 @@ void func_80A87F44(Actor* thisx, PlayState* play);
 void func_80A87BEC(EnJj* this, PlayState* play);
 void func_80A87C30(EnJj* this, PlayState* play);
 
-/*
+#if 0
 ActorInit En_Jj_InitVars = {
-    ACTOR_EN_JJ,
+    /**/ ACTOR_EN_JJ,
-    ACTORTYPE_ITEMACTION,
+    /**/ ACTORTYPE_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JJ,
+    /**/ OBJECT_JJ,
-    sizeof(EnJj),
+    /**/ sizeof(EnJj),
-    (ActorFunc)EnJj_Init,
+    /**/ EnJj_Init,
-    (ActorFunc)EnJj_Destroy,
+    /**/ EnJj_Destroy,
-    (ActorFunc)EnJj_Update,
+    /**/ EnJj_Update,
-    (ActorFunc)EnJj_Draw,
+    /**/ EnJj_Draw,
 };
-*/
+#endif
 
 extern ColliderCylinderInit D_80A88CB4;
 // static ColliderCylinderInit sCylinderInit = {

docs/tutorial/data.md

@@ -94,15 +94,15 @@ s32 D_80B18910[] = { 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000,
 s32 D_80B1893C[] = { 0x00000000, 0x00000000, 0xFF000000 };
 
 ActorInit En_Tg_InitVars = {
-    ACTOR_EN_TG,
+    /**/ ACTOR_EN_TG,
-    ACTORTYPE_NPC,
+    /**/ ACTORTYPE_NPC,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MU,
+    /**/ OBJECT_MU,
-    sizeof(EnTg),
+    /**/ sizeof(EnTg),
-    (ActorFunc)EnTg_Init,
+    /**/ EnTg_Init,
-    (ActorFunc)EnTg_Destroy,
+    /**/ EnTg_Destroy,
-    (ActorFunc)EnTg_Update,
+    /**/ EnTg_Update,
-    (ActorFunc)EnTg_Draw,
+    /**/ EnTg_Draw,
 };
 
 s32 D_80B18968[] = { 0x00000000, 0x44480000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
@@ -490,15 +490,15 @@ To replace the `extern`, because the data is in a separate file, we include the
 Lastly, uncomment the InitVars block that's been sitting there the whole time. The data section of the file now looks like
 ```C
 ActorInit En_Jj_InitVars = {
-    ACTOR_EN_JJ,
+    /**/ ACTOR_EN_JJ,
-    ACTORTYPE_ITEMACTION,
+    /**/ ACTORTYPE_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JJ,
+    /**/ OBJECT_JJ,
-    sizeof(EnJj),
+    /**/ sizeof(EnJj),
-    (ActorFunc)EnJj_Init,
+    /**/ EnJj_Init,
-    (ActorFunc)EnJj_Destroy,
+    /**/ EnJj_Destroy,
-    (ActorFunc)EnJj_Update,
+    /**/ EnJj_Update,
-    (ActorFunc)EnJj_Draw,
+    /**/ EnJj_Draw,
 };
 
 #include "en_jj_cutscene_data.c" EARLY
@@ -567,15 +567,15 @@ Notice that the numbers in the bottom pane is all shifted one word to the left.
 
 ```C
 ActorInit En_Jj_InitVars = {
-    ACTOR_EN_JJ,
+    /**/ ACTOR_EN_JJ,
-    ACTORTYPE_ITEMACTION,
+    /**/ ACTORTYPE_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JJ,
+    /**/ OBJECT_JJ,
-    sizeof(EnJj),
+    /**/ sizeof(EnJj),
-    (ActorFunc)EnJj_Init,
+    /**/ EnJj_Init,
-    (ActorFunc)EnJj_Destroy,
+    /**/ EnJj_Destroy,
-    (ActorFunc)EnJj_Update,
+    /**/ EnJj_Update,
-    (ActorFunc)EnJj_Draw,
+    /**/ EnJj_Draw,
 };
 
 s32 usused = 0;

src/code/z_en_a_keep.c

@@ -21,15 +21,15 @@ void EnAObj_SetupBoulderFragment(EnAObj* this, s16 type);
 void EnAObj_SetupBlock(EnAObj* this, s16 type);
 
 ActorInit En_A_Obj_InitVars = {
-    ACTOR_EN_A_OBJ,
+    /**/ ACTOR_EN_A_OBJ,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(EnAObj),
+    /**/ sizeof(EnAObj),
-    (ActorFunc)EnAObj_Init,
+    /**/ EnAObj_Init,
-    (ActorFunc)EnAObj_Destroy,
+    /**/ EnAObj_Destroy,
-    (ActorFunc)EnAObj_Update,
+    /**/ EnAObj_Update,
-    (ActorFunc)EnAObj_Draw,
+    /**/ EnAObj_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/code/z_en_item00.c

@@ -21,15 +21,15 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play);
 void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play);
 
 ActorInit En_Item00_InitVars = {
-    ACTOR_EN_ITEM00,
+    /**/ ACTOR_EN_ITEM00,
-    ACTORCAT_MISC,
+    /**/ ACTORCAT_MISC,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(EnItem00),
+    /**/ sizeof(EnItem00),
-    (ActorFunc)EnItem00_Init,
+    /**/ EnItem00_Init,
-    (ActorFunc)EnItem00_Destroy,
+    /**/ EnItem00_Destroy,
-    (ActorFunc)EnItem00_Update,
+    /**/ EnItem00_Update,
-    (ActorFunc)EnItem00_Draw,
+    /**/ EnItem00_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/code/z_player_call.c

@@ -18,15 +18,15 @@ void Player_Update(Actor* thisx, PlayState* play);
 void Player_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Player_InitVars = {
-    ACTOR_PLAYER,
+    /**/ ACTOR_PLAYER,
-    ACTORCAT_PLAYER,
+    /**/ ACTORCAT_PLAYER,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(Player),
+    /**/ sizeof(Player),
-    (ActorFunc)PlayerCall_Init,
+    /**/ PlayerCall_Init,
-    (ActorFunc)PlayerCall_Destroy,
+    /**/ PlayerCall_Destroy,
-    (ActorFunc)PlayerCall_Update,
+    /**/ PlayerCall_Update,
-    (ActorFunc)PlayerCall_Draw,
+    /**/ PlayerCall_Draw,
 };
 
 void PlayerCall_InitFuncPtrs(void) {

src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

@@ -12,15 +12,15 @@ void ArmsHook_Wait(ArmsHook* this, PlayState* play);
 void ArmsHook_Shoot(ArmsHook* this, PlayState* play);
 
 ActorInit Arms_Hook_InitVars = {
-    ACTOR_ARMS_HOOK,
+    /**/ ACTOR_ARMS_HOOK,
-    ACTORCAT_ITEMACTION,
+    /**/ ACTORCAT_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_LINK_BOY,
+    /**/ OBJECT_LINK_BOY,
-    sizeof(ArmsHook),
+    /**/ sizeof(ArmsHook),
-    (ActorFunc)ArmsHook_Init,
+    /**/ ArmsHook_Init,
-    (ActorFunc)ArmsHook_Destroy,
+    /**/ ArmsHook_Destroy,
-    (ActorFunc)ArmsHook_Update,
+    /**/ ArmsHook_Update,
-    (ActorFunc)ArmsHook_Draw,
+    /**/ ArmsHook_Draw,
 };
 
 static ColliderQuadInit sQuadInit = {

src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

@@ -21,15 +21,15 @@ void ArrowFire_Hit(ArrowFire* this, PlayState* play);
 #include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
 
 ActorInit Arrow_Fire_InitVars = {
-    ACTOR_ARROW_FIRE,
+    /**/ ACTOR_ARROW_FIRE,
-    ACTORCAT_ITEMACTION,
+    /**/ ACTORCAT_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(ArrowFire),
+    /**/ sizeof(ArrowFire),
-    (ActorFunc)ArrowFire_Init,
+    /**/ ArrowFire_Init,
-    (ActorFunc)ArrowFire_Destroy,
+    /**/ ArrowFire_Destroy,
-    (ActorFunc)ArrowFire_Update,
+    /**/ ArrowFire_Update,
-    (ActorFunc)ArrowFire_Draw,
+    /**/ ArrowFire_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c

@@ -22,15 +22,15 @@ void ArrowIce_Hit(ArrowIce* this, PlayState* play);
 #include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
 
 ActorInit Arrow_Ice_InitVars = {
-    ACTOR_ARROW_ICE,
+    /**/ ACTOR_ARROW_ICE,
-    ACTORCAT_ITEMACTION,
+    /**/ ACTORCAT_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(ArrowIce),
+    /**/ sizeof(ArrowIce),
-    (ActorFunc)ArrowIce_Init,
+    /**/ ArrowIce_Init,
-    (ActorFunc)ArrowIce_Destroy,
+    /**/ ArrowIce_Destroy,
-    (ActorFunc)ArrowIce_Update,
+    /**/ ArrowIce_Update,
-    (ActorFunc)ArrowIce_Draw,
+    /**/ ArrowIce_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c

@@ -22,15 +22,15 @@ void ArrowLight_Hit(ArrowLight* this, PlayState* play);
 #include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
 
 ActorInit Arrow_Light_InitVars = {
-    ACTOR_ARROW_LIGHT,
+    /**/ ACTOR_ARROW_LIGHT,
-    ACTORCAT_ITEMACTION,
+    /**/ ACTORCAT_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(ArrowLight),
+    /**/ sizeof(ArrowLight),
-    (ActorFunc)ArrowLight_Init,
+    /**/ ArrowLight_Init,
-    (ActorFunc)ArrowLight_Destroy,
+    /**/ ArrowLight_Destroy,
-    (ActorFunc)ArrowLight_Update,
+    /**/ ArrowLight_Update,
-    (ActorFunc)ArrowLight_Draw,
+    /**/ ArrowLight_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -33,15 +33,15 @@ void func_8086CB10(BgBdanObjects* this, PlayState* play);
 void func_8086CB8C(BgBdanObjects* this, PlayState* play);
 
 ActorInit Bg_Bdan_Objects_InitVars = {
-    ACTOR_BG_BDAN_OBJECTS,
+    /**/ ACTOR_BG_BDAN_OBJECTS,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_BDAN_OBJECTS,
+    /**/ OBJECT_BDAN_OBJECTS,
-    sizeof(BgBdanObjects),
+    /**/ sizeof(BgBdanObjects),
-    (ActorFunc)BgBdanObjects_Init,
+    /**/ BgBdanObjects_Init,
-    (ActorFunc)BgBdanObjects_Destroy,
+    /**/ BgBdanObjects_Destroy,
-    (ActorFunc)BgBdanObjects_Update,
+    /**/ BgBdanObjects_Update,
-    (ActorFunc)BgBdanObjects_Draw,
+    /**/ BgBdanObjects_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c

@@ -43,15 +43,15 @@ void func_8086DDA8(BgBdanSwitch* this);
 void func_8086DDC0(BgBdanSwitch* this, PlayState* play);
 
 ActorInit Bg_Bdan_Switch_InitVars = {
-    ACTOR_BG_BDAN_SWITCH,
+    /**/ ACTOR_BG_BDAN_SWITCH,
-    ACTORCAT_SWITCH,
+    /**/ ACTORCAT_SWITCH,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_BDAN_OBJECTS,
+    /**/ OBJECT_BDAN_OBJECTS,
-    sizeof(BgBdanSwitch),
+    /**/ sizeof(BgBdanSwitch),
-    (ActorFunc)BgBdanSwitch_Init,
+    /**/ BgBdanSwitch_Init,
-    (ActorFunc)BgBdanSwitch_Destroy,
+    /**/ BgBdanSwitch_Destroy,
-    (ActorFunc)BgBdanSwitch_Update,
+    /**/ BgBdanSwitch_Update,
-    (ActorFunc)BgBdanSwitch_Draw,
+    /**/ BgBdanSwitch_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[] = {

src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c

@@ -18,15 +18,15 @@ void BgBomGuard_Update(Actor* thisx, PlayState* play);
 void func_8086E638(BgBomGuard* this, PlayState* play);
 
 ActorInit Bg_Bom_Guard_InitVars = {
-    ACTOR_BG_BOM_GUARD,
+    /**/ ACTOR_BG_BOM_GUARD,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_BOWL,
+    /**/ OBJECT_BOWL,
-    sizeof(BgBomGuard),
+    /**/ sizeof(BgBomGuard),
-    (ActorFunc)BgBomGuard_Init,
+    /**/ BgBomGuard_Init,
-    (ActorFunc)BgBomGuard_Destroy,
+    /**/ BgBomGuard_Destroy,
-    (ActorFunc)BgBomGuard_Update,
+    /**/ BgBomGuard_Update,
-    NULL,
+    /**/ NULL,
 };
 
 void BgBomGuard_SetupAction(BgBomGuard* this, BgBomGuardActionFunc actionFunc) {

src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c

@@ -70,15 +70,15 @@ static ColliderTrisInit sTrisInit = {
 };
 
 ActorInit Bg_Bombwall_InitVars = {
-    ACTOR_BG_BOMBWALL,
+    /**/ ACTOR_BG_BOMBWALL,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_FIELD_KEEP,
+    /**/ OBJECT_GAMEPLAY_FIELD_KEEP,
-    sizeof(BgBombwall),
+    /**/ sizeof(BgBombwall),
-    (ActorFunc)BgBombwall_Init,
+    /**/ BgBombwall_Init,
-    (ActorFunc)BgBombwall_Destroy,
+    /**/ BgBombwall_Destroy,
-    (ActorFunc)BgBombwall_Update,
+    /**/ BgBombwall_Update,
-    (ActorFunc)BgBombwall_Draw,
+    /**/ BgBombwall_Draw,
 };
 
 void BgBombwall_InitDynapoly(BgBombwall* this, PlayState* play) {

src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c

@@ -25,15 +25,15 @@ void BgBowlWall_FinishFall(BgBowlWall* this, PlayState* play);
 void BgBowlWall_Reset(BgBowlWall* this, PlayState* play);
 
 ActorInit Bg_Bowl_Wall_InitVars = {
-    ACTOR_BG_BOWL_WALL,
+    /**/ ACTOR_BG_BOWL_WALL,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_BOWL,
+    /**/ OBJECT_BOWL,
-    sizeof(BgBowlWall),
+    /**/ sizeof(BgBowlWall),
-    (ActorFunc)BgBowlWall_Init,
+    /**/ BgBowlWall_Init,
-    (ActorFunc)BgBowlWall_Destroy,
+    /**/ BgBowlWall_Destroy,
-    (ActorFunc)BgBowlWall_Update,
+    /**/ BgBowlWall_Update,
-    (ActorFunc)BgBowlWall_Draw,
+    /**/ BgBowlWall_Draw,
 };
 
 static Vec3f sBullseyeOffset[] = {

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -27,15 +27,15 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play);
 void BgBreakwall_LavaCoverMove(BgBreakwall* this, PlayState* play);
 
 ActorInit Bg_Breakwall_InitVars = {
-    ACTOR_BG_BREAKWALL,
+    /**/ ACTOR_BG_BREAKWALL,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgBreakwall),
+    /**/ sizeof(BgBreakwall),
-    (ActorFunc)BgBreakwall_Init,
+    /**/ BgBreakwall_Init,
-    (ActorFunc)BgBreakwall_Destroy,
+    /**/ BgBreakwall_Destroy,
-    (ActorFunc)BgBreakwall_Update,
+    /**/ BgBreakwall_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static ColliderQuadInit sQuadInit = {

src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c

@@ -18,15 +18,15 @@ void BgDdanJd_Idle(BgDdanJd* this, PlayState* play);
 void BgDdanJd_Move(BgDdanJd* this, PlayState* play);
 
 ActorInit Bg_Ddan_Jd_InitVars = {
-    ACTOR_BG_DDAN_JD,
+    /**/ ACTOR_BG_DDAN_JD,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DDAN_OBJECTS,
+    /**/ OBJECT_DDAN_OBJECTS,
-    sizeof(BgDdanJd),
+    /**/ sizeof(BgDdanJd),
-    (ActorFunc)BgDdanJd_Init,
+    /**/ BgDdanJd_Init,
-    (ActorFunc)BgDdanJd_Destroy,
+    /**/ BgDdanJd_Destroy,
-    (ActorFunc)BgDdanJd_Update,
+    /**/ BgDdanJd_Update,
-    (ActorFunc)BgDdanJd_Draw,
+    /**/ BgDdanJd_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c

@@ -19,15 +19,15 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, PlayState* play);
 void BgDdanKd_DoNothing(BgDdanKd* this, PlayState* play);
 
 ActorInit Bg_Ddan_Kd_InitVars = {
-    ACTOR_BG_DDAN_KD,
+    /**/ ACTOR_BG_DDAN_KD,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DDAN_OBJECTS,
+    /**/ OBJECT_DDAN_OBJECTS,
-    sizeof(BgDdanKd),
+    /**/ sizeof(BgDdanKd),
-    (ActorFunc)BgDdanKd_Init,
+    /**/ BgDdanKd_Init,
-    (ActorFunc)BgDdanKd_Destroy,
+    /**/ BgDdanKd_Destroy,
-    (ActorFunc)BgDdanKd_Update,
+    /**/ BgDdanKd_Update,
-    (ActorFunc)BgDdanKd_Draw,
+    /**/ BgDdanKd_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c

@@ -21,15 +21,15 @@ void BgDodoago_DoNothing(BgDodoago* this, PlayState* play);
 void BgDodoago_LightOneEye(BgDodoago* this, PlayState* play);
 
 ActorInit Bg_Dodoago_InitVars = {
-    ACTOR_BG_DODOAGO,
+    /**/ ACTOR_BG_DODOAGO,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DDAN_OBJECTS,
+    /**/ OBJECT_DDAN_OBJECTS,
-    sizeof(BgDodoago),
+    /**/ sizeof(BgDodoago),
-    (ActorFunc)BgDodoago_Init,
+    /**/ BgDodoago_Init,
-    (ActorFunc)BgDodoago_Destroy,
+    /**/ BgDodoago_Destroy,
-    (ActorFunc)BgDodoago_Update,
+    /**/ BgDodoago_Update,
-    (ActorFunc)BgDodoago_Draw,
+    /**/ BgDodoago_Draw,
 };
 
 static ColliderCylinderInit sColCylinderInitMain = {

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -55,15 +55,15 @@ void BgDyYoseizo_DrawEffects(BgDyYoseizo* this, PlayState* play);
 static s32 sUnusedGetItemIds[] = { GI_FARORES_WIND, GI_NAYRUS_LOVE, GI_DINS_FIRE };
 
 ActorInit Bg_Dy_Yoseizo_InitVars = {
-    ACTOR_BG_DY_YOSEIZO,
+    /**/ ACTOR_BG_DY_YOSEIZO,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DY_OBJ,
+    /**/ OBJECT_DY_OBJ,
-    sizeof(BgDyYoseizo),
+    /**/ sizeof(BgDyYoseizo),
-    (ActorFunc)BgDyYoseizo_Init,
+    /**/ BgDyYoseizo_Init,
-    (ActorFunc)BgDyYoseizo_Destroy,
+    /**/ BgDyYoseizo_Destroy,
-    (ActorFunc)BgDyYoseizo_Update,
+    /**/ BgDyYoseizo_Update,
-    NULL,
+    /**/ NULL,
 };
 
 void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) {

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

@@ -26,15 +26,15 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, PlayState* play);
 void BgGanonOtyuka_DoNothing(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Ganon_Otyuka_InitVars = {
-    ACTOR_BG_GANON_OTYUKA,
+    /**/ ACTOR_BG_GANON_OTYUKA,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GANON,
+    /**/ OBJECT_GANON,
-    sizeof(BgGanonOtyuka),
+    /**/ sizeof(BgGanonOtyuka),
-    (ActorFunc)BgGanonOtyuka_Init,
+    /**/ BgGanonOtyuka_Init,
-    (ActorFunc)BgGanonOtyuka_Destroy,
+    /**/ BgGanonOtyuka_Destroy,
-    (ActorFunc)BgGanonOtyuka_Update,
+    /**/ BgGanonOtyuka_Update,
-    (ActorFunc)BgGanonOtyuka_Draw,
+    /**/ BgGanonOtyuka_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c

@@ -21,15 +21,15 @@ void func_808783AC(BgGateShutter* this, PlayState* play);
 void func_808783D4(BgGateShutter* this, PlayState* play);
 
 ActorInit Bg_Gate_Shutter_InitVars = {
-    ACTOR_BG_GATE_SHUTTER,
+    /**/ ACTOR_BG_GATE_SHUTTER,
-    ACTORCAT_ITEMACTION,
+    /**/ ACTORCAT_ITEMACTION,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SPOT01_MATOYAB,
+    /**/ OBJECT_SPOT01_MATOYAB,
-    sizeof(BgGateShutter),
+    /**/ sizeof(BgGateShutter),
-    (ActorFunc)BgGateShutter_Init,
+    /**/ BgGateShutter_Init,
-    (ActorFunc)BgGateShutter_Destroy,
+    /**/ BgGateShutter_Destroy,
-    (ActorFunc)BgGateShutter_Update,
+    /**/ BgGateShutter_Update,
-    (ActorFunc)BgGateShutter_Draw,
+    /**/ BgGateShutter_Draw,
 };
 
 void BgGateShutter_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c

@@ -20,15 +20,15 @@ void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, PlayState* play);
 void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, PlayState* play);
 
 ActorInit Bg_Gjyo_Bridge_InitVars = {
-    ACTOR_BG_GJYO_BRIDGE,
+    /**/ ACTOR_BG_GJYO_BRIDGE,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GJYO_OBJECTS,
+    /**/ OBJECT_GJYO_OBJECTS,
-    sizeof(BgGjyoBridge),
+    /**/ sizeof(BgGjyoBridge),
-    (ActorFunc)BgGjyoBridge_Init,
+    /**/ BgGjyoBridge_Init,
-    (ActorFunc)BgGjyoBridge_Destroy,
+    /**/ BgGjyoBridge_Destroy,
-    (ActorFunc)BgGjyoBridge_Update,
+    /**/ BgGjyoBridge_Update,
-    (ActorFunc)BgGjyoBridge_Draw,
+    /**/ BgGjyoBridge_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

@@ -22,15 +22,15 @@ void BgGndDarkmeiro_UpdateStaticBlock(BgGndDarkmeiro* this, PlayState* play);
 void BgGndDarkmeiro_UpdateSwitchBlock(BgGndDarkmeiro* this, PlayState* play);
 
 ActorInit Bg_Gnd_Darkmeiro_InitVars = {
-    ACTOR_BG_GND_DARKMEIRO,
+    /**/ ACTOR_BG_GND_DARKMEIRO,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DEMO_KEKKAI,
+    /**/ OBJECT_DEMO_KEKKAI,
-    sizeof(BgGndDarkmeiro),
+    /**/ sizeof(BgGndDarkmeiro),
-    (ActorFunc)BgGndDarkmeiro_Init,
+    /**/ BgGndDarkmeiro_Init,
-    (ActorFunc)BgGndDarkmeiro_Destroy,
+    /**/ BgGndDarkmeiro_Destroy,
-    (ActorFunc)BgGndDarkmeiro_Update,
+    /**/ BgGndDarkmeiro_Update,
-    NULL,
+    /**/ NULL,
 };
 
 void BgGndDarkmeiro_ToggleBlock(BgGndDarkmeiro* this, PlayState* play) {

src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c

@@ -19,15 +19,15 @@ void BgGndFiremeiro_Shake(BgGndFiremeiro* this, PlayState* play);
 void BgGndFiremeiro_Rise(BgGndFiremeiro* this, PlayState* play);
 
 ActorInit Bg_Gnd_Firemeiro_InitVars = {
-    ACTOR_BG_GND_FIREMEIRO,
+    /**/ ACTOR_BG_GND_FIREMEIRO,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DEMO_KEKKAI,
+    /**/ OBJECT_DEMO_KEKKAI,
-    sizeof(BgGndFiremeiro),
+    /**/ sizeof(BgGndFiremeiro),
-    (ActorFunc)BgGndFiremeiro_Init,
+    /**/ BgGndFiremeiro_Init,
-    (ActorFunc)BgGndFiremeiro_Destroy,
+    /**/ BgGndFiremeiro_Destroy,
-    (ActorFunc)BgGndFiremeiro_Update,
+    /**/ BgGndFiremeiro_Update,
-    (ActorFunc)BgGndFiremeiro_Draw,
+    /**/ BgGndFiremeiro_Draw,
 };
 
 void BgGndFiremeiro_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c

@@ -24,15 +24,15 @@ void BgGndIceblock_Idle(BgGndIceblock* this, PlayState* play);
 void BgGndIceblock_Slide(BgGndIceblock* this, PlayState* play);
 
 ActorInit Bg_Gnd_Iceblock_InitVars = {
-    ACTOR_BG_GND_ICEBLOCK,
+    /**/ ACTOR_BG_GND_ICEBLOCK,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DEMO_KEKKAI,
+    /**/ OBJECT_DEMO_KEKKAI,
-    sizeof(BgGndIceblock),
+    /**/ sizeof(BgGndIceblock),
-    (ActorFunc)BgGndIceblock_Init,
+    /**/ BgGndIceblock_Init,
-    (ActorFunc)BgGndIceblock_Destroy,
+    /**/ BgGndIceblock_Destroy,
-    (ActorFunc)BgGndIceblock_Update,
+    /**/ BgGndIceblock_Update,
-    (ActorFunc)BgGndIceblock_Draw,
+    /**/ BgGndIceblock_Draw,
 };
 
 static Color_RGBA8 sWhite = { 250, 250, 250, 255 };

src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c

@@ -15,15 +15,15 @@ void BgGndNisekabe_Update(Actor* thisx, PlayState* play);
 void BgGndNisekabe_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Gnd_Nisekabe_InitVars = {
-    ACTOR_BG_GND_NISEKABE,
+    /**/ ACTOR_BG_GND_NISEKABE,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DEMO_KEKKAI,
+    /**/ OBJECT_DEMO_KEKKAI,
-    sizeof(BgGndNisekabe),
+    /**/ sizeof(BgGndNisekabe),
-    (ActorFunc)BgGndNisekabe_Init,
+    /**/ BgGndNisekabe_Init,
-    (ActorFunc)BgGndNisekabe_Destroy,
+    /**/ BgGndNisekabe_Destroy,
-    (ActorFunc)BgGndNisekabe_Update,
+    /**/ BgGndNisekabe_Update,
-    (ActorFunc)BgGndNisekabe_Draw,
+    /**/ BgGndNisekabe_Draw,
 };
 
 void BgGndNisekabe_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c

@@ -20,15 +20,15 @@ void func_8087B284(BgGndSoulmeiro* this, PlayState* play);
 void func_8087B350(BgGndSoulmeiro* this, PlayState* play);
 
 ActorInit Bg_Gnd_Soulmeiro_InitVars = {
-    ACTOR_BG_GND_SOULMEIRO,
+    /**/ ACTOR_BG_GND_SOULMEIRO,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_DEMO_KEKKAI,
+    /**/ OBJECT_DEMO_KEKKAI,
-    sizeof(BgGndSoulmeiro),
+    /**/ sizeof(BgGndSoulmeiro),
-    (ActorFunc)BgGndSoulmeiro_Init,
+    /**/ BgGndSoulmeiro_Init,
-    (ActorFunc)BgGndSoulmeiro_Destroy,
+    /**/ BgGndSoulmeiro_Destroy,
-    (ActorFunc)BgGndSoulmeiro_Update,
+    /**/ BgGndSoulmeiro_Update,
-    (ActorFunc)BgGndSoulmeiro_Draw,
+    /**/ BgGndSoulmeiro_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

@@ -21,15 +21,15 @@ void func_8087BAAC(BgHaka* this, PlayState* play);
 void func_8087BAE4(BgHaka* this, PlayState* play);
 
 ActorInit Bg_Haka_InitVars = {
-    ACTOR_BG_HAKA,
+    /**/ ACTOR_BG_HAKA,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKA,
+    /**/ OBJECT_HAKA,
-    sizeof(BgHaka),
+    /**/ sizeof(BgHaka),
-    (ActorFunc)BgHaka_Init,
+    /**/ BgHaka_Init,
-    (ActorFunc)BgHaka_Destroy,
+    /**/ BgHaka_Destroy,
-    (ActorFunc)BgHaka_Update,
+    /**/ BgHaka_Update,
-    (ActorFunc)BgHaka_Draw,
+    /**/ BgHaka_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c

@@ -53,15 +53,15 @@ static f32 sStatueDistToPlayer = 0;
 static s16 sStatueRotY;
 
 ActorInit Bg_Haka_Gate_InitVars = {
-    ACTOR_BG_HAKA_GATE,
+    /**/ ACTOR_BG_HAKA_GATE,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKA_OBJECTS,
+    /**/ OBJECT_HAKA_OBJECTS,
-    sizeof(BgHakaGate),
+    /**/ sizeof(BgHakaGate),
-    (ActorFunc)BgHakaGate_Init,
+    /**/ BgHakaGate_Init,
-    (ActorFunc)BgHakaGate_Destroy,
+    /**/ BgHakaGate_Destroy,
-    (ActorFunc)BgHakaGate_Update,
+    /**/ BgHakaGate_Update,
-    (ActorFunc)BgHakaGate_Draw,
+    /**/ BgHakaGate_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c

@@ -25,15 +25,15 @@ void func_8087D720(BgHakaHuta* this, PlayState* play);
 void BgHakaHuta_DoNothing(BgHakaHuta* this, PlayState* play);
 
 ActorInit Bg_Haka_Huta_InitVars = {
-    ACTOR_BG_HAKA_HUTA,
+    /**/ ACTOR_BG_HAKA_HUTA,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKACH_OBJECTS,
+    /**/ OBJECT_HAKACH_OBJECTS,
-    sizeof(BgHakaHuta),
+    /**/ sizeof(BgHakaHuta),
-    (ActorFunc)BgHakaHuta_Init,
+    /**/ BgHakaHuta_Init,
-    (ActorFunc)BgHakaHuta_Destroy,
+    /**/ BgHakaHuta_Destroy,
-    (ActorFunc)BgHakaHuta_Update,
+    /**/ BgHakaHuta_Update,
-    (ActorFunc)BgHakaHuta_Draw,
+    /**/ BgHakaHuta_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c

@@ -20,15 +20,15 @@ void func_8087DBF0(BgHakaMegane* this, PlayState* play);
 void BgHakaMegane_DoNothing(BgHakaMegane* this, PlayState* play);
 
 ActorInit Bg_Haka_Megane_InitVars = {
-    ACTOR_BG_HAKA_MEGANE,
+    /**/ ACTOR_BG_HAKA_MEGANE,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgHakaMegane),
+    /**/ sizeof(BgHakaMegane),
-    (ActorFunc)BgHakaMegane_Init,
+    /**/ BgHakaMegane_Init,
-    (ActorFunc)BgHakaMegane_Destroy,
+    /**/ BgHakaMegane_Destroy,
-    (ActorFunc)BgHakaMegane_Update,
+    /**/ BgHakaMegane_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c

@@ -24,15 +24,15 @@ void func_8087E2D8(BgHakaMeganeBG* this, PlayState* play);
 void func_8087E34C(BgHakaMeganeBG* this, PlayState* play);
 
 ActorInit Bg_Haka_MeganeBG_InitVars = {
-    ACTOR_BG_HAKA_MEGANEBG,
+    /**/ ACTOR_BG_HAKA_MEGANEBG,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKA_OBJECTS,
+    /**/ OBJECT_HAKA_OBJECTS,
-    sizeof(BgHakaMeganeBG),
+    /**/ sizeof(BgHakaMeganeBG),
-    (ActorFunc)BgHakaMeganeBG_Init,
+    /**/ BgHakaMeganeBG_Init,
-    (ActorFunc)BgHakaMeganeBG_Destroy,
+    /**/ BgHakaMeganeBG_Destroy,
-    (ActorFunc)BgHakaMeganeBG_Update,
+    /**/ BgHakaMeganeBG_Update,
-    (ActorFunc)BgHakaMeganeBG_Draw,
+    /**/ BgHakaMeganeBG_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

@@ -27,15 +27,15 @@ void BgHakaSgami_SetupSpin(BgHakaSgami* this, PlayState* play);
 void BgHakaSgami_Spin(BgHakaSgami* this, PlayState* play);
 
 ActorInit Bg_Haka_Sgami_InitVars = {
-    ACTOR_BG_HAKA_SGAMI,
+    /**/ ACTOR_BG_HAKA_SGAMI,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgHakaSgami),
+    /**/ sizeof(BgHakaSgami),
-    (ActorFunc)BgHakaSgami_Init,
+    /**/ BgHakaSgami_Init,
-    (ActorFunc)BgHakaSgami_Destroy,
+    /**/ BgHakaSgami_Destroy,
-    (ActorFunc)BgHakaSgami_Update,
+    /**/ BgHakaSgami_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static ColliderTrisElementInit sTrisElementsInit[4] = {

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c

@@ -22,15 +22,15 @@ void BgHakaShip_CrashShake(BgHakaShip* this, PlayState* play);
 void BgHakaShip_CrashFall(BgHakaShip* this, PlayState* play);
 
 ActorInit Bg_Haka_Ship_InitVars = {
-    ACTOR_BG_HAKA_SHIP,
+    /**/ ACTOR_BG_HAKA_SHIP,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKA_OBJECTS,
+    /**/ OBJECT_HAKA_OBJECTS,
-    sizeof(BgHakaShip),
+    /**/ sizeof(BgHakaShip),
-    (ActorFunc)BgHakaShip_Init,
+    /**/ BgHakaShip_Init,
-    (ActorFunc)BgHakaShip_Destroy,
+    /**/ BgHakaShip_Destroy,
-    (ActorFunc)BgHakaShip_Update,
+    /**/ BgHakaShip_Update,
-    (ActorFunc)BgHakaShip_Draw,
+    /**/ BgHakaShip_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c

@@ -30,15 +30,15 @@ void func_80880D68(BgHakaTrap* this);
 static UNK_TYPE D_80880F30 = 0;
 
 ActorInit Bg_Haka_Trap_InitVars = {
-    ACTOR_BG_HAKA_TRAP,
+    /**/ ACTOR_BG_HAKA_TRAP,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKA_OBJECTS,
+    /**/ OBJECT_HAKA_OBJECTS,
-    sizeof(BgHakaTrap),
+    /**/ sizeof(BgHakaTrap),
-    (ActorFunc)BgHakaTrap_Init,
+    /**/ BgHakaTrap_Init,
-    (ActorFunc)BgHakaTrap_Destroy,
+    /**/ BgHakaTrap_Destroy,
-    (ActorFunc)BgHakaTrap_Update,
+    /**/ BgHakaTrap_Update,
-    (ActorFunc)BgHakaTrap_Draw,
+    /**/ BgHakaTrap_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c

@@ -19,15 +19,15 @@ void BgHakaTubo_Idle(BgHakaTubo* this, PlayState* play);
 void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play);
 
 ActorInit Bg_Haka_Tubo_InitVars = {
-    ACTOR_BG_HAKA_TUBO,
+    /**/ ACTOR_BG_HAKA_TUBO,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKA_OBJECTS,
+    /**/ OBJECT_HAKA_OBJECTS,
-    sizeof(BgHakaTubo),
+    /**/ sizeof(BgHakaTubo),
-    (ActorFunc)BgHakaTubo_Init,
+    /**/ BgHakaTubo_Init,
-    (ActorFunc)BgHakaTubo_Destroy,
+    /**/ BgHakaTubo_Destroy,
-    (ActorFunc)BgHakaTubo_Update,
+    /**/ BgHakaTubo_Update,
-    (ActorFunc)BgHakaTubo_Draw,
+    /**/ BgHakaTubo_Draw,
 };
 
 static ColliderCylinderInit sPotColliderInit = {

src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c

@@ -19,15 +19,15 @@ void BgHakaWater_Wait(BgHakaWater* this, PlayState* play);
 void BgHakaWater_ChangeWaterLevel(BgHakaWater* this, PlayState* play);
 
 ActorInit Bg_Haka_Water_InitVars = {
-    ACTOR_BG_HAKA_WATER,
+    /**/ ACTOR_BG_HAKA_WATER,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HAKACH_OBJECTS,
+    /**/ OBJECT_HAKACH_OBJECTS,
-    sizeof(BgHakaWater),
+    /**/ sizeof(BgHakaWater),
-    (ActorFunc)BgHakaWater_Init,
+    /**/ BgHakaWater_Init,
-    (ActorFunc)BgHakaWater_Destroy,
+    /**/ BgHakaWater_Destroy,
-    (ActorFunc)BgHakaWater_Update,
+    /**/ BgHakaWater_Update,
-    (ActorFunc)BgHakaWater_Draw,
+    /**/ BgHakaWater_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c

@@ -55,15 +55,15 @@ static ColliderCylinderInit sCylinderInit = {
 static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
 
 ActorInit Bg_Haka_Zou_InitVars = {
-    ACTOR_BG_HAKA_ZOU,
+    /**/ ACTOR_BG_HAKA_ZOU,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgHakaZou),
+    /**/ sizeof(BgHakaZou),
-    (ActorFunc)BgHakaZou_Init,
+    /**/ BgHakaZou_Init,
-    (ActorFunc)BgHakaZou_Destroy,
+    /**/ BgHakaZou_Destroy,
-    (ActorFunc)BgHakaZou_Update,
+    /**/ BgHakaZou_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c

@@ -28,15 +28,15 @@ void BgHeavyBlock_Land(BgHeavyBlock* this, PlayState* play);
 void BgHeavyBlock_DoNothing(BgHeavyBlock* this, PlayState* play);
 
 ActorInit Bg_Heavy_Block_InitVars = {
-    ACTOR_BG_HEAVY_BLOCK,
+    /**/ ACTOR_BG_HEAVY_BLOCK,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HEAVY_OBJECT,
+    /**/ OBJECT_HEAVY_OBJECT,
-    sizeof(BgHeavyBlock),
+    /**/ sizeof(BgHeavyBlock),
-    (ActorFunc)BgHeavyBlock_Init,
+    /**/ BgHeavyBlock_Init,
-    (ActorFunc)BgHeavyBlock_Destroy,
+    /**/ BgHeavyBlock_Destroy,
-    (ActorFunc)BgHeavyBlock_Update,
+    /**/ BgHeavyBlock_Update,
-    (ActorFunc)BgHeavyBlock_Draw,
+    /**/ BgHeavyBlock_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

@@ -54,15 +54,15 @@ static CollisionCheckInfoInit sCcInfoInit = { 1, 80, 100, MASS_IMMOVABLE };
 static BgHidanCurtainParams sHCParams[] = { { 81, 144, 0.090f, 144.0f, 5.0f }, { 46, 88, 0.055f, 88.0f, 3.0f } };
 
 ActorInit Bg_Hidan_Curtain_InitVars = {
-    ACTOR_BG_HIDAN_CURTAIN,
+    /**/ ACTOR_BG_HIDAN_CURTAIN,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgHidanCurtain),
+    /**/ sizeof(BgHidanCurtain),
-    (ActorFunc)BgHidanCurtain_Init,
+    /**/ BgHidanCurtain_Init,
-    (ActorFunc)BgHidanCurtain_Destroy,
+    /**/ BgHidanCurtain_Destroy,
-    (ActorFunc)BgHidanCurtain_Update,
+    /**/ BgHidanCurtain_Update,
-    (ActorFunc)BgHidanCurtain_Draw,
+    /**/ BgHidanCurtain_Draw,
 };
 
 void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c

@@ -18,15 +18,15 @@ void BgHidanDalm_Wait(BgHidanDalm* this, PlayState* play);
 void BgHidanDalm_Shrink(BgHidanDalm* this, PlayState* play);
 
 ActorInit Bg_Hidan_Dalm_InitVars = {
-    ACTOR_BG_HIDAN_DALM,
+    /**/ ACTOR_BG_HIDAN_DALM,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanDalm),
+    /**/ sizeof(BgHidanDalm),
-    (ActorFunc)BgHidanDalm_Init,
+    /**/ BgHidanDalm_Init,
-    (ActorFunc)BgHidanDalm_Destroy,
+    /**/ BgHidanDalm_Destroy,
-    (ActorFunc)BgHidanDalm_Update,
+    /**/ BgHidanDalm_Update,
-    (ActorFunc)BgHidanDalm_Draw,
+    /**/ BgHidanDalm_Draw,
 };
 
 static ColliderTrisElementInit sTrisElementInit[4] = {

src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c

@@ -22,15 +22,15 @@ void BgHidanFirewall_Collide(BgHidanFirewall* this, PlayState* play);
 void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, PlayState* play);
 
 ActorInit Bg_Hidan_Firewall_InitVars = {
-    ACTOR_BG_HIDAN_FIREWALL,
+    /**/ ACTOR_BG_HIDAN_FIREWALL,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanFirewall),
+    /**/ sizeof(BgHidanFirewall),
-    (ActorFunc)BgHidanFirewall_Init,
+    /**/ BgHidanFirewall_Init,
-    (ActorFunc)BgHidanFirewall_Destroy,
+    /**/ BgHidanFirewall_Destroy,
-    (ActorFunc)BgHidanFirewall_Update,
+    /**/ BgHidanFirewall_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c

@@ -19,15 +19,15 @@ void func_8088706C(BgHidanFslift* this, PlayState* play);
 void func_808870D8(BgHidanFslift* this, PlayState* play);
 
 ActorInit Bg_Hidan_Fslift_InitVars = {
-    ACTOR_BG_HIDAN_FSLIFT,
+    /**/ ACTOR_BG_HIDAN_FSLIFT,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanFslift),
+    /**/ sizeof(BgHidanFslift),
-    (ActorFunc)BgHidanFslift_Init,
+    /**/ BgHidanFslift_Init,
-    (ActorFunc)BgHidanFslift_Destroy,
+    /**/ BgHidanFslift_Destroy,
-    (ActorFunc)BgHidanFslift_Update,
+    /**/ BgHidanFslift_Update,
-    (ActorFunc)BgHidanFslift_Draw,
+    /**/ BgHidanFslift_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c

@@ -32,15 +32,15 @@ void BgHidanFwbig_WaitForPlayer(BgHidanFwbig* this, PlayState* play);
 void BgHidanFwbig_Move(BgHidanFwbig* this, PlayState* play);
 
 ActorInit Bg_Hidan_Fwbig_InitVars = {
-    ACTOR_BG_HIDAN_FWBIG,
+    /**/ ACTOR_BG_HIDAN_FWBIG,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanFwbig),
+    /**/ sizeof(BgHidanFwbig),
-    (ActorFunc)BgHidanFwbig_Init,
+    /**/ BgHidanFwbig_Init,
-    (ActorFunc)BgHidanFwbig_Destroy,
+    /**/ BgHidanFwbig_Destroy,
-    (ActorFunc)BgHidanFwbig_Update,
+    /**/ BgHidanFwbig_Update,
-    (ActorFunc)BgHidanFwbig_Draw,
+    /**/ BgHidanFwbig_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c

@@ -64,15 +64,15 @@ static ColliderTrisInit sTrisInit = {
 };
 
 ActorInit Bg_Hidan_Hamstep_InitVars = {
-    ACTOR_BG_HIDAN_HAMSTEP,
+    /**/ ACTOR_BG_HIDAN_HAMSTEP,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanHamstep),
+    /**/ sizeof(BgHidanHamstep),
-    (ActorFunc)BgHidanHamstep_Init,
+    /**/ BgHidanHamstep_Init,
-    (ActorFunc)BgHidanHamstep_Destroy,
+    /**/ BgHidanHamstep_Destroy,
-    (ActorFunc)BgHidanHamstep_Update,
+    /**/ BgHidanHamstep_Update,
-    (ActorFunc)BgHidanHamstep_Draw,
+    /**/ BgHidanHamstep_Draw,
 };
 
 static BgHidanHamstepActionFunc sActionFuncs[] = {

src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c

@@ -19,15 +19,15 @@ void func_808896B8(BgHidanHrock* this, PlayState* play);
 void func_808894A4(BgHidanHrock* this, PlayState* play);
 
 ActorInit Bg_Hidan_Hrock_InitVars = {
-    ACTOR_BG_HIDAN_HROCK,
+    /**/ ACTOR_BG_HIDAN_HROCK,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanHrock),
+    /**/ sizeof(BgHidanHrock),
-    (ActorFunc)BgHidanHrock_Init,
+    /**/ BgHidanHrock_Init,
-    (ActorFunc)BgHidanHrock_Destroy,
+    /**/ BgHidanHrock_Destroy,
-    (ActorFunc)BgHidanHrock_Update,
+    /**/ BgHidanHrock_Update,
-    (ActorFunc)BgHidanHrock_Draw,
+    /**/ BgHidanHrock_Draw,
 };
 
 static ColliderTrisElementInit sTrisElementsInit[2] = {

src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c

@@ -24,15 +24,15 @@ void func_80889D28(BgHidanKousi* this, PlayState* play);
 static f32 D_80889E40[] = { 120.0f, 150.0f, 150.0f };
 
 ActorInit Bg_Hidan_Kousi_InitVars = {
-    ACTOR_BG_HIDAN_KOUSI,
+    /**/ ACTOR_BG_HIDAN_KOUSI,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanKousi),
+    /**/ sizeof(BgHidanKousi),
-    (ActorFunc)BgHidanKousi_Init,
+    /**/ BgHidanKousi_Init,
-    (ActorFunc)BgHidanKousi_Destroy,
+    /**/ BgHidanKousi_Destroy,
-    (ActorFunc)BgHidanKousi_Update,
+    /**/ BgHidanKousi_Update,
-    (ActorFunc)BgHidanKousi_Draw,
+    /**/ BgHidanKousi_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

@@ -23,15 +23,15 @@ void BgHidanKowarerukabe_Update(Actor* thisx, PlayState* play);
 void BgHidanKowarerukabe_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Hidan_Kowarerukabe_InitVars = {
-    ACTOR_BG_HIDAN_KOWARERUKABE,
+    /**/ ACTOR_BG_HIDAN_KOWARERUKABE,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanKowarerukabe),
+    /**/ sizeof(BgHidanKowarerukabe),
-    (ActorFunc)BgHidanKowarerukabe_Init,
+    /**/ BgHidanKowarerukabe_Init,
-    (ActorFunc)BgHidanKowarerukabe_Destroy,
+    /**/ BgHidanKowarerukabe_Destroy,
-    (ActorFunc)BgHidanKowarerukabe_Update,
+    /**/ BgHidanKowarerukabe_Update,
-    (ActorFunc)BgHidanKowarerukabe_Draw,
+    /**/ BgHidanKowarerukabe_Draw,
 };
 
 static Gfx* sBreakableWallDLists[] = {

src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c

@@ -30,15 +30,15 @@ void func_8088BC40(PlayState* play, BgHidanRock* this);
 static Vec3f D_8088BF60 = { 3310.0f, 120.0f, 0.0f };
 
 ActorInit Bg_Hidan_Rock_InitVars = {
-    ACTOR_BG_HIDAN_ROCK,
+    /**/ ACTOR_BG_HIDAN_ROCK,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanRock),
+    /**/ sizeof(BgHidanRock),
-    (ActorFunc)BgHidanRock_Init,
+    /**/ BgHidanRock_Init,
-    (ActorFunc)BgHidanRock_Destroy,
+    /**/ BgHidanRock_Destroy,
-    (ActorFunc)BgHidanRock_Update,
+    /**/ BgHidanRock_Update,
-    (ActorFunc)BgHidanRock_Draw,
+    /**/ BgHidanRock_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

@@ -15,15 +15,15 @@ void BgHidanRsekizou_Update(Actor* thisx, PlayState* play);
 void BgHidanRsekizou_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Hidan_Rsekizou_InitVars = {
-    ACTOR_BG_HIDAN_RSEKIZOU,
+    /**/ ACTOR_BG_HIDAN_RSEKIZOU,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanRsekizou),
+    /**/ sizeof(BgHidanRsekizou),
-    (ActorFunc)BgHidanRsekizou_Init,
+    /**/ BgHidanRsekizou_Init,
-    (ActorFunc)BgHidanRsekizou_Destroy,
+    /**/ BgHidanRsekizou_Destroy,
-    (ActorFunc)BgHidanRsekizou_Update,
+    /**/ BgHidanRsekizou_Update,
-    (ActorFunc)BgHidanRsekizou_Draw,
+    /**/ BgHidanRsekizou_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[6] = {

src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c

@@ -18,15 +18,15 @@ void func_8088D434(BgHidanSekizou* this, PlayState* play);
 void func_8088D720(BgHidanSekizou* this, PlayState* play);
 
 ActorInit Bg_Hidan_Sekizou_InitVars = {
-    ACTOR_BG_HIDAN_SEKIZOU,
+    /**/ ACTOR_BG_HIDAN_SEKIZOU,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanSekizou),
+    /**/ sizeof(BgHidanSekizou),
-    (ActorFunc)BgHidanSekizou_Init,
+    /**/ BgHidanSekizou_Init,
-    (ActorFunc)BgHidanSekizou_Destroy,
+    /**/ BgHidanSekizou_Destroy,
-    (ActorFunc)BgHidanSekizou_Update,
+    /**/ BgHidanSekizou_Update,
-    (ActorFunc)BgHidanSekizou_Draw,
+    /**/ BgHidanSekizou_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[6] = {

src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c

@@ -22,15 +22,15 @@ void func_8088E7A8(BgHidanSima* this, PlayState* play);
 void func_8088E90C(BgHidanSima* this);
 
 ActorInit Bg_Hidan_Sima_InitVars = {
-    ACTOR_BG_HIDAN_SIMA,
+    /**/ ACTOR_BG_HIDAN_SIMA,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanSima),
+    /**/ sizeof(BgHidanSima),
-    (ActorFunc)BgHidanSima_Init,
+    /**/ BgHidanSima_Init,
-    (ActorFunc)BgHidanSima_Destroy,
+    /**/ BgHidanSima_Destroy,
-    (ActorFunc)BgHidanSima_Update,
+    /**/ BgHidanSima_Update,
-    (ActorFunc)BgHidanSima_Draw,
+    /**/ BgHidanSima_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[2] = {

src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c

@@ -19,15 +19,15 @@ void func_8088F514(BgHidanSyoku* this, PlayState* play);
 void func_8088F62C(BgHidanSyoku* this, PlayState* play);
 
 ActorInit Bg_Hidan_Syoku_InitVars = {
-    ACTOR_BG_HIDAN_SYOKU,
+    /**/ ACTOR_BG_HIDAN_SYOKU,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_HIDAN_OBJECTS,
+    /**/ OBJECT_HIDAN_OBJECTS,
-    sizeof(BgHidanSyoku),
+    /**/ sizeof(BgHidanSyoku),
-    (ActorFunc)BgHidanSyoku_Init,
+    /**/ BgHidanSyoku_Init,
-    (ActorFunc)BgHidanSyoku_Destroy,
+    /**/ BgHidanSyoku_Destroy,
-    (ActorFunc)BgHidanSyoku_Update,
+    /**/ BgHidanSyoku_Update,
-    (ActorFunc)BgHidanSyoku_Draw,
+    /**/ BgHidanSyoku_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c

@@ -24,15 +24,15 @@ static Color_RGBA8 sGray = { 180, 180, 180, 255 };
 static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
 
 ActorInit Bg_Ice_Objects_InitVars = {
-    ACTOR_BG_ICE_OBJECTS,
+    /**/ ACTOR_BG_ICE_OBJECTS,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_ICE_OBJECTS,
+    /**/ OBJECT_ICE_OBJECTS,
-    sizeof(BgIceObjects),
+    /**/ sizeof(BgIceObjects),
-    (ActorFunc)BgIceObjects_Init,
+    /**/ BgIceObjects_Init,
-    (ActorFunc)BgIceObjects_Destroy,
+    /**/ BgIceObjects_Destroy,
-    (ActorFunc)BgIceObjects_Update,
+    /**/ BgIceObjects_Update,
-    (ActorFunc)BgIceObjects_Draw,
+    /**/ BgIceObjects_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c

@@ -24,15 +24,15 @@ void BgIceShelter_Idle(BgIceShelter* this, PlayState* play);
 void BgIceShelter_Melt(BgIceShelter* this, PlayState* play);
 
 ActorInit Bg_Ice_Shelter_InitVars = {
-    ACTOR_BG_ICE_SHELTER,
+    /**/ ACTOR_BG_ICE_SHELTER,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_ICE_OBJECTS,
+    /**/ OBJECT_ICE_OBJECTS,
-    sizeof(BgIceShelter),
+    /**/ sizeof(BgIceShelter),
-    (ActorFunc)BgIceShelter_Init,
+    /**/ BgIceShelter_Init,
-    (ActorFunc)BgIceShelter_Destroy,
+    /**/ BgIceShelter_Destroy,
-    (ActorFunc)BgIceShelter_Update,
+    /**/ BgIceShelter_Update,
-    (ActorFunc)BgIceShelter_Draw,
+    /**/ BgIceShelter_Draw,
 };
 
 static f32 sRedIceScales[] = { 0.1f, 0.06f, 0.1f, 0.1f, 0.25f };

src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c

@@ -19,15 +19,15 @@ void func_80891D6C(BgIceShutter* this, PlayState* play);
 void func_80891DD4(BgIceShutter* this, PlayState* play);
 
 ActorInit Bg_Ice_Shutter_InitVars = {
-    ACTOR_BG_ICE_SHUTTER,
+    /**/ ACTOR_BG_ICE_SHUTTER,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_ICE_OBJECTS,
+    /**/ OBJECT_ICE_OBJECTS,
-    sizeof(BgIceShutter),
+    /**/ sizeof(BgIceShutter),
-    (ActorFunc)BgIceShutter_Init,
+    /**/ BgIceShutter_Init,
-    (ActorFunc)BgIceShutter_Destroy,
+    /**/ BgIceShutter_Destroy,
-    (ActorFunc)BgIceShutter_Update,
+    /**/ BgIceShutter_Update,
-    (ActorFunc)BgIceShutter_Draw,
+    /**/ BgIceShutter_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c

@@ -41,15 +41,15 @@ static ColliderCylinderInit sCylinderInit = {
 };
 
 ActorInit Bg_Ice_Turara_InitVars = {
-    ACTOR_BG_ICE_TURARA,
+    /**/ ACTOR_BG_ICE_TURARA,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_ICE_OBJECTS,
+    /**/ OBJECT_ICE_OBJECTS,
-    sizeof(BgIceTurara),
+    /**/ sizeof(BgIceTurara),
-    (ActorFunc)BgIceTurara_Init,
+    /**/ BgIceTurara_Init,
-    (ActorFunc)BgIceTurara_Destroy,
+    /**/ BgIceTurara_Destroy,
-    (ActorFunc)BgIceTurara_Update,
+    /**/ BgIceTurara_Update,
-    (ActorFunc)BgIceTurara_Draw,
+    /**/ BgIceTurara_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -18,15 +18,15 @@ void func_80892890(BgInGate* this, PlayState* play);
 void BgInGate_DoNothing(BgInGate* this, PlayState* play);
 
 ActorInit Bg_Ingate_InitVars = {
-    ACTOR_BG_INGATE,
+    /**/ ACTOR_BG_INGATE,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_INGATE,
+    /**/ OBJECT_INGATE,
-    sizeof(BgInGate),
+    /**/ sizeof(BgInGate),
-    (ActorFunc)BgInGate_Init,
+    /**/ BgInGate_Init,
-    (ActorFunc)BgInGate_Destroy,
+    /**/ BgInGate_Destroy,
-    (ActorFunc)BgInGate_Update,
+    /**/ BgInGate_Update,
-    (ActorFunc)BgInGate_Draw,
+    /**/ BgInGate_Draw,
 };
 
 void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) {

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c

@@ -26,15 +26,15 @@ void BgJya1flift_DelayMove(BgJya1flift* this, PlayState* play);
 static u8 sIsSpawned = false;
 
 ActorInit Bg_Jya_1flift_InitVars = {
-    ACTOR_BG_JYA_1FLIFT,
+    /**/ ACTOR_BG_JYA_1FLIFT,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJya1flift),
+    /**/ sizeof(BgJya1flift),
-    (ActorFunc)BgJya1flift_Init,
+    /**/ BgJya1flift_Init,
-    (ActorFunc)BgJya1flift_Destroy,
+    /**/ BgJya1flift_Destroy,
-    (ActorFunc)BgJya1flift_Update,
+    /**/ BgJya1flift_Update,
-    (ActorFunc)BgJya1flift_Draw,
+    /**/ BgJya1flift_Draw,
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c

@@ -24,15 +24,15 @@ void func_808934FC(BgJyaAmishutter* this);
 void func_8089350C(BgJyaAmishutter* this);
 
 ActorInit Bg_Jya_Amishutter_InitVars = {
-    ACTOR_BG_JYA_AMISHUTTER,
+    /**/ ACTOR_BG_JYA_AMISHUTTER,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaAmishutter),
+    /**/ sizeof(BgJyaAmishutter),
-    (ActorFunc)BgJyaAmishutter_Init,
+    /**/ BgJyaAmishutter_Init,
-    (ActorFunc)BgJyaAmishutter_Destroy,
+    /**/ BgJyaAmishutter_Destroy,
-    (ActorFunc)BgJyaAmishutter_Update,
+    /**/ BgJyaAmishutter_Update,
-    (ActorFunc)BgJyaAmishutter_Draw,
+    /**/ BgJyaAmishutter_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c

@@ -17,15 +17,15 @@ void BgJyaBigmirror_Draw(Actor* thisx, PlayState* play);
 static u8 sIsSpawned = false;
 
 ActorInit Bg_Jya_Bigmirror_InitVars = {
-    ACTOR_BG_JYA_BIGMIRROR,
+    /**/ ACTOR_BG_JYA_BIGMIRROR,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaBigmirror),
+    /**/ sizeof(BgJyaBigmirror),
-    (ActorFunc)BgJyaBigmirror_Init,
+    /**/ BgJyaBigmirror_Init,
-    (ActorFunc)BgJyaBigmirror_Destroy,
+    /**/ BgJyaBigmirror_Destroy,
-    (ActorFunc)BgJyaBigmirror_Update,
+    /**/ BgJyaBigmirror_Update,
-    (ActorFunc)BgJyaBigmirror_Draw,
+    /**/ BgJyaBigmirror_Draw,
 };
 
 typedef struct {

src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c

@@ -15,15 +15,15 @@ void BgJyaBlock_Update(Actor* thisx, PlayState* play);
 void BgJyaBlock_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Jya_Block_InitVars = {
-    ACTOR_BG_JYA_BLOCK,
+    /**/ ACTOR_BG_JYA_BLOCK,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_DANGEON_KEEP,
+    /**/ OBJECT_GAMEPLAY_DANGEON_KEEP,
-    sizeof(BgJyaBlock),
+    /**/ sizeof(BgJyaBlock),
-    (ActorFunc)BgJyaBlock_Init,
+    /**/ BgJyaBlock_Init,
-    (ActorFunc)BgJyaBlock_Destroy,
+    /**/ BgJyaBlock_Destroy,
-    (ActorFunc)BgJyaBlock_Update,
+    /**/ BgJyaBlock_Update,
-    (ActorFunc)BgJyaBlock_Draw,
+    /**/ BgJyaBlock_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c

@@ -15,15 +15,15 @@ void BgJyaBombchuiwa_CleanUpAfterExplosion(BgJyaBombchuiwa* this, PlayState* pla
 void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, PlayState* play);
 
 ActorInit Bg_Jya_Bombchuiwa_InitVars = {
-    ACTOR_BG_JYA_BOMBCHUIWA,
+    /**/ ACTOR_BG_JYA_BOMBCHUIWA,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaBombchuiwa),
+    /**/ sizeof(BgJyaBombchuiwa),
-    (ActorFunc)BgJyaBombchuiwa_Init,
+    /**/ BgJyaBombchuiwa_Init,
-    (ActorFunc)BgJyaBombchuiwa_Destroy,
+    /**/ BgJyaBombchuiwa_Destroy,
-    (ActorFunc)BgJyaBombchuiwa_Update,
+    /**/ BgJyaBombchuiwa_Update,
-    (ActorFunc)BgJyaBombchuiwa_Draw,
+    /**/ BgJyaBombchuiwa_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[1] = {

src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c

@@ -17,15 +17,15 @@ void BgJyaBombiwa_Update(Actor* thisx, PlayState* play);
 void BgJyaBombiwa_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Jya_Bombiwa_InitVars = {
-    ACTOR_BG_JYA_BOMBIWA,
+    /**/ ACTOR_BG_JYA_BOMBIWA,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaBombiwa),
+    /**/ sizeof(BgJyaBombiwa),
-    (ActorFunc)BgJyaBombiwa_Init,
+    /**/ BgJyaBombiwa_Init,
-    (ActorFunc)BgJyaBombiwa_Destroy,
+    /**/ BgJyaBombiwa_Destroy,
-    (ActorFunc)BgJyaBombiwa_Update,
+    /**/ BgJyaBombiwa_Update,
-    (ActorFunc)BgJyaBombiwa_Draw,
+    /**/ BgJyaBombiwa_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[] = {

src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c

@@ -19,15 +19,15 @@ void func_80896ABC(BgJyaCobra* this, PlayState* play);
 #include "assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c"
 
 ActorInit Bg_Jya_Cobra_InitVars = {
-    ACTOR_BG_JYA_COBRA,
+    /**/ ACTOR_BG_JYA_COBRA,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaCobra),
+    /**/ sizeof(BgJyaCobra),
-    (ActorFunc)BgJyaCobra_Init,
+    /**/ BgJyaCobra_Init,
-    (ActorFunc)BgJyaCobra_Destroy,
+    /**/ BgJyaCobra_Destroy,
-    (ActorFunc)BgJyaCobra_Update,
+    /**/ BgJyaCobra_Update,
-    (ActorFunc)BgJyaCobra_Draw,
+    /**/ BgJyaCobra_Draw,
 };
 
 static s16 D_80897308[] = { 0, 0, 0, 0 };

src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c

@@ -24,15 +24,15 @@ void BgJyaGoroiwa_UpdateRotation(BgJyaGoroiwa* this);
 void BgJyaGoroiwa_UpdateCollider(BgJyaGoroiwa* this);
 
 ActorInit Bg_Jya_Goroiwa_InitVars = {
-    ACTOR_BG_JYA_GOROIWA,
+    /**/ ACTOR_BG_JYA_GOROIWA,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GOROIWA,
+    /**/ OBJECT_GOROIWA,
-    sizeof(BgJyaGoroiwa),
+    /**/ sizeof(BgJyaGoroiwa),
-    (ActorFunc)BgJyaGoroiwa_Init,
+    /**/ BgJyaGoroiwa_Init,
-    (ActorFunc)BgJyaGoroiwa_Destroy,
+    /**/ BgJyaGoroiwa_Destroy,
-    (ActorFunc)BgJyaGoroiwa_Update,
+    /**/ BgJyaGoroiwa_Update,
-    (ActorFunc)BgJyaGoroiwa_Draw,
+    /**/ BgJyaGoroiwa_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[] = {

src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c

@@ -23,15 +23,15 @@ void BgJyaHaheniron_SetupRubbleCollide(BgJyaHaheniron* this);
 void BgJyaHaheniron_RubbleCollide(BgJyaHaheniron* this, PlayState* play);
 
 ActorInit Bg_Jya_Haheniron_InitVars = {
-    ACTOR_BG_JYA_HAHENIRON,
+    /**/ ACTOR_BG_JYA_HAHENIRON,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_IRON,
+    /**/ OBJECT_JYA_IRON,
-    sizeof(BgJyaHaheniron),
+    /**/ sizeof(BgJyaHaheniron),
-    (ActorFunc)BgJyaHaheniron_Init,
+    /**/ BgJyaHaheniron_Init,
-    (ActorFunc)BgJyaHaheniron_Destroy,
+    /**/ BgJyaHaheniron_Destroy,
-    (ActorFunc)BgJyaHaheniron_Update,
+    /**/ BgJyaHaheniron_Update,
-    (ActorFunc)BgJyaHaheniron_Draw,
+    /**/ BgJyaHaheniron_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[1] = {

src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c

@@ -25,15 +25,15 @@ void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk
 static int sUnused = 0;
 
 ActorInit Bg_Jya_Ironobj_InitVars = {
-    ACTOR_BG_JYA_IRONOBJ,
+    /**/ ACTOR_BG_JYA_IRONOBJ,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_IRON,
+    /**/ OBJECT_JYA_IRON,
-    sizeof(BgJyaIronobj),
+    /**/ sizeof(BgJyaIronobj),
-    (ActorFunc)BgJyaIronobj_Init,
+    /**/ BgJyaIronobj_Init,
-    (ActorFunc)BgJyaIronobj_Destroy,
+    /**/ BgJyaIronobj_Destroy,
-    (ActorFunc)BgJyaIronobj_Update,
+    /**/ BgJyaIronobj_Update,
-    (ActorFunc)BgJyaIronobj_Draw,
+    /**/ BgJyaIronobj_Draw,
 };
 
 static Gfx* sOpaDL[] = { gPillarDL, gThroneDL };

src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c

@@ -22,15 +22,15 @@ void func_80899950(BgJyaKanaami* this, PlayState* play);
 void func_80899A08(BgJyaKanaami* this);
 
 ActorInit Bg_Jya_Kanaami_InitVars = {
-    ACTOR_BG_JYA_KANAAMI,
+    /**/ ACTOR_BG_JYA_KANAAMI,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaKanaami),
+    /**/ sizeof(BgJyaKanaami),
-    (ActorFunc)BgJyaKanaami_Init,
+    /**/ BgJyaKanaami_Init,
-    (ActorFunc)BgJyaKanaami_Destroy,
+    /**/ BgJyaKanaami_Destroy,
-    (ActorFunc)BgJyaKanaami_Update,
+    /**/ BgJyaKanaami_Update,
-    (ActorFunc)BgJyaKanaami_Draw,
+    /**/ BgJyaKanaami_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c

@@ -23,15 +23,15 @@ void BgJyaLift_Move(BgJyaLift* this, PlayState* play);
 static s16 sIsSpawned = false;
 
 ActorInit Bg_Jya_Lift_InitVars = {
-    ACTOR_BG_JYA_LIFT,
+    /**/ ACTOR_BG_JYA_LIFT,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaLift),
+    /**/ sizeof(BgJyaLift),
-    (ActorFunc)BgJyaLift_Init,
+    /**/ BgJyaLift_Init,
-    (ActorFunc)BgJyaLift_Destroy,
+    /**/ BgJyaLift_Destroy,
-    (ActorFunc)BgJyaLift_Update,
+    /**/ BgJyaLift_Update,
-    (ActorFunc)BgJyaLift_Draw,
+    /**/ BgJyaLift_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c

@@ -21,15 +21,15 @@ void BgJyaMegami_SetupExplode(BgJyaMegami* this);
 void BgJyaMegami_Explode(BgJyaMegami* this, PlayState* play);
 
 ActorInit Bg_Jya_Megami_InitVars = {
-    ACTOR_BG_JYA_MEGAMI,
+    /**/ ACTOR_BG_JYA_MEGAMI,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaMegami),
+    /**/ sizeof(BgJyaMegami),
-    (ActorFunc)BgJyaMegami_Init,
+    /**/ BgJyaMegami_Init,
-    (ActorFunc)BgJyaMegami_Destroy,
+    /**/ BgJyaMegami_Destroy,
-    (ActorFunc)BgJyaMegami_Update,
+    /**/ BgJyaMegami_Update,
-    (ActorFunc)BgJyaMegami_Draw,
+    /**/ BgJyaMegami_Draw,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[] = {

src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c

@@ -24,15 +24,15 @@ void func_8089B870(BgJyaZurerukabe* this, PlayState* play);
 static f32 D_8089B9C0[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
 
 ActorInit Bg_Jya_Zurerukabe_InitVars = {
-    ACTOR_BG_JYA_ZURERUKABE,
+    /**/ ACTOR_BG_JYA_ZURERUKABE,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_JYA_OBJ,
+    /**/ OBJECT_JYA_OBJ,
-    sizeof(BgJyaZurerukabe),
+    /**/ sizeof(BgJyaZurerukabe),
-    (ActorFunc)BgJyaZurerukabe_Init,
+    /**/ BgJyaZurerukabe_Init,
-    (ActorFunc)BgJyaZurerukabe_Destroy,
+    /**/ BgJyaZurerukabe_Destroy,
-    (ActorFunc)BgJyaZurerukabe_Update,
+    /**/ BgJyaZurerukabe_Update,
-    (ActorFunc)BgJyaZurerukabe_Draw,
+    /**/ BgJyaZurerukabe_Draw,
 };
 
 static s16 D_8089B9F0[4] = { 943, 1043, 1243, 1343 };

src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c

@@ -15,15 +15,15 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play);
 void BgMenkuriEye_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Menkuri_Eye_InitVars = {
-    ACTOR_BG_MENKURI_EYE,
+    /**/ ACTOR_BG_MENKURI_EYE,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MENKURI_OBJECTS,
+    /**/ OBJECT_MENKURI_OBJECTS,
-    sizeof(BgMenkuriEye),
+    /**/ sizeof(BgMenkuriEye),
-    (ActorFunc)BgMenkuriEye_Init,
+    /**/ BgMenkuriEye_Init,
-    (ActorFunc)BgMenkuriEye_Destroy,
+    /**/ BgMenkuriEye_Destroy,
-    (ActorFunc)BgMenkuriEye_Update,
+    /**/ BgMenkuriEye_Update,
-    (ActorFunc)BgMenkuriEye_Draw,
+    /**/ BgMenkuriEye_Draw,
 };
 
 static s32 D_8089C1A0;

src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c

@@ -15,15 +15,15 @@ void BgMenkuriKaiten_Update(Actor* thisx, PlayState* play);
 void BgMenkuriKaiten_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Menkuri_Kaiten_InitVars = {
-    ACTOR_BG_MENKURI_KAITEN,
+    /**/ ACTOR_BG_MENKURI_KAITEN,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MENKURI_OBJECTS,
+    /**/ OBJECT_MENKURI_OBJECTS,
-    sizeof(BgMenkuriKaiten),
+    /**/ sizeof(BgMenkuriKaiten),
-    (ActorFunc)BgMenkuriKaiten_Init,
+    /**/ BgMenkuriKaiten_Init,
-    (ActorFunc)BgMenkuriKaiten_Destroy,
+    /**/ BgMenkuriKaiten_Destroy,
-    (ActorFunc)BgMenkuriKaiten_Update,
+    /**/ BgMenkuriKaiten_Update,
-    (ActorFunc)BgMenkuriKaiten_Draw,
+    /**/ BgMenkuriKaiten_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c

@@ -15,15 +15,15 @@ void BgMenkuriNisekabe_Update(Actor* thisx, PlayState* play);
 void BgMenkuriNisekabe_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Menkuri_Nisekabe_InitVars = {
-    ACTOR_BG_MENKURI_NISEKABE,
+    /**/ ACTOR_BG_MENKURI_NISEKABE,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MENKURI_OBJECTS,
+    /**/ OBJECT_MENKURI_OBJECTS,
-    sizeof(BgMenkuriNisekabe),
+    /**/ sizeof(BgMenkuriNisekabe),
-    (ActorFunc)BgMenkuriNisekabe_Init,
+    /**/ BgMenkuriNisekabe_Init,
-    (ActorFunc)BgMenkuriNisekabe_Destroy,
+    /**/ BgMenkuriNisekabe_Destroy,
-    (ActorFunc)BgMenkuriNisekabe_Update,
+    /**/ BgMenkuriNisekabe_Update,
-    (ActorFunc)BgMenkuriNisekabe_Draw,
+    /**/ BgMenkuriNisekabe_Draw,
 };
 
 static Gfx* sDLists[] = { gGTGFakeWallDL, gGTGFakeCeilingDL };

src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c

@@ -20,15 +20,15 @@ void BgMizuBwall_Break(BgMizuBwall* this, PlayState* play);
 void BgMizuBwall_DoNothing(BgMizuBwall* this, PlayState* play);
 
 ActorInit Bg_Mizu_Bwall_InitVars = {
-    ACTOR_BG_MIZU_BWALL,
+    /**/ ACTOR_BG_MIZU_BWALL,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MIZU_OBJECTS,
+    /**/ OBJECT_MIZU_OBJECTS,
-    sizeof(BgMizuBwall),
+    /**/ sizeof(BgMizuBwall),
-    (ActorFunc)BgMizuBwall_Init,
+    /**/ BgMizuBwall_Init,
-    (ActorFunc)BgMizuBwall_Destroy,
+    /**/ BgMizuBwall_Destroy,
-    (ActorFunc)BgMizuBwall_Update,
+    /**/ BgMizuBwall_Update,
-    (ActorFunc)BgMizuBwall_Draw,
+    /**/ BgMizuBwall_Draw,
 };
 
 static ColliderTrisElementInit sTrisElementInitFloor[2] = {

src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c

@@ -26,15 +26,15 @@ void func_8089E650(BgMizuMovebg* this, PlayState* play);
 s32 func_8089E108(Path* pathList, Vec3f* pos, s32 pathId, s32 pointId);
 
 ActorInit Bg_Mizu_Movebg_InitVars = {
-    ACTOR_BG_MIZU_MOVEBG,
+    /**/ ACTOR_BG_MIZU_MOVEBG,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MIZU_OBJECTS,
+    /**/ OBJECT_MIZU_OBJECTS,
-    sizeof(BgMizuMovebg),
+    /**/ sizeof(BgMizuMovebg),
-    (ActorFunc)BgMizuMovebg_Init,
+    /**/ BgMizuMovebg_Init,
-    (ActorFunc)BgMizuMovebg_Destroy,
+    /**/ BgMizuMovebg_Destroy,
-    (ActorFunc)BgMizuMovebg_Update,
+    /**/ BgMizuMovebg_Update,
-    (ActorFunc)BgMizuMovebg_Draw,
+    /**/ BgMizuMovebg_Draw,
 };
 
 static f32 D_8089EB40[] = { -115.200005f, -115.200005f, -115.200005f, 0.0f };

src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c

@@ -14,15 +14,15 @@ void BgMizuShutter_Move(BgMizuShutter* this, PlayState* play);
 void BgMizuShutter_WaitForCutscene(BgMizuShutter* this, PlayState* play);
 
 ActorInit Bg_Mizu_Shutter_InitVars = {
-    ACTOR_BG_MIZU_SHUTTER,
+    /**/ ACTOR_BG_MIZU_SHUTTER,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MIZU_OBJECTS,
+    /**/ OBJECT_MIZU_OBJECTS,
-    sizeof(BgMizuShutter),
+    /**/ sizeof(BgMizuShutter),
-    (ActorFunc)BgMizuShutter_Init,
+    /**/ BgMizuShutter_Init,
-    (ActorFunc)BgMizuShutter_Destroy,
+    /**/ BgMizuShutter_Destroy,
-    (ActorFunc)BgMizuShutter_Update,
+    /**/ BgMizuShutter_Update,
-    (ActorFunc)BgMizuShutter_Draw,
+    /**/ BgMizuShutter_Draw,
 };
 
 static Gfx* sDisplayLists[] = { gObjectMizuObjectsShutterDL_007130, gObjectMizuObjectsShutterDL_0072D0 };

src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c

@@ -17,15 +17,15 @@ void BgMizuUzu_Draw(Actor* thisx, PlayState* play);
 void func_8089F788(BgMizuUzu* this, PlayState* play);
 
 ActorInit Bg_Mizu_Uzu_InitVars = {
-    ACTOR_BG_MIZU_UZU,
+    /**/ ACTOR_BG_MIZU_UZU,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MIZU_OBJECTS,
+    /**/ OBJECT_MIZU_OBJECTS,
-    sizeof(BgMizuUzu),
+    /**/ sizeof(BgMizuUzu),
-    (ActorFunc)BgMizuUzu_Init,
+    /**/ BgMizuUzu_Init,
-    (ActorFunc)BgMizuUzu_Destroy,
+    /**/ BgMizuUzu_Destroy,
-    (ActorFunc)BgMizuUzu_Update,
+    /**/ BgMizuUzu_Update,
-    (ActorFunc)BgMizuUzu_Draw,
+    /**/ BgMizuUzu_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c

@@ -30,15 +30,15 @@ static WaterLevel sWaterLevels[] = {
 };
 
 ActorInit Bg_Mizu_Water_InitVars = {
-    ACTOR_BG_MIZU_WATER,
+    /**/ ACTOR_BG_MIZU_WATER,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MIZU_OBJECTS,
+    /**/ OBJECT_MIZU_OBJECTS,
-    sizeof(BgMizuWater),
+    /**/ sizeof(BgMizuWater),
-    (ActorFunc)BgMizuWater_Init,
+    /**/ BgMizuWater_Init,
-    (ActorFunc)BgMizuWater_Destroy,
+    /**/ BgMizuWater_Destroy,
-    (ActorFunc)BgMizuWater_Update,
+    /**/ BgMizuWater_Update,
-    (ActorFunc)BgMizuWater_Draw,
+    /**/ BgMizuWater_Draw,
 };
 
 static f32 sUnused1 = 0;

src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c

@@ -25,15 +25,15 @@ void func_808A0850(BgMjin* this, PlayState* play);
 void BgMjin_DoNothing(BgMjin* this, PlayState* play);
 
 ActorInit Bg_Mjin_InitVars = {
-    ACTOR_BG_MJIN,
+    /**/ ACTOR_BG_MJIN,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgMjin),
+    /**/ sizeof(BgMjin),
-    (ActorFunc)BgMjin_Init,
+    /**/ BgMjin_Init,
-    (ActorFunc)BgMjin_Destroy,
+    /**/ BgMjin_Destroy,
-    (ActorFunc)BgMjin_Update,
+    /**/ BgMjin_Update,
-    NULL,
+    /**/ NULL,
 };
 
 extern UNK_TYPE D_06000000;

src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c

@@ -29,15 +29,15 @@ void BgMoriBigst_StalfosPairFight(BgMoriBigst* this, PlayState* play);
 void BgMoriBigst_SetupDone(BgMoriBigst* this, PlayState* play);
 
 ActorInit Bg_Mori_Bigst_InitVars = {
-    ACTOR_BG_MORI_BIGST,
+    /**/ ACTOR_BG_MORI_BIGST,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MORI_OBJECTS,
+    /**/ OBJECT_MORI_OBJECTS,
-    sizeof(BgMoriBigst),
+    /**/ sizeof(BgMoriBigst),
-    (ActorFunc)BgMoriBigst_Init,
+    /**/ BgMoriBigst_Init,
-    (ActorFunc)BgMoriBigst_Destroy,
+    /**/ BgMoriBigst_Destroy,
-    (ActorFunc)BgMoriBigst_Update,
+    /**/ BgMoriBigst_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c

@@ -20,15 +20,15 @@ void BgMoriElevator_MoveAboveGround(BgMoriElevator* this, PlayState* play);
 static s16 sIsSpawned = false;
 
 ActorInit Bg_Mori_Elevator_InitVars = {
-    ACTOR_BG_MORI_ELEVATOR,
+    /**/ ACTOR_BG_MORI_ELEVATOR,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MORI_OBJECTS,
+    /**/ OBJECT_MORI_OBJECTS,
-    sizeof(BgMoriElevator),
+    /**/ sizeof(BgMoriElevator),
-    (ActorFunc)BgMoriElevator_Init,
+    /**/ BgMoriElevator_Init,
-    (ActorFunc)BgMoriElevator_Destroy,
+    /**/ BgMoriElevator_Destroy,
-    (ActorFunc)BgMoriElevator_Update,
+    /**/ BgMoriElevator_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c

@@ -25,15 +25,15 @@ void BgMoriHashigo_LadderFall(BgMoriHashigo* this, PlayState* play);
 void BgMoriHashigo_SetupLadderRest(BgMoriHashigo* this);
 
 ActorInit Bg_Mori_Hashigo_InitVars = {
-    ACTOR_BG_MORI_HASHIGO,
+    /**/ ACTOR_BG_MORI_HASHIGO,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MORI_OBJECTS,
+    /**/ OBJECT_MORI_OBJECTS,
-    sizeof(BgMoriHashigo),
+    /**/ sizeof(BgMoriHashigo),
-    (ActorFunc)BgMoriHashigo_Init,
+    /**/ BgMoriHashigo_Init,
-    (ActorFunc)BgMoriHashigo_Destroy,
+    /**/ BgMoriHashigo_Destroy,
-    (ActorFunc)BgMoriHashigo_Update,
+    /**/ BgMoriHashigo_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[1] = {

src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c

@@ -22,15 +22,15 @@ void BgMoriHashira4_GateWait(BgMoriHashira4* this, PlayState* play);
 void BgMoriHashira4_GateOpen(BgMoriHashira4* this, PlayState* play);
 
 ActorInit Bg_Mori_Hashira4_InitVars = {
-    ACTOR_BG_MORI_HASHIRA4,
+    /**/ ACTOR_BG_MORI_HASHIRA4,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MORI_OBJECTS,
+    /**/ OBJECT_MORI_OBJECTS,
-    sizeof(BgMoriHashira4),
+    /**/ sizeof(BgMoriHashira4),
-    (ActorFunc)BgMoriHashira4_Init,
+    /**/ BgMoriHashira4_Init,
-    (ActorFunc)BgMoriHashira4_Destroy,
+    /**/ BgMoriHashira4_Destroy,
-    (ActorFunc)BgMoriHashira4_Update,
+    /**/ BgMoriHashira4_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c

@@ -30,15 +30,15 @@ void func_808A3D58(BgMoriHineri* this, PlayState* play);
 static s16 sSubCamId = CAM_ID_NONE;
 
 ActorInit Bg_Mori_Hineri_InitVars = {
-    ACTOR_BG_MORI_HINERI,
+    /**/ ACTOR_BG_MORI_HINERI,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgMoriHineri),
+    /**/ sizeof(BgMoriHineri),
-    (ActorFunc)BgMoriHineri_Init,
+    /**/ BgMoriHineri_Init,
-    (ActorFunc)BgMoriHineri_Destroy,
+    /**/ BgMoriHineri_Destroy,
-    (ActorFunc)BgMoriHineri_Update,
+    /**/ BgMoriHineri_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c

@@ -22,15 +22,15 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, PlayState* play);
 static s16 sIsSpawned = false;
 
 ActorInit Bg_Mori_Idomizu_InitVars = {
-    ACTOR_BG_MORI_IDOMIZU,
+    /**/ ACTOR_BG_MORI_IDOMIZU,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MORI_OBJECTS,
+    /**/ OBJECT_MORI_OBJECTS,
-    sizeof(BgMoriIdomizu),
+    /**/ sizeof(BgMoriIdomizu),
-    (ActorFunc)BgMoriIdomizu_Init,
+    /**/ BgMoriIdomizu_Init,
-    (ActorFunc)BgMoriIdomizu_Destroy,
+    /**/ BgMoriIdomizu_Destroy,
-    (ActorFunc)BgMoriIdomizu_Update,
+    /**/ BgMoriIdomizu_Update,
-    NULL,
+    /**/ NULL,
 };
 
 void BgMoriIdomizu_SetupAction(BgMoriIdomizu* this, BgMoriIdomizuActionFunc actionFunc) {

src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c

@@ -21,15 +21,15 @@ void BgMoriKaitenkabe_SetupRotate(BgMoriKaitenkabe* this);
 void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play);
 
 ActorInit Bg_Mori_Kaitenkabe_InitVars = {
-    ACTOR_BG_MORI_KAITENKABE,
+    /**/ ACTOR_BG_MORI_KAITENKABE,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MORI_OBJECTS,
+    /**/ OBJECT_MORI_OBJECTS,
-    sizeof(BgMoriKaitenkabe),
+    /**/ sizeof(BgMoriKaitenkabe),
-    (ActorFunc)BgMoriKaitenkabe_Init,
+    /**/ BgMoriKaitenkabe_Init,
-    (ActorFunc)BgMoriKaitenkabe_Destroy,
+    /**/ BgMoriKaitenkabe_Destroy,
-    (ActorFunc)BgMoriKaitenkabe_Update,
+    /**/ BgMoriKaitenkabe_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c

@@ -29,15 +29,15 @@ void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, PlayState* play);
 static s16 sCamSetting = CAM_SET_NONE;
 
 ActorInit Bg_Mori_Rakkatenjo_InitVars = {
-    ACTOR_BG_MORI_RAKKATENJO,
+    /**/ ACTOR_BG_MORI_RAKKATENJO,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_MORI_OBJECTS,
+    /**/ OBJECT_MORI_OBJECTS,
-    sizeof(BgMoriRakkatenjo),
+    /**/ sizeof(BgMoriRakkatenjo),
-    (ActorFunc)BgMoriRakkatenjo_Init,
+    /**/ BgMoriRakkatenjo_Init,
-    (ActorFunc)BgMoriRakkatenjo_Destroy,
+    /**/ BgMoriRakkatenjo_Destroy,
-    (ActorFunc)BgMoriRakkatenjo_Update,
+    /**/ BgMoriRakkatenjo_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c

@@ -29,15 +29,15 @@ void BgPoEvent_PaintingPresent(BgPoEvent* this, PlayState* play);
 void BgPoEvent_PaintingBurn(BgPoEvent* this, PlayState* play);
 
 ActorInit Bg_Po_Event_InitVars = {
-    ACTOR_BG_PO_EVENT,
+    /**/ ACTOR_BG_PO_EVENT,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_PO_SISTERS,
+    /**/ OBJECT_PO_SISTERS,
-    sizeof(BgPoEvent),
+    /**/ sizeof(BgPoEvent),
-    (ActorFunc)BgPoEvent_Init,
+    /**/ BgPoEvent_Init,
-    (ActorFunc)BgPoEvent_Destroy,
+    /**/ BgPoEvent_Destroy,
-    (ActorFunc)BgPoEvent_Update,
+    /**/ BgPoEvent_Update,
-    (ActorFunc)BgPoEvent_Draw,
+    /**/ BgPoEvent_Draw,
 };
 
 static ColliderTrisElementInit sTrisElementsInit[2] = {

src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c

@@ -59,15 +59,15 @@ static Color_RGBA8 sEnvColors[] = {
 };
 
 ActorInit Bg_Po_Syokudai_InitVars = {
-    ACTOR_BG_PO_SYOKUDAI,
+    /**/ ACTOR_BG_PO_SYOKUDAI,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SYOKUDAI,
+    /**/ OBJECT_SYOKUDAI,
-    sizeof(BgPoSyokudai),
+    /**/ sizeof(BgPoSyokudai),
-    (ActorFunc)BgPoSyokudai_Init,
+    /**/ BgPoSyokudai_Init,
-    (ActorFunc)BgPoSyokudai_Destroy,
+    /**/ BgPoSyokudai_Destroy,
-    (ActorFunc)BgPoSyokudai_Update,
+    /**/ BgPoSyokudai_Update,
-    (ActorFunc)BgPoSyokudai_Draw,
+    /**/ BgPoSyokudai_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c

@@ -17,16 +17,16 @@ void BgPushbox_Draw(Actor* thisx, PlayState* play);
 void BgPushbox_UpdateImpl(BgPushbox* this, PlayState* play);
 
 ActorInit Bg_Pushbox_InitVars = {
-    ACTOR_BG_PUSHBOX,
+    /**/ ACTOR_BG_PUSHBOX,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
     //! @bug fixing this actor would involve using OBJECT_PU_BOX
-    OBJECT_GAMEPLAY_DANGEON_KEEP,
+    /**/ OBJECT_GAMEPLAY_DANGEON_KEEP,
-    sizeof(BgPushbox),
+    /**/ sizeof(BgPushbox),
-    (ActorFunc)BgPushbox_Init,
+    /**/ BgPushbox_Init,
-    (ActorFunc)BgPushbox_Destroy,
+    /**/ BgPushbox_Destroy,
-    (ActorFunc)BgPushbox_Update,
+    /**/ BgPushbox_Update,
-    (ActorFunc)BgPushbox_Draw,
+    /**/ BgPushbox_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

@@ -27,15 +27,15 @@ void func_808A932C(BgRelayObjects* this, PlayState* play);
 void func_808A939C(BgRelayObjects* this, PlayState* play);
 
 ActorInit Bg_Relay_Objects_InitVars = {
-    ACTOR_BG_RELAY_OBJECTS,
+    /**/ ACTOR_BG_RELAY_OBJECTS,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_RELAY_OBJECTS,
+    /**/ OBJECT_RELAY_OBJECTS,
-    sizeof(BgRelayObjects),
+    /**/ sizeof(BgRelayObjects),
-    (ActorFunc)BgRelayObjects_Init,
+    /**/ BgRelayObjects_Init,
-    (ActorFunc)BgRelayObjects_Destroy,
+    /**/ BgRelayObjects_Destroy,
-    (ActorFunc)BgRelayObjects_Update,
+    /**/ BgRelayObjects_Update,
-    (ActorFunc)BgRelayObjects_Draw,
+    /**/ BgRelayObjects_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c

@@ -15,15 +15,15 @@ void BgSpot00Break_Update(Actor* thisx, PlayState* play);
 void BgSpot00Break_Draw(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Spot00_Break_InitVars = {
-    ACTOR_BG_SPOT00_BREAK,
+    /**/ ACTOR_BG_SPOT00_BREAK,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SPOT00_BREAK,
+    /**/ OBJECT_SPOT00_BREAK,
-    sizeof(BgSpot00Break),
+    /**/ sizeof(BgSpot00Break),
-    (ActorFunc)BgSpot00Break_Init,
+    /**/ BgSpot00Break_Init,
-    (ActorFunc)BgSpot00Break_Destroy,
+    /**/ BgSpot00Break_Destroy,
-    (ActorFunc)BgSpot00Break_Update,
+    /**/ BgSpot00Break_Update,
-    (ActorFunc)BgSpot00Break_Draw,
+    /**/ BgSpot00Break_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

@@ -26,15 +26,15 @@ void BgSpot00Hanebasi_DrawbridgeRiseAndFall(BgSpot00Hanebasi* this, PlayState* p
 void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, PlayState* play);
 
 ActorInit Bg_Spot00_Hanebasi_InitVars = {
-    ACTOR_BG_SPOT00_HANEBASI,
+    /**/ ACTOR_BG_SPOT00_HANEBASI,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SPOT00_OBJECTS,
+    /**/ OBJECT_SPOT00_OBJECTS,
-    sizeof(BgSpot00Hanebasi),
+    /**/ sizeof(BgSpot00Hanebasi),
-    (ActorFunc)BgSpot00Hanebasi_Init,
+    /**/ BgSpot00Hanebasi_Init,
-    (ActorFunc)BgSpot00Hanebasi_Destroy,
+    /**/ BgSpot00Hanebasi_Destroy,
-    (ActorFunc)BgSpot00Hanebasi_Update,
+    /**/ BgSpot00Hanebasi_Update,
-    (ActorFunc)BgSpot00Hanebasi_Draw,
+    /**/ BgSpot00Hanebasi_Draw,
 };
 
 static f32 sTorchFlameScale = 0.0f;

src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c

@@ -17,15 +17,15 @@ void BgSpot01Fusya_Draw(Actor* thisx, PlayState* play);
 void func_808AAA50(BgSpot01Fusya* this, PlayState* play);
 
 ActorInit Bg_Spot01_Fusya_InitVars = {
-    ACTOR_BG_SPOT01_FUSYA,
+    /**/ ACTOR_BG_SPOT01_FUSYA,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SPOT01_OBJECTS,
+    /**/ OBJECT_SPOT01_OBJECTS,
-    sizeof(BgSpot01Fusya),
+    /**/ sizeof(BgSpot01Fusya),
-    (ActorFunc)BgSpot01Fusya_Init,
+    /**/ BgSpot01Fusya_Init,
-    (ActorFunc)BgSpot01Fusya_Destroy,
+    /**/ BgSpot01Fusya_Destroy,
-    (ActorFunc)BgSpot01Fusya_Update,
+    /**/ BgSpot01Fusya_Update,
-    (ActorFunc)BgSpot01Fusya_Draw,
+    /**/ BgSpot01Fusya_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c

@@ -37,15 +37,15 @@ static BgSpot01IdohashiraDrawFunc sDrawFuncs[] = {
 };
 
 ActorInit Bg_Spot01_Idohashira_InitVars = {
-    ACTOR_BG_SPOT01_IDOHASHIRA,
+    /**/ ACTOR_BG_SPOT01_IDOHASHIRA,
-    ACTORCAT_PROP,
+    /**/ ACTORCAT_PROP,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SPOT01_OBJECTS,
+    /**/ OBJECT_SPOT01_OBJECTS,
-    sizeof(BgSpot01Idohashira),
+    /**/ sizeof(BgSpot01Idohashira),
-    (ActorFunc)BgSpot01Idohashira_Init,
+    /**/ BgSpot01Idohashira_Init,
-    (ActorFunc)BgSpot01Idohashira_Destroy,
+    /**/ BgSpot01Idohashira_Destroy,
-    (ActorFunc)BgSpot01Idohashira_Update,
+    /**/ BgSpot01Idohashira_Update,
-    (ActorFunc)BgSpot01Idohashira_Draw,
+    /**/ BgSpot01Idohashira_Draw,
 };
 
 void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) {

src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c

@@ -17,15 +17,15 @@ void BgSpot01Idomizu_Draw(Actor* thisx, PlayState* play);
 void func_808ABB84(BgSpot01Idomizu* this, PlayState* play);
 
 ActorInit Bg_Spot01_Idomizu_InitVars = {
-    ACTOR_BG_SPOT01_IDOMIZU,
+    /**/ ACTOR_BG_SPOT01_IDOMIZU,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SPOT01_OBJECTS,
+    /**/ OBJECT_SPOT01_OBJECTS,
-    sizeof(BgSpot01Idomizu),
+    /**/ sizeof(BgSpot01Idomizu),
-    (ActorFunc)BgSpot01Idomizu_Init,
+    /**/ BgSpot01Idomizu_Init,
-    (ActorFunc)BgSpot01Idomizu_Destroy,
+    /**/ BgSpot01Idomizu_Destroy,
-    (ActorFunc)BgSpot01Idomizu_Update,
+    /**/ BgSpot01Idomizu_Update,
-    (ActorFunc)BgSpot01Idomizu_Draw,
+    /**/ BgSpot01Idomizu_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c

@@ -17,15 +17,15 @@ void BgSpot01Idosoko_Draw(Actor* thisx, PlayState* play);
 void func_808ABF54(BgSpot01Idosoko* this, PlayState* play);
 
 ActorInit Bg_Spot01_Idosoko_InitVars = {
-    ACTOR_BG_SPOT01_IDOSOKO,
+    /**/ ACTOR_BG_SPOT01_IDOSOKO,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_SPOT01_MATOYA,
+    /**/ OBJECT_SPOT01_MATOYA,
-    sizeof(BgSpot01Idosoko),
+    /**/ sizeof(BgSpot01Idosoko),
-    (ActorFunc)BgSpot01Idosoko_Init,
+    /**/ BgSpot01Idosoko_Init,
-    (ActorFunc)BgSpot01Idosoko_Destroy,
+    /**/ BgSpot01Idosoko_Destroy,
-    (ActorFunc)BgSpot01Idosoko_Update,
+    /**/ BgSpot01Idosoko_Update,
-    (ActorFunc)BgSpot01Idosoko_Draw,
+    /**/ BgSpot01Idosoko_Draw,
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c

@@ -19,15 +19,15 @@ void func_808AC474(BgSpot01Objects2* this, PlayState* play);
 void func_808AC4A4(Actor* thisx, PlayState* play);
 
 ActorInit Bg_Spot01_Objects2_InitVars = {
-    ACTOR_BG_SPOT01_OBJECTS2,
+    /**/ ACTOR_BG_SPOT01_OBJECTS2,
-    ACTORCAT_BG,
+    /**/ ACTORCAT_BG,
-    FLAGS,
+    /**/ FLAGS,
-    OBJECT_GAMEPLAY_KEEP,
+    /**/ OBJECT_GAMEPLAY_KEEP,
-    sizeof(BgSpot01Objects2),
+    /**/ sizeof(BgSpot01Objects2),
-    (ActorFunc)BgSpot01Objects2_Init,
+    /**/ BgSpot01Objects2_Init,
-    (ActorFunc)BgSpot01Objects2_Destroy,
+    /**/ BgSpot01Objects2_Destroy,
-    (ActorFunc)BgSpot01Objects2_Update,
+    /**/ BgSpot01Objects2_Update,
-    NULL,
+    /**/ NULL,
 };
 
 static InitChainEntry sInitChain[] = {