Format

2022-11-13 20:53:40 -03:00 · 2022-11-13 20:53:40 -03:00 · a6e89b3969
parent 7da80ae27f
commit a6e89b3969
503 changed files with 974 additions and 4496 deletions
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@ -24,15 +24,8 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play);
 void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play);

 ActorInit En_Item00_InitVars = {
-    ACTOR_EN_ITEM00,
-    ACTORCAT_MISC,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(EnItem00),
-    EnItem00_Init,
-    EnItem00_Destroy,
-    EnItem00_Update,
-    EnItem00_Draw,
+    ACTOR_EN_ITEM00, ACTORCAT_MISC,    FLAGS,           GAMEPLAY_KEEP, sizeof(EnItem00),
+    EnItem00_Init,   EnItem00_Destroy, EnItem00_Update, EnItem00_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/code/z_player_call.c
+++ b/src/code/z_player_call.c
@ -15,15 +15,8 @@ void PlayerCall_Update(Actor* thisx, PlayState* play);
 void PlayerCall_Draw(Actor* thisx, PlayState* play);

 ActorInit Player_InitVars = {
-    ACTOR_PLAYER,
-    ACTORCAT_PLAYER,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(Player),
-    PlayerCall_Init,
-    PlayerCall_Destroy,
-    PlayerCall_Update,
-    PlayerCall_Draw,
+    ACTOR_PLAYER,       ACTORCAT_PLAYER,   FLAGS,           GAMEPLAY_KEEP, sizeof(Player), PlayerCall_Init,
+    PlayerCall_Destroy, PlayerCall_Update, PlayerCall_Draw,
 };

 void Player_Init(Actor* thisx, PlayState* play);
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
@ -21,15 +21,8 @@ void ArmsHook_Wait(ArmsHook* this, PlayState* play);
 void ArmsHook_Shoot(ArmsHook* this, PlayState* play);

 ActorInit Arms_Hook_InitVars = {
-    ACTOR_ARMS_HOOK,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(ArmsHook),
-    ArmsHook_Init,
-    ArmsHook_Destroy,
-    ArmsHook_Update,
-    ArmsHook_Draw,
+    ACTOR_ARMS_HOOK, ACTORCAT_ITEMACTION, FLAGS,           GAMEPLAY_KEEP, sizeof(ArmsHook),
+    ArmsHook_Init,   ArmsHook_Destroy,    ArmsHook_Update, ArmsHook_Draw,
 };

 static ColliderQuadInit D_808C1BC0 = {
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@ -22,15 +22,8 @@ void FireArrow_Fly(ArrowFire* this, PlayState* play);
 #include "overlays/ovl_Arrow_fire/ovl_Arrow_Fire.c"

 ActorInit Arrow_Fire_InitVars = {
-    ACTOR_ARROW_FIRE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(ArrowFire),
-    ArrowFire_Init,
-    ArrowFire_Destroy,
-    ArrowFire_Update,
-    ArrowFire_Draw,
+    ACTOR_ARROW_FIRE,  ACTORCAT_ITEMACTION, FLAGS,          GAMEPLAY_KEEP, sizeof(ArrowFire), ArrowFire_Init,
+    ArrowFire_Destroy, ArrowFire_Update,    ArrowFire_Draw,
 };

 static ColliderQuadInit sQuadInit = {
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@ -24,15 +24,8 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play);
 s32 unused; // Needed for bss

 ActorInit Arrow_Ice_InitVars = {
-    ACTOR_ARROW_ICE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(ArrowIce),
-    ArrowIce_Init,
-    ArrowIce_Destroy,
-    ArrowIce_Update,
-    ArrowIce_Draw,
+    ACTOR_ARROW_ICE, ACTORCAT_ITEMACTION, FLAGS,           GAMEPLAY_KEEP, sizeof(ArrowIce),
+    ArrowIce_Init,   ArrowIce_Destroy,    ArrowIce_Update, ArrowIce_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@ -22,15 +22,8 @@ void ArrowLight_Fly(ArrowLight* this, PlayState* play);
 #include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"

 ActorInit Arrow_Light_InitVars = {
-    ACTOR_ARROW_LIGHT,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(ArrowLight),
-    ArrowLight_Init,
-    ArrowLight_Destroy,
-    ArrowLight_Update,
-    ArrowLight_Draw,
+    ACTOR_ARROW_LIGHT,  ACTORCAT_ITEMACTION, FLAGS,           GAMEPLAY_KEEP, sizeof(ArrowLight), ArrowLight_Init,
+    ArrowLight_Destroy, ArrowLight_Update,   ArrowLight_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c
+++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c
@ -19,15 +19,9 @@ void BgBotihasira_Draw(Actor* thisx, PlayState* play);
 void BgBotihasira_DoNothing(BgBotihasira* this, PlayState* play);

 ActorInit Bg_Botihasira_InitVars = {
-    ACTOR_BG_BOTIHASIRA,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_BOTIHASIRA,
-    sizeof(BgBotihasira),
-    BgBotihasira_Init,
-    BgBotihasira_Destroy,
-    BgBotihasira_Update,
-    BgBotihasira_Draw,
+    ACTOR_BG_BOTIHASIRA,  ACTORCAT_ITEMACTION,  FLAGS,
+    OBJECT_BOTIHASIRA,    sizeof(BgBotihasira), BgBotihasira_Init,
+    BgBotihasira_Destroy, BgBotihasira_Update,  BgBotihasira_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@ -46,9 +46,15 @@ void func_808B7D34(Actor* thisx, PlayState* play);
 void BgBreakwall_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Breakwall_InitVars = {
-    ACTOR_BG_BREAKWALL, ACTORCAT_ITEMACTION,           FLAGS,
-    GAMEPLAY_KEEP,      sizeof(BgBreakwall),           BgBreakwall_Init,
-    NULL,    BgBreakwall_Update, NULL,
+    ACTOR_BG_BREAKWALL,
+    ACTORCAT_ITEMACTION,
+    FLAGS,
+    GAMEPLAY_KEEP,
+    sizeof(BgBreakwall),
+    BgBreakwall_Init,
+    NULL,
+    BgBreakwall_Update,
+    NULL,
 };

 typedef struct {
--- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c
+++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c
@ -42,15 +42,9 @@ typedef enum {
 u8 sIsLoaded[32];

 ActorInit Bg_Crace_Movebg_InitVars = {
-    ACTOR_BG_CRACE_MOVEBG,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_CRACE_OBJECT,
-    sizeof(BgCraceMovebg),
-    BgCraceMovebg_Init,
-    BgCraceMovebg_Destroy,
-    BgCraceMovebg_Update,
-    BgCraceMovebg_Draw,
+    ACTOR_BG_CRACE_MOVEBG, ACTORCAT_BG,           FLAGS,
+    OBJECT_CRACE_OBJECT,   sizeof(BgCraceMovebg), BgCraceMovebg_Init,
+    BgCraceMovebg_Destroy, BgCraceMovebg_Update,  BgCraceMovebg_Draw,
 };

 static u8 sHasInitializedIsLoaded = 0;
--- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
+++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
@ -20,15 +20,9 @@ void BgCtowerGear_UpdateOrgan(Actor* thisx, PlayState* play);
 void BgCtowerGear_DrawOrgan(Actor* thisx, PlayState* play);

 ActorInit Bg_Ctower_Gear_InitVars = {
-    ACTOR_BG_CTOWER_GEAR,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_CTOWER_ROT,
-    sizeof(BgCtowerGear),
-    BgCtowerGear_Init,
-    BgCtowerGear_Destroy,
-    BgCtowerGear_Update,
-    BgCtowerGear_Draw,
+    ACTOR_BG_CTOWER_GEAR, ACTORCAT_PROP,        FLAGS,
+    OBJECT_CTOWER_ROT,    sizeof(BgCtowerGear), BgCtowerGear_Init,
+    BgCtowerGear_Destroy, BgCtowerGear_Update,  BgCtowerGear_Draw,
 };

 static Vec3f sExitSplashOffsets[] = {
--- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
+++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
@ -22,15 +22,9 @@ void BgCtowerRot_DoorIdle(BgCtowerRot* this, PlayState* play);
 void BgCtowerRot_SetupDoorClose(BgCtowerRot* this, PlayState* play);

 ActorInit Bg_Ctower_Rot_InitVars = {
-    ACTOR_BG_CTOWER_ROT,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_CTOWER_ROT,
-    sizeof(BgCtowerRot),
-    BgCtowerRot_Init,
-    BgCtowerRot_Destroy,
-    BgCtowerRot_Update,
-    BgCtowerRot_Draw,
+    ACTOR_BG_CTOWER_ROT, ACTORCAT_BG,         FLAGS,
+    OBJECT_CTOWER_ROT,   sizeof(BgCtowerRot), BgCtowerRot_Init,
+    BgCtowerRot_Destroy, BgCtowerRot_Update,  BgCtowerRot_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
+++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
@ -46,15 +46,9 @@ u8 D_80A2B870[][2] = {
 };

 ActorInit Bg_Dblue_Movebg_InitVars = {
-    ACTOR_BG_DBLUE_MOVEBG,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_DBLUE_OBJECT,
-    sizeof(BgDblueMovebg),
-    BgDblueMovebg_Init,
-    BgDblueMovebg_Destroy,
-    BgDblueMovebg_Update,
-    BgDblueMovebg_Draw,
+    ACTOR_BG_DBLUE_MOVEBG, ACTORCAT_BG,           FLAGS,
+    OBJECT_DBLUE_OBJECT,   sizeof(BgDblueMovebg), BgDblueMovebg_Init,
+    BgDblueMovebg_Destroy, BgDblueMovebg_Update,  BgDblueMovebg_Draw,
 };

 static Gfx* sOpaDLists[] = {
--- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c
+++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c
@ -25,15 +25,9 @@ void BgDkjailIvy_SetupFadeOut(BgDkjailIvy* this);
 void BgDkjailIvy_FadeOut(BgDkjailIvy* this, PlayState* play);

 ActorInit Bg_Dkjail_Ivy_InitVars = {
-    ACTOR_BG_DKJAIL_IVY,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_DKJAIL_OBJ,
-    sizeof(BgDkjailIvy),
-    BgDkjailIvy_Init,
-    BgDkjailIvy_Destroy,
-    BgDkjailIvy_Update,
-    BgDkjailIvy_Draw,
+    ACTOR_BG_DKJAIL_IVY, ACTORCAT_BG,         FLAGS,
+    OBJECT_DKJAIL_OBJ,   sizeof(BgDkjailIvy), BgDkjailIvy_Init,
+    BgDkjailIvy_Destroy, BgDkjailIvy_Update,  BgDkjailIvy_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c
+++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c
@ -27,15 +27,8 @@ void func_80BC4530(BgF40Block* this, PlayState* play);
 void func_80BC457C(BgF40Block* this, PlayState* play);

 ActorInit Bg_F40_Block_InitVars = {
-    ACTOR_BG_F40_BLOCK,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_F40_OBJ,
-    sizeof(BgF40Block),
-    BgF40Block_Init,
-    BgF40Block_Destroy,
-    BgF40Block_Update,
-    BgF40Block_Draw,
+    ACTOR_BG_F40_BLOCK, ACTORCAT_BG,       FLAGS,           OBJECT_F40_OBJ, sizeof(BgF40Block), BgF40Block_Init,
+    BgF40Block_Destroy, BgF40Block_Update, BgF40Block_Draw,
 };

 static Vec3f D_80BC4620[] = {
--- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c
+++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c
@ -20,15 +20,8 @@ void func_808D75F0(BgF40Flift* this, PlayState* play);
 void func_808D7714(BgF40Flift* this, PlayState* play);

 ActorInit Bg_F40_Flift_InitVars = {
-    ACTOR_BG_F40_FLIFT,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_F40_OBJ,
-    sizeof(BgF40Flift),
-    BgF40Flift_Init,
-    BgF40Flift_Destroy,
-    BgF40Flift_Update,
-    BgF40Flift_Draw,
+    ACTOR_BG_F40_FLIFT, ACTORCAT_BG,       FLAGS,           OBJECT_F40_OBJ, sizeof(BgF40Flift), BgF40Flift_Init,
+    BgF40Flift_Destroy, BgF40Flift_Update, BgF40Flift_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c
+++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c
@ -25,15 +25,9 @@ void BgF40Switch_WaitToPress(BgF40Switch* this, PlayState* play);
 void BgF40Switch_IdleUnpressed(BgF40Switch* this, PlayState* play);

 ActorInit Bg_F40_Switch_InitVars = {
-    ACTOR_BG_F40_SWITCH,
-    ACTORCAT_SWITCH,
-    FLAGS,
-    OBJECT_F40_SWITCH,
-    sizeof(BgF40Switch),
-    BgF40Switch_Init,
-    BgF40Switch_Destroy,
-    BgF40Switch_Update,
-    BgF40Switch_Draw,
+    ACTOR_BG_F40_SWITCH, ACTORCAT_SWITCH,     FLAGS,
+    OBJECT_F40_SWITCH,   sizeof(BgF40Switch), BgF40Switch_Init,
+    BgF40Switch_Destroy, BgF40Switch_Update,  BgF40Switch_Draw,
 };

 s32 sBgF40SwitchGlobalsInitialized = false;
--- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c
+++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c
@ -22,15 +22,8 @@ void func_809AC68C(BgFireWall* this, PlayState* play);
 void func_809AC6C0(BgFireWall* this, PlayState* play);

 ActorInit Bg_Fire_Wall_InitVars = {
-    ACTOR_BG_FIRE_WALL,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_FWALL,
-    sizeof(BgFireWall),
-    BgFireWall_Init,
-    BgFireWall_Destroy,
-    BgFireWall_Update,
-    NULL,
+    ACTOR_BG_FIRE_WALL, ACTORCAT_BG,       FLAGS, OBJECT_FWALL, sizeof(BgFireWall), BgFireWall_Init,
+    BgFireWall_Destroy, BgFireWall_Update, NULL,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
+++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
@ -17,15 +17,8 @@ void BgFuKaiten_Update(Actor* thisx, PlayState* play);
 void BgFuKaiten_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Fu_Kaiten_InitVars = {
-    ACTOR_BG_FU_KAITEN,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_FU_KAITEN,
-    sizeof(BgFuKaiten),
-    BgFuKaiten_Init,
-    BgFuKaiten_Destroy,
-    BgFuKaiten_Update,
-    BgFuKaiten_Draw,
+    ACTOR_BG_FU_KAITEN, ACTORCAT_BG,       FLAGS,           OBJECT_FU_KAITEN, sizeof(BgFuKaiten), BgFuKaiten_Init,
+    BgFuKaiten_Destroy, BgFuKaiten_Update, BgFuKaiten_Draw,
 };

 void BgFuKaiten_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c
+++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c
@ -17,15 +17,8 @@ void BgFuMizu_Update(Actor* thisx, PlayState* play);
 void BgFuMizu_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Fu_Mizu_InitVars = {
-    ACTOR_BG_FU_MIZU,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_FU_KAITEN,
-    sizeof(BgFuMizu),
-    BgFuMizu_Init,
-    BgFuMizu_Destroy,
-    BgFuMizu_Update,
-    BgFuMizu_Draw,
+    ACTOR_BG_FU_MIZU, ACTORCAT_BG,      FLAGS,           OBJECT_FU_KAITEN, sizeof(BgFuMizu),
+    BgFuMizu_Init,    BgFuMizu_Destroy, BgFuMizu_Update, BgFuMizu_Draw,
 };

 void BgFuMizu_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
@ -24,15 +24,8 @@ void BgGoronOyu_SpawnEffects(BgGoronOyu* this, PlayState* play);
 void func_80B40160(BgGoronOyu* this, PlayState* play);

 ActorInit Bg_Goron_Oyu_InitVars = {
-    ACTOR_BG_GORON_OYU,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_OYU,
-    sizeof(BgGoronOyu),
-    BgGoronOyu_Init,
-    BgGoronOyu_Destroy,
-    BgGoronOyu_Update,
-    BgGoronOyu_Draw,
+    ACTOR_BG_GORON_OYU, ACTORCAT_BG,       FLAGS,           OBJECT_OYU, sizeof(BgGoronOyu), BgGoronOyu_Init,
+    BgGoronOyu_Destroy, BgGoronOyu_Update, BgGoronOyu_Draw,
 };

 void func_80B40080(BgGoronOyu* this) {
--- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
@ -27,15 +27,9 @@ void func_80B6DEA8(BgHakaCurtain* this, PlayState* play);
 void func_80B6DE80(BgHakaCurtain* this);

 ActorInit Bg_Haka_Curtain_InitVars = {
-    ACTOR_BG_HAKA_CURTAIN,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_HAKA_OBJ,
-    sizeof(BgHakaCurtain),
-    BgHakaCurtain_Init,
-    BgHakaCurtain_Destroy,
-    BgHakaCurtain_Update,
-    BgHakaCurtain_Draw,
+    ACTOR_BG_HAKA_CURTAIN, ACTORCAT_BG,           FLAGS,
+    OBJECT_HAKA_OBJ,       sizeof(BgHakaCurtain), BgHakaCurtain_Init,
+    BgHakaCurtain_Destroy, BgHakaCurtain_Update,  BgHakaCurtain_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
@ -24,15 +24,8 @@ void BgHakaTomb_SetupDoNothing(BgHakaTomb* this);
 void BgHakaTomb_DoNothing(BgHakaTomb* this, PlayState* play);

 ActorInit Bg_Haka_Tomb_InitVars = {
-    ACTOR_BG_HAKA_TOMB,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_HAKA_OBJ,
-    sizeof(BgHakaTomb),
-    BgHakaTomb_Init,
-    BgHakaTomb_Destroy,
-    BgHakaTomb_Update,
-    BgHakaTomb_Draw,
+    ACTOR_BG_HAKA_TOMB, ACTORCAT_BG,       FLAGS,           OBJECT_HAKA_OBJ, sizeof(BgHakaTomb), BgHakaTomb_Init,
+    BgHakaTomb_Destroy, BgHakaTomb_Update, BgHakaTomb_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
@ -40,15 +40,8 @@ BgHakuginPostColliders D_80A9DDC0;
 BgHakuginPostUnkStruct D_80A9E028;

 ActorInit Bg_Hakugin_Post_InitVars = {
-    ACTOR_BG_HAKUGIN_POST,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_HAKUGIN_OBJ,
-    sizeof(BgHakuginPost),
-    BgHakuginPost_Init,
-    BgHakuginPost_Destroy,
-    BgHakuginPost_Update,
-    NULL,
+    ACTOR_BG_HAKUGIN_POST, ACTORCAT_BG,          FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginPost), BgHakuginPost_Init,
+    BgHakuginPost_Destroy, BgHakuginPost_Update, NULL,
 };

 typedef struct {
--- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c
@ -39,15 +39,9 @@ void func_80B165E0(BgHakuginSwitch* this, PlayState* play);
 u32 D_80B16AF0;

 ActorInit Bg_Hakugin_Switch_InitVars = {
-    ACTOR_BG_HAKUGIN_SWITCH,
-    ACTORCAT_SWITCH,
-    FLAGS,
-    OBJECT_GORONSWITCH,
-    sizeof(BgHakuginSwitch),
-    BgHakuginSwitch_Init,
-    BgHakuginSwitch_Destroy,
-    BgHakuginSwitch_Update,
-    BgHakuginSwitch_Draw,
+    ACTOR_BG_HAKUGIN_SWITCH, ACTORCAT_SWITCH,         FLAGS,
+    OBJECT_GORONSWITCH,      sizeof(BgHakuginSwitch), BgHakuginSwitch_Init,
+    BgHakuginSwitch_Destroy, BgHakuginSwitch_Update,  BgHakuginSwitch_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c
+++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c
@ -24,15 +24,8 @@ void func_80AC4C34(BgIcefloe* this, PlayState* play);
 void func_80AC4CF0(BgIcefloe* this);

 ActorInit Bg_Icefloe_InitVars = {
-    ACTOR_BG_ICEFLOE,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_ICEFLOE,
-    sizeof(BgIcefloe),
-    BgIcefloe_Init,
-    BgIcefloe_Destroy,
-    BgIcefloe_Update,
-    BgIcefloe_Draw,
+    ACTOR_BG_ICEFLOE,  ACTORCAT_BG,      FLAGS,          OBJECT_ICEFLOE, sizeof(BgIcefloe), BgIcefloe_Init,
+    BgIcefloe_Destroy, BgIcefloe_Update, BgIcefloe_Draw,
 };
 static BgIcefloe* sSpawnedInstances[] = { NULL, NULL, NULL };

--- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
+++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
@ -43,15 +43,8 @@ static ColliderCylinderInit sCylinderInit = {
 };

 ActorInit Bg_Icicle_InitVars = {
-    ACTOR_BG_ICICLE,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_ICICLE,
-    sizeof(BgIcicle),
-    BgIcicle_Init,
-    BgIcicle_Destroy,
-    BgIcicle_Update,
-    BgIcicle_Draw,
+    ACTOR_BG_ICICLE, ACTORCAT_PROP,    FLAGS,           OBJECT_ICICLE, sizeof(BgIcicle),
+    BgIcicle_Init,   BgIcicle_Destroy, BgIcicle_Update, BgIcicle_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c
@ -26,15 +26,8 @@ void func_80B7F398(BgIkanaBlock* this, PlayState* play);
 void func_80B7F564(Actor* thisx, PlayState* play);

 ActorInit Bg_Ikana_Block_InitVars = {
-    ACTOR_BG_IKANA_BLOCK,
-    ACTORCAT_BG,
-    FLAGS,
-    GAMEPLAY_DANGEON_KEEP,
-    sizeof(BgIkanaBlock),
-    BgIkanaBlock_Init,
-    BgIkanaBlock_Destroy,
-    BgIkanaBlock_Update,
-    NULL,
+    ACTOR_BG_IKANA_BLOCK, ACTORCAT_BG,         FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(BgIkanaBlock), BgIkanaBlock_Init,
+    BgIkanaBlock_Destroy, BgIkanaBlock_Update, NULL,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c
@ -25,15 +25,9 @@ void BgIkanaDharma_SetupWaitForCutsceneToEnd(BgIkanaDharma* this);
 void BgIkanaDharma_WaitForCutsceneToEnd(BgIkanaDharma* this, PlayState* play);

 ActorInit Bg_Ikana_Dharma_InitVars = {
-    ACTOR_BG_IKANA_DHARMA,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_IKANA_OBJ,
-    sizeof(BgIkanaDharma),
-    BgIkanaDharma_Init,
-    BgIkanaDharma_Destroy,
-    BgIkanaDharma_Update,
-    BgIkanaDharma_Draw,
+    ACTOR_BG_IKANA_DHARMA, ACTORCAT_BG,           FLAGS,
+    OBJECT_IKANA_OBJ,      sizeof(BgIkanaDharma), BgIkanaDharma_Init,
+    BgIkanaDharma_Destroy, BgIkanaDharma_Update,  BgIkanaDharma_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
@ -27,15 +27,9 @@ void BgIkanaMirror_SetupEmitLight(BgIkanaMirror* this);
 void BgIkanaMirror_EmitLight(BgIkanaMirror* this, PlayState* play);

 ActorInit Bg_Ikana_Mirror_InitVars = {
-    ACTOR_BG_IKANA_MIRROR,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_IKANA_OBJ,
-    sizeof(BgIkanaMirror),
-    BgIkanaMirror_Init,
-    BgIkanaMirror_Destroy,
-    BgIkanaMirror_Update,
-    BgIkanaMirror_Draw,
+    ACTOR_BG_IKANA_MIRROR, ACTORCAT_PROP,         FLAGS,
+    OBJECT_IKANA_OBJ,      sizeof(BgIkanaMirror), BgIkanaMirror_Init,
+    BgIkanaMirror_Destroy, BgIkanaMirror_Update,  BgIkanaMirror_Draw,
 };

 static ColliderTrisElementInit sMirrorColliderElementsInit[] = {
--- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
@ -22,15 +22,8 @@ void BgIkanaRay_SetActivated(BgIkanaRay* this);
 void BgIkanaRay_UpdateActivated(BgIkanaRay* this, PlayState* play);

 ActorInit Bg_Ikana_Ray_InitVars = {
-    ACTOR_BG_IKANA_RAY,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_IKANA_OBJ,
-    sizeof(BgIkanaRay),
-    BgIkanaRay_Init,
-    BgIkanaRay_Destroy,
-    BgIkanaRay_Update,
-    BgIkanaRay_Draw,
+    ACTOR_BG_IKANA_RAY, ACTORCAT_PROP,     FLAGS,           OBJECT_IKANA_OBJ, sizeof(BgIkanaRay), BgIkanaRay_Init,
+    BgIkanaRay_Destroy, BgIkanaRay_Update, BgIkanaRay_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
@ -37,15 +37,9 @@ void BgIkanaShutter_SetupDoNothing(BgIkanaShutter* this);
 void BgIkanaShutter_DoNothing(BgIkanaShutter* this, PlayState* play);

 ActorInit Bg_Ikana_Shutter_InitVars = {
-    ACTOR_BG_IKANA_SHUTTER,
-    ACTORCAT_SWITCH,
-    FLAGS,
-    OBJECT_IKANA_OBJ,
-    sizeof(BgIkanaShutter),
-    BgIkanaShutter_Init,
-    BgIkanaShutter_Destroy,
-    BgIkanaShutter_Update,
-    BgIkanaShutter_Draw,
+    ACTOR_BG_IKANA_SHUTTER, ACTORCAT_SWITCH,        FLAGS,
+    OBJECT_IKANA_OBJ,       sizeof(BgIkanaShutter), BgIkanaShutter_Init,
+    BgIkanaShutter_Destroy, BgIkanaShutter_Update,  BgIkanaShutter_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c
+++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c
@ -19,15 +19,9 @@ void BgIkninside_Draw(Actor* thisx, PlayState* play);
 void func_80C072D0(BgIkninside* this, PlayState* play);

 ActorInit Bg_Ikninside_InitVars = {
-    ACTOR_BG_IKNINSIDE,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_IKNINSIDE_OBJ,
-    sizeof(BgIkninside),
-    BgIkninside_Init,
-    BgIkninside_Destroy,
-    BgIkninside_Update,
-    BgIkninside_Draw,
+    ACTOR_BG_IKNINSIDE,   ACTORCAT_BG,         FLAGS,
+    OBJECT_IKNINSIDE_OBJ, sizeof(BgIkninside), BgIkninside_Init,
+    BgIkninside_Destroy,  BgIkninside_Update,  BgIkninside_Draw,
 };

 static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_obj_DL_00A5A8 };
--- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c
+++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c
@ -28,15 +28,9 @@ void func_80BD78C4(Actor* thisx, PlayState* play);
 void func_80BD7538(Actor* thisx, PlayState* play);

 ActorInit Bg_Iknv_Doukutu_InitVars = {
-    ACTOR_BG_IKNV_DOUKUTU,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_IKNV_OBJ,
-    sizeof(BgIknvDoukutu),
-    BgIknvDoukutu_Init,
-    BgIknvDoukutu_Destroy,
-    BgIknvDoukutu_Update,
-    BgIknvDoukutu_Draw,
+    ACTOR_BG_IKNV_DOUKUTU, ACTORCAT_BG,           FLAGS,
+    OBJECT_IKNV_OBJ,       sizeof(BgIknvDoukutu), BgIknvDoukutu_Init,
+    BgIknvDoukutu_Destroy, BgIknvDoukutu_Update,  BgIknvDoukutu_Draw,
 };

 void BgIknvDoukutu_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
+++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
@ -22,15 +22,8 @@ void BgIknvObj_UpdateRaisedDoor(BgIknvObj* this, PlayState* play);
 void BgIknvObj_UpdateSakonDoor(BgIknvObj* this, PlayState* play);

 ActorInit Bg_Iknv_Obj_InitVars = {
-    ACTOR_BG_IKNV_OBJ,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_IKNV_OBJ,
-    sizeof(BgIknvObj),
-    BgIknvObj_Init,
-    BgIknvObj_Destroy,
-    BgIknvObj_Update,
-    BgIknvObj_Draw,
+    ACTOR_BG_IKNV_OBJ, ACTORCAT_BG,      FLAGS,          OBJECT_IKNV_OBJ, sizeof(BgIknvObj), BgIknvObj_Init,
+    BgIknvObj_Destroy, BgIknvObj_Update, BgIknvObj_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
@ -27,15 +27,8 @@ void func_80954340(BgIngate* this, PlayState* play);
 void func_809543D4(BgIngate* this, PlayState* play);

 ActorInit Bg_Ingate_InitVars = {
-    ACTOR_BG_INGATE,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_SICHITAI_OBJ,
-    sizeof(BgIngate),
-    BgIngate_Init,
-    BgIngate_Destroy,
-    BgIngate_Update,
-    BgIngate_Draw,
+    ACTOR_BG_INGATE, ACTORCAT_BG,      FLAGS,           OBJECT_SICHITAI_OBJ, sizeof(BgIngate),
+    BgIngate_Init,   BgIngate_Destroy, BgIngate_Update, BgIngate_Draw,
 };

 /**
--- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
+++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
@ -16,15 +16,8 @@ void BgInibsMovebg_Destroy(Actor* thisx, PlayState* play);
 void BgInibsMovebg_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Inibs_Movebg_InitVars = {
-    ACTOR_BG_INIBS_MOVEBG,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_INIBS_OBJECT,
-    sizeof(BgInibsMovebg),
-    BgInibsMovebg_Init,
-    BgInibsMovebg_Destroy,
-    Actor_Noop,
-    BgInibsMovebg_Draw,
+    ACTOR_BG_INIBS_MOVEBG, ACTORCAT_BG,           FLAGS,      OBJECT_INIBS_OBJECT, sizeof(BgInibsMovebg),
+    BgInibsMovebg_Init,    BgInibsMovebg_Destroy, Actor_Noop, BgInibsMovebg_Draw,
 };

 Gfx* sOpaDLists[] = { gTwinmoldArenaNormalModeSandDL, gTwinmoldArenaGiantModeSandDL };
--- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c
+++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c
@ -21,15 +21,9 @@ void func_80A538E0(BgKeikokuSaku* this, PlayState* play);
 void func_80A53994(BgKeikokuSaku* this, PlayState* play);

 ActorInit Bg_Keikoku_Saku_InitVars = {
-    ACTOR_BG_KEIKOKU_SAKU,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_KEIKOKU_OBJ,
-    sizeof(BgKeikokuSaku),
-    BgKeikokuSaku_Init,
-    BgKeikokuSaku_Destroy,
-    BgKeikokuSaku_Update,
-    BgKeikokuSaku_Draw,
+    ACTOR_BG_KEIKOKU_SAKU, ACTORCAT_ITEMACTION,   FLAGS,
+    OBJECT_KEIKOKU_OBJ,    sizeof(BgKeikokuSaku), BgKeikokuSaku_Init,
+    BgKeikokuSaku_Destroy, BgKeikokuSaku_Update,  BgKeikokuSaku_Draw,
 };

 void BgKeikokuSaku_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
+++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
@ -17,15 +17,9 @@ void BgKeikokuSpr_Update(Actor* thisx, PlayState* play);
 void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Keikoku_Spr_InitVars = {
-    ACTOR_BG_KEIKOKU_SPR,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_KEIKOKU_OBJ,
-    sizeof(BgKeikokuSpr),
-    BgKeikokuSpr_Init,
-    BgKeikokuSpr_Destroy,
-    BgKeikokuSpr_Update,
-    BgKeikokuSpr_Draw,
+    ACTOR_BG_KEIKOKU_SPR, ACTORCAT_PROP,        FLAGS,
+    OBJECT_KEIKOKU_OBJ,   sizeof(BgKeikokuSpr), BgKeikokuSpr_Init,
+    BgKeikokuSpr_Destroy, BgKeikokuSpr_Update,  BgKeikokuSpr_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
+++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
@ -28,15 +28,9 @@ void BgKin2Fence_SetupDoNothing(BgKin2Fence* this);
 void BgKin2Fence_DoNothing(BgKin2Fence* this, PlayState* play);

 ActorInit Bg_Kin2_Fence_InitVars = {
-    ACTOR_BG_KIN2_FENCE,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_KIN2_OBJ,
-    sizeof(BgKin2Fence),
-    BgKin2Fence_Init,
-    BgKin2Fence_Destroy,
-    BgKin2Fence_Update,
-    BgKin2Fence_Draw,
+    ACTOR_BG_KIN2_FENCE, ACTORCAT_BG,         FLAGS,
+    OBJECT_KIN2_OBJ,     sizeof(BgKin2Fence), BgKin2Fence_Init,
+    BgKin2Fence_Destroy, BgKin2Fence_Update,  BgKin2Fence_Draw,
 };

 static ColliderJntSphElementInit sJntSphElementsInit[4] = {
--- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c
+++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c
@ -28,15 +28,9 @@ void BgKin2Picture_SetupDoNothing(BgKin2Picture* this);
 void BgKin2Picture_DoNothing(BgKin2Picture* this, PlayState* play);

 ActorInit Bg_Kin2_Picture_InitVars = {
-    ACTOR_BG_KIN2_PICTURE,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_KIN2_OBJ,
-    sizeof(BgKin2Picture),
-    BgKin2Picture_Init,
-    BgKin2Picture_Destroy,
-    BgKin2Picture_Update,
-    BgKin2Picture_Draw,
+    ACTOR_BG_KIN2_PICTURE, ACTORCAT_PROP,         FLAGS,
+    OBJECT_KIN2_OBJ,       sizeof(BgKin2Picture), BgKin2Picture_Init,
+    BgKin2Picture_Destroy, BgKin2Picture_Update,  BgKin2Picture_Draw,
 };

 static ColliderTrisElementInit sTrisElementsInit[] = {
--- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c
+++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c
@ -24,15 +24,9 @@ void func_80B70498(BgKin2Shelf* this);
 void func_80B704B4(BgKin2Shelf* this, PlayState* play);

 ActorInit Bg_Kin2_Shelf_InitVars = {
-    ACTOR_BG_KIN2_SHELF,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_KIN2_OBJ,
-    sizeof(BgKin2Shelf),
-    BgKin2Shelf_Init,
-    BgKin2Shelf_Destroy,
-    BgKin2Shelf_Update,
-    BgKin2Shelf_Draw,
+    ACTOR_BG_KIN2_SHELF, ACTORCAT_BG,         FLAGS,
+    OBJECT_KIN2_OBJ,     sizeof(BgKin2Shelf), BgKin2Shelf_Init,
+    BgKin2Shelf_Destroy, BgKin2Shelf_Update,  BgKin2Shelf_Draw,
 };

 f32 D_80B70750[] = { 60.0f, 120.0f };
--- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
+++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
@ -21,15 +21,8 @@ void BgLadder_FadeIn(BgLadder* this, PlayState* play);
 void BgLadder_DoNothing(BgLadder* this, PlayState* play);

 ActorInit Bg_Ladder_InitVars = {
-    ACTOR_BG_LADDER,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_LADDER,
-    sizeof(BgLadder),
-    BgLadder_Init,
-    BgLadder_Destroy,
-    BgLadder_Update,
-    BgLadder_Draw,
+    ACTOR_BG_LADDER, ACTORCAT_PROP,    FLAGS,           OBJECT_LADDER, sizeof(BgLadder),
+    BgLadder_Init,   BgLadder_Destroy, BgLadder_Update, BgLadder_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c
+++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c
@ -38,15 +38,9 @@ void func_80C188C4(BgLastBwall* this, PlayState* play);
 void BgLastBwall_DoNothing(BgLastBwall* this, PlayState* play);

 ActorInit Bg_Last_Bwall_InitVars = {
-    ACTOR_BG_LAST_BWALL,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_LAST_OBJ,
-    sizeof(BgLastBwall),
-    BgLastBwall_Init,
-    BgLastBwall_Destroy,
-    BgLastBwall_Update,
-    BgLastBwall_Draw,
+    ACTOR_BG_LAST_BWALL, ACTORCAT_BG,         FLAGS,
+    OBJECT_LAST_OBJ,     sizeof(BgLastBwall), BgLastBwall_Init,
+    BgLastBwall_Destroy, BgLastBwall_Update,  BgLastBwall_Draw,
 };

 static ColliderTrisElementInit sTrisElementsInit[] = {
--- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
+++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
@ -16,15 +16,8 @@ void BgLbfshot_Destroy(Actor* thisx, PlayState* play);
 void BgLbfshot_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Lbfshot_InitVars = {
-    ACTOR_BG_LBFSHOT,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_LBFSHOT,
-    sizeof(BgLbfshot),
-    BgLbfshot_Init,
-    BgLbfshot_Destroy,
-    Actor_Noop,
-    BgLbfshot_Draw,
+    ACTOR_BG_LBFSHOT, ACTORCAT_BG,       FLAGS,      OBJECT_LBFSHOT, sizeof(BgLbfshot),
+    BgLbfshot_Init,   BgLbfshot_Destroy, Actor_Noop, BgLbfshot_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
+++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
@ -21,15 +21,8 @@ void BgLotus_Sink(BgLotus* this, PlayState* play);
 void BgLotus_WaitToAppear(BgLotus* this, PlayState* play);

 ActorInit Bg_Lotus_InitVars = {
-    ACTOR_BG_LOTUS,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_LOTUS,
-    sizeof(BgLotus),
-    BgLotus_Init,
-    BgLotus_Destroy,
-    BgLotus_Update,
-    BgLotus_Draw,
+    ACTOR_BG_LOTUS, ACTORCAT_BG,     FLAGS,          OBJECT_LOTUS, sizeof(BgLotus),
+    BgLotus_Init,   BgLotus_Destroy, BgLotus_Update, BgLotus_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
+++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
@ -15,9 +15,8 @@ void BgMarketStep_Init(Actor* thisx, PlayState* play);
 void BgMarketStep_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Market_Step_InitVars = {
-    ACTOR_BG_MARKET_STEP,  ACTORCAT_BG,           FLAGS,
-    OBJECT_MARKET_OBJ,     sizeof(BgMarketStep),  BgMarketStep_Init,
-    Actor_Noop, Actor_Noop, BgMarketStep_Draw,
+    ACTOR_BG_MARKET_STEP, ACTORCAT_BG, FLAGS,      OBJECT_MARKET_OBJ, sizeof(BgMarketStep),
+    BgMarketStep_Init,    Actor_Noop,  Actor_Noop, BgMarketStep_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
+++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
@ -17,15 +17,9 @@ void BgMbarChair_Update(Actor* thisx, PlayState* play);
 void BgMbarChair_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Mbar_Chair_InitVars = {
-    ACTOR_BG_MBAR_CHAIR,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_MBAR_OBJ,
-    sizeof(BgMbarChair),
-    BgMbarChair_Init,
-    BgMbarChair_Destroy,
-    BgMbarChair_Update,
-    BgMbarChair_Draw,
+    ACTOR_BG_MBAR_CHAIR, ACTORCAT_BG,         FLAGS,
+    OBJECT_MBAR_OBJ,     sizeof(BgMbarChair), BgMbarChair_Init,
+    BgMbarChair_Destroy, BgMbarChair_Update,  BgMbarChair_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c
+++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c
@ -31,15 +31,8 @@ void BgNumaHana_SetupOpenedIdle(BgNumaHana* this);
 void BgNumaHana_OpenedIdle(BgNumaHana* this, PlayState* play);

 ActorInit Bg_Numa_Hana_InitVars = {
-    ACTOR_BG_NUMA_HANA,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_NUMA_OBJ,
-    sizeof(BgNumaHana),
-    BgNumaHana_Init,
-    BgNumaHana_Destroy,
-    BgNumaHana_Update,
-    BgNumaHana_Draw,
+    ACTOR_BG_NUMA_HANA, ACTORCAT_BG,       FLAGS,           OBJECT_NUMA_OBJ, sizeof(BgNumaHana), BgNumaHana_Init,
+    BgNumaHana_Destroy, BgNumaHana_Update, BgNumaHana_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c
@ -28,15 +28,9 @@ typedef enum {
 } BGOpenShutterDoorState;

 ActorInit Bg_Open_Shutter_InitVars = {
-    ACTOR_BG_OPEN_SHUTTER,
-    ACTORCAT_DOOR,
-    FLAGS,
-    OBJECT_OPEN_OBJ,
-    sizeof(BgOpenShutter),
-    BgOpenShutter_Init,
-    BgOpenShutter_Destroy,
-    BgOpenShutter_Update,
-    BgOpenShutter_Draw,
+    ACTOR_BG_OPEN_SHUTTER, ACTORCAT_DOOR,         FLAGS,
+    OBJECT_OPEN_OBJ,       sizeof(BgOpenShutter), BgOpenShutter_Init,
+    BgOpenShutter_Destroy, BgOpenShutter_Update,  BgOpenShutter_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c
+++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c
@ -17,15 +17,8 @@ void BgOpenSpot_Update(Actor* thisx, PlayState* play);
 void BgOpenSpot_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Open_Spot_InitVars = {
-    ACTOR_BG_OPEN_SPOT,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_OPEN_OBJ,
-    sizeof(BgOpenSpot),
-    BgOpenSpot_Init,
-    BgOpenSpot_Destroy,
-    BgOpenSpot_Update,
-    NULL,
+    ACTOR_BG_OPEN_SPOT, ACTORCAT_PROP,     FLAGS, OBJECT_OPEN_OBJ, sizeof(BgOpenSpot), BgOpenSpot_Init,
+    BgOpenSpot_Destroy, BgOpenSpot_Update, NULL,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c
+++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c
@ -25,15 +25,8 @@ void BgSinkaiKabe_Update(Actor* thisx, PlayState* play);
 void BgSinkaiKabe_WaitForPlayer(BgSinkaiKabe* this, PlayState* play);

 ActorInit Bg_Sinkai_Kabe_InitVars = {
-    ACTOR_BG_SINKAI_KABE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_SINKAI_KABE,
-    sizeof(BgSinkaiKabe),
-    BgSinkaiKabe_Init,
-    BgSinkaiKabe_Destroy,
-    BgSinkaiKabe_Update,
-    NULL,
+    ACTOR_BG_SINKAI_KABE, ACTORCAT_ITEMACTION, FLAGS, OBJECT_SINKAI_KABE, sizeof(BgSinkaiKabe), BgSinkaiKabe_Init,
+    BgSinkaiKabe_Destroy, BgSinkaiKabe_Update, NULL,
 };

 static s32 sCurrentPythonIndex = 0;
--- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c
+++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c
@ -25,15 +25,8 @@ void func_809CEE74(BgSpdweb* this);
 void func_809CEEAC(BgSpdweb* this, PlayState* play);

 ActorInit Bg_Spdweb_InitVars = {
-    ACTOR_BG_SPDWEB,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_SPDWEB,
-    sizeof(BgSpdweb),
-    BgSpdweb_Init,
-    BgSpdweb_Destroy,
-    BgSpdweb_Update,
-    BgSpdweb_Draw,
+    ACTOR_BG_SPDWEB, ACTORCAT_BG,      FLAGS,           OBJECT_SPDWEB, sizeof(BgSpdweb),
+    BgSpdweb_Init,   BgSpdweb_Destroy, BgSpdweb_Update, BgSpdweb_Draw,
 };

 static ColliderTrisElementInit sTrisElementsInit1[2] = {
--- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c
+++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c
@ -23,15 +23,8 @@ void func_80A60D10(BgSpoutFire* this, PlayState* play);
 void func_80A60E08(BgSpoutFire* this, PlayState* play);

 ActorInit Bg_Spout_Fire_InitVars = {
-    ACTOR_BG_SPOUT_FIRE,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_FWALL,
-    sizeof(BgSpoutFire),
-    BgSpoutFire_Init,
-    BgSpoutFire_Destroy,
-    BgSpoutFire_Update,
-    NULL,
+    ACTOR_BG_SPOUT_FIRE, ACTORCAT_BG,        FLAGS, OBJECT_FWALL, sizeof(BgSpoutFire), BgSpoutFire_Init,
+    BgSpoutFire_Destroy, BgSpoutFire_Update, NULL,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
+++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
@ -17,15 +17,8 @@ void BgTobira01_Update(Actor* thisx, PlayState* play);
 void BgTobira01_Draw(Actor* thisx, PlayState* play);

 ActorInit Bg_Tobira01_InitVars = {
-    ACTOR_BG_TOBIRA01,
-    ACTORCAT_PROP,
-    FLAGS,
-    OBJECT_SPOT11_OBJ,
-    sizeof(BgTobira01),
-    BgTobira01_Init,
-    BgTobira01_Destroy,
-    BgTobira01_Update,
-    BgTobira01_Draw,
+    ACTOR_BG_TOBIRA01,  ACTORCAT_PROP,     FLAGS,           OBJECT_SPOT11_OBJ, sizeof(BgTobira01), BgTobira01_Init,
+    BgTobira01_Destroy, BgTobira01_Update, BgTobira01_Draw,
 };

 void BgTobira01_Open(BgTobira01* this, PlayState* play) {
--- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
+++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
@ -19,15 +19,8 @@ void BgUmajump_Draw(Actor* thisx, PlayState* play);
 void func_8091A5A0(Actor* thisx, PlayState* play);

 ActorInit Bg_Umajump_InitVars = {
-    ACTOR_BG_UMAJUMP,
-    ACTORCAT_PROP,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(BgUmajump),
-    BgUmajump_Init,
-    BgUmajump_Destroy,
-    BgUmajump_Update,
-    NULL,
+    ACTOR_BG_UMAJUMP,  ACTORCAT_PROP,    FLAGS, GAMEPLAY_KEEP, sizeof(BgUmajump), BgUmajump_Init,
+    BgUmajump_Destroy, BgUmajump_Update, NULL,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c
+++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c
@ -113,15 +113,8 @@ static DamageTable sRedTwinmoldDamageTable = {
 };

 ActorInit Boss_02_InitVars = {
-    ACTOR_BOSS_02,
-    ACTORCAT_BOSS,
-    FLAGS,
-    OBJECT_BOSS02,
-    sizeof(Boss02),
-    Boss02_Init,
-    Boss02_Destroy,
-    Boss02_Twinmold_Update,
-    Boss02_Twinmold_Draw,
+    ACTOR_BOSS_02,          ACTORCAT_BOSS,        FLAGS, OBJECT_BOSS02, sizeof(Boss02), Boss02_Init, Boss02_Destroy,
+    Boss02_Twinmold_Update, Boss02_Twinmold_Draw,
 };

 f32 D_809DF5B0 = 1.0f;
--- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c
+++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c
@ -275,15 +275,8 @@ Actor* Boss03_FindActorDblueMovebg(PlayState* play) {
 /* Start of Gyorg's Init and actionFuncs section */

 ActorInit Boss_03_InitVars = {
-    ACTOR_BOSS_03,
-    ACTORCAT_BOSS,
-    FLAGS,
-    OBJECT_BOSS03,
-    sizeof(Boss03),
-    Boss03_Init,
-    Boss03_Destroy,
-    Boss03_Update,
-    Boss03_Draw,
+    ACTOR_BOSS_03, ACTORCAT_BOSS,  FLAGS,         OBJECT_BOSS03, sizeof(Boss03),
+    Boss03_Init,   Boss03_Destroy, Boss03_Update, Boss03_Draw,
 };

 // The limbs referenced here are not used. The spheres are positioned manually by Boss03_PostLimbDraw
--- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c
+++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c
@ -63,15 +63,8 @@ static DamageTable sDamageTable = {
 };

 ActorInit Boss_04_InitVars = {
-    ACTOR_BOSS_04,
-    ACTORCAT_BOSS,
-    FLAGS,
-    OBJECT_BOSS04,
-    sizeof(Boss04),
-    Boss04_Init,
-    Boss04_Destroy,
-    Boss04_Update,
-    Boss04_Draw,
+    ACTOR_BOSS_04, ACTORCAT_BOSS,  FLAGS,         OBJECT_BOSS04, sizeof(Boss04),
+    Boss04_Init,   Boss04_Destroy, Boss04_Update, Boss04_Draw,
 };

 static ColliderJntSphElementInit sJntSphElementsInit1[1] = {
--- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c
+++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c
@ -70,15 +70,8 @@ static DamageTable sDamageTable = {
 };

 ActorInit Boss_06_InitVars = {
-    ACTOR_BOSS_06,
-    ACTORCAT_BOSS,
-    FLAGS,
-    OBJECT_KNIGHT,
-    sizeof(Boss06),
-    Boss06_Init,
-    Boss06_Destroy,
-    Boss06_Update,
-    Boss06_Draw,
+    ACTOR_BOSS_06, ACTORCAT_BOSS,  FLAGS,         OBJECT_KNIGHT, sizeof(Boss06),
+    Boss06_Init,   Boss06_Destroy, Boss06_Update, Boss06_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@ -26,15 +26,8 @@ void func_808CDFF8(Actor* thisx, PlayState* play);
 void func_808CE078(Actor* thisx, PlayState* play2);

 ActorInit Demo_Effect_InitVars = {
-    ACTOR_DEMO_EFFECT,
-    ACTORCAT_BG,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(DemoEffect),
-    DemoEffect_Init,
-    DemoEffect_Destroy,
-    DemoEffect_Update,
-    NULL,
+    ACTOR_DEMO_EFFECT,  ACTORCAT_BG,       FLAGS, GAMEPLAY_KEEP, sizeof(DemoEffect), DemoEffect_Init,
+    DemoEffect_Destroy, DemoEffect_Update, NULL,
 };

 void DemoEffect_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c
+++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c
@ -19,15 +19,8 @@ void func_80A4FB68(DemoGetitem* this, PlayState* play2);
 void DemoGetitem_Draw(Actor* thisx, PlayState* play);

 ActorInit Demo_Getitem_InitVars = {
-    ACTOR_DEMO_GETITEM,
-    ACTORCAT_BG,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(DemoGetitem),
-    DemoGetitem_Init,
-    DemoGetitem_Destroy,
-    DemoGetitem_Update,
-    NULL,
+    ACTOR_DEMO_GETITEM,  ACTORCAT_BG,        FLAGS, GAMEPLAY_KEEP, sizeof(DemoGetitem), DemoGetitem_Init,
+    DemoGetitem_Destroy, DemoGetitem_Update, NULL,
 };

 static s16 sObjectBankIndices[] = { OBJECT_GI_MASK14, OBJECT_GI_SWORD_4 };
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@ -23,15 +23,8 @@ static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at on
 static s16 sLostWoodsSkyFishParticleNum = 0;

 ActorInit Demo_Kankyo_InitVars = {
-    ACTOR_DEMO_KANKYO,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(DemoKankyo),
-    DemoKankyo_Init,
-    DemoKankyo_Destroy,
-    DemoKankyo_Update,
-    DemoKankyo_Draw,
+    ACTOR_DEMO_KANKYO,  ACTORCAT_ITEMACTION, FLAGS,           GAMEPLAY_KEEP, sizeof(DemoKankyo), DemoKankyo_Init,
+    DemoKankyo_Destroy, DemoKankyo_Update,   DemoKankyo_Draw,
 };

 static s32 sObjectBubbleIndex = OBJECT_BUBBLE | 0x10000;
--- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
+++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
@ -16,15 +16,8 @@ void DemoShd_Update(Actor* thisx, PlayState* play);
 void DemoShd_Draw(Actor* thisx, PlayState* play);

 ActorInit Demo_Shd_InitVars = {
-    ACTOR_DEMO_SHD,
-    ACTORCAT_ENEMY,
-    FLAGS,
-    OBJECT_FWALL,
-    sizeof(DemoShd),
-    DemoShd_Init,
-    DemoShd_Destroy,
-    DemoShd_Update,
-    DemoShd_Draw,
+    ACTOR_DEMO_SHD, ACTORCAT_ENEMY,  FLAGS,          OBJECT_FWALL, sizeof(DemoShd),
+    DemoShd_Init,   DemoShd_Destroy, DemoShd_Update, DemoShd_Draw,
 };

 void DemoShd_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c
+++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c
@ -26,15 +26,8 @@ void func_80C173B4(Actor* thisx, PlayState* play);
 void func_80C17690(Actor* thisx, PlayState* play);

 ActorInit Demo_Syoten_InitVars = {
-    ACTOR_DEMO_SYOTEN,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_SYOTEN,
-    sizeof(DemoSyoten),
-    DemoSyoten_Init,
-    DemoSyoten_Destroy,
-    DemoSyoten_Update,
-    DemoSyoten_Draw,
+    ACTOR_DEMO_SYOTEN,  ACTORCAT_ITEMACTION, FLAGS,           OBJECT_SYOTEN, sizeof(DemoSyoten), DemoSyoten_Init,
+    DemoSyoten_Destroy, DemoSyoten_Update,   DemoSyoten_Draw,
 };

 u8 D_80C177D0[] = {
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
@ -36,15 +36,8 @@ static DemoTreLgtInfo D_808E1490[2] = {
 };

 ActorInit Demo_Tre_Lgt_InitVars = {
-    ACTOR_DEMO_TRE_LGT,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_BOX,
-    sizeof(DemoTreLgt),
-    DemoTreLgt_Init,
-    DemoTreLgt_Destroy,
-    DemoTreLgt_Update,
-    DemoTreLgt_Draw,
+    ACTOR_DEMO_TRE_LGT, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_BOX, sizeof(DemoTreLgt), DemoTreLgt_Init,
+    DemoTreLgt_Destroy, DemoTreLgt_Update,   DemoTreLgt_Draw,
 };

 static TransformUpdateIndex* sBoxLightAnimations[] = {
--- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c
+++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c
@ -16,15 +16,7 @@ void DmAh_Update(Actor* thisx, PlayState* play);
 void DmAh_Draw(Actor* thisx, PlayState* play);

 ActorInit Dm_Ah_InitVars = {
-    ACTOR_DM_AH,
-    ACTORCAT_NPC,
-    FLAGS,
-    OBJECT_AH,
-    sizeof(DmAh),
-    DmAh_Init,
-    DmAh_Destroy,
-    DmAh_Update,
-    DmAh_Draw,
+    ACTOR_DM_AH, ACTORCAT_NPC, FLAGS, OBJECT_AH, sizeof(DmAh), DmAh_Init, DmAh_Destroy, DmAh_Update, DmAh_Draw,
 };

 static AnimationInfoS sAnimations[] = {
--- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c
+++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c
@ -16,15 +16,7 @@ void DmAl_Update(Actor* thisx, PlayState* play);
 void DmAl_Draw(Actor* thisx, PlayState* play);

 ActorInit Dm_Al_InitVars = {
-    ACTOR_EN_AL,
-    ACTORCAT_NPC,
-    FLAGS,
-    OBJECT_AL,
-    sizeof(DmAl),
-    DmAl_Init,
-    DmAl_Destroy,
-    DmAl_Update,
-    DmAl_Draw,
+    ACTOR_EN_AL, ACTORCAT_NPC, FLAGS, OBJECT_AL, sizeof(DmAl), DmAl_Init, DmAl_Destroy, DmAl_Update, DmAl_Draw,
 };

 typedef enum {
--- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c
+++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c
@ -22,15 +22,7 @@ void func_80C1CC80(DmAn* this, PlayState* play);
 void func_80C1D0B0(Actor* thisx, PlayState* play);

 ActorInit Dm_An_InitVars = {
-    ACTOR_DM_AN,
-    ACTORCAT_NPC,
-    FLAGS,
-    OBJECT_AN1,
-    sizeof(DmAn),
-    DmAn_Init,
-    DmAn_Destroy,
-    DmAn_Update,
-    NULL,
+    ACTOR_DM_AN, ACTORCAT_NPC, FLAGS, OBJECT_AN1, sizeof(DmAn), DmAn_Init, DmAn_Destroy, DmAn_Update, NULL,
 };

 static AnimationInfoS sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c
+++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c
@ -19,15 +19,7 @@ void func_80C1EAC4(DmBal* this);
 void func_80C1EAD8(DmBal* this, PlayState* play);

 ActorInit Dm_Bal_InitVars = {
-    ACTOR_DM_BAL,
-    ACTORCAT_NPC,
-    FLAGS,
-    OBJECT_BAL,
-    sizeof(DmBal),
-    DmBal_Init,
-    DmBal_Destroy,
-    DmBal_Update,
-    DmBal_Draw,
+    ACTOR_DM_BAL, ACTORCAT_NPC, FLAGS, OBJECT_BAL, sizeof(DmBal), DmBal_Init, DmBal_Destroy, DmBal_Update, DmBal_Draw,
 };

 static AnimationInfo sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c
+++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c
@ -21,15 +21,8 @@ void func_80AA67F8(DmChar00* this, PlayState* play);
 void func_80AA695C(DmChar00* this, PlayState* play);

 ActorInit Dm_Char00_InitVars = {
-    ACTOR_DM_CHAR00,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_DELF,
-    sizeof(DmChar00),
-    DmChar00_Init,
-    DmChar00_Destroy,
-    DmChar00_Update,
-    DmChar00_Draw,
+    ACTOR_DM_CHAR00, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_DELF,   sizeof(DmChar00),
+    DmChar00_Init,   DmChar00_Destroy,    DmChar00_Update, DmChar00_Draw,
 };

 static AnimationInfo sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c
+++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c
@ -36,15 +36,8 @@ s16 D_80AAAE26;
 #include "overlays/ovl_Dm_Char01/ovl_Dm_Char01.c"

 ActorInit Dm_Char01_InitVars = {
-    ACTOR_DM_CHAR01,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_MTORIDE,
-    sizeof(DmChar01),
-    DmChar01_Init,
-    DmChar01_Destroy,
-    DmChar01_Update,
-    DmChar01_Draw,
+    ACTOR_DM_CHAR01, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_MTORIDE, sizeof(DmChar01),
+    DmChar01_Init,   DmChar01_Destroy,    DmChar01_Update, DmChar01_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
+++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
@ -19,15 +19,8 @@ void DmChar02_Draw(Actor* thisx, PlayState* play);
 void DmChar02_PerformCutsceneActions(DmChar02* this, PlayState* play);

 ActorInit Dm_Char02_InitVars = {
-    ACTOR_DM_CHAR02,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_STK2,
-    sizeof(DmChar02),
-    DmChar02_Init,
-    DmChar02_Destroy,
-    DmChar02_Update,
-    DmChar02_Draw,
+    ACTOR_DM_CHAR02, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_STK2,   sizeof(DmChar02),
+    DmChar02_Init,   DmChar02_Destroy,    DmChar02_Update, DmChar02_Draw,

 };

--- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c
+++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c
@ -21,15 +21,8 @@ void DmChar03_DoNothing(DmChar03* this, PlayState* play);
 void func_80AABA84(PlayState* play, DmChar03* this);

 ActorInit Dm_Char03_InitVars = {
-    ACTOR_DM_CHAR03,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_OSN,
-    sizeof(DmChar03),
-    DmChar03_Init,
-    DmChar03_Destroy,
-    DmChar03_Update,
-    DmChar03_Draw,
+    ACTOR_DM_CHAR03, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_OSN,    sizeof(DmChar03),
+    DmChar03_Init,   DmChar03_Destroy,    DmChar03_Update, DmChar03_Draw,
 };

 AnimationInfo sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c
+++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c
@ -19,15 +19,8 @@ void DmChar04_Draw(Actor* thisx, PlayState* play);
 void func_80AABE34(DmChar04* this, PlayState* play);

 ActorInit Dm_Char04_InitVars = {
-    ACTOR_DM_CHAR04,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(DmChar04),
-    DmChar04_Init,
-    DmChar04_Destroy,
-    DmChar04_Update,
-    DmChar04_Draw,
+    ACTOR_DM_CHAR04, ACTORCAT_ITEMACTION, FLAGS,           GAMEPLAY_KEEP, sizeof(DmChar04),
+    DmChar04_Init,   DmChar04_Destroy,    DmChar04_Update, DmChar04_Draw,
 };

 void DmChar04_ChangeAnim(SkelAnime* skelAnime, AnimationInfo* animation, u16 animIndex) {
--- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c
+++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c
@ -36,15 +36,8 @@ void func_80AAE030(PlayState* play, DmChar05* this);
 void func_80AAE114(PlayState* play, DmChar05* this);

 ActorInit Dm_Char05_InitVars = {
-    ACTOR_DM_CHAR05,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_DMASK,
-    sizeof(DmChar05),
-    DmChar05_Init,
-    DmChar05_Destroy,
-    DmChar05_Update,
-    DmChar05_Draw,
+    ACTOR_DM_CHAR05, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_DMASK,  sizeof(DmChar05),
+    DmChar05_Init,   DmChar05_Destroy,    DmChar05_Update, DmChar05_Draw,
 };

 static AnimationInfo sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c
+++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c
@ -19,15 +19,8 @@ void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc);
 void func_80AAE6F0(DmChar06* this, PlayState* play);

 ActorInit Dm_Char06_InitVars = {
-    ACTOR_DM_CHAR06,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_YUKIYAMA,
-    sizeof(DmChar06),
-    DmChar06_Init,
-    DmChar06_Destroy,
-    DmChar06_Update,
-    DmChar06_Draw,
+    ACTOR_DM_CHAR06, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_YUKIYAMA, sizeof(DmChar06),
+    DmChar06_Init,   DmChar06_Destroy,    DmChar06_Update, DmChar06_Draw,
 };

 void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc) {
--- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c
+++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c
@ -19,15 +19,8 @@ void DmChar07_Draw(Actor* thisx, PlayState* play);
 void DmChar07_DoNothing(DmChar07* this, PlayState* play);

 ActorInit Dm_Char07_InitVars = {
-    ACTOR_DM_CHAR07,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_MILKBAR,
-    sizeof(DmChar07),
-    DmChar07_Init,
-    DmChar07_Destroy,
-    DmChar07_Update,
-    DmChar07_Draw,
+    ACTOR_DM_CHAR07, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_MILKBAR, sizeof(DmChar07),
+    DmChar07_Init,   DmChar07_Destroy,    DmChar07_Update, DmChar07_Draw,
 };

 void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) {
--- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
+++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
@ -52,15 +52,8 @@ typedef enum {
 } TurtleAnimation;

 ActorInit Dm_Char08_InitVars = {
-    ACTOR_DM_CHAR08,
-    ACTORCAT_BG,
-    FLAGS,
-    OBJECT_KAMEJIMA,
-    sizeof(DmChar08),
-    DmChar08_Init,
-    DmChar08_Destroy,
-    DmChar08_Update,
-    DmChar08_Draw,
+    ACTOR_DM_CHAR08, ACTORCAT_BG,      FLAGS,           OBJECT_KAMEJIMA, sizeof(DmChar08),
+    DmChar08_Init,   DmChar08_Destroy, DmChar08_Update, DmChar08_Draw,
 };

 #include "overlays/ovl_Dm_Char08/ovl_Dm_Char08.c"
--- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c
+++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c
@ -19,15 +19,8 @@ void DmChar09_DoNothing(DmChar09* this, PlayState* play);
 void func_80AB2268(DmChar09* this, PlayState* play);

 ActorInit Dm_Char09_InitVars = {
-    ACTOR_DM_CHAR09,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_BEE,
-    sizeof(DmChar09),
-    DmChar09_Init,
-    DmChar09_Destroy,
-    DmChar09_Update,
-    DmChar09_Draw,
+    ACTOR_DM_CHAR09, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_BEE,    sizeof(DmChar09),
+    DmChar09_Init,   DmChar09_Destroy,    DmChar09_Update, DmChar09_Draw,
 };

 static AnimationInfo sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c
+++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c
@ -22,15 +22,7 @@ void func_80C24BD0(DmGm* this, PlayState* play);
 void func_80C25000(Actor* thisx, PlayState* play);

 ActorInit Dm_Gm_InitVars = {
-    ACTOR_DM_GM,
-    ACTORCAT_NPC,
-    FLAGS,
-    OBJECT_AN1,
-    sizeof(DmGm),
-    DmGm_Init,
-    DmGm_Destroy,
-    DmGm_Update,
-    NULL,
+    ACTOR_DM_GM, ACTORCAT_NPC, FLAGS, OBJECT_AN1, sizeof(DmGm), DmGm_Init, DmGm_Destroy, DmGm_Update, NULL,
 };

 static AnimationInfoS sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
+++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
@ -16,15 +16,7 @@ void DmNb_Update(Actor* thisx, PlayState* play);
 void DmNb_Draw(Actor* thisx, PlayState* play);

 ActorInit Dm_Nb_InitVars = {
-    ACTOR_DM_NB,
-    ACTORCAT_NPC,
-    FLAGS,
-    OBJECT_NB,
-    sizeof(DmNb),
-    DmNb_Init,
-    DmNb_Destroy,
-    DmNb_Update,
-    DmNb_Draw,
+    ACTOR_DM_NB, ACTORCAT_NPC, FLAGS, OBJECT_NB, sizeof(DmNb), DmNb_Init, DmNb_Destroy, DmNb_Update, DmNb_Draw,
 };

 static AnimationInfoS sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c
+++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c
@ -19,15 +19,8 @@ void DmOpstage_Draw(Actor* thisx, PlayState* play);
 void DmOpstage_FollowCutsceneScript(DmOpstage* this, PlayState* play);

 ActorInit Dm_Opstage_InitVars = {
-    ACTOR_DM_OPSTAGE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_KEIKOKU_DEMO,
-    sizeof(DmOpstage),
-    DmOpstage_Init,
-    DmOpstage_Destroy,
-    DmOpstage_Update,
-    DmOpstage_Draw,
+    ACTOR_DM_OPSTAGE,  ACTORCAT_ITEMACTION, FLAGS,          OBJECT_KEIKOKU_DEMO, sizeof(DmOpstage), DmOpstage_Init,
+    DmOpstage_Destroy, DmOpstage_Update,    DmOpstage_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c
+++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c
@ -17,15 +17,8 @@ void DmRavine_Update(Actor* thisx, PlayState* play);
 void DmRavine_Draw(Actor* thisx, PlayState* play);

 ActorInit Dm_Ravine_InitVars = {
-    ACTOR_DM_RAVINE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_KEIKOKU_DEMO,
-    sizeof(DmRavine),
-    DmRavine_Init,
-    DmRavine_Destroy,
-    DmRavine_Update,
-    DmRavine_Draw,
+    ACTOR_DM_RAVINE, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_KEIKOKU_DEMO, sizeof(DmRavine),
+    DmRavine_Init,   DmRavine_Destroy,    DmRavine_Update, DmRavine_Draw,
 };

 void DmRavine_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
+++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
@ -19,15 +19,7 @@ void DmSa_Draw(Actor* thisx, PlayState* play);
 void DmSa_DoNothing(DmSa* this, PlayState* play);

 ActorInit Dm_Sa_InitVars = {
-    ACTOR_DM_SA,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_STK,
-    sizeof(DmSa),
-    DmSa_Init,
-    DmSa_Destroy,
-    DmSa_Update,
-    DmSa_Draw,
+    ACTOR_DM_SA, ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK, sizeof(DmSa), DmSa_Init, DmSa_Destroy, DmSa_Update, DmSa_Draw,
 };

 static AnimationInfo sAnimationInfo[] = { { &gSkullKidTPoseAnim, 1.0f, 0, -1.0f, ANIMMODE_LOOP, 0 } };
--- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c
+++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c
@ -17,15 +17,8 @@ void DmStatue_Update(Actor* thisx, PlayState* play);
 void DmStatue_Draw(Actor* thisx, PlayState* play);

 ActorInit Dm_Statue_InitVars = {
-    ACTOR_DM_STATUE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_SMTOWER,
-    sizeof(DmStatue),
-    DmStatue_Init,
-    DmStatue_Destroy,
-    DmStatue_Update,
-    DmStatue_Draw,
+    ACTOR_DM_STATUE, ACTORCAT_ITEMACTION, FLAGS,           OBJECT_SMTOWER, sizeof(DmStatue),
+    DmStatue_Init,   DmStatue_Destroy,    DmStatue_Update, DmStatue_Draw,
 };

 void DmStatue_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
@ -151,15 +151,8 @@ typedef enum {
 } SkullKidDekuPipesCutsceneState;

 ActorInit Dm_Stk_InitVars = {
-    ACTOR_DM_STK,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_STK,
-    sizeof(DmStk),
-    DmStk_Init,
-    DmStk_Destroy,
-    DmStk_Update,
-    DmStk_Draw,
+    ACTOR_DM_STK, ACTORCAT_ITEMACTION, FLAGS,        OBJECT_STK, sizeof(DmStk),
+    DmStk_Init,   DmStk_Destroy,       DmStk_Update, DmStk_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c
+++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c
@ -19,15 +19,8 @@ void func_80C229EC(DmTag* this, PlayState* play);
 void func_80C229FC(DmTag* this, PlayState* play);

 ActorInit Dm_Tag_InitVars = {
-    ACTOR_DM_TAG,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(DmTag),
-    DmTag_Init,
-    DmTag_Destroy,
-    DmTag_Update,
-    NULL,
+    ACTOR_DM_TAG, ACTORCAT_ITEMACTION, FLAGS,        GAMEPLAY_KEEP, sizeof(DmTag),
+    DmTag_Init,   DmTag_Destroy,       DmTag_Update, NULL,
 };

 s32 D_80C22BF0[] = {
--- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c
+++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c
@ -18,15 +18,7 @@ void DmZl_Draw(Actor* thisx, PlayState* play);
 void DmZl_DoNothing(DmZl* this, PlayState* play);

 ActorInit Dm_Zl_InitVars = {
-    ACTOR_DM_ZL,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_ZL4,
-    sizeof(DmZl),
-    DmZl_Init,
-    DmZl_Destroy,
-    DmZl_Update,
-    DmZl_Draw,
+    ACTOR_DM_ZL, ACTORCAT_ITEMACTION, FLAGS, OBJECT_ZL4, sizeof(DmZl), DmZl_Init, DmZl_Destroy, DmZl_Update, DmZl_Draw,
 };

 static AnimationInfo sAnimationInfo[] = {
--- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
@ -21,15 +21,8 @@ void DoorAna_WaitOpen(DoorAna* this, PlayState* play);
 void DoorAna_GrabLink(DoorAna* this, PlayState* play);

 ActorInit Door_Ana_InitVars = {
-    ACTOR_DOOR_ANA,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_FIELD_KEEP,
-    sizeof(DoorAna),
-    DoorAna_Init,
-    DoorAna_Destroy,
-    DoorAna_Update,
-    DoorAna_Draw,
+    ACTOR_DOOR_ANA, ACTORCAT_ITEMACTION, FLAGS,          GAMEPLAY_FIELD_KEEP, sizeof(DoorAna),
+    DoorAna_Init,   DoorAna_Destroy,     DoorAna_Update, DoorAna_Draw,
 };

 static ColliderCylinderInit sCylinderInit = {
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@ -41,15 +41,8 @@ void func_808A1C50(DoorShutter* this, PlayState* play);
 void DoorShutter_Draw(Actor* thisx, PlayState* play);

 ActorInit Door_Shutter_InitVars = {
-    ACTOR_DOOR_SHUTTER,
-    ACTORCAT_DOOR,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(DoorShutter),
-    DoorShutter_Init,
-    DoorShutter_Destroy,
-    DoorShutter_Update,
-    NULL,
+    ACTOR_DOOR_SHUTTER,  ACTORCAT_DOOR,      FLAGS, GAMEPLAY_KEEP, sizeof(DoorShutter), DoorShutter_Init,
+    DoorShutter_Destroy, DoorShutter_Update, NULL,
 };

 typedef struct {
--- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c
+++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c
@ -68,15 +68,8 @@ void DoorSpiral_Wait(DoorSpiral* this, PlayState* play);
 void DoorSpiral_PlayerClimb(DoorSpiral* this, PlayState* play);

 ActorInit Door_Spiral_InitVars = {
-    ACTOR_DOOR_SPIRAL,
-    ACTORCAT_DOOR,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(DoorSpiral),
-    DoorSpiral_Init,
-    DoorSpiral_Destroy,
-    DoorSpiral_Update,
-    DoorSpiral_Draw,
+    ACTOR_DOOR_SPIRAL,  ACTORCAT_DOOR,     FLAGS,           GAMEPLAY_KEEP, sizeof(DoorSpiral), DoorSpiral_Init,
+    DoorSpiral_Destroy, DoorSpiral_Update, DoorSpiral_Draw,
 };

 // Parameters for each staircase, indexed with SpiralType
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@ -50,15 +50,8 @@ static s16 D_808BC000;
 static f32 D_808BC004;

 ActorInit Door_Warp1_InitVars = {
-    ACTOR_DOOR_WARP1,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_WARP1,
-    sizeof(DoorWarp1),
-    DoorWarp1_Init,
-    DoorWarp1_Destroy,
-    DoorWarp1_Update,
-    DoorWarp1_Draw,
+    ACTOR_DOOR_WARP1,  ACTORCAT_ITEMACTION, FLAGS,          OBJECT_WARP1, sizeof(DoorWarp1), DoorWarp1_Init,
+    DoorWarp1_Destroy, DoorWarp1_Update,    DoorWarp1_Draw,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c
+++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c
@ -19,15 +19,8 @@ void EffChange_SetColors(EffChange* this, s32 arg1);
 void func_80A4C5CC(EffChange* this, PlayState* play);

 ActorInit Eff_Change_InitVars = {
-    ACTOR_EFF_CHANGE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(EffChange),
-    EffChange_Init,
-    EffChange_Destroy,
-    EffChange_Update,
-    NULL,
+    ACTOR_EFF_CHANGE,  ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EffChange), EffChange_Init,
+    EffChange_Destroy, EffChange_Update,    NULL,
 };

 static u8 D_80A4C920[] = {
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@ -25,15 +25,8 @@ void func_80919768(Actor* thisx, PlayState* play2);
 void func_809199FC(Actor* thisx, PlayState* play2);

 ActorInit Eff_Dust_InitVars = {
-    ACTOR_EFF_DUST,
-    ACTORCAT_NPC,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(EffDust),
-    EffDust_Init,
-    EffDust_Destroy,
-    EffDust_Update,
-    EffDust_Draw,
+    ACTOR_EFF_DUST, ACTORCAT_NPC,    FLAGS,          GAMEPLAY_KEEP, sizeof(EffDust),
+    EffDust_Init,   EffDust_Destroy, EffDust_Update, EffDust_Draw,
 };

 void func_80918B40(EffDust* this) {
--- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c
+++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c
@ -24,15 +24,9 @@ void func_80BCED34(EffKamejimaWave* this, PlayState* play);
 void EffKamejimaWave_SetVtxAlpha(u8 alpha);

 ActorInit Eff_Kamejima_Wave_InitVars = {
-    ACTOR_EFF_KAMEJIMA_WAVE,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_KAMEJIMA,
-    sizeof(EffKamejimaWave),
-    EffKamejimaWave_Init,
-    EffKamejimaWave_Destroy,
-    EffKamejimaWave_Update,
-    NULL,
+    ACTOR_EFF_KAMEJIMA_WAVE, ACTORCAT_ITEMACTION,     FLAGS,
+    OBJECT_KAMEJIMA,         sizeof(EffKamejimaWave), EffKamejimaWave_Init,
+    EffKamejimaWave_Destroy, EffKamejimaWave_Update,  NULL,
 };

 static Color_RGBA8 sPrimColors[] = {
--- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c
+++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c
@ -29,15 +29,8 @@ typedef enum EffLastDayAction {
 } EffLastDayAction;

 ActorInit Eff_Lastday_InitVars = {
-    ACTOR_EFF_LASTDAY,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_LASTDAY,
-    sizeof(EffLastday),
-    EffLastday_Init,
-    EffLastday_Destroy,
-    EffLastday_Update,
-    EffLastday_Draw,
+    ACTOR_EFF_LASTDAY,  ACTORCAT_ITEMACTION, FLAGS,           OBJECT_LASTDAY, sizeof(EffLastday), EffLastday_Init,
+    EffLastday_Destroy, EffLastday_Update,   EffLastday_Draw,
 };

 void EffLastday_Init(Actor* thisx, PlayState* play2) {
--- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c
+++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c
@ -19,15 +19,9 @@ void EffZoraband_Draw(Actor* thisx, PlayState* play2);
 void EffZoraband_MikauFadeOut(EffZoraband* this, PlayState* play);

 ActorInit Eff_Zoraband_InitVars = {
-    ACTOR_EFF_ZORABAND,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    OBJECT_ZORABAND,
-    sizeof(EffZoraband),
-    EffZoraband_Init,
-    EffZoraband_Destroy,
-    EffZoraband_Update,
-    EffZoraband_Draw,
+    ACTOR_EFF_ZORABAND,  ACTORCAT_ITEMACTION, FLAGS,
+    OBJECT_ZORABAND,     sizeof(EffZoraband), EffZoraband_Init,
+    EffZoraband_Destroy, EffZoraband_Update,  EffZoraband_Draw,
 };

 void EffZoraband_Init(Actor* thisx, PlayState* play) {
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@ -19,15 +19,8 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc);
 void func_8092E284(ElfMsg* this, PlayState* play);

 ActorInit Elf_Msg_InitVars = {
-    ACTOR_ELF_MSG,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(ElfMsg),
-    ElfMsg_Init,
-    ElfMsg_Destroy,
-    ElfMsg_Update,
-    NULL,
+    ACTOR_ELF_MSG, ACTORCAT_ITEMACTION, FLAGS,         GAMEPLAY_KEEP, sizeof(ElfMsg),
+    ElfMsg_Init,   ElfMsg_Destroy,      ElfMsg_Update, NULL,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
+++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
@ -19,15 +19,8 @@ void func_8096EF98(ElfMsg2* this, PlayState* play);
 void func_8096EFD0(ElfMsg2* this, PlayState* play);

 ActorInit Elf_Msg2_InitVars = {
-    ACTOR_ELF_MSG2,
-    ACTORCAT_BG,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(ElfMsg2),
-    ElfMsg2_Init,
-    ElfMsg2_Destroy,
-    ElfMsg2_Update,
-    NULL,
+    ACTOR_ELF_MSG2, ACTORCAT_BG,     FLAGS,          GAMEPLAY_KEEP, sizeof(ElfMsg2),
+    ElfMsg2_Init,   ElfMsg2_Destroy, ElfMsg2_Update, NULL,
 };

 static InitChainEntry sInitChain[] = {
--- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
+++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
@ -18,15 +18,8 @@ void ElfMsg3_Update(Actor* thisx, PlayState* play);
 void func_80A2CF7C(ElfMsg3* this, PlayState* play);

 ActorInit Elf_Msg3_InitVars = {
-    ACTOR_ELF_MSG3,
-    ACTORCAT_ITEMACTION,
-    FLAGS,
-    GAMEPLAY_KEEP,
-    sizeof(ElfMsg3),
-    ElfMsg3_Init,
-    ElfMsg3_Destroy,
-    ElfMsg3_Update,
-    NULL,
+    ACTOR_ELF_MSG3, ACTORCAT_ITEMACTION, FLAGS,          GAMEPLAY_KEEP, sizeof(ElfMsg3),
+    ElfMsg3_Init,   ElfMsg3_Destroy,     ElfMsg3_Update, NULL,
 };

 static InitChainEntry sInitChain[] = {
--- a/Show More
+++ b/Show More