Messing with formatting

docs/tutorial/advanced_control_flow.md

@@ -32,10 +32,12 @@ ActorInit En_Ms_InitVars = {
     FLAGS,
     OBJECT_MS,
     sizeof(EnMs),
-    EnMs_Init,
-    EnMs_Destroy,
-    EnMs_Update,
-    EnMs_Draw,
+    {
+        EnMs_Init,
+        EnMs_Destroy,
+        EnMs_Update,
+        EnMs_Draw,
+    },
 };
 
 static ColliderCylinderInitType1 D_80952BA0 = {

docs/tutorial/beginning_decomp.md

@@ -33,10 +33,12 @@ ActorInit En_Recepgirl_InitVars = {
     FLAGS,
     OBJECT_BG,
     sizeof(EnRecepgirl),
-    EnRecepgirl_Init,
-    EnRecepgirl_Destroy,
-    EnRecepgirl_Update,
-    EnRecepgirl_Draw,
+    {
+        EnRecepgirl_Init,
+        EnRecepgirl_Destroy,
+        EnRecepgirl_Update,
+        EnRecepgirl_Draw,
+    },
 };
 
 // static InitChainEntry sInitChain[] = {
@@ -341,10 +343,12 @@ ActorInit En_Recepgirl_InitVars = {
     FLAGS,
     OBJECT_BG,
     sizeof(EnRecepgirl),
-    EnRecepgirl_Init,
-    EnRecepgirl_Destroy,
-    EnRecepgirl_Update,
-    EnRecepgirl_Draw,
+    {
+        EnRecepgirl_Init,
+        EnRecepgirl_Destroy,
+        EnRecepgirl_Update,
+        EnRecepgirl_Draw,
+    },
 };
 
 static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };

docs/tutorial/data.md

@@ -49,10 +49,12 @@ ActorInit En_Recepgirl_InitVars = {
     FLAGS,
     OBJECT_BG,
     sizeof(EnRecepgirl),
-    EnRecepgirl_Init,
-    EnRecepgirl_Destroy,
-    EnRecepgirl_Update,
-    EnRecepgirl_Draw,
+    {
+        EnRecepgirl_Init,
+        EnRecepgirl_Destroy,
+        EnRecepgirl_Update,
+        EnRecepgirl_Draw,
+    },
 };
 
 static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };
@@ -105,10 +107,12 @@ ActorInit En_Recepgirl_InitVars = {
     FLAGS,
     OBJECT_BG,
     sizeof(EnRecepgirl),
-    EnRecepgirl_Init,
-    EnRecepgirl_Destroy,
-    EnRecepgirl_Update,
-    EnRecepgirl_Draw,
+    {
+        EnRecepgirl_Init,
+        EnRecepgirl_Destroy,
+        EnRecepgirl_Update,
+        EnRecepgirl_Draw,
+    },
 };
 
 static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 };

docs/tutorial/documenting.md

@@ -54,10 +54,12 @@ ActorInit En_Recepgirl_InitVars = {
     FLAGS,
     OBJECT_BG,
     sizeof(EnRecepgirl),
-    EnRecepgirl_Init,
-    EnRecepgirl_Destroy,
-    EnRecepgirl_Update,
-    EnRecepgirl_Draw,
+    {
+        EnRecepgirl_Init,
+        EnRecepgirl_Destroy,
+        EnRecepgirl_Update,
+        EnRecepgirl_Draw,
+    },
 };
 
 static void* D_80C106B0[4] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0, object_bg_Tex_00FCF0 };

include/z64actor.h

@@ -93,10 +93,12 @@ typedef struct {
     /* 0x04 */ u32 flags;
     /* 0x08 */ s16 objectId;
     /* 0x0C */ u32 instanceSize;
+    struct {
     /* 0x10 */ ActorFunc init;
     /* 0x14 */ ActorFunc destroy;
     /* 0x18 */ ActorFunc update;
     /* 0x1C */ ActorFunc draw;
+    };
 } ActorInit; // size = 0x20
 
 typedef enum {

src/code/z_en_item00.c

@@ -29,10 +29,12 @@ ActorInit En_Item00_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(EnItem00),
-    EnItem00_Init,
-    EnItem00_Destroy,
-    EnItem00_Update,
-    EnItem00_Draw,
+    {
+        EnItem00_Init,
+        EnItem00_Destroy,
+        EnItem00_Update,
+        EnItem00_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/code/z_player_call.c

@@ -20,10 +20,12 @@ ActorInit Player_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(Player),
-    PlayerCall_Init,
-    PlayerCall_Destroy,
-    PlayerCall_Update,
-    PlayerCall_Draw,
+    {
+        PlayerCall_Init,
+        PlayerCall_Destroy,
+        PlayerCall_Update,
+        PlayerCall_Draw,
+    },
 };
 
 void Player_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

@@ -26,10 +26,12 @@ ActorInit Arms_Hook_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(ArmsHook),
-    ArmsHook_Init,
-    ArmsHook_Destroy,
-    ArmsHook_Update,
-    ArmsHook_Draw,
+    {
+        ArmsHook_Init,
+        ArmsHook_Destroy,
+        ArmsHook_Update,
+        ArmsHook_Draw,
+    },
 };
 
 static ColliderQuadInit D_808C1BC0 = {

src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

@@ -27,10 +27,12 @@ ActorInit Arrow_Fire_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(ArrowFire),
-    ArrowFire_Init,
-    ArrowFire_Destroy,
-    ArrowFire_Update,
-    ArrowFire_Draw,
+    {
+        ArrowFire_Init,
+        ArrowFire_Destroy,
+        ArrowFire_Update,
+        ArrowFire_Draw,
+    },
 };
 
 static ColliderQuadInit sQuadInit = {

src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c

@@ -29,10 +29,12 @@ ActorInit Arrow_Ice_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(ArrowIce),
-    ArrowIce_Init,
-    ArrowIce_Destroy,
-    ArrowIce_Update,
-    ArrowIce_Draw,
+    {
+        ArrowIce_Init,
+        ArrowIce_Destroy,
+        ArrowIce_Update,
+        ArrowIce_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c

@@ -27,10 +27,12 @@ ActorInit Arrow_Light_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(ArrowLight),
-    ArrowLight_Init,
-    ArrowLight_Destroy,
-    ArrowLight_Update,
-    ArrowLight_Draw,
+    {
+        ArrowLight_Init,
+        ArrowLight_Destroy,
+        ArrowLight_Update,
+        ArrowLight_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c

@@ -29,10 +29,12 @@ ActorInit Bg_Astr_Bombwall_InitVars = {
     FLAGS,
     OBJECT_ASTR_OBJ,
     sizeof(BgAstrBombwall),
-    BgAstrBombwall_Init,
-    BgAstrBombwall_Destroy,
-    BgAstrBombwall_Update,
-    BgAstrBombwall_Draw,
+    {
+        BgAstrBombwall_Init,
+        BgAstrBombwall_Destroy,
+        BgAstrBombwall_Update,
+        BgAstrBombwall_Draw,
+    },
 };
 
 static ColliderTrisElementInit sTrisElementsInit[2] = {

src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c

@@ -24,10 +24,12 @@ ActorInit Bg_Botihasira_InitVars = {
     FLAGS,
     OBJECT_BOTIHASIRA,
     sizeof(BgBotihasira),
-    BgBotihasira_Init,
-    BgBotihasira_Destroy,
-    BgBotihasira_Update,
-    BgBotihasira_Draw,
+    {
+        BgBotihasira_Init,
+        BgBotihasira_Destroy,
+        BgBotihasira_Update,
+        BgBotihasira_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -46,9 +46,17 @@ 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 {

src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c

@@ -47,10 +47,12 @@ ActorInit Bg_Crace_Movebg_InitVars = {
     FLAGS,
     OBJECT_CRACE_OBJECT,
     sizeof(BgCraceMovebg),
-    BgCraceMovebg_Init,
-    BgCraceMovebg_Destroy,
-    BgCraceMovebg_Update,
-    BgCraceMovebg_Draw,
+    {
+        BgCraceMovebg_Init,
+        BgCraceMovebg_Destroy,
+        BgCraceMovebg_Update,
+        BgCraceMovebg_Draw,
+    },
 };
 
 static u8 sHasInitializedIsLoaded = 0;

src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c

@@ -25,10 +25,12 @@ ActorInit Bg_Ctower_Gear_InitVars = {
     FLAGS,
     OBJECT_CTOWER_ROT,
     sizeof(BgCtowerGear),
-    BgCtowerGear_Init,
-    BgCtowerGear_Destroy,
-    BgCtowerGear_Update,
-    BgCtowerGear_Draw,
+    {
+        BgCtowerGear_Init,
+        BgCtowerGear_Destroy,
+        BgCtowerGear_Update,
+        BgCtowerGear_Draw,
+    },
 };
 
 static Vec3f sExitSplashOffsets[] = {

src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c

@@ -27,10 +27,12 @@ ActorInit Bg_Ctower_Rot_InitVars = {
     FLAGS,
     OBJECT_CTOWER_ROT,
     sizeof(BgCtowerRot),
-    BgCtowerRot_Init,
-    BgCtowerRot_Destroy,
-    BgCtowerRot_Update,
-    BgCtowerRot_Draw,
+    {
+        BgCtowerRot_Init,
+        BgCtowerRot_Destroy,
+        BgCtowerRot_Update,
+        BgCtowerRot_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c

@@ -21,11 +21,11 @@ ActorInit Bg_Danpei_Movebg_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(BgDanpeiMovebg),
-    BgDanpeiMovebg_Init,
+{BgDanpeiMovebg_Init,
     BgDanpeiMovebg_Destroy,
     BgDanpeiMovebg_Update,
     NULL,
-};
+},};
 
 // static InitChainEntry sInitChain[] = {
 static InitChainEntry D_80AF753C[] = {

src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c

@@ -36,10 +36,12 @@ ActorInit Bg_Dblue_Balance_InitVars = {
     FLAGS,
     OBJECT_DBLUE_OBJECT,
     sizeof(BgDblueBalance),
-    BgDblueBalance_Init,
-    BgDblueBalance_Destroy,
-    BgDblueBalance_Update,
-    BgDblueBalance_Draw,
+    {
+        BgDblueBalance_Init,
+        BgDblueBalance_Destroy,
+        BgDblueBalance_Update,
+        BgDblueBalance_Draw,
+    },
 };
 
 typedef struct {

src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c

@@ -22,11 +22,11 @@ ActorInit Bg_Dblue_Elevator_InitVars = {
     FLAGS,
     OBJECT_DBLUE_OBJECT,
     sizeof(BgDblueElevator),
-    BgDblueElevator_Init,
+{BgDblueElevator_Init,
     BgDblueElevator_Destroy,
     BgDblueElevator_Update,
     BgDblueElevator_Draw,
-};
+},};
 
 // static InitChainEntry sInitChain[] = {
 static InitChainEntry D_80B929EC[] = {

src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c

@@ -51,10 +51,12 @@ ActorInit Bg_Dblue_Movebg_InitVars = {
     FLAGS,
     OBJECT_DBLUE_OBJECT,
     sizeof(BgDblueMovebg),
-    BgDblueMovebg_Init,
-    BgDblueMovebg_Destroy,
-    BgDblueMovebg_Update,
-    BgDblueMovebg_Draw,
+    {
+        BgDblueMovebg_Init,
+        BgDblueMovebg_Destroy,
+        BgDblueMovebg_Update,
+        BgDblueMovebg_Draw,
+    },
 };
 
 static Gfx* sOpaDLists[] = {

src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c

@@ -31,10 +31,12 @@ ActorInit Bg_Dblue_Waterfall_InitVars = {
     FLAGS,
     OBJECT_DBLUE_OBJECT,
     sizeof(BgDblueWaterfall),
-    BgDblueWaterfall_Init,
-    BgDblueWaterfall_Destroy,
-    BgDblueWaterfall_Update,
-    BgDblueWaterfall_Draw,
+    {
+        BgDblueWaterfall_Init,
+        BgDblueWaterfall_Destroy,
+        BgDblueWaterfall_Update,
+        BgDblueWaterfall_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c

@@ -30,10 +30,12 @@ ActorInit Bg_Dkjail_Ivy_InitVars = {
     FLAGS,
     OBJECT_DKJAIL_OBJ,
     sizeof(BgDkjailIvy),
-    BgDkjailIvy_Init,
-    BgDkjailIvy_Destroy,
-    BgDkjailIvy_Update,
-    BgDkjailIvy_Draw,
+    {
+        BgDkjailIvy_Init,
+        BgDkjailIvy_Destroy,
+        BgDkjailIvy_Update,
+        BgDkjailIvy_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -32,11 +32,11 @@ ActorInit Bg_Dy_Yoseizo_InitVars = {
     FLAGS,
     OBJECT_DY_OBJ,
     sizeof(BgDyYoseizo),
-    BgDyYoseizo_Init,
+{BgDyYoseizo_Init,
     BgDyYoseizo_Destroy,
     BgDyYoseizo_Update,
     NULL,
-};
+},};
 
 #endif
 

src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c

@@ -32,10 +32,12 @@ ActorInit Bg_F40_Block_InitVars = {
     FLAGS,
     OBJECT_F40_OBJ,
     sizeof(BgF40Block),
-    BgF40Block_Init,
-    BgF40Block_Destroy,
-    BgF40Block_Update,
-    BgF40Block_Draw,
+    {
+        BgF40Block_Init,
+        BgF40Block_Destroy,
+        BgF40Block_Update,
+        BgF40Block_Draw,
+    },
 };
 
 static Vec3f D_80BC4620[] = {

src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c

@@ -25,10 +25,12 @@ ActorInit Bg_F40_Flift_InitVars = {
     FLAGS,
     OBJECT_F40_OBJ,
     sizeof(BgF40Flift),
-    BgF40Flift_Init,
-    BgF40Flift_Destroy,
-    BgF40Flift_Update,
-    BgF40Flift_Draw,
+    {
+        BgF40Flift_Init,
+        BgF40Flift_Destroy,
+        BgF40Flift_Update,
+        BgF40Flift_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c

@@ -30,10 +30,12 @@ ActorInit Bg_F40_Switch_InitVars = {
     FLAGS,
     OBJECT_F40_SWITCH,
     sizeof(BgF40Switch),
-    BgF40Switch_Init,
-    BgF40Switch_Destroy,
-    BgF40Switch_Update,
-    BgF40Switch_Draw,
+    {
+        BgF40Switch_Init,
+        BgF40Switch_Destroy,
+        BgF40Switch_Update,
+        BgF40Switch_Draw,
+    },
 };
 
 s32 sBgF40SwitchGlobalsInitialized = false;

src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c

@@ -22,11 +22,11 @@ ActorInit Bg_F40_Swlift_InitVars = {
     FLAGS,
     OBJECT_F40_OBJ,
     sizeof(BgF40Swlift),
-    BgF40Swlift_Init,
+{BgF40Swlift_Init,
     BgF40Swlift_Destroy,
     BgF40Swlift_Update,
     BgF40Swlift_Draw,
-};
+},};
 
 // static InitChainEntry sInitChain[] = {
 static InitChainEntry D_8096F540[] = {

src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c

@@ -27,10 +27,12 @@ ActorInit Bg_Fire_Wall_InitVars = {
     FLAGS,
     OBJECT_FWALL,
     sizeof(BgFireWall),
-    BgFireWall_Init,
-    BgFireWall_Destroy,
-    BgFireWall_Update,
-    NULL,
+    {
+        BgFireWall_Init,
+        BgFireWall_Destroy,
+        BgFireWall_Update,
+        NULL,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c

@@ -22,10 +22,12 @@ ActorInit Bg_Fu_Kaiten_InitVars = {
     FLAGS,
     OBJECT_FU_KAITEN,
     sizeof(BgFuKaiten),
-    BgFuKaiten_Init,
-    BgFuKaiten_Destroy,
-    BgFuKaiten_Update,
-    BgFuKaiten_Draw,
+    {
+        BgFuKaiten_Init,
+        BgFuKaiten_Destroy,
+        BgFuKaiten_Update,
+        BgFuKaiten_Draw,
+    },
 };
 
 void BgFuKaiten_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c

@@ -22,10 +22,12 @@ ActorInit Bg_Fu_Mizu_InitVars = {
     FLAGS,
     OBJECT_FU_KAITEN,
     sizeof(BgFuMizu),
-    BgFuMizu_Init,
-    BgFuMizu_Destroy,
-    BgFuMizu_Update,
-    BgFuMizu_Draw,
+    {
+        BgFuMizu_Init,
+        BgFuMizu_Destroy,
+        BgFuMizu_Update,
+        BgFuMizu_Draw,
+    },
 };
 
 void BgFuMizu_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c

@@ -29,10 +29,12 @@ ActorInit Bg_Goron_Oyu_InitVars = {
     FLAGS,
     OBJECT_OYU,
     sizeof(BgGoronOyu),
-    BgGoronOyu_Init,
-    BgGoronOyu_Destroy,
-    BgGoronOyu_Update,
-    BgGoronOyu_Draw,
+    {
+        BgGoronOyu_Init,
+        BgGoronOyu_Destroy,
+        BgGoronOyu_Update,
+        BgGoronOyu_Draw,
+    },
 };
 
 void func_80B40080(BgGoronOyu* this) {

src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c

@@ -30,10 +30,12 @@ ActorInit Bg_Haka_Bombwall_InitVars = {
     FLAGS,
     OBJECT_HAKA_OBJ,
     sizeof(BgHakaBombwall),
-    BgHakaBombwall_Init,
-    BgHakaBombwall_Destroy,
-    BgHakaBombwall_Update,
-    BgHakaBombwall_Draw,
+    {
+        BgHakaBombwall_Init,
+        BgHakaBombwall_Destroy,
+        BgHakaBombwall_Update,
+        BgHakaBombwall_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c

@@ -32,10 +32,12 @@ ActorInit Bg_Haka_Curtain_InitVars = {
     FLAGS,
     OBJECT_HAKA_OBJ,
     sizeof(BgHakaCurtain),
-    BgHakaCurtain_Init,
-    BgHakaCurtain_Destroy,
-    BgHakaCurtain_Update,
-    BgHakaCurtain_Draw,
+    {
+        BgHakaCurtain_Init,
+        BgHakaCurtain_Destroy,
+        BgHakaCurtain_Update,
+        BgHakaCurtain_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c

@@ -29,10 +29,12 @@ ActorInit Bg_Haka_Tomb_InitVars = {
     FLAGS,
     OBJECT_HAKA_OBJ,
     sizeof(BgHakaTomb),
-    BgHakaTomb_Init,
-    BgHakaTomb_Destroy,
-    BgHakaTomb_Update,
-    BgHakaTomb_Draw,
+    {
+        BgHakaTomb_Init,
+        BgHakaTomb_Destroy,
+        BgHakaTomb_Update,
+        BgHakaTomb_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c

@@ -32,10 +32,12 @@ ActorInit Bg_Hakugin_Bombwall_InitVars = {
     FLAGS,
     OBJECT_HAKUGIN_OBJ,
     sizeof(BgHakuginBombwall),
-    BgHakuginBombwall_Init,
-    BgHakuginBombwall_Destroy,
-    BgHakuginBombwall_Update,
-    BgHakuginBombwall_Draw,
+    {
+        BgHakuginBombwall_Init,
+        BgHakuginBombwall_Destroy,
+        BgHakuginBombwall_Update,
+        BgHakuginBombwall_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c

@@ -24,10 +24,12 @@ ActorInit Bg_Hakugin_Elvpole_InitVars = {
     FLAGS,
     OBJECT_HAKUGIN_OBJ,
     sizeof(BgHakuginElvpole),
-    BgHakuginElvpole_Init,
-    BgHakuginElvpole_Destroy,
-    BgHakuginElvpole_Update,
-    BgHakuginElvpole_Draw,
+    {
+        BgHakuginElvpole_Init,
+        BgHakuginElvpole_Destroy,
+        BgHakuginElvpole_Update,
+        BgHakuginElvpole_Draw,
+    },
 };
 
 void BgHakuginElvpole_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c

@@ -45,10 +45,12 @@ ActorInit Bg_Hakugin_Post_InitVars = {
     FLAGS,
     OBJECT_HAKUGIN_OBJ,
     sizeof(BgHakuginPost),
-    BgHakuginPost_Init,
-    BgHakuginPost_Destroy,
-    BgHakuginPost_Update,
-    NULL,
+    {
+        BgHakuginPost_Init,
+        BgHakuginPost_Destroy,
+        BgHakuginPost_Update,
+        NULL,
+    },
 };
 
 typedef struct {

src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c

@@ -44,10 +44,12 @@ ActorInit Bg_Hakugin_Switch_InitVars = {
     FLAGS,
     OBJECT_GORONSWITCH,
     sizeof(BgHakuginSwitch),
-    BgHakuginSwitch_Init,
-    BgHakuginSwitch_Destroy,
-    BgHakuginSwitch_Update,
-    BgHakuginSwitch_Draw,
+    {
+        BgHakuginSwitch_Init,
+        BgHakuginSwitch_Destroy,
+        BgHakuginSwitch_Update,
+        BgHakuginSwitch_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c

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

src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c

@@ -48,10 +48,12 @@ ActorInit Bg_Icicle_InitVars = {
     FLAGS,
     OBJECT_ICICLE,
     sizeof(BgIcicle),
-    BgIcicle_Init,
-    BgIcicle_Destroy,
-    BgIcicle_Update,
-    BgIcicle_Draw,
+    {
+        BgIcicle_Init,
+        BgIcicle_Destroy,
+        BgIcicle_Update,
+        BgIcicle_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c

@@ -31,10 +31,12 @@ ActorInit Bg_Ikana_Block_InitVars = {
     FLAGS,
     GAMEPLAY_DANGEON_KEEP,
     sizeof(BgIkanaBlock),
-    BgIkanaBlock_Init,
-    BgIkanaBlock_Destroy,
-    BgIkanaBlock_Update,
-    NULL,
+    {
+        BgIkanaBlock_Init,
+        BgIkanaBlock_Destroy,
+        BgIkanaBlock_Update,
+        NULL,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c

@@ -31,10 +31,12 @@ ActorInit Bg_Ikana_Bombwall_InitVars = {
     FLAGS,
     OBJECT_IKANA_OBJ,
     sizeof(BgIkanaBombwall),
-    BgIkanaBombwall_Init,
-    BgIkanaBombwall_Destroy,
-    BgIkanaBombwall_Update,
-    BgIkanaBombwall_Draw,
+    {
+        BgIkanaBombwall_Init,
+        BgIkanaBombwall_Destroy,
+        BgIkanaBombwall_Update,
+        BgIkanaBombwall_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit1 = {

src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c

@@ -30,10 +30,12 @@ ActorInit Bg_Ikana_Dharma_InitVars = {
     FLAGS,
     OBJECT_IKANA_OBJ,
     sizeof(BgIkanaDharma),
-    BgIkanaDharma_Init,
-    BgIkanaDharma_Destroy,
-    BgIkanaDharma_Update,
-    BgIkanaDharma_Draw,
+    {
+        BgIkanaDharma_Init,
+        BgIkanaDharma_Destroy,
+        BgIkanaDharma_Update,
+        BgIkanaDharma_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c

@@ -32,10 +32,12 @@ ActorInit Bg_Ikana_Mirror_InitVars = {
     FLAGS,
     OBJECT_IKANA_OBJ,
     sizeof(BgIkanaMirror),
-    BgIkanaMirror_Init,
-    BgIkanaMirror_Destroy,
-    BgIkanaMirror_Update,
-    BgIkanaMirror_Draw,
+    {
+        BgIkanaMirror_Init,
+        BgIkanaMirror_Destroy,
+        BgIkanaMirror_Update,
+        BgIkanaMirror_Draw,
+    },
 };
 
 static ColliderTrisElementInit sMirrorColliderElementsInit[] = {

src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c

@@ -27,10 +27,12 @@ ActorInit Bg_Ikana_Ray_InitVars = {
     FLAGS,
     OBJECT_IKANA_OBJ,
     sizeof(BgIkanaRay),
-    BgIkanaRay_Init,
-    BgIkanaRay_Destroy,
-    BgIkanaRay_Update,
-    BgIkanaRay_Draw,
+    {
+        BgIkanaRay_Init,
+        BgIkanaRay_Destroy,
+        BgIkanaRay_Update,
+        BgIkanaRay_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c

@@ -40,10 +40,12 @@ ActorInit Bg_Ikana_Rotaryroom_InitVars = {
     FLAGS,
     OBJECT_IKANA_OBJ,
     sizeof(BgIkanaRotaryroom),
-    BgIkanaRotaryroom_Init,
-    BgIkanaRotaryroom_Destroy,
-    BgIkanaRotaryroom_Update,
-    BgIkanaRotaryroom_Draw,
+    {
+        BgIkanaRotaryroom_Init,
+        BgIkanaRotaryroom_Destroy,
+        BgIkanaRotaryroom_Update,
+        BgIkanaRotaryroom_Draw,
+    },
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit1[2] = {

src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c

@@ -42,10 +42,12 @@ ActorInit Bg_Ikana_Shutter_InitVars = {
     FLAGS,
     OBJECT_IKANA_OBJ,
     sizeof(BgIkanaShutter),
-    BgIkanaShutter_Init,
-    BgIkanaShutter_Destroy,
-    BgIkanaShutter_Update,
-    BgIkanaShutter_Draw,
+    {
+        BgIkanaShutter_Init,
+        BgIkanaShutter_Destroy,
+        BgIkanaShutter_Update,
+        BgIkanaShutter_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

@@ -35,10 +35,12 @@ ActorInit Bg_Iknin_Susceil_InitVars = {
     FLAGS,
     OBJECT_IKNINSIDE_OBJ,
     sizeof(BgIkninSusceil),
-    BgIkninSusceil_Init,
-    BgIkninSusceil_Destroy,
-    BgIkninSusceil_Update,
-    BgIkninSusceil_Draw,
+    {
+        BgIkninSusceil_Init,
+        BgIkninSusceil_Destroy,
+        BgIkninSusceil_Update,
+        BgIkninSusceil_Draw,
+    },
 };
 
 static s32 unused = 0;

src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c

@@ -24,10 +24,12 @@ ActorInit Bg_Ikninside_InitVars = {
     FLAGS,
     OBJECT_IKNINSIDE_OBJ,
     sizeof(BgIkninside),
-    BgIkninside_Init,
-    BgIkninside_Destroy,
-    BgIkninside_Update,
-    BgIkninside_Draw,
+    {
+        BgIkninside_Init,
+        BgIkninside_Destroy,
+        BgIkninside_Update,
+        BgIkninside_Draw,
+    },
 };
 
 static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_obj_DL_00A5A8 };

src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c

@@ -33,10 +33,12 @@ ActorInit Bg_Iknv_Doukutu_InitVars = {
     FLAGS,
     OBJECT_IKNV_OBJ,
     sizeof(BgIknvDoukutu),
-    BgIknvDoukutu_Init,
-    BgIknvDoukutu_Destroy,
-    BgIknvDoukutu_Update,
-    BgIknvDoukutu_Draw,
+    {
+        BgIknvDoukutu_Init,
+        BgIknvDoukutu_Destroy,
+        BgIknvDoukutu_Update,
+        BgIknvDoukutu_Draw,
+    },
 };
 
 void BgIknvDoukutu_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c

@@ -27,10 +27,12 @@ ActorInit Bg_Iknv_Obj_InitVars = {
     FLAGS,
     OBJECT_IKNV_OBJ,
     sizeof(BgIknvObj),
-    BgIknvObj_Init,
-    BgIknvObj_Destroy,
-    BgIknvObj_Update,
-    BgIknvObj_Draw,
+    {
+        BgIknvObj_Init,
+        BgIknvObj_Destroy,
+        BgIknvObj_Update,
+        BgIknvObj_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -32,10 +32,12 @@ ActorInit Bg_Ingate_InitVars = {
     FLAGS,
     OBJECT_SICHITAI_OBJ,
     sizeof(BgIngate),
-    BgIngate_Init,
-    BgIngate_Destroy,
-    BgIngate_Update,
-    BgIngate_Draw,
+    {
+        BgIngate_Init,
+        BgIngate_Destroy,
+        BgIngate_Update,
+        BgIngate_Draw,
+    },
 };
 
 /**

src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c

@@ -21,10 +21,12 @@ ActorInit Bg_Inibs_Movebg_InitVars = {
     FLAGS,
     OBJECT_INIBS_OBJECT,
     sizeof(BgInibsMovebg),
-    BgInibsMovebg_Init,
-    BgInibsMovebg_Destroy,
-    Actor_Noop,
-    BgInibsMovebg_Draw,
+    {
+        BgInibsMovebg_Init,
+        BgInibsMovebg_Destroy,
+        Actor_Noop,
+        BgInibsMovebg_Draw,
+    },
 };
 
 Gfx* sOpaDLists[] = { gTwinmoldArenaNormalModeSandDL, gTwinmoldArenaGiantModeSandDL };

src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c

@@ -26,10 +26,12 @@ ActorInit Bg_Keikoku_Saku_InitVars = {
     FLAGS,
     OBJECT_KEIKOKU_OBJ,
     sizeof(BgKeikokuSaku),
-    BgKeikokuSaku_Init,
-    BgKeikokuSaku_Destroy,
-    BgKeikokuSaku_Update,
-    BgKeikokuSaku_Draw,
+    {
+        BgKeikokuSaku_Init,
+        BgKeikokuSaku_Destroy,
+        BgKeikokuSaku_Update,
+        BgKeikokuSaku_Draw,
+    },
 };
 
 void BgKeikokuSaku_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c

@@ -22,10 +22,12 @@ ActorInit Bg_Keikoku_Spr_InitVars = {
     FLAGS,
     OBJECT_KEIKOKU_OBJ,
     sizeof(BgKeikokuSpr),
-    BgKeikokuSpr_Init,
-    BgKeikokuSpr_Destroy,
-    BgKeikokuSpr_Update,
-    BgKeikokuSpr_Draw,
+    {
+        BgKeikokuSpr_Init,
+        BgKeikokuSpr_Destroy,
+        BgKeikokuSpr_Update,
+        BgKeikokuSpr_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

@@ -28,10 +28,12 @@ ActorInit Bg_Kin2_Bombwall_InitVars = {
     FLAGS,
     OBJECT_KIN2_OBJ,
     sizeof(BgKin2Bombwall),
-    BgKin2Bombwall_Init,
-    BgKin2Bombwall_Destroy,
-    BgKin2Bombwall_Update,
-    BgKin2Bombwall_Draw,
+    {
+        BgKin2Bombwall_Init,
+        BgKin2Bombwall_Destroy,
+        BgKin2Bombwall_Update,
+        BgKin2Bombwall_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c

@@ -33,10 +33,12 @@ ActorInit Bg_Kin2_Fence_InitVars = {
     FLAGS,
     OBJECT_KIN2_OBJ,
     sizeof(BgKin2Fence),
-    BgKin2Fence_Init,
-    BgKin2Fence_Destroy,
-    BgKin2Fence_Update,
-    BgKin2Fence_Draw,
+    {
+        BgKin2Fence_Init,
+        BgKin2Fence_Destroy,
+        BgKin2Fence_Update,
+        BgKin2Fence_Draw,
+    },
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit[4] = {

src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c

@@ -33,10 +33,12 @@ ActorInit Bg_Kin2_Picture_InitVars = {
     FLAGS,
     OBJECT_KIN2_OBJ,
     sizeof(BgKin2Picture),
-    BgKin2Picture_Init,
-    BgKin2Picture_Destroy,
-    BgKin2Picture_Update,
-    BgKin2Picture_Draw,
+    {
+        BgKin2Picture_Init,
+        BgKin2Picture_Destroy,
+        BgKin2Picture_Update,
+        BgKin2Picture_Draw,
+    },
 };
 
 static ColliderTrisElementInit sTrisElementsInit[] = {

src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c

@@ -29,10 +29,12 @@ ActorInit Bg_Kin2_Shelf_InitVars = {
     FLAGS,
     OBJECT_KIN2_OBJ,
     sizeof(BgKin2Shelf),
-    BgKin2Shelf_Init,
-    BgKin2Shelf_Destroy,
-    BgKin2Shelf_Update,
-    BgKin2Shelf_Draw,
+    {
+        BgKin2Shelf_Init,
+        BgKin2Shelf_Destroy,
+        BgKin2Shelf_Update,
+        BgKin2Shelf_Draw,
+    },
 };
 
 f32 D_80B70750[] = { 60.0f, 120.0f };

src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c

@@ -26,10 +26,12 @@ ActorInit Bg_Ladder_InitVars = {
     FLAGS,
     OBJECT_LADDER,
     sizeof(BgLadder),
-    BgLadder_Init,
-    BgLadder_Destroy,
-    BgLadder_Update,
-    BgLadder_Draw,
+    {
+        BgLadder_Init,
+        BgLadder_Destroy,
+        BgLadder_Update,
+        BgLadder_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c

@@ -43,10 +43,12 @@ ActorInit Bg_Last_Bwall_InitVars = {
     FLAGS,
     OBJECT_LAST_OBJ,
     sizeof(BgLastBwall),
-    BgLastBwall_Init,
-    BgLastBwall_Destroy,
-    BgLastBwall_Update,
-    BgLastBwall_Draw,
+    {
+        BgLastBwall_Init,
+        BgLastBwall_Destroy,
+        BgLastBwall_Update,
+        BgLastBwall_Draw,
+    },
 };
 
 static ColliderTrisElementInit sTrisElementsInit[] = {

src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c

@@ -21,10 +21,12 @@ ActorInit Bg_Lbfshot_InitVars = {
     FLAGS,
     OBJECT_LBFSHOT,
     sizeof(BgLbfshot),
-    BgLbfshot_Init,
-    BgLbfshot_Destroy,
-    Actor_Noop,
-    BgLbfshot_Draw,
+    {
+        BgLbfshot_Init,
+        BgLbfshot_Destroy,
+        Actor_Noop,
+        BgLbfshot_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c

@@ -26,10 +26,12 @@ ActorInit Bg_Lotus_InitVars = {
     FLAGS,
     OBJECT_LOTUS,
     sizeof(BgLotus),
-    BgLotus_Init,
-    BgLotus_Destroy,
-    BgLotus_Update,
-    BgLotus_Draw,
+    {
+        BgLotus_Init,
+        BgLotus_Destroy,
+        BgLotus_Update,
+        BgLotus_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c

@@ -15,9 +15,17 @@ 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[] = {

src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c

@@ -22,10 +22,12 @@ ActorInit Bg_Mbar_Chair_InitVars = {
     FLAGS,
     OBJECT_MBAR_OBJ,
     sizeof(BgMbarChair),
-    BgMbarChair_Init,
-    BgMbarChair_Destroy,
-    BgMbarChair_Update,
-    BgMbarChair_Draw,
+    {
+        BgMbarChair_Init,
+        BgMbarChair_Destroy,
+        BgMbarChair_Update,
+        BgMbarChair_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c

@@ -36,10 +36,12 @@ ActorInit Bg_Numa_Hana_InitVars = {
     FLAGS,
     OBJECT_NUMA_OBJ,
     sizeof(BgNumaHana),
-    BgNumaHana_Init,
-    BgNumaHana_Destroy,
-    BgNumaHana_Update,
-    BgNumaHana_Draw,
+    {
+        BgNumaHana_Init,
+        BgNumaHana_Destroy,
+        BgNumaHana_Update,
+        BgNumaHana_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c

@@ -33,10 +33,12 @@ ActorInit Bg_Open_Shutter_InitVars = {
     FLAGS,
     OBJECT_OPEN_OBJ,
     sizeof(BgOpenShutter),
-    BgOpenShutter_Init,
-    BgOpenShutter_Destroy,
-    BgOpenShutter_Update,
-    BgOpenShutter_Draw,
+    {
+        BgOpenShutter_Init,
+        BgOpenShutter_Destroy,
+        BgOpenShutter_Update,
+        BgOpenShutter_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c

@@ -22,10 +22,12 @@ ActorInit Bg_Open_Spot_InitVars = {
     FLAGS,
     OBJECT_OPEN_OBJ,
     sizeof(BgOpenSpot),
-    BgOpenSpot_Init,
-    BgOpenSpot_Destroy,
-    BgOpenSpot_Update,
-    NULL,
+    {
+        BgOpenSpot_Init,
+        BgOpenSpot_Destroy,
+        BgOpenSpot_Update,
+        NULL,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c

@@ -30,10 +30,12 @@ ActorInit Bg_Sinkai_Kabe_InitVars = {
     FLAGS,
     OBJECT_SINKAI_KABE,
     sizeof(BgSinkaiKabe),
-    BgSinkaiKabe_Init,
-    BgSinkaiKabe_Destroy,
-    BgSinkaiKabe_Update,
-    NULL,
+    {
+        BgSinkaiKabe_Init,
+        BgSinkaiKabe_Destroy,
+        BgSinkaiKabe_Update,
+        NULL,
+    },
 };
 
 static s32 sCurrentPythonIndex = 0;

src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c

@@ -30,10 +30,12 @@ ActorInit Bg_Spdweb_InitVars = {
     FLAGS,
     OBJECT_SPDWEB,
     sizeof(BgSpdweb),
-    BgSpdweb_Init,
-    BgSpdweb_Destroy,
-    BgSpdweb_Update,
-    BgSpdweb_Draw,
+    {
+        BgSpdweb_Init,
+        BgSpdweb_Destroy,
+        BgSpdweb_Update,
+        BgSpdweb_Draw,
+    },
 };
 
 static ColliderTrisElementInit sTrisElementsInit1[2] = {

src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c

@@ -28,10 +28,12 @@ ActorInit Bg_Spout_Fire_InitVars = {
     FLAGS,
     OBJECT_FWALL,
     sizeof(BgSpoutFire),
-    BgSpoutFire_Init,
-    BgSpoutFire_Destroy,
-    BgSpoutFire_Update,
-    NULL,
+    {
+        BgSpoutFire_Init,
+        BgSpoutFire_Destroy,
+        BgSpoutFire_Update,
+        NULL,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c

@@ -22,10 +22,12 @@ ActorInit Bg_Tobira01_InitVars = {
     FLAGS,
     OBJECT_SPOT11_OBJ,
     sizeof(BgTobira01),
-    BgTobira01_Init,
-    BgTobira01_Destroy,
-    BgTobira01_Update,
-    BgTobira01_Draw,
+    {
+        BgTobira01_Init,
+        BgTobira01_Destroy,
+        BgTobira01_Update,
+        BgTobira01_Draw,
+    },
 };
 
 void BgTobira01_Open(BgTobira01* this, PlayState* play) {

src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c

@@ -24,10 +24,12 @@ ActorInit Bg_Umajump_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(BgUmajump),
-    BgUmajump_Init,
-    BgUmajump_Destroy,
-    BgUmajump_Update,
-    NULL,
+    {
+        BgUmajump_Init,
+        BgUmajump_Destroy,
+        BgUmajump_Update,
+        NULL,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Boss_01/z_boss_01.c

@@ -240,11 +240,11 @@ ActorInit Boss_01_InitVars = {
     FLAGS,
     OBJECT_BOSS01,
     sizeof(Boss01),
-    Boss01_Init,
+{Boss01_Init,
     Boss01_Destroy,
     Boss01_Update,
     Boss01_Draw,
-};
+},};
 
 #endif
 

src/overlays/actors/ovl_Boss_02/z_boss_02.c

@@ -118,10 +118,12 @@ ActorInit Boss_02_InitVars = {
     FLAGS,
     OBJECT_BOSS02,
     sizeof(Boss02),
-    Boss02_Init,
-    Boss02_Destroy,
-    Boss02_Twinmold_Update,
-    Boss02_Twinmold_Draw,
+    {
+        Boss02_Init,
+        Boss02_Destroy,
+        Boss02_Twinmold_Update,
+        Boss02_Twinmold_Draw,
+    },
 };
 
 f32 D_809DF5B0 = 1.0f;

src/overlays/actors/ovl_Boss_03/z_boss_03.c

@@ -280,10 +280,12 @@ ActorInit Boss_03_InitVars = {
     FLAGS,
     OBJECT_BOSS03,
     sizeof(Boss03),
-    Boss03_Init,
-    Boss03_Destroy,
-    Boss03_Update,
-    Boss03_Draw,
+    {
+        Boss03_Init,
+        Boss03_Destroy,
+        Boss03_Update,
+        Boss03_Draw,
+    },
 };
 
 // The limbs referenced here are not used. The spheres are positioned manually by Boss03_PostLimbDraw

src/overlays/actors/ovl_Boss_04/z_boss_04.c

@@ -68,10 +68,12 @@ ActorInit Boss_04_InitVars = {
     FLAGS,
     OBJECT_BOSS04,
     sizeof(Boss04),
-    Boss04_Init,
-    Boss04_Destroy,
-    Boss04_Update,
-    Boss04_Draw,
+    {
+        Boss04_Init,
+        Boss04_Destroy,
+        Boss04_Update,
+        Boss04_Draw,
+    },
 };
 
 static ColliderJntSphElementInit sJntSphElementsInit1[1] = {

src/overlays/actors/ovl_Boss_05/z_boss_05.c

@@ -153,11 +153,11 @@ ActorInit Boss_05_InitVars = {
     FLAGS,
     OBJECT_BOSS05,
     sizeof(Boss05),
-    Boss05_Init,
+{Boss05_Init,
     Boss05_Destroy,
     Boss05_Update,
     Boss05_Draw,
-};
+},};
 
 #endif
 

src/overlays/actors/ovl_Boss_06/z_boss_06.c

@@ -75,10 +75,12 @@ ActorInit Boss_06_InitVars = {
     FLAGS,
     OBJECT_KNIGHT,
     sizeof(Boss06),
-    Boss06_Init,
-    Boss06_Destroy,
-    Boss06_Update,
-    Boss06_Draw,
+    {
+        Boss06_Init,
+        Boss06_Destroy,
+        Boss06_Update,
+        Boss06_Draw,
+    },
 };
 
 static ColliderCylinderInit sCylinderInit = {

src/overlays/actors/ovl_Boss_07/z_boss_07.c

@@ -240,11 +240,11 @@ ActorInit Boss_07_InitVars = {
     FLAGS,
     OBJECT_BOSS07,
     sizeof(Boss07),
-    Boss07_Init,
+{Boss07_Init,
     Boss07_Destroy,
     Boss07_Update,
     Boss07_Draw,
-};
+},};
 
 // static ColliderJntSphElementInit sJntSphElementsInit[11] = {
 static ColliderJntSphElementInit D_80A07A40[11] = {

src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c

@@ -40,11 +40,11 @@ ActorInit Boss_Hakugin_InitVars = {
     FLAGS,
     OBJECT_BOSS_HAKUGIN,
     sizeof(BossHakugin),
-    BossHakugin_Init,
+{BossHakugin_Init,
     BossHakugin_Destroy,
     BossHakugin_Update,
     BossHakugin_Draw,
-};
+},};
 
 // static ColliderJntSphElementInit sJntSphElementsInit[19] = {
 static ColliderJntSphElementInit D_80B0E700[19] = {

src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c

@@ -31,10 +31,12 @@ ActorInit Demo_Effect_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(DemoEffect),
-    DemoEffect_Init,
-    DemoEffect_Destroy,
-    DemoEffect_Update,
-    NULL,
+    {
+        DemoEffect_Init,
+        DemoEffect_Destroy,
+        DemoEffect_Update,
+        NULL,
+    },
 };
 
 void DemoEffect_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c

@@ -24,10 +24,12 @@ ActorInit Demo_Getitem_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(DemoGetitem),
-    DemoGetitem_Init,
-    DemoGetitem_Destroy,
-    DemoGetitem_Update,
-    NULL,
+    {
+        DemoGetitem_Init,
+        DemoGetitem_Destroy,
+        DemoGetitem_Update,
+        NULL,
+    },
 };
 
 static s16 sObjectBankIndices[] = { OBJECT_GI_MASK14, OBJECT_GI_SWORD_4 };

src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c

@@ -28,10 +28,12 @@ ActorInit Demo_Kankyo_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(DemoKankyo),
-    DemoKankyo_Init,
-    DemoKankyo_Destroy,
-    DemoKankyo_Update,
-    DemoKankyo_Draw,
+    {
+        DemoKankyo_Init,
+        DemoKankyo_Destroy,
+        DemoKankyo_Update,
+        DemoKankyo_Draw,
+    },
 };
 
 static s32 sObjectBubbleIndex = OBJECT_BUBBLE | 0x10000;

src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c

@@ -22,11 +22,11 @@ ActorInit Demo_Moonend_InitVars = {
     FLAGS,
     OBJECT_MOONEND,
     sizeof(DemoMoonend),
-    DemoMoonend_Init,
+{DemoMoonend_Init,
     DemoMoonend_Destroy,
     DemoMoonend_Update,
     DemoMoonend_Draw,
-};
+},};
 
 #endif
 

src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c

@@ -21,10 +21,12 @@ ActorInit Demo_Shd_InitVars = {
     FLAGS,
     OBJECT_FWALL,
     sizeof(DemoShd),
-    DemoShd_Init,
-    DemoShd_Destroy,
-    DemoShd_Update,
-    DemoShd_Draw,
+    {
+        DemoShd_Init,
+        DemoShd_Destroy,
+        DemoShd_Update,
+        DemoShd_Draw,
+    },
 };
 
 void DemoShd_Init(Actor* thisx, PlayState* play) {

src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c

@@ -31,10 +31,12 @@ ActorInit Demo_Syoten_InitVars = {
     FLAGS,
     OBJECT_SYOTEN,
     sizeof(DemoSyoten),
-    DemoSyoten_Init,
-    DemoSyoten_Destroy,
-    DemoSyoten_Update,
-    DemoSyoten_Draw,
+    {
+        DemoSyoten_Init,
+        DemoSyoten_Destroy,
+        DemoSyoten_Update,
+        DemoSyoten_Draw,
+    },
 };
 
 u8 D_80C177D0[] = {

src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c

@@ -41,10 +41,12 @@ ActorInit Demo_Tre_Lgt_InitVars = {
     FLAGS,
     OBJECT_BOX,
     sizeof(DemoTreLgt),
-    DemoTreLgt_Init,
-    DemoTreLgt_Destroy,
-    DemoTreLgt_Update,
-    DemoTreLgt_Draw,
+    {
+        DemoTreLgt_Init,
+        DemoTreLgt_Destroy,
+        DemoTreLgt_Update,
+        DemoTreLgt_Draw,
+    },
 };
 
 static TransformUpdateIndex* sBoxLightAnimations[] = {

src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c

@@ -21,10 +21,12 @@ ActorInit Dm_Ah_InitVars = {
     FLAGS,
     OBJECT_AH,
     sizeof(DmAh),
-    DmAh_Init,
-    DmAh_Destroy,
-    DmAh_Update,
-    DmAh_Draw,
+    {
+        DmAh_Init,
+        DmAh_Destroy,
+        DmAh_Update,
+        DmAh_Draw,
+    },
 };
 
 static AnimationInfoS sAnimations[] = {

src/overlays/actors/ovl_Dm_Al/z_dm_al.c

@@ -21,10 +21,12 @@ ActorInit Dm_Al_InitVars = {
     FLAGS,
     OBJECT_AL,
     sizeof(DmAl),
-    DmAl_Init,
-    DmAl_Destroy,
-    DmAl_Update,
-    DmAl_Draw,
+    {
+        DmAl_Init,
+        DmAl_Destroy,
+        DmAl_Update,
+        DmAl_Draw,
+    },
 };
 
 typedef enum {

src/overlays/actors/ovl_Dm_An/z_dm_an.c

@@ -27,10 +27,12 @@ ActorInit Dm_An_InitVars = {
     FLAGS,
     OBJECT_AN1,
     sizeof(DmAn),
-    DmAn_Init,
-    DmAn_Destroy,
-    DmAn_Update,
-    NULL,
+    {
+        DmAn_Init,
+        DmAn_Destroy,
+        DmAn_Update,
+        NULL,
+    },
 };
 
 static AnimationInfoS sAnimationInfo[] = {

src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c

@@ -24,10 +24,12 @@ ActorInit Dm_Bal_InitVars = {
     FLAGS,
     OBJECT_BAL,
     sizeof(DmBal),
-    DmBal_Init,
-    DmBal_Destroy,
-    DmBal_Update,
-    DmBal_Draw,
+    {
+        DmBal_Init,
+        DmBal_Destroy,
+        DmBal_Update,
+        DmBal_Draw,
+    },
 };
 
 static AnimationInfo sAnimationInfo[] = {

src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c

@@ -26,10 +26,12 @@ ActorInit Dm_Char00_InitVars = {
     FLAGS,
     OBJECT_DELF,
     sizeof(DmChar00),
-    DmChar00_Init,
-    DmChar00_Destroy,
-    DmChar00_Update,
-    DmChar00_Draw,
+    {
+        DmChar00_Init,
+        DmChar00_Destroy,
+        DmChar00_Update,
+        DmChar00_Draw,
+    },
 };
 
 static AnimationInfo sAnimationInfo[] = {

src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c

@@ -41,10 +41,12 @@ ActorInit Dm_Char01_InitVars = {
     FLAGS,
     OBJECT_MTORIDE,
     sizeof(DmChar01),
-    DmChar01_Init,
-    DmChar01_Destroy,
-    DmChar01_Update,
-    DmChar01_Draw,
+    {
+        DmChar01_Init,
+        DmChar01_Destroy,
+        DmChar01_Update,
+        DmChar01_Draw,
+    },
 };
 
 static InitChainEntry sInitChain[] = {

src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c

@@ -24,10 +24,12 @@ ActorInit Dm_Char02_InitVars = {
     FLAGS,
     OBJECT_STK2,
     sizeof(DmChar02),
-    DmChar02_Init,
-    DmChar02_Destroy,
-    DmChar02_Update,
-    DmChar02_Draw,
+    {
+        DmChar02_Init,
+        DmChar02_Destroy,
+        DmChar02_Update,
+        DmChar02_Draw,
+    },
 
 };
 

src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c

@@ -26,10 +26,12 @@ ActorInit Dm_Char03_InitVars = {
     FLAGS,
     OBJECT_OSN,
     sizeof(DmChar03),
-    DmChar03_Init,
-    DmChar03_Destroy,
-    DmChar03_Update,
-    DmChar03_Draw,
+    {
+        DmChar03_Init,
+        DmChar03_Destroy,
+        DmChar03_Update,
+        DmChar03_Draw,
+    },
 };
 
 AnimationInfo sAnimationInfo[] = {

src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c

@@ -24,10 +24,12 @@ ActorInit Dm_Char04_InitVars = {
     FLAGS,
     GAMEPLAY_KEEP,
     sizeof(DmChar04),
-    DmChar04_Init,
-    DmChar04_Destroy,
-    DmChar04_Update,
-    DmChar04_Draw,
+    {
+        DmChar04_Init,
+        DmChar04_Destroy,
+        DmChar04_Update,
+        DmChar04_Draw,
+    },
 };
 
 void DmChar04_ChangeAnim(SkelAnime* skelAnime, AnimationInfo* animation, u16 animIndex) {

src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c

@@ -41,10 +41,12 @@ ActorInit Dm_Char05_InitVars = {
     FLAGS,
     OBJECT_DMASK,
     sizeof(DmChar05),
-    DmChar05_Init,
-    DmChar05_Destroy,
-    DmChar05_Update,
-    DmChar05_Draw,
+    {
+        DmChar05_Init,
+        DmChar05_Destroy,
+        DmChar05_Update,
+        DmChar05_Draw,
+    },
 };
 
 static AnimationInfo sAnimationInfo[] = {

src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c

@@ -24,10 +24,12 @@ ActorInit Dm_Char06_InitVars = {
     FLAGS,
     OBJECT_YUKIYAMA,
     sizeof(DmChar06),
-    DmChar06_Init,
-    DmChar06_Destroy,
-    DmChar06_Update,
-    DmChar06_Draw,
+    {
+        DmChar06_Init,
+        DmChar06_Destroy,
+        DmChar06_Update,
+        DmChar06_Draw,
+    },
 };
 
 void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc) {