diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md index 48f645f4ea..0762591272 100644 --- a/docs/tutorial/advanced_control_flow.md +++ b/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 = { diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md index dd750d1ad8..17826c5be2 100644 --- a/docs/tutorial/beginning_decomp.md +++ b/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 }; diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index b4b386eaac..9f78069477 100644 --- a/docs/tutorial/data.md +++ b/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 }; diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md index ec00f169a3..f89eddaf51 100644 --- a/docs/tutorial/documenting.md +++ b/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 }; diff --git a/include/z64actor.h b/include/z64actor.h index 3af22c4e9d..6baf2b2be4 100644 --- a/include/z64actor.h +++ b/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 { diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 8f135d79bb..06ecb8c4ab 100644 --- a/src/code/z_en_item00.c +++ b/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 = { diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index fa52c8f23b..aaecc23862 100644 --- a/src/code/z_player_call.c +++ b/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); diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 0a94c1d867..4ba9a06366 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/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 = { diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index ec0045c014..4866085f29 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/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 = { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 1889d3897b..b4bb5218d5 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 822400f288..43a2e8f93d 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index 106c1b988f..f7d5b2c8a3 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/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] = { diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index ab01da4db0..3c4df96b3f 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/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 = { diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 32b3d22bd0..7697a5c163 100644 --- 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,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 { diff --git 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 index b0966cf20f..2572a1897a 100644 --- 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 @@ -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; diff --git 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 index 33f7eae318..8aeba033bc 100644 --- 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 @@ -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[] = { diff --git 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 index e63d4ff5b4..f41e6af50b 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index 2a73bf7d3d..d8b7c8c9c7 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index 70248cb8eb..19155a97c2 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/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 { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index 1400033b56..4dc2c830e1 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/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[] = { diff --git 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 index 8a4f883ed5..c52fc75c0a 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index 8653c4e1e9..b769d1167f 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/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 = { diff --git 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 index d83131359f..d7dc3733bf 100644 --- 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 @@ -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 = { diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 6bd6519d37..3728d1bbea 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/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 diff --git 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 index b620a4ddda..8237fb884f 100644 --- 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 @@ -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[] = { diff --git 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 index 14789a6e61..1d9fcc96ce 100644 --- 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 @@ -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[] = { diff --git 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 index 7ff35618e2..e887180d2b 100644 --- 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 @@ -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; diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index 9b8fe0c513..635f72b48d 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/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[] = { diff --git 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 index bcd2dcae2e..6e12f11574 100644 --- 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 @@ -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 = { diff --git 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 index 277a5ef662..5a8325de63 100644 --- 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 @@ -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) { diff --git 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 index fe2e23a332..b46b1282d6 100644 --- 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 @@ -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) { diff --git 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 index a8665c347d..830d1f543e 100644 --- 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 @@ -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) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index 938f8e7be2..d5ac8ba456 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/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 = { diff --git 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 index ffad13ffc8..dd3b8939c5 100644 --- 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 @@ -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[] = { diff --git 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 index c5450e0160..ca084f3fce 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index 6a3a0a9c77..1649cb8076 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/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 = { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 30abfabc04..6356acd0e7 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/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) { diff --git 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 index 10182898c1..76baccb969 100644 --- 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 @@ -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 { diff --git 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 index 7c9dc96020..a695c627fc 100644 --- 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 @@ -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 = { diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index e40cba9547..297d147f26 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/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 }; diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 4465ba1daa..d73601e9f0 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/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[] = { diff --git 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 index 6e991c0e82..861fb2917b 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index 7325e3e7db..cb3f097427 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/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 = { diff --git 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 index c810290777..3ec176e8d3 100644 --- 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 @@ -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 = { diff --git 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 index 1c53c95dc8..b73f25932a 100644 --- 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 @@ -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[] = { diff --git 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 index 22d9d86ed7..031abd2b94 100644 --- 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 @@ -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 = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 9e830e7e82..bf5bcd5da2 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/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] = { diff --git 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 index 18bfb09097..251de07e6f 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index abf59a1783..5b99cc16aa 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/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; diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index c72efb9cef..6c84bb5b73 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/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 }; diff --git 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 index 50487b99a0..2c5a4b83cd 100644 --- 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 @@ -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) { diff --git 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 index c5b59f26d2..3fe086aa2d 100644 --- 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 @@ -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 = { diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index fc19d2feed..5927240662 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/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, + }, }; /** diff --git 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 index 6b67a3c50e..840576ffb3 100644 --- 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 @@ -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 }; diff --git 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 index 7c92f99183..1ccc83c955 100644 --- 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 @@ -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) { diff --git 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 index 20d79e61c6..65722f428f 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index 7d45695d29..d9c77b8543 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/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 = { diff --git 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 index 2ed9207b55..a3ce1c53a5 100644 --- 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 @@ -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] = { diff --git 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 index df8e16d5ea..5938a59d04 100644 --- 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 @@ -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[] = { diff --git 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 index 79b6f55541..54ac5044ca 100644 --- 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 @@ -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 }; diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index 12e3a39982..72051ede00 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/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[] = { diff --git 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 index e2a8a08bee..9b3d8ff28a 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c index c187c3b908..fe48c4fb22 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index e8906b5626..805d85be6b 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/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[] = { diff --git 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 index 36a2dcf2dc..f632afd33f 100644 --- 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,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[] = { diff --git 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 index 0eec819894..3996bbd454 100644 --- 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 @@ -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[] = { diff --git 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 index fe49011205..dc3a5d5a10 100644 --- 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 @@ -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 = { diff --git 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 index 2a4f22bb3c..ad1ec96dde 100644 --- 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 @@ -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[] = { diff --git 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 index f012c2d253..f3283f1dff 100644 --- 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 @@ -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[] = { diff --git 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 index ed84bce219..0524cd4536 100644 --- 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 @@ -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; diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index 219a4e81c6..2f3e91abda 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/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] = { diff --git 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 index bfaeff36b3..2b238aee9f 100644 --- 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 @@ -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 = { diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index 49e860b713..34a6551130 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/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) { diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 80d0f551a7..a49d63eddf 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 98b6d74586..23942ef72c 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/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 diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index cbcf4aae65..513fad6a81 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/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; diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 46640c82a1..d0392adf09 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/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 diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index 9e40a3a7de..0ee797642a 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/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] = { diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index a4a9316c0a..3916a8e719 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/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 diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index a8ce22de62..985fcc8b49 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/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 = { diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index b8cabbd573..74d9ad8a08 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/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] = { diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index 26b3695476..301d37500c 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/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] = { diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 9356ff7709..e03d62a4d2 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/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) { diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index 2831e709eb..b56c8165c1 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/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 }; diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 83b1add406..1ae915fdd5 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/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; diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index 66715e3eb3..1bd7a7e353 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/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 diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 2912760cb9..5b70e4c247 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/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) { diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index 9432dc5980..b3f1c57506 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/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[] = { diff --git 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 index 01faa431ca..fc8a58919d 100644 --- 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 @@ -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[] = { diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c index 4f18196484..b211af8a66 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c index 9a325b6957..527b22e21d 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/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 { diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c index 028d0c428b..8e2a7b09e8 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c index 54fd75174a..0590220702 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 53ddcbc5c3..afa8d6df2f 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 49a53f5573..276c2d3688 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index ebd0c80c86..18cbf505a1 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/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, + }, }; diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index 8840ac165e..4700df884c 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index a542c04db2..9903b695d4 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/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) { diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index dcd6267fec..fe513a7338 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/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[] = { diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c index f33e2461ad..ad383ec2aa 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/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) { diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c index 55dd0352c8..0699558ef9 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -24,10 +24,12 @@ ActorInit Dm_Char07_InitVars = { FLAGS, OBJECT_MILKBAR, sizeof(DmChar07), - DmChar07_Init, - DmChar07_Destroy, - DmChar07_Update, - DmChar07_Draw, + { + DmChar07_Init, + DmChar07_Destroy, + DmChar07_Update, + DmChar07_Draw, + }, }; void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index 6a1ac36b7b..ee1ede5daf 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -57,10 +57,12 @@ ActorInit Dm_Char08_InitVars = { FLAGS, OBJECT_KAMEJIMA, sizeof(DmChar08), - DmChar08_Init, - DmChar08_Destroy, - DmChar08_Update, - DmChar08_Draw, + { + DmChar08_Init, + DmChar08_Destroy, + DmChar08_Update, + DmChar08_Draw, + }, }; #include "overlays/ovl_Dm_Char08/ovl_Dm_Char08.c" diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index 3e8989e9de..e03039c9f8 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -24,10 +24,12 @@ ActorInit Dm_Char09_InitVars = { FLAGS, OBJECT_BEE, sizeof(DmChar09), - DmChar09_Init, - DmChar09_Destroy, - DmChar09_Update, - DmChar09_Draw, + { + DmChar09_Init, + DmChar09_Destroy, + DmChar09_Update, + DmChar09_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c index ca850f2d86..8c8254a1f6 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -27,10 +27,12 @@ ActorInit Dm_Gm_InitVars = { FLAGS, OBJECT_AN1, sizeof(DmGm), - DmGm_Init, - DmGm_Destroy, - DmGm_Update, - NULL, + { + DmGm_Init, + DmGm_Destroy, + DmGm_Update, + NULL, + }, }; static AnimationInfoS sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index d981d73a13..bf8a09aefc 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -27,11 +27,11 @@ ActorInit Dm_Hina_InitVars = { FLAGS, OBJECT_BSMASK, sizeof(DmHina), - DmHina_Init, +{DmHina_Init, DmHina_Destroy, DmHina_Update, DmHina_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c index 4b4dda5e59..79e06640fb 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -21,10 +21,12 @@ ActorInit Dm_Nb_InitVars = { FLAGS, OBJECT_NB, sizeof(DmNb), - DmNb_Init, - DmNb_Destroy, - DmNb_Update, - DmNb_Draw, + { + DmNb_Init, + DmNb_Destroy, + DmNb_Update, + DmNb_Draw, + }, }; static AnimationInfoS sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index e7ea6ce5c8..a4c501267e 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -24,10 +24,12 @@ ActorInit Dm_Opstage_InitVars = { FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmOpstage), - DmOpstage_Init, - DmOpstage_Destroy, - DmOpstage_Update, - DmOpstage_Draw, + { + DmOpstage_Init, + DmOpstage_Destroy, + DmOpstage_Update, + DmOpstage_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c index 1dc86989f4..2a2b72538b 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -22,10 +22,12 @@ ActorInit Dm_Ravine_InitVars = { FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmRavine), - DmRavine_Init, - DmRavine_Destroy, - DmRavine_Update, - DmRavine_Draw, + { + DmRavine_Init, + DmRavine_Destroy, + DmRavine_Update, + DmRavine_Draw, + }, }; void DmRavine_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c index 895c9a6a9c..9dd7e93e84 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -24,10 +24,12 @@ ActorInit Dm_Sa_InitVars = { FLAGS, OBJECT_STK, sizeof(DmSa), - DmSa_Init, - DmSa_Destroy, - DmSa_Update, - DmSa_Draw, + { + DmSa_Init, + DmSa_Destroy, + DmSa_Update, + DmSa_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { { &gSkullKidTPoseAnim, 1.0f, 0, -1.0f, ANIMMODE_LOOP, 0 } }; diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c index fc69f14f67..432edf8e20 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -22,10 +22,12 @@ ActorInit Dm_Statue_InitVars = { FLAGS, OBJECT_SMTOWER, sizeof(DmStatue), - DmStatue_Init, - DmStatue_Destroy, - DmStatue_Update, - DmStatue_Draw, + { + DmStatue_Init, + DmStatue_Destroy, + DmStatue_Update, + DmStatue_Draw, + }, }; void DmStatue_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index bfd6e5c7b6..e846933b1b 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -156,10 +156,12 @@ ActorInit Dm_Stk_InitVars = { FLAGS, OBJECT_STK, sizeof(DmStk), - DmStk_Init, - DmStk_Destroy, - DmStk_Update, - DmStk_Draw, + { + DmStk_Init, + DmStk_Destroy, + DmStk_Update, + DmStk_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c index fe85d9f1cb..11f6a4f5e8 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -24,10 +24,12 @@ ActorInit Dm_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DmTag), - DmTag_Init, - DmTag_Destroy, - DmTag_Update, - NULL, + { + DmTag_Init, + DmTag_Destroy, + DmTag_Update, + NULL, + }, }; s32 D_80C22BF0[] = { diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index 336d61696d..65a097bdcb 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -22,11 +22,11 @@ ActorInit Dm_Tsg_InitVars = { FLAGS, OBJECT_OPEN_OBJ, sizeof(DmTsg), - DmTsg_Init, +{DmTsg_Init, DmTsg_Destroy, DmTsg_Update, DmTsg_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index d2f16d7cec..256435f77e 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -23,10 +23,12 @@ ActorInit Dm_Zl_InitVars = { FLAGS, OBJECT_ZL4, sizeof(DmZl), - DmZl_Init, - DmZl_Destroy, - DmZl_Update, - DmZl_Draw, + { + DmZl_Init, + DmZl_Destroy, + DmZl_Update, + DmZl_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index f8431fd8e7..934c602802 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -26,10 +26,12 @@ ActorInit Door_Ana_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(DoorAna), - DoorAna_Init, - DoorAna_Destroy, - DoorAna_Update, - DoorAna_Draw, + { + DoorAna_Init, + DoorAna_Destroy, + DoorAna_Update, + DoorAna_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index c2abe35d31..6982b66de6 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -46,10 +46,12 @@ ActorInit Door_Shutter_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DoorShutter), - DoorShutter_Init, - DoorShutter_Destroy, - DoorShutter_Update, - NULL, + { + DoorShutter_Init, + DoorShutter_Destroy, + DoorShutter_Update, + NULL, + }, }; typedef struct { diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c index 126278ee9d..ae6892c6c0 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -73,10 +73,12 @@ ActorInit Door_Spiral_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DoorSpiral), - DoorSpiral_Init, - DoorSpiral_Destroy, - DoorSpiral_Update, - DoorSpiral_Draw, + { + DoorSpiral_Init, + DoorSpiral_Destroy, + DoorSpiral_Update, + DoorSpiral_Draw, + }, }; // Parameters for each staircase, indexed with SpiralType diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index e9b60f6ed6..96103c2b62 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -55,10 +55,12 @@ ActorInit Door_Warp1_InitVars = { FLAGS, OBJECT_WARP1, sizeof(DoorWarp1), - DoorWarp1_Init, - DoorWarp1_Destroy, - DoorWarp1_Update, - DoorWarp1_Draw, + { + DoorWarp1_Init, + DoorWarp1_Destroy, + DoorWarp1_Update, + DoorWarp1_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c index c324243e01..17af891c3c 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -24,10 +24,12 @@ ActorInit Eff_Change_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EffChange), - EffChange_Init, - EffChange_Destroy, - EffChange_Update, - NULL, + { + EffChange_Init, + EffChange_Destroy, + EffChange_Update, + NULL, + }, }; static u8 D_80A4C920[] = { diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 2d2c222af2..63704540c5 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -30,10 +30,12 @@ ActorInit Eff_Dust_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EffDust), - EffDust_Init, - EffDust_Destroy, - EffDust_Update, - EffDust_Draw, + { + EffDust_Init, + EffDust_Destroy, + EffDust_Update, + EffDust_Draw, + }, }; void func_80918B40(EffDust* this) { diff --git 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 index e04bfcdce7..ca04283180 100644 --- 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 @@ -29,10 +29,12 @@ ActorInit Eff_Kamejima_Wave_InitVars = { FLAGS, OBJECT_KAMEJIMA, sizeof(EffKamejimaWave), - EffKamejimaWave_Init, - EffKamejimaWave_Destroy, - EffKamejimaWave_Update, - NULL, + { + EffKamejimaWave_Init, + EffKamejimaWave_Destroy, + EffKamejimaWave_Update, + NULL, + }, }; static Color_RGBA8 sPrimColors[] = { diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index aacfb97250..ee198ab1ed 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -34,10 +34,12 @@ ActorInit Eff_Lastday_InitVars = { FLAGS, OBJECT_LASTDAY, sizeof(EffLastday), - EffLastday_Init, - EffLastday_Destroy, - EffLastday_Update, - EffLastday_Draw, + { + EffLastday_Init, + EffLastday_Destroy, + EffLastday_Update, + EffLastday_Draw, + }, }; void EffLastday_Init(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index f98d97deee..88d8aad956 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -22,11 +22,11 @@ ActorInit Eff_Stk_InitVars = { FLAGS, OBJECT_STK2, sizeof(EffStk), - EffStk_Init, +{EffStk_Init, EffStk_Destroy, EffStk_Update, EffStk_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index f6aafe4393..2759ecc847 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -24,10 +24,12 @@ ActorInit Eff_Zoraband_InitVars = { FLAGS, OBJECT_ZORABAND, sizeof(EffZoraband), - EffZoraband_Init, - EffZoraband_Destroy, - EffZoraband_Update, - EffZoraband_Draw, + { + EffZoraband_Init, + EffZoraband_Destroy, + EffZoraband_Update, + EffZoraband_Draw, + }, }; void EffZoraband_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index ffbf51eb48..2f068d2316 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -24,10 +24,12 @@ ActorInit Elf_Msg_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg), - ElfMsg_Init, - ElfMsg_Destroy, - ElfMsg_Update, - NULL, + { + ElfMsg_Init, + ElfMsg_Destroy, + ElfMsg_Update, + NULL, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index ce5b0cec86..63d3c03adc 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -24,10 +24,12 @@ ActorInit Elf_Msg2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg2), - ElfMsg2_Init, - ElfMsg2_Destroy, - ElfMsg2_Update, - NULL, + { + ElfMsg2_Init, + ElfMsg2_Destroy, + ElfMsg2_Update, + NULL, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c index 7adf9f5d1b..f7b1a631eb 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -23,10 +23,12 @@ ActorInit Elf_Msg3_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg3), - ElfMsg3_Init, - ElfMsg3_Destroy, - ElfMsg3_Update, - NULL, + { + ElfMsg3_Init, + ElfMsg3_Destroy, + ElfMsg3_Update, + NULL, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index 6976ad7051..f9b8def3f4 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -28,10 +28,12 @@ ActorInit Elf_Msg4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg4), - ElfMsg4_Init, - ElfMsg4_Destroy, - ElfMsg4_Update, - NULL, + { + ElfMsg4_Init, + ElfMsg4_Destroy, + ElfMsg4_Update, + NULL, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c index 1da7943265..909f04ca0b 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -23,10 +23,12 @@ ActorInit Elf_Msg5_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg5), - ElfMsg5_Init, - ElfMsg5_Destroy, - ElfMsg5_Update, - NULL, + { + ElfMsg5_Init, + ElfMsg5_Destroy, + ElfMsg5_Update, + NULL, + }, }; static InitChainEntry sInitChainsInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index bb904e1d9d..6efb1c8239 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -29,10 +29,12 @@ ActorInit Elf_Msg6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg6), - ElfMsg6_Init, - ElfMsg6_Destroy, - ElfMsg6_Update, - NULL, + { + ElfMsg6_Init, + ElfMsg6_Destroy, + ElfMsg6_Update, + NULL, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index ed01a43edc..5c278ed099 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -53,10 +53,12 @@ ActorInit En_Ah_InitVars = { FLAGS, OBJECT_AH, sizeof(EnAh), - EnAh_Init, - EnAh_Destroy, - EnAh_Update, - EnAh_Draw, + { + EnAh_Init, + EnAh_Destroy, + EnAh_Update, + EnAh_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index aefc2ee72f..26022fa6bd 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -37,10 +37,12 @@ ActorInit En_Akindonuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnAkindonuts), - EnAkindonuts_Init, - EnAkindonuts_Destroy, - EnAkindonuts_Update, - EnAkindonuts_Draw, + { + EnAkindonuts_Init, + EnAkindonuts_Destroy, + EnAkindonuts_Update, + EnAkindonuts_Draw, + }, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index b51e2fef17..12d013dd24 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -91,10 +91,12 @@ ActorInit En_Al_InitVars = { FLAGS, OBJECT_AL, sizeof(EnAl), - EnAl_Init, - EnAl_Destroy, - EnAl_Update, - EnAl_Draw, + { + EnAl_Init, + EnAl_Destroy, + EnAl_Update, + EnAl_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 4755135722..2e7c6dd9d2 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -43,10 +43,12 @@ ActorInit En_Am_InitVars = { FLAGS, OBJECT_AM, sizeof(EnAm), - EnAm_Init, - EnAm_Destroy, - EnAm_Update, - EnAm_Draw, + { + EnAm_Init, + EnAm_Destroy, + EnAm_Update, + EnAm_Draw, + }, }; static ColliderCylinderInit sEnemyCylinderInit = { diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 9f08c215bd..78e6257546 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -25,11 +25,11 @@ ActorInit En_An_InitVars = { FLAGS, OBJECT_AN1, sizeof(EnAn), - EnAn_Init, +{EnAn_Init, EnAn_Destroy, EnAn_Update, NULL, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80B58BBC = { diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index 21fda2fbb4..279ddeadb4 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -24,11 +24,11 @@ ActorInit En_And_InitVars = { FLAGS, OBJECT_AND, sizeof(EnAnd), - EnAnd_Init, +{EnAnd_Init, EnAnd_Destroy, EnAnd_Update, EnAnd_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 5dd2e7c4e9..d0fecef65e 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -46,10 +46,12 @@ ActorInit En_Ani_InitVars = { FLAGS, OBJECT_ANI, sizeof(EnAni), - EnAni_Init, - EnAni_Destroy, - EnAni_Update, - EnAni_Draw, + { + EnAni_Init, + EnAni_Destroy, + EnAni_Update, + EnAni_Draw, + }, }; // two different colliders, but only one init for both diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index 11f8d9123b..51dc4f2f62 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -40,10 +40,12 @@ ActorInit En_Aob_01_InitVars = { FLAGS, OBJECT_AOB, sizeof(EnAob01), - EnAob01_Init, - EnAob01_Destroy, - EnAob01_Update, - EnAob01_Draw, + { + EnAob01_Init, + EnAob01_Destroy, + EnAob01_Update, + EnAob01_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index ddad9b88ed..c138111f6d 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -28,10 +28,12 @@ ActorInit En_Arrow_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnArrow), - EnArrow_Init, - EnArrow_Destroy, - EnArrow_Update, - EnArrow_Draw, + { + EnArrow_Init, + EnArrow_Destroy, + EnArrow_Update, + EnArrow_Draw, + }, }; static ColliderQuadInit sQuadInit = { diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index ce3439bda7..f4e495709a 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -26,10 +26,12 @@ ActorInit En_Attack_Niw_InitVars = { FLAGS, OBJECT_NIW, sizeof(EnAttackNiw), - EnAttackNiw_Init, - EnAttackNiw_Destroy, - EnAttackNiw_Update, - EnAttackNiw_Draw, + { + EnAttackNiw_Init, + EnAttackNiw_Destroy, + EnAttackNiw_Update, + EnAttackNiw_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 88389b9055..dc55c7a95d 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -98,10 +98,12 @@ ActorInit En_Az_InitVars = { FLAGS, OBJECT_AZ, sizeof(EnAz), - EnAz_Init, - EnAz_Destroy, - EnAz_Update, - EnAz_Draw, + { + EnAz_Init, + EnAz_Destroy, + EnAz_Update, + EnAz_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index e35405e429..64bf446ac7 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -56,10 +56,12 @@ ActorInit En_Baba_InitVars = { FLAGS, OBJECT_BBA, sizeof(EnBaba), - EnBaba_Init, - EnBaba_Destroy, - EnBaba_Update, - EnBaba_Draw, + { + EnBaba_Init, + EnBaba_Destroy, + EnBaba_Update, + EnBaba_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index 2a0bda7664..8a3828f781 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -47,10 +47,12 @@ ActorInit En_Baguo_InitVars = { FLAGS, OBJECT_GMO, sizeof(EnBaguo), - EnBaguo_Init, - EnBaguo_Destroy, - EnBaguo_Update, - NULL, + { + EnBaguo_Init, + EnBaguo_Destroy, + EnBaguo_Update, + NULL, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index 89f1adbe50..9feb534877 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -29,10 +29,12 @@ ActorInit En_Baisen_InitVars = { FLAGS, OBJECT_BAI, sizeof(EnBaisen), - EnBaisen_Init, - EnBaisen_Destroy, - EnBaisen_Update, - EnBaisen_Draw, + { + EnBaisen_Init, + EnBaisen_Destroy, + EnBaisen_Update, + EnBaisen_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index 55da6ce363..be749f008f 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -22,11 +22,11 @@ ActorInit En_Bal_InitVars = { FLAGS, OBJECT_BAL, sizeof(EnBal), - EnBal_Init, +{EnBal_Init, EnBal_Destroy, EnBal_Update, EnBal_Draw, -}; +},}; // static DamageTable sDamageTable = { static DamageTable D_80A63CE0 = { diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index 834f3dce5f..412eefc1c9 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -34,10 +34,12 @@ ActorInit En_Bat_InitVars = { FLAGS, OBJECT_BAT, sizeof(EnBat), - EnBat_Init, - EnBat_Destroy, - EnBat_Update, - EnBat_Draw, + { + EnBat_Init, + EnBat_Destroy, + EnBat_Update, + EnBat_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 0a6e0e7000..4cdc2df771 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -41,10 +41,12 @@ ActorInit En_Bb_InitVars = { FLAGS, OBJECT_BB, sizeof(EnBb), - EnBb_Init, - EnBb_Destroy, - EnBb_Update, - EnBb_Draw, + { + EnBb_Init, + EnBb_Destroy, + EnBb_Update, + EnBb_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index 331ead772b..c02abee9dc 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -34,10 +34,12 @@ ActorInit En_Bba_01_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBba01), - EnBba01_Init, - EnBba01_Destroy, - EnBba01_Update, - EnBba01_Draw, + { + EnBba01_Init, + EnBba01_Destroy, + EnBba01_Update, + EnBba01_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index e60464479e..f3ca51483d 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -41,10 +41,12 @@ ActorInit En_Bbfall_InitVars = { FLAGS, OBJECT_BB, sizeof(EnBbfall), - EnBbfall_Init, - EnBbfall_Destroy, - EnBbfall_Update, - EnBbfall_Draw, + { + EnBbfall_Init, + EnBbfall_Destroy, + EnBbfall_Update, + EnBbfall_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[3] = { diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index 077ce319f1..852836d53e 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -28,10 +28,12 @@ ActorInit En_Bee_InitVars = { FLAGS, OBJECT_BEE, sizeof(EnBee), - EnBee_Init, - EnBee_Destroy, - EnBee_Update, - EnBee_Draw, + { + EnBee_Init, + EnBee_Destroy, + EnBee_Update, + EnBee_Draw, + }, }; static DamageTable sDamageTable = { diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.c b/src/overlays/actors/ovl_En_Bh/z_en_bh.c index e083ce6a02..a1d28a6c41 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.c +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -23,10 +23,12 @@ ActorInit En_Bh_InitVars = { FLAGS, OBJECT_BH, sizeof(EnBh), - EnBh_Init, - EnBh_Destroy, - EnBh_Update, - EnBh_Draw, + { + EnBh_Init, + EnBh_Destroy, + EnBh_Update, + EnBh_Draw, + }, }; void EnBh_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 2b80d73829..070f59505f 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -36,10 +36,12 @@ ActorInit En_Bigokuta_InitVars = { FLAGS, OBJECT_BIGOKUTA, sizeof(EnBigokuta), - EnBigokuta_Init, - EnBigokuta_Destroy, - EnBigokuta_Update, - EnBigokuta_Draw, + { + EnBigokuta_Init, + EnBigokuta_Destroy, + EnBigokuta_Update, + EnBigokuta_Draw, + }, }; static ColliderCylinderInit sShellCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index f348912ace..fbb02b9442 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -52,10 +52,12 @@ ActorInit En_Bigpamet_InitVars = { FLAGS, OBJECT_TL, sizeof(EnBigpamet), - EnBigpamet_Init, - EnBigpamet_Destroy, - EnBigpamet_Update, - EnBigpamet_Draw, + { + EnBigpamet_Init, + EnBigpamet_Destroy, + EnBigpamet_Update, + EnBigpamet_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index 52fad91a16..7c23263823 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -88,10 +88,12 @@ ActorInit En_Bigpo_InitVars = { FLAGS, OBJECT_BIGPO, sizeof(EnBigpo), - EnBigpo_Init, - EnBigpo_Destroy, - EnBigpo_Update, - NULL, + { + EnBigpo_Init, + EnBigpo_Destroy, + EnBigpo_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 2a08596761..e8e7c2d527 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -217,10 +217,12 @@ ActorInit En_Bigslime_InitVars = { FLAGS, OBJECT_BIGSLIME, sizeof(EnBigslime), - EnBigslime_Init, - EnBigslime_Destroy, - EnBigslime_UpdateGekko, - EnBigslime_DrawGekko, + { + EnBigslime_Init, + EnBigslime_Destroy, + EnBigslime_UpdateGekko, + EnBigslime_DrawGekko, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c index 753f349806..1a82be77b4 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -35,10 +35,12 @@ ActorInit En_Bji_01_InitVars = { FLAGS, OBJECT_BJI, sizeof(EnBji01), - EnBji01_Init, - EnBji01_Destroy, - EnBji01_Update, - EnBji01_Draw, + { + EnBji01_Init, + EnBji01_Destroy, + EnBji01_Update, + EnBji01_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index a1f5529fab..2cbbe0a12d 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -52,10 +52,12 @@ ActorInit En_Bjt_InitVars = { FLAGS, OBJECT_BJT, sizeof(EnBjt), - EnBjt_Init, - EnBjt_Destroy, - EnBjt_Update, - EnBjt_Draw, + { + EnBjt_Init, + EnBjt_Destroy, + EnBjt_Update, + EnBjt_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c index 0516274221..b18cf70f03 100644 --- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c @@ -21,10 +21,12 @@ ActorInit En_Boj_01_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj01), - EnBoj01_Init, - EnBoj01_Destroy, - EnBoj01_Update, - EnBoj01_Draw, + { + EnBoj01_Init, + EnBoj01_Destroy, + EnBoj01_Update, + EnBoj01_Draw, + }, }; void EnBoj01_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c index 280d37f85a..751ac91a4b 100644 --- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c @@ -21,10 +21,12 @@ ActorInit En_Boj_02_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj02), - EnBoj02_Init, - EnBoj02_Destroy, - EnBoj02_Update, - EnBoj02_Draw, + { + EnBoj02_Init, + EnBoj02_Destroy, + EnBoj02_Update, + EnBoj02_Draw, + }, }; void EnBoj02_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c index 319e110a39..dcc5b1d20c 100644 --- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c @@ -21,10 +21,12 @@ ActorInit En_Boj_03_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj03), - EnBoj03_Init, - EnBoj03_Destroy, - EnBoj03_Update, - EnBoj03_Draw, + { + EnBoj03_Init, + EnBoj03_Destroy, + EnBoj03_Update, + EnBoj03_Draw, + }, }; void EnBoj03_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c index 7654f13e49..d2d2d86609 100644 --- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c @@ -21,10 +21,12 @@ ActorInit En_Boj_04_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj04), - EnBoj04_Init, - EnBoj04_Destroy, - EnBoj04_Update, - EnBoj04_Draw, + { + EnBoj04_Init, + EnBoj04_Destroy, + EnBoj04_Update, + EnBoj04_Draw, + }, }; void EnBoj04_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c index e96e0f94ce..6caa2e5569 100644 --- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c @@ -21,10 +21,12 @@ ActorInit En_Boj_05_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj05), - EnBoj05_Init, - EnBoj05_Destroy, - EnBoj05_Update, - EnBoj05_Draw, + { + EnBoj05_Init, + EnBoj05_Destroy, + EnBoj05_Update, + EnBoj05_Draw, + }, }; void EnBoj05_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 85d5c6b6b6..a527c0e2d1 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -38,10 +38,12 @@ ActorInit En_Bom_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBom), - EnBom_Init, - EnBom_Destroy, - EnBom_Update, - EnBom_Draw, + { + EnBom_Init, + EnBom_Destroy, + EnBom_Update, + EnBom_Draw, + }, }; static f32 enBomScales[] = { 0.01f, 0.03f }; diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index a2953ee696..7b21e60c3e 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -43,10 +43,12 @@ ActorInit En_Bom_Bowl_Man_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBomBowlMan), - EnBomBowlMan_Init, - EnBomBowlMan_Destroy, - EnBomBowlMan_Update, - EnBomBowlMan_Draw, + { + EnBomBowlMan_Init, + EnBomBowlMan_Destroy, + EnBomBowlMan_Update, + EnBomBowlMan_Draw, + }, }; static AnimationHeader* sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 23b2e49322..cf4f85f2b1 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -31,10 +31,12 @@ ActorInit En_Bom_Chu_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBomChu), - EnBomChu_Init, - EnBomChu_Destroy, - EnBomChu_Update, - EnBomChu_Draw, + { + EnBomChu_Init, + EnBomChu_Destroy, + EnBomChu_Update, + EnBomChu_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index 4beb8c9198..f8e3054ed3 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -31,10 +31,12 @@ ActorInit En_Bombal_InitVars = { FLAGS, OBJECT_FUSEN, sizeof(EnBombal), - EnBombal_Init, - EnBombal_Destroy, - EnBombal_Update, - EnBombal_Draw, + { + EnBombal_Init, + EnBombal_Destroy, + EnBombal_Update, + EnBombal_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index 6fdfd2ef36..93c8084955 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -31,10 +31,12 @@ ActorInit En_Bombers_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBombers), - EnBombers_Init, - EnBombers_Destroy, - EnBombers_Update, - EnBombers_Draw, + { + EnBombers_Init, + EnBombers_Destroy, + EnBombers_Update, + EnBombers_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 31fa3b8086..c60335b38b 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -29,10 +29,12 @@ ActorInit En_Bombers2_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBombers2), - EnBombers2_Init, - EnBombers2_Destroy, - EnBombers2_Update, - EnBombers2_Draw, + { + EnBombers2_Init, + EnBombers2_Destroy, + EnBombers2_Update, + EnBombers2_Draw, + }, }; static u16 sTextIds[] = { diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index c93e2fa3cc..9d5f6ccd84 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -30,10 +30,12 @@ ActorInit En_Bombf_InitVars = { FLAGS, OBJECT_BOMBF, sizeof(EnBombf), - EnBombf_Init, - EnBombf_Destroy, - EnBombf_Update, - EnBombf_Draw, + { + EnBombf_Init, + EnBombf_Destroy, + EnBombf_Update, + EnBombf_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index 8346d41ef2..754ad75d4f 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -59,10 +59,12 @@ ActorInit En_Bomjima_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBomjima), - EnBomjima_Init, - EnBomjima_Destroy, - EnBomjima_Update, - EnBomjima_Draw, + { + EnBomjima_Init, + EnBomjima_Destroy, + EnBomjima_Update, + EnBomjima_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index 2eae67a962..a8d420940a 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -46,10 +46,12 @@ ActorInit En_Bomjimb_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBomjimb), - EnBomjimb_Init, - EnBomjimb_Destroy, - EnBomjimb_Update, - EnBomjimb_Draw, + { + EnBomjimb_Init, + EnBomjimb_Destroy, + EnBomjimb_Update, + EnBomjimb_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 4243b71dd9..f2104accac 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -25,10 +25,12 @@ ActorInit En_Boom_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoom), - EnBoom_Init, - EnBoom_Destroy, - EnBoom_Update, - EnBoom_Draw, + { + EnBoom_Init, + EnBoom_Destroy, + EnBoom_Update, + EnBoom_Draw, + }, }; static ColliderQuadInit sQuadInit = { diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 6d8ca6f533..c6909c174c 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -62,10 +62,12 @@ ActorInit En_Box_InitVars = { FLAGS, OBJECT_BOX, sizeof(EnBox), - EnBox_Init, - EnBox_Destroy, - EnBox_Update, - EnBox_Draw, + { + EnBox_Init, + EnBox_Destroy, + EnBox_Update, + EnBox_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 9736085e67..ff95b5c0f3 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -118,11 +118,11 @@ ActorInit En_Bsb_InitVars = { FLAGS, OBJECT_BSB, sizeof(EnBsb), - EnBsb_Init, +{EnBsb_Init, EnBsb_Destroy, EnBsb_Update, EnBsb_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c index e0a233d161..31f91d852e 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.c +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -23,10 +23,12 @@ ActorInit En_Bu_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBu), - EnBu_Init, - EnBu_Destroy, - EnBu_Update, - EnBu_Draw, + { + EnBu_Init, + EnBu_Destroy, + EnBu_Update, + EnBu_Draw, + }, }; void EnBu_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 845a7b3c70..d3403e1f8b 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -25,10 +25,12 @@ ActorInit En_Bubble_InitVars = { FLAGS, OBJECT_BUBBLE, sizeof(EnBubble), - EnBubble_Init, - EnBubble_Destroy, - EnBubble_Update, - EnBubble_Draw, + { + EnBubble_Init, + EnBubble_Destroy, + EnBubble_Update, + EnBubble_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 9769d77ded..c14f211984 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -59,10 +59,12 @@ ActorInit En_Butte_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnButte), - EnButte_Init, - EnButte_Destroy, - EnButte_Update, - EnButte_Draw, + { + EnButte_Init, + EnButte_Destroy, + EnButte_Update, + EnButte_Draw, + }, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index 7e4460b624..335f834d8b 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -24,10 +24,12 @@ ActorInit En_Cha_InitVars = { FLAGS, OBJECT_CHA, sizeof(EnCha), - EnCha_Init, - EnCha_Destroy, - EnCha_Update, - EnCha_Draw, + { + EnCha_Init, + EnCha_Destroy, + EnCha_Update, + EnCha_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index c9ffe6b179..329e17577f 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -37,10 +37,12 @@ ActorInit En_Clear_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnClearTag), - EnClearTag_Init, - EnClearTag_Destroy, - EnClearTag_Update, - EnClearTag_Draw, + { + EnClearTag_Init, + EnClearTag_Destroy, + EnClearTag_Update, + EnClearTag_Draw, + }, }; static Vec3f sZeroVector = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index b7c3df5124..83a7868b23 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -26,10 +26,12 @@ ActorInit En_Cne_01_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnCne01), - EnCne01_Init, - EnCne01_Destroy, - EnCne01_Update, - EnCne01_Draw, + { + EnCne01_Init, + EnCne01_Destroy, + EnCne01_Update, + EnCne01_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index 2224341a6f..e40abc8b4b 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -53,10 +53,12 @@ ActorInit En_Col_Man_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnColMan), - EnColMan_Init, - EnColMan_Destroy, - EnColMan_Update, - NULL, + { + EnColMan_Init, + EnColMan_Destroy, + EnColMan_Update, + NULL, + }, }; static Color_RGBA8 primColor = { 60, 50, 20, 255 }; diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 1da2428a74..68a8ca08e1 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -33,10 +33,12 @@ ActorInit En_Cow_InitVars = { FLAGS, OBJECT_COW, sizeof(EnCow), - EnCow_Init, - EnCow_Destroy, - EnCow_Update, - EnCow_Draw, + { + EnCow_Init, + EnCow_Destroy, + EnCow_Update, + EnCow_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index d6b981f561..27f741c23c 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -33,10 +33,12 @@ ActorInit En_Crow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnCrow), - EnCrow_Init, - EnCrow_Destroy, - EnCrow_Update, - EnCrow_Draw, + { + EnCrow_Init, + EnCrow_Destroy, + EnCrow_Update, + EnCrow_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c index e5e7a57f0f..ba6d193b81 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -25,10 +25,12 @@ ActorInit En_Dai_InitVars = { FLAGS, OBJECT_DAI, sizeof(EnDai), - EnDai_Init, - EnDai_Destroy, - EnDai_Update, - EnDai_Draw, + { + EnDai_Init, + EnDai_Destroy, + EnDai_Update, + EnDai_Draw, + }, }; static Vec3f D_80B3FBF0 = { 1.0f, 1.0f, 1.0f }; diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index cb8eb5bf76..2c2d750b05 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -27,10 +27,12 @@ ActorInit En_Daiku_InitVars = { FLAGS, OBJECT_DAIKU, sizeof(EnDaiku), - EnDaiku_Init, - EnDaiku_Destroy, - EnDaiku_Update, - EnDaiku_Draw, + { + EnDaiku_Init, + EnDaiku_Destroy, + EnDaiku_Update, + EnDaiku_Draw, + }, }; static u16 sTextIds[] = { diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index a14ae79fc5..a9e97a6234 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -38,10 +38,12 @@ ActorInit En_Daiku2_InitVars = { FLAGS, OBJECT_DAIKU, sizeof(EnDaiku2), - EnDaiku2_Init, - EnDaiku2_Destroy, - EnDaiku2_Update, - EnDaiku2_Draw, + { + EnDaiku2_Init, + EnDaiku2_Destroy, + EnDaiku2_Update, + EnDaiku2_Draw, + }, }; static u16 sTextIds[] = { diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index b7cfc944bb..4e17bc833e 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -44,11 +44,11 @@ ActorInit En_Death_InitVars = { FLAGS, OBJECT_DEATH, sizeof(EnDeath), - EnDeath_Init, +{EnDeath_Init, EnDeath_Destroy, EnDeath_Update, EnDeath_Draw, -}; +},}; // static ColliderSphereInit sSphereInit = { static ColliderSphereInit D_808C98E0 = { diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 94d6e1a12c..a2ea0a72d1 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -38,11 +38,11 @@ ActorInit En_Dekubaba_InitVars = { FLAGS, OBJECT_DEKUBABA, sizeof(EnDekubaba), - EnDekubaba_Init, +{EnDekubaba_Init, EnDekubaba_Destroy, EnDekubaba_Update, EnDekubaba_Draw, -}; +},}; // static ColliderJntSphElementInit sJntSphElementsInit[7] = { static ColliderJntSphElementInit D_808B4D60[7] = { diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 5af29f0bfc..8fe31c54dc 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -45,10 +45,12 @@ ActorInit En_Dekunuts_InitVars = { FLAGS, OBJECT_DEKUNUTS, sizeof(EnDekunuts), - EnDekunuts_Init, - EnDekunuts_Destroy, - EnDekunuts_Update, - EnDekunuts_Draw, + { + EnDekunuts_Init, + EnDekunuts_Destroy, + EnDekunuts_Update, + EnDekunuts_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index 0d45691aa7..6468004c33 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -36,10 +36,12 @@ ActorInit En_Demo_heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnDemoheishi), - EnDemoheishi_Init, - EnDemoheishi_Destroy, - EnDemoheishi_Update, - EnDemoheishi_Draw, + { + EnDemoheishi_Init, + EnDemoheishi_Destroy, + EnDemoheishi_Update, + EnDemoheishi_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c index ddcd4d0d1d..154c4269d3 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -44,10 +44,12 @@ ActorInit En_Dg_InitVars = { FLAGS, OBJECT_DOG, sizeof(EnDg), - EnDg_Init, - EnDg_Destroy, - EnDg_Update, - EnDg_Draw, + { + EnDg_Init, + EnDg_Destroy, + EnDg_Update, + EnDg_Draw, + }, }; #define DOG_FLAG_NONE 0 diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index 86800a97a0..b6409ebe3c 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -63,10 +63,12 @@ ActorInit En_Dinofos_InitVars = { FLAGS, OBJECT_DINOFOS, sizeof(EnDinofos), - EnDinofos_Init, - EnDinofos_Destroy, - EnDinofos_Update, - EnDinofos_Draw, + { + EnDinofos_Init, + EnDinofos_Destroy, + EnDinofos_Update, + EnDinofos_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[9] = { diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c index edea6d3700..c24c591368 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -27,10 +27,12 @@ ActorInit En_Dnb_InitVars = { FLAGS, OBJECT_HANAREYAMA_OBJ, sizeof(EnDnb), - EnDnb_Init, - EnDnb_Destroy, - EnDnb_Update, - EnDnb_Draw, + { + EnDnb_Init, + EnDnb_Destroy, + EnDnb_Update, + EnDnb_Draw, + }, }; void func_80A4FDD0(EnDnbEffect* effect, EnDnb* this, s16* alloc, s32 idx) { diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c index 130fc9e0c7..3a7e5d53c2 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -25,11 +25,11 @@ ActorInit En_Dnh_InitVars = { FLAGS, OBJECT_TRO, sizeof(EnDnh), - EnDnh_Init, +{EnDnh_Init, EnDnh_Destroy, EnDnh_Update, EnDnh_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index 8723994276..dc0dd8105b 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -30,10 +30,12 @@ ActorInit En_Dnk_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnDnk), - EnDnk_Init, - EnDnk_Destroy, - EnDnk_Update, - NULL, + { + EnDnk_Init, + EnDnk_Destroy, + EnDnk_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index 8abf7b2c0b..46b62de74f 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -95,10 +95,12 @@ ActorInit En_Dno_InitVars = { FLAGS, OBJECT_DNJ, sizeof(EnDno), - EnDno_Init, - EnDno_Destroy, - EnDno_Update, - EnDno_Draw, + { + EnDno_Init, + EnDno_Destroy, + EnDno_Update, + EnDno_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c index 0fdb12fbc4..0a27956ad2 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -38,10 +38,12 @@ ActorInit En_Dnp_InitVars = { FLAGS, OBJECT_DNQ, sizeof(EnDnp), - EnDnp_Init, - EnDnp_Destroy, - EnDnp_Update, - EnDnp_Draw, + { + EnDnp_Init, + EnDnp_Destroy, + EnDnp_Update, + EnDnp_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c index 954765187e..a4585b3362 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -31,10 +31,12 @@ ActorInit En_Dnq_InitVars = { FLAGS, OBJECT_DNO, sizeof(EnDnq), - EnDnq_Init, - EnDnq_Destroy, - EnDnq_Update, - EnDnq_Draw, + { + EnDnq_Init, + EnDnq_Destroy, + EnDnq_Update, + EnDnq_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index ab84386a7a..0a1a4230ef 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -45,10 +45,12 @@ ActorInit En_Dns_InitVars = { FLAGS, OBJECT_DNS, sizeof(EnDns), - EnDns_Init, - EnDns_Destroy, - EnDns_Update, - EnDns_Draw, + { + EnDns_Init, + EnDns_Destroy, + EnDns_Update, + EnDns_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 195c9baa77..5dd2dcd131 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -41,10 +41,12 @@ ActorInit En_Dodongo_InitVars = { FLAGS, OBJECT_DODONGO, sizeof(EnDodongo), - EnDodongo_Init, - EnDodongo_Destroy, - EnDodongo_Update, - EnDodongo_Draw, + { + EnDodongo_Init, + EnDodongo_Destroy, + EnDodongo_Update, + EnDodongo_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit1[10] = { diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 5fae597ca2..c358c34178 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -283,10 +283,12 @@ ActorInit En_Door_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnDoor), - EnDoor_Init, - EnDoor_Destroy, - EnDoor_Update, - EnDoor_Draw, + { + EnDoor_Init, + EnDoor_Destroy, + EnDoor_Update, + EnDoor_Draw, + }, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index 3132722924..69f4cc24c1 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -26,10 +26,12 @@ ActorInit En_Door_Etc_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnDoorEtc), - EnDoorEtc_Init, - EnDoorEtc_Destroy, - EnDoorEtc_Update, - NULL, + { + EnDoorEtc_Init, + EnDoorEtc_Destroy, + EnDoorEtc_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 0dbb4416be..d476f76aef 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -56,10 +56,12 @@ ActorInit En_Dragon_InitVars = { FLAGS, OBJECT_UTUBO, sizeof(EnDragon), - EnDragon_Init, - EnDragon_Destroy, - EnDragon_Update, - EnDragon_Draw, + { + EnDragon_Init, + EnDragon_Destroy, + EnDragon_Update, + EnDragon_Draw, + }, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c index 8e13082e33..7f97832470 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -23,10 +23,12 @@ ActorInit En_Drs_InitVars = { FLAGS, OBJECT_DRS, sizeof(EnDrs), - EnDrs_Init, - EnDrs_Destroy, - EnDrs_Update, - NULL, + { + EnDrs_Init, + EnDrs_Destroy, + EnDrs_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c index 0a2de4cc63..8f720522b4 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -26,10 +26,12 @@ ActorInit En_Ds2n_InitVars = { FLAGS, OBJECT_DS2N, sizeof(EnDs2n), - EnDs2n_Init, - EnDs2n_Destroy, - EnDs2n_Update, - EnDs2n_Draw, + { + EnDs2n_Init, + EnDs2n_Destroy, + EnDs2n_Update, + EnDs2n_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index 8287938d60..197537fa91 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -22,11 +22,11 @@ ActorInit En_Dt_InitVars = { FLAGS, OBJECT_DT, sizeof(EnDt), - EnDt_Init, +{EnDt_Init, EnDt_Destroy, EnDt_Update, EnDt_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80BEB29C = { diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index f41e25d669..804f719582 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -25,10 +25,12 @@ ActorInit En_Dy_Extra_InitVars = { FLAGS, OBJECT_DY_OBJ, sizeof(EnDyExtra), - EnDyExtra_Init, - EnDyExtra_Destroy, - EnDyExtra_Update, - EnDyExtra_Draw, + { + EnDyExtra_Init, + EnDyExtra_Destroy, + EnDyExtra_Update, + EnDyExtra_Draw, + }, }; void EnDyExtra_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c index d87e27b979..02d8163a46 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -35,10 +35,12 @@ ActorInit En_Egblock_InitVars = { FLAGS, OBJECT_EG, sizeof(EnEgblock), - EnEgblock_Init, - EnEgblock_Destroy, - EnEgblock_Update, - EnEgblock_Draw, + { + EnEgblock_Init, + EnEgblock_Destroy, + EnEgblock_Update, + EnEgblock_Draw, + }, }; void EnEgblock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index 936da3157e..615da676b1 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -299,10 +299,12 @@ ActorInit En_Egol_InitVars = { FLAGS, OBJECT_EG, sizeof(EnEgol), - EnEgol_Init, - EnEgol_Destroy, - EnEgol_Update, - EnEgol_Draw, + { + EnEgol_Init, + EnEgol_Destroy, + EnEgol_Update, + EnEgol_Draw, + }, }; void EnEgol_ChangeAnim(EnEgol* this, s32 animation) { diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 1fe4557449..6d050123eb 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -39,10 +39,12 @@ ActorInit En_Elf_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnElf), - EnElf_Init, - EnElf_Destroy, - EnElf_Update, - EnElf_Draw, + { + EnElf_Init, + EnElf_Destroy, + EnElf_Update, + EnElf_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index 2c32201432..a1b0741ba5 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -26,10 +26,12 @@ ActorInit En_Elfbub_InitVars = { FLAGS, OBJECT_BUBBLE, sizeof(EnElfbub), - EnElfbub_Init, - EnElfbub_Destroy, - EnElfbub_Update, - EnElfbub_Draw, + { + EnElfbub_Init, + EnElfbub_Destroy, + EnElfbub_Update, + EnElfbub_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index f370a63e50..38e1e2abe0 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -41,10 +41,12 @@ ActorInit En_Elfgrp_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnElfgrp), - EnElfgrp_Init, - EnElfgrp_Destroy, - EnElfgrp_Update, - NULL, + { + EnElfgrp_Init, + EnElfgrp_Destroy, + EnElfgrp_Update, + NULL, + }, }; void func_80A396B0(EnElfgrp* this, s32 arg1) { diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index 7bfb5ebb5b..b5368e99a1 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -28,10 +28,12 @@ ActorInit En_Elforg_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnElforg), - EnElforg_Init, - EnElforg_Destroy, - EnElforg_Update, - EnElforg_Draw, + { + EnElforg_Init, + EnElforg_Destroy, + EnElforg_Update, + EnElforg_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 819351184b..178a58f71a 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -21,10 +21,12 @@ ActorInit En_Encount1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount1), - EnEncount1_Init, - NULL, - EnEncount1_Update, - NULL, + { + EnEncount1_Init, + NULL, + EnEncount1_Update, + NULL, + }, }; static s16 sActorList[] = { diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 624ebbb91a..fedd9b73ad 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -31,10 +31,12 @@ ActorInit En_Encount2_InitVars = { FLAGS, OBJECT_FUSEN, sizeof(EnEncount2), - EnEncount2_Init, - EnEncount2_Destroy, - EnEncount2_Update, - EnEncount2_Draw, + { + EnEncount2_Init, + EnEncount2_Destroy, + EnEncount2_Update, + EnEncount2_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index 47d60d34e1..85351f75a5 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -26,11 +26,11 @@ ActorInit En_Encount3_InitVars = { FLAGS, OBJECT_BIG_FWALL, sizeof(EnEncount3), - EnEncount3_Init, +{EnEncount3_Init, EnEncount3_Destroy, EnEncount3_Update, EnEncount3_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c index ceca077e45..2a3c023933 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -26,10 +26,12 @@ ActorInit En_Encount4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount4), - EnEncount4_Init, - EnEncount4_Destroy, - EnEncount4_Update, - NULL, + { + EnEncount4_Init, + EnEncount4_Destroy, + EnEncount4_Update, + NULL, + }, }; s16 D_809C46D0[] = { diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c index 18824f1abd..20cc630cbc 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c @@ -25,10 +25,12 @@ ActorInit En_Ending_Hero_InitVars = { FLAGS, OBJECT_DT, sizeof(EnEndingHero), - EnEndingHero_Init, - EnEndingHero_Destroy, - EnEndingHero_Update, - EnEndingHero_Draw, + { + EnEndingHero_Init, + EnEndingHero_Destroy, + EnEndingHero_Update, + EnEndingHero_Draw, + }, }; void EnEndingHero_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c index be07ef6de6..1a951f1748 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c @@ -25,10 +25,12 @@ ActorInit En_Ending_Hero2_InitVars = { FLAGS, OBJECT_BAI, sizeof(EnEndingHero2), - EnEndingHero2_Init, - EnEndingHero2_Destroy, - EnEndingHero2_Update, - EnEndingHero2_Draw, + { + EnEndingHero2_Init, + EnEndingHero2_Destroy, + EnEndingHero2_Update, + EnEndingHero2_Draw, + }, }; void EnEndingHero2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c index 5e9906ffeb..3ecabdbb4d 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c @@ -25,10 +25,12 @@ ActorInit En_Ending_Hero3_InitVars = { FLAGS, OBJECT_TORYO, sizeof(EnEndingHero3), - EnEndingHero3_Init, - EnEndingHero3_Destroy, - EnEndingHero3_Update, - EnEndingHero3_Draw, + { + EnEndingHero3_Init, + EnEndingHero3_Destroy, + EnEndingHero3_Update, + EnEndingHero3_Draw, + }, }; void EnEndingHero3_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c index d9f081a445..bf60d056db 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c @@ -25,10 +25,12 @@ ActorInit En_Ending_Hero4_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnEndingHero4), - EnEndingHero4_Init, - EnEndingHero4_Destroy, - EnEndingHero4_Update, - EnEndingHero4_Draw, + { + EnEndingHero4_Init, + EnEndingHero4_Destroy, + EnEndingHero4_Update, + EnEndingHero4_Draw, + }, }; void EnEndingHero4_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c index d0bd861523..1913cb94e2 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c +++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c @@ -25,10 +25,12 @@ ActorInit En_Ending_Hero5_InitVars = { FLAGS, OBJECT_DAIKU, sizeof(EnEndingHero5), - EnEndingHero5_Init, - EnEndingHero5_Destroy, - EnEndingHero5_Update, - EnEndingHero5_Draw, + { + EnEndingHero5_Init, + EnEndingHero5_Destroy, + EnEndingHero5_Update, + EnEndingHero5_Draw, + }, }; void EnEndingHero5_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c index d15a62dc29..f7bb4855b7 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c @@ -30,10 +30,12 @@ ActorInit En_Ending_Hero6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnEndingHero6), - EnEndingHero6_Init, - EnEndingHero6_Destroy, - EnEndingHero6_Update, - EnEndingHero6_Draw, + { + EnEndingHero6_Init, + EnEndingHero6_Destroy, + EnEndingHero6_Update, + EnEndingHero6_Draw, + }, }; static FlexSkeletonHeader* sSkeletons[] = { diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index 9b9c43bce1..9716aa6dc2 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -29,10 +29,12 @@ ActorInit En_Estone_InitVars = { FLAGS, OBJECT_EG, sizeof(EnEstone), - EnEstone_Init, - EnEstone_Destroy, - EnEstone_Update, - EnEstone_Draw, + { + EnEstone_Init, + EnEstone_Destroy, + EnEstone_Update, + EnEstone_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index f00cead6b3..65683c6801 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -68,10 +68,12 @@ ActorInit En_Fall_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnFall), - EnFall_Init, - EnFall_Destroy, - EnFall_Update, - NULL, + { + EnFall_Init, + EnFall_Destroy, + EnFall_Update, + NULL, + }, }; /** diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c index bd7013a97a..9362f4b5d0 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -27,10 +27,12 @@ ActorInit En_Fall2_InitVars = { FLAGS, OBJECT_FALL2, sizeof(EnFall2), - EnFall2_Init, - EnFall2_Destroy, - EnFall2_Update, - EnFall2_Draw, + { + EnFall2_Init, + EnFall2_Destroy, + EnFall2_Update, + EnFall2_Draw, + }, }; void EnFall2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index cc7c7f3456..891a8f7dc7 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -57,10 +57,12 @@ ActorInit En_Famos_InitVars = { FLAGS, OBJECT_FAMOS, sizeof(EnFamos), - EnFamos_Init, - EnFamos_Destroy, - EnFamos_Update, - EnFamos_Draw, + { + EnFamos_Init, + EnFamos_Destroy, + EnFamos_Update, + EnFamos_Draw, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index e449804503..b97c229e21 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -30,10 +30,12 @@ ActorInit En_Fg_InitVars = { FLAGS, OBJECT_FR, sizeof(EnFg), - EnFg_Init, - EnFg_Destroy, - EnFg_Update, - EnFg_Draw, + { + EnFg_Init, + EnFg_Destroy, + EnFg_Update, + EnFg_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 80218a417d..b8de6e96cf 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -21,10 +21,12 @@ ActorInit En_Fire_Rock_InitVars = { FLAGS, OBJECT_EFC_STAR_FIELD, sizeof(EnFireRock), - EnFireRock_Init, - EnFireRock_Destroy, - EnFireRock_Update, - EnFireRock_Draw, + { + EnFireRock_Init, + EnFireRock_Destroy, + EnFireRock_Update, + EnFireRock_Draw, + }, }; void EnFireRock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 8c7e461687..a67164fe4e 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -50,10 +50,12 @@ ActorInit En_Firefly_InitVars = { FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly), - EnFirefly_Init, - EnFirefly_Destroy, - EnFirefly_Update, - EnFirefly_Draw, + { + EnFirefly_Init, + EnFirefly_Destroy, + EnFirefly_Update, + EnFirefly_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c index 0a8a56ef32..fe959e62b0 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -21,10 +21,12 @@ ActorInit En_Firefly2_InitVars = { FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly2), - EnFirefly2_Init, - EnFirefly2_Destroy, - EnFirefly2_Update, - EnFirefly2_Draw, + { + EnFirefly2_Init, + EnFirefly2_Destroy, + EnFirefly2_Update, + EnFirefly2_Draw, + }, }; void EnFirefly2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 11924553ac..320146e01e 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -74,10 +74,12 @@ ActorInit En_Fish_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnFish), - EnFish_Init, - EnFish_Destroy, - EnFish_Update, - EnFish_Draw, + { + EnFish_Init, + EnFish_Destroy, + EnFish_Update, + EnFish_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index 3f9daaac11..ebfdabab95 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -55,10 +55,12 @@ ActorInit En_Fish2_InitVars = { FLAGS, OBJECT_FB, sizeof(EnFish2), - EnFish2_Init, - EnFish2_Destroy, - EnFish2_Update, - EnFish2_Draw, + { + EnFish2_Init, + EnFish2_Destroy, + EnFish2_Update, + EnFish2_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index 942f3d7a42..63b4c5f933 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -207,10 +207,12 @@ ActorInit En_Fishing_InitVars = { FLAGS, OBJECT_FISH, sizeof(EnFishing), - EnFishing_Init, - EnFishing_Destroy, - EnFishing_UpdateFish, - EnFishing_DrawFish, + { + EnFishing_Init, + EnFishing_Destroy, + EnFishing_UpdateFish, + EnFishing_DrawFish, + }, }; f32 D_8090CCD0 = 0.0f; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index d2c99d39dc..5d45071d34 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -65,10 +65,12 @@ ActorInit En_Floormas_InitVars = { FLAGS, OBJECT_WALLMASTER, sizeof(EnFloormas), - EnFloormas_Init, - EnFloormas_Destroy, - EnFloormas_Update, - EnFloormas_Draw, + { + EnFloormas_Init, + EnFloormas_Destroy, + EnFloormas_Update, + EnFloormas_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 3beb49b111..bcd529f080 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -20,10 +20,12 @@ ActorInit En_Fr_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnFr), - EnFr_Init, - EnFr_Destroy, - EnFr_Update, - NULL, + { + EnFr_Init, + EnFr_Destroy, + EnFr_Update, + NULL, + }, }; void EnFr_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 293c8df0ce..37c8deb798 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -75,10 +75,12 @@ ActorInit En_Fsn_InitVars = { FLAGS, OBJECT_FSN, sizeof(EnFsn), - EnFsn_Init, - EnFsn_Destroy, - EnFsn_Update, - EnFsn_Draw, + { + EnFsn_Init, + EnFsn_Destroy, + EnFsn_Update, + EnFsn_Draw, + }, }; static AnimationInfoS sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index c6ec0361f3..72f351f4d1 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -61,10 +61,12 @@ ActorInit En_Fu_InitVars = { FLAGS, OBJECT_MU, sizeof(EnFu), - EnFu_Init, - EnFu_Destroy, - EnFu_Update, - EnFu_Draw, + { + EnFu_Init, + EnFu_Destroy, + EnFu_Update, + EnFu_Draw, + }, }; static s32 D_80964B00[] = { 300, 100, 100 }; diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index 3147c68bf1..0d156a5448 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -34,10 +34,12 @@ ActorInit En_Fu_Kago_InitVars = { FLAGS, OBJECT_FU_MATO, sizeof(EnFuKago), - EnFuKago_Init, - EnFuKago_Destroy, - EnFuKago_Update, - EnFuKago_Draw, + { + EnFuKago_Init, + EnFuKago_Destroy, + EnFuKago_Update, + EnFuKago_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index 049b7849ef..8c3dc5b247 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -33,10 +33,12 @@ ActorInit En_Fu_Mato_InitVars = { FLAGS, OBJECT_FU_MATO, sizeof(EnFuMato), - EnFuMato_Init, - EnFuMato_Destroy, - EnFuMato_Update, - EnFuMato_Draw, + { + EnFuMato_Init, + EnFuMato_Destroy, + EnFuMato_Update, + EnFuMato_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index eb466ec6e5..c0b55485a2 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -55,10 +55,12 @@ ActorInit En_Fz_InitVars = { FLAGS, OBJECT_FZ, sizeof(EnFz), - EnFz_Init, - EnFz_Destroy, - EnFz_Update, - EnFz_Draw, + { + EnFz_Init, + EnFz_Destroy, + EnFz_Update, + EnFz_Draw, + }, }; static s16 D_809346F0[] = { 0, 0x2000, 0x4000, 0 }; diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index 5bd1b0f6b0..053ebf0b04 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -31,10 +31,12 @@ ActorInit En_Gakufu_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnGakufu), - EnGakufu_Init, - EnGakufu_Destroy, - EnGakufu_Update, - EnGakufu_Draw, + { + EnGakufu_Init, + EnGakufu_Destroy, + EnGakufu_Update, + EnGakufu_Draw, + }, }; Vec3f sRewardDropsSpawnTerminaFieldPos = { diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index 0b48b1d124..c8a0464e82 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -29,10 +29,12 @@ ActorInit En_Gamelupy_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnGamelupy), - EnGamelupy_Init, - EnGamelupy_Destroy, - EnGamelupy_Update, - EnGamelupy_Draw, + { + EnGamelupy_Init, + EnGamelupy_Destroy, + EnGamelupy_Update, + EnGamelupy_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index 0f156a58b3..04a5c794ec 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -42,10 +42,12 @@ ActorInit En_Gb2_InitVars = { FLAGS, OBJECT_PS, sizeof(EnGb2), - EnGb2_Init, - EnGb2_Destroy, - EnGb2_Update, - EnGb2_Draw, + { + EnGb2_Init, + EnGb2_Destroy, + EnGb2_Update, + EnGb2_Draw, + }, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 5fd73ebb67..32d1ec10a2 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -21,10 +21,12 @@ ActorInit En_Ge1_InitVars = { FLAGS, OBJECT_GE1, sizeof(EnGe1), - EnGe1_Init, - EnGe1_Destroy, - EnGe1_Update, - EnGe1_Draw, + { + EnGe1_Init, + EnGe1_Destroy, + EnGe1_Update, + EnGe1_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 110a644599..43875cce8a 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -33,11 +33,11 @@ ActorInit En_Ge2_InitVars = { FLAGS, OBJECT_GLA, sizeof(EnGe2), - EnGe2_Init, +{EnGe2_Init, EnGe2_Destroy, EnGe2_Update, EnGe2_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80B8CE40 = { diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 989a88fda1..49303a302d 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -22,11 +22,11 @@ ActorInit En_Ge3_InitVars = { FLAGS, OBJECT_GELDB, sizeof(EnGe3), - EnGe3_Init, +{EnGe3_Init, EnGe3_Destroy, EnGe3_Update, EnGe3_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_809A0DA0 = { diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index 93f14fe33e..09bc4af715 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -43,10 +43,12 @@ ActorInit En_Geg_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnGeg), - EnGeg_Init, - EnGeg_Destroy, - EnGeg_Update, - EnGeg_Draw, + { + EnGeg_Init, + EnGeg_Destroy, + EnGeg_Update, + EnGeg_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index 0239867dc3..2f28d419c1 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -32,10 +32,12 @@ ActorInit En_Gg_InitVars = { FLAGS, OBJECT_GG, sizeof(EnGg), - EnGg_Init, - EnGg_Destroy, - EnGg_Update, - EnGg_Draw, + { + EnGg_Init, + EnGg_Destroy, + EnGg_Update, + EnGg_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c index 8c550e24ec..319eeeb459 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -33,10 +33,12 @@ ActorInit En_Gg2_InitVars = { FLAGS, OBJECT_GG, sizeof(EnGg2), - EnGg2_Init, - EnGg2_Destroy, - EnGg2_Update, - EnGg2_Draw, + { + EnGg2_Init, + EnGg2_Destroy, + EnGg2_Update, + EnGg2_Draw, + }, }; AnimationInfo D_80B3BF00[] = { diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index e49cd5c7c2..9991941f22 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -78,10 +78,12 @@ ActorInit En_Giant_InitVars = { FLAGS, OBJECT_GIANT, sizeof(EnGiant), - EnGiant_Init, - EnGiant_Destroy, - EnGiant_Update, - EnGiant_Draw, + { + EnGiant_Init, + EnGiant_Destroy, + EnGiant_Update, + EnGiant_Draw, + }, }; static AnimationHeader* sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index 0519d16bc0..3387db5d56 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -36,10 +36,12 @@ ActorInit En_Ginko_Man_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnGinkoMan), - EnGinkoMan_Init, - EnGinkoMan_Destroy, - EnGinkoMan_Update, - EnGinkoMan_Draw, + { + EnGinkoMan_Init, + EnGinkoMan_Destroy, + EnGinkoMan_Update, + EnGinkoMan_Draw, + }, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index b42837c93a..16715e5e9d 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -57,10 +57,12 @@ ActorInit En_GirlA_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnGirlA), - EnGirlA_Init, - EnGirlA_Destroy, - EnGirlA_Update, - NULL, + { + EnGirlA_Init, + EnGirlA_Destroy, + EnGirlA_Update, + NULL, + }, }; static ShopItemEntry sShopItemEntries[] = { diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index b3940a2d06..8e316df5b0 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -39,10 +39,12 @@ ActorInit En_Gk_InitVars = { FLAGS, OBJECT_GK, sizeof(EnGk), - EnGk_Init, - EnGk_Destroy, - EnGk_Update, - EnGk_Draw, + { + EnGk_Init, + EnGk_Destroy, + EnGk_Update, + EnGk_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index d8bfeb4643..6fa9140455 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -161,10 +161,12 @@ ActorInit En_Gm_InitVars = { FLAGS, OBJECT_IN2, sizeof(EnGm), - EnGm_Init, - EnGm_Destroy, - EnGm_Update, - EnGm_Draw, + { + EnGm_Init, + EnGm_Destroy, + EnGm_Update, + EnGm_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index d22ae1e193..19333ec606 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -84,10 +84,12 @@ ActorInit En_Go_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnGo), - EnGo_Init, - EnGo_Destroy, - EnGo_Update, - NULL, + { + EnGo_Init, + EnGo_Destroy, + EnGo_Update, + NULL, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index ce8daa1b02..70fb6dce0b 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -39,10 +39,12 @@ ActorInit En_Goroiwa_InitVars = { FLAGS, OBJECT_GOROIWA, sizeof(EnGoroiwa), - EnGoroiwa_Init, - EnGoroiwa_Destroy, - EnGoroiwa_Update, - EnGoroiwa_Draw, + { + EnGoroiwa_Init, + EnGoroiwa_Destroy, + EnGoroiwa_Update, + EnGoroiwa_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index e98b047659..a6b2ddb020 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -143,10 +143,12 @@ ActorInit En_Grasshopper_InitVars = { FLAGS, OBJECT_GRASSHOPPER, sizeof(EnGrasshopper), - EnGrasshopper_Init, - EnGrasshopper_Destroy, - EnGrasshopper_Update, - EnGrasshopper_Draw, + { + EnGrasshopper_Init, + EnGrasshopper_Destroy, + EnGrasshopper_Update, + EnGrasshopper_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 904c2ec1a1..50efb002e5 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -43,10 +43,12 @@ ActorInit En_Gs_InitVars = { FLAGS, OBJECT_GS, sizeof(EnGs), - EnGs_Init, - EnGs_Destroy, - EnGs_Update, - EnGs_Draw, + { + EnGs_Init, + EnGs_Destroy, + EnGs_Update, + EnGs_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index f23e4f3f5b..e7abf184e3 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -31,10 +31,12 @@ ActorInit En_Guard_Nuts_InitVars = { FLAGS, OBJECT_DNK, sizeof(EnGuardNuts), - EnGuardNuts_Init, - EnGuardNuts_Destroy, - EnGuardNuts_Update, - EnGuardNuts_Draw, + { + EnGuardNuts_Init, + EnGuardNuts_Destroy, + EnGuardNuts_Update, + EnGuardNuts_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c index 886c06bedf..fbb7a7d802 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -33,10 +33,12 @@ ActorInit En_Guruguru_InitVars = { FLAGS, OBJECT_FU, sizeof(EnGuruguru), - EnGuruguru_Init, - EnGuruguru_Destroy, - EnGuruguru_Update, - EnGuruguru_Draw, + { + EnGuruguru_Init, + EnGuruguru_Destroy, + EnGuruguru_Update, + EnGuruguru_Draw, + }, }; static u16 textIDs[] = { 0x292A, 0x292B, 0x292C, 0x292D, 0x292E, 0x292F, 0x2930, 0x2931, diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index 9181ca6c21..1d3d11e989 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -38,10 +38,12 @@ ActorInit En_Hakurock_InitVars = { FLAGS, OBJECT_BOSS_HAKUGIN, sizeof(EnHakurock), - EnHakurock_Init, - EnHakurock_Destroy, - EnHakurock_Update, - NULL, + { + EnHakurock_Init, + EnHakurock_Destroy, + EnHakurock_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index b49ac5ea91..8886d8f434 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -27,10 +27,12 @@ ActorInit En_Hanabi_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHanabi), - EnHanabi_Init, - EnHanabi_Destroy, - EnHanabi_Update, - NULL, + { + EnHanabi_Init, + EnHanabi_Destroy, + EnHanabi_Update, + NULL, + }, }; Vec3s D_80B23AA0[] = { diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index b0394ec09a..2f0abd7830 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -22,10 +22,12 @@ ActorInit En_Hata_InitVars = { FLAGS, OBJECT_HATA, sizeof(EnHata), - EnHata_Init, - EnHata_Destroy, - EnHata_Update, - EnHata_Draw, + { + EnHata_Init, + EnHata_Destroy, + EnHata_Update, + EnHata_Draw, + }, }; void EnHata_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c index 187ff16c9e..d68a561653 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -34,10 +34,12 @@ ActorInit En_Heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnHeishi), - EnHeishi_Init, - EnHeishi_Destroy, - EnHeishi_Update, - EnHeishi_Draw, + { + EnHeishi_Init, + EnHeishi_Destroy, + EnHeishi_Update, + EnHeishi_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c index 26f17923a3..21a61b365c 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -53,10 +53,12 @@ ActorInit En_Hg_InitVars = { FLAGS, OBJECT_HARFGIBUD, sizeof(EnHg), - EnHg_Init, - EnHg_Destroy, - EnHg_Update, - EnHg_Draw, + { + EnHg_Init, + EnHg_Destroy, + EnHg_Update, + EnHg_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index e6bca20a29..fd0ca66370 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -54,10 +54,12 @@ ActorInit En_Hgo_InitVars = { FLAGS, OBJECT_HARFGIBUD, sizeof(EnHgo), - EnHgo_Init, - EnHgo_Destroy, - EnHgo_Update, - EnHgo_Draw, + { + EnHgo_Init, + EnHgo_Destroy, + EnHgo_Update, + EnHgo_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index c5f6955b18..1790e3a04e 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -37,10 +37,12 @@ ActorInit En_Hidden_Nuts_InitVars = { FLAGS, OBJECT_HINTNUTS, sizeof(EnHiddenNuts), - EnHiddenNuts_Init, - EnHiddenNuts_Destroy, - EnHiddenNuts_Update, - EnHiddenNuts_Draw, + { + EnHiddenNuts_Init, + EnHiddenNuts_Destroy, + EnHiddenNuts_Update, + EnHiddenNuts_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index 005864a4cf..94fa4bf19f 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -45,10 +45,12 @@ ActorInit En_Hint_Skb_InitVars = { FLAGS, OBJECT_SKB, sizeof(EnHintSkb), - EnHintSkb_Init, - EnHintSkb_Destroy, - EnHintSkb_Update, - EnHintSkb_Draw, + { + EnHintSkb_Init, + EnHintSkb_Destroy, + EnHintSkb_Update, + EnHintSkb_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index 96c9a082d5..aa55ad226c 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -22,10 +22,12 @@ ActorInit En_Hit_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHitTag), - EnHitTag_Init, - EnHitTag_Destroy, - EnHitTag_Update, - NULL, + { + EnHitTag_Init, + EnHitTag_Destroy, + EnHitTag_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 40fc316808..ecf5f300fb 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -63,10 +63,12 @@ ActorInit En_Holl_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHoll), - EnHoll_Init, - EnHoll_Destroy, - EnHoll_Update, - EnHoll_Draw, + { + EnHoll_Init, + EnHoll_Destroy, + EnHoll_Update, + EnHoll_Draw, + }, }; #include "overlays/ovl_En_Holl/ovl_En_Holl.c" diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 856d23572a..eb3f9af8de 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -37,11 +37,11 @@ ActorInit En_Honotrap_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(EnHonotrap), - EnHonotrap_Init, +{EnHonotrap_Init, EnHonotrap_Destroy, EnHonotrap_Update, EnHonotrap_Draw, -}; +},}; // static ColliderTrisElementInit sTrisElementsInit[2] = { static ColliderTrisElementInit D_80930424[2] = { diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index cf8ed1fc41..355f03be07 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -150,10 +150,12 @@ ActorInit En_Horse_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHorse), - EnHorse_Init, - EnHorse_Destroy, - EnHorse_Update, - EnHorse_Draw, + { + EnHorse_Init, + EnHorse_Destroy, + EnHorse_Update, + EnHorse_Draw, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 873afec6c7..74e2d0f4e6 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -41,10 +41,12 @@ ActorInit En_Horse_Game_Check_InitVars = { FLAGS, OBJECT_HORSE_GAME_CHECK, sizeof(EnHorseGameCheck), - EnHorseGameCheck_Init, - EnHorseGameCheck_Destroy, - EnHorseGameCheck_Update, - EnHorseGameCheck_Draw, + { + EnHorseGameCheck_Init, + EnHorseGameCheck_Destroy, + EnHorseGameCheck_Update, + EnHorseGameCheck_Draw, + }, }; #include "overlays/ovl_En_Horse_Game_Check/ovl_En_Horse_Game_Check.c" diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 427d288d94..1405cd99a0 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -32,10 +32,12 @@ ActorInit En_Horse_Link_Child_InitVars = { FLAGS, OBJECT_HORSE_LINK_CHILD, sizeof(EnHorseLinkChild), - EnHorseLinkChild_Init, - EnHorseLinkChild_Destroy, - EnHorseLinkChild_Update, - EnHorseLinkChild_Draw, + { + EnHorseLinkChild_Init, + EnHorseLinkChild_Destroy, + EnHorseLinkChild_Update, + EnHorseLinkChild_Draw, + }, }; AnimationHeader* D_808DFEC0[] = { &object_horse_link_child_Anim_006D44, &object_horse_link_child_Anim_007468 }; diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index b2c42e1ee9..8df65e5a64 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -29,10 +29,12 @@ ActorInit En_Hs_InitVars = { FLAGS, OBJECT_HS, sizeof(EnHs), - EnHs_Init, - EnHs_Destroy, - EnHs_Update, - EnHs_Draw, + { + EnHs_Init, + EnHs_Destroy, + EnHs_Update, + EnHs_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 0d21109813..0bda06697b 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -23,10 +23,12 @@ ActorInit En_Hs2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHs2), - EnHs2_Init, - EnHs2_Destroy, - EnHs2_Update, - EnHs2_Draw, + { + EnHs2_Init, + EnHs2_Destroy, + EnHs2_Update, + EnHs2_Draw, + }, }; void EnHs2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c index a3bac52989..d7a94e8ba6 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -95,10 +95,12 @@ ActorInit En_Ig_InitVars = { FLAGS, OBJECT_DAI, sizeof(EnIg), - EnIg_Init, - EnIg_Destroy, - EnIg_Update, - EnIg_Draw, + { + EnIg_Init, + EnIg_Destroy, + EnIg_Update, + EnIg_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 5442785078..babcbaa58f 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -80,10 +80,12 @@ ActorInit En_Ik_InitVars = { FLAGS, OBJECT_IK, sizeof(EnIk), - EnIk_Init, - EnIk_Destroy, - EnIk_Update, - EnIk_Draw, + { + EnIk_Init, + EnIk_Destroy, + EnIk_Update, + EnIk_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 6372213df9..ceb7a8cfd3 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -28,10 +28,12 @@ ActorInit En_In_InitVars = { FLAGS, OBJECT_IN, sizeof(EnIn), - EnIn_Init, - EnIn_Destroy, - EnIn_Update, - EnIn_Draw, + { + EnIn_Init, + EnIn_Destroy, + EnIn_Update, + EnIn_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 9c30151193..41dfb75000 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -38,10 +38,12 @@ ActorInit En_Insect_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInsect), - EnInsect_Init, - EnInsect_Destroy, - EnInsect_Update, - EnInsect_Draw, + { + EnInsect_Init, + EnInsect_Destroy, + EnInsect_Update, + EnInsect_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 4377e745b7..ceaedd19d0 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -184,10 +184,12 @@ ActorInit En_Invadepoh_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInvadepoh), - EnInvadepoh_Init, - EnInvadepoh_Destroy, - EnInvadepoh_Update, - NULL, + { + EnInvadepoh_Init, + EnInvadepoh_Destroy, + EnInvadepoh_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInitAlien = { diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index 6c12ad5ff3..955425c36d 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -29,11 +29,11 @@ ActorInit En_Invadepoh_Demo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInvadepohDemo), - EnInvadepohDemo_Init, +{EnInvadepohDemo_Init, EnInvadepohDemo_Destroy, EnInvadepohDemo_Update, EnInvadepohDemo_Draw, -}; +},}; // static InitChainEntry sInitChain[] = { static InitChainEntry D_80C1AA74[] = { diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index 04c729e4c1..dc0ae2dc51 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -24,10 +24,12 @@ ActorInit En_Invisible_Ruppe_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInvisibleRuppe), - EnInvisibleRuppe_Init, - EnInvisibleRuppe_Destroy, - EnInvisibleRuppe_Update, - NULL, + { + EnInvisibleRuppe_Init, + EnInvisibleRuppe_Destroy, + EnInvisibleRuppe_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 3c3706a8f4..6b9cdd67fc 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -50,10 +50,12 @@ ActorInit En_Ishi_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnIshi), - EnIshi_Init, - EnIshi_Destroy, - EnIshi_Update, - NULL, + { + EnIshi_Init, + EnIshi_Destroy, + EnIshi_Update, + NULL, + }, }; static f32 D_8095F6B8[] = { 0.1f, 0.4f }; diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c index a1391a2fb5..55c559dae3 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -56,10 +56,12 @@ ActorInit En_Ja_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnJa), - EnJa_Init, - EnJa_Destroy, - EnJa_Update, - EnJa_Draw, + { + EnJa_Init, + EnJa_Destroy, + EnJa_Update, + EnJa_Draw, + }, }; Vec3f D_80BC36AC = { -10.0f, 56.0f, 25.0f }; diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c index 01970f39f2..76bddb25f1 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -26,10 +26,12 @@ ActorInit En_Jc_Mato_InitVars = { FLAGS, OBJECT_TRU, sizeof(EnJcMato), - EnJcMato_Init, - EnJcMato_Destroy, - EnJcMato_Update, - EnJcMato_Draw, + { + EnJcMato_Init, + EnJcMato_Destroy, + EnJcMato_Update, + EnJcMato_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c index 7363ec14b7..4626cf78d6 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -70,10 +70,12 @@ ActorInit En_Jg_InitVars = { FLAGS, OBJECT_JG, sizeof(EnJg), - EnJg_Init, - EnJg_Destroy, - EnJg_Update, - EnJg_Draw, + { + EnJg_Init, + EnJg_Destroy, + EnJg_Update, + EnJg_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index eb15d1666a..c1f2a6e366 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -42,10 +42,12 @@ ActorInit En_Jgame_Tsn_InitVars = { FLAGS, OBJECT_TSN, sizeof(EnJgameTsn), - EnJgameTsn_Init, - EnJgameTsn_Destroy, - EnJgameTsn_Update, - EnJgameTsn_Draw, + { + EnJgameTsn_Init, + EnJgameTsn_Destroy, + EnJgameTsn_Update, + EnJgameTsn_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index b86c01a2c0..a5a3f2efaf 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -33,10 +33,12 @@ ActorInit En_Js_InitVars = { FLAGS, OBJECT_OB, sizeof(EnJs), - EnJs_Init, - EnJs_Destroy, - EnJs_Update, - EnJs_Draw, + { + EnJs_Init, + EnJs_Destroy, + EnJs_Update, + EnJs_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index 2e273bae6b..3d2671443b 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -75,11 +75,11 @@ ActorInit En_Jso_InitVars = { FLAGS, OBJECT_JSO, sizeof(EnJso), - EnJso_Init, +{EnJso_Init, EnJso_Destroy, EnJso_Update, NULL, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_809B0F88 = { diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index 521ac17b15..996f810ec6 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -77,11 +77,11 @@ ActorInit En_Jso2_InitVars = { FLAGS, OBJECT_JSO, sizeof(EnJso2), - EnJso2_Init, +{EnJso2_Init, EnJso2_Destroy, EnJso2_Update, EnJso2_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80A7B608 = { diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index e035fd23a0..227e48c66d 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -155,10 +155,12 @@ ActorInit En_Kaizoku_InitVars = { FLAGS, OBJECT_KZ, sizeof(EnKaizoku), - EnKaizoku_Init, - EnKaizoku_Destroy, - EnKaizoku_Update, - NULL, + { + EnKaizoku_Init, + EnKaizoku_Destroy, + EnKaizoku_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index ac938fee4e..002f17beed 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -73,10 +73,12 @@ ActorInit En_Kakasi_InitVars = { FLAGS, OBJECT_KA, sizeof(EnKakasi), - EnKakasi_Init, - EnKakasi_Destroy, - EnKakasi_Update, - EnKakasi_Draw, + { + EnKakasi_Init, + EnKakasi_Destroy, + EnKakasi_Update, + EnKakasi_Draw, + }, }; Vec3f D_80971DCC[] = { diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index 9b2b0da407..ff075123a7 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -47,10 +47,12 @@ ActorInit En_Kame_InitVars = { FLAGS, OBJECT_TL, sizeof(EnKame), - EnKame_Init, - EnKame_Destroy, - EnKame_Update, - EnKame_Draw, + { + EnKame_Init, + EnKame_Destroy, + EnKame_Update, + EnKame_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index d16eb39d45..01cd0c8999 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -23,10 +23,12 @@ ActorInit En_Kanban_InitVars = { FLAGS, OBJECT_KANBAN, sizeof(EnKanban), - EnKanban_Init, - EnKanban_Destroy, - EnKanban_Update, - EnKanban_Draw, + { + EnKanban_Init, + EnKanban_Destroy, + EnKanban_Update, + EnKanban_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 6060ded7a2..c34b3394a0 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -46,10 +46,12 @@ ActorInit En_Karebaba_InitVars = { FLAGS, OBJECT_DEKUBABA, sizeof(EnKarebaba), - EnKarebaba_Init, - EnKarebaba_Destroy, - EnKarebaba_Update, - EnKarebaba_Draw, + { + EnKarebaba_Init, + EnKarebaba_Destroy, + EnKarebaba_Update, + EnKarebaba_Draw, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c index 1f5a4be029..1ec9931da4 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -28,10 +28,12 @@ ActorInit En_Kbt_InitVars = { FLAGS, OBJECT_KBT, sizeof(EnKbt), - EnKbt_Init, - EnKbt_Destroy, - EnKbt_Update, - EnKbt_Draw, + { + EnKbt_Init, + EnKbt_Destroy, + EnKbt_Update, + EnKbt_Draw, + }, }; void EnKbt_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index 95327591d7..044d3157a5 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -43,10 +43,12 @@ ActorInit En_Kendo_Js_InitVars = { FLAGS, OBJECT_JS, sizeof(EnKendoJs), - EnKendoJs_Init, - EnKendoJs_Destroy, - EnKendoJs_Update, - EnKendoJs_Draw, + { + EnKendoJs_Init, + EnKendoJs_Destroy, + EnKendoJs_Update, + EnKendoJs_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index 1f210a55f6..a55d92b77e 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -37,10 +37,12 @@ ActorInit En_Kgy_InitVars = { FLAGS, OBJECT_KGY, sizeof(EnKgy), - EnKgy_Init, - EnKgy_Destroy, - EnKgy_Update, - EnKgy_Draw, + { + EnKgy_Init, + EnKgy_Destroy, + EnKgy_Update, + EnKgy_Draw, + }, }; void EnKgy_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index 822471737d..5394f74292 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -21,11 +21,11 @@ ActorInit En_Kitan_InitVars = { FLAGS, OBJECT_KITAN, sizeof(EnKitan), - EnKitan_Init, +{EnKitan_Init, EnKitan_Destroy, EnKitan_Update, NULL, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80C09D50 = { diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index 25b452c383..f02f789181 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -199,11 +199,11 @@ ActorInit En_Knight_InitVars = { FLAGS, OBJECT_KNIGHT, sizeof(EnKnight), - EnKnight_Init, +{EnKnight_Init, EnKnight_Destroy, EnKnight_Update, EnKnight_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index 4501ee4b09..6909e71d89 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -40,10 +40,12 @@ ActorInit En_Kujiya_InitVars = { FLAGS, OBJECT_KUJIYA, sizeof(EnKujiya), - EnKujiya_Init, - EnKujiya_Destroy, - EnKujiya_Update, - EnKujiya_Draw, + { + EnKujiya_Init, + EnKujiya_Destroy, + EnKujiya_Update, + EnKujiya_Draw, + }, }; #define CHECK_LOTTERY_NUMBERS \ diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 053b085df6..c5ab7869ee 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -63,10 +63,12 @@ ActorInit En_Kusa_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnKusa), - EnKusa_Init, - EnKusa_Destroy, - EnKusa_Update, - NULL, + { + EnKusa_Init, + EnKusa_Destroy, + EnKusa_Update, + NULL, + }, }; static s16 objectIds[] = { GAMEPLAY_FIELD_KEEP, OBJECT_KUSA, OBJECT_KUSA, OBJECT_KUSA }; diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 24d7b3fb60..e56c7cef3c 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -59,10 +59,12 @@ ActorInit En_Kusa2_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnKusa2), - EnKusa2_Init, - EnKusa2_Destroy, - EnKusa2_Update, - EnKusa2_Draw, + { + EnKusa2_Init, + EnKusa2_Destroy, + EnKusa2_Update, + EnKusa2_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index 978e6792d2..db223a9c67 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -55,10 +55,12 @@ ActorInit En_Lift_Nuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnLiftNuts), - EnLiftNuts_Init, - EnLiftNuts_Destroy, - EnLiftNuts_Update, - EnLiftNuts_Draw, + { + EnLiftNuts_Init, + EnLiftNuts_Destroy, + EnLiftNuts_Update, + EnLiftNuts_Draw, + }, }; static AnimationInfo sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index 5631d2ad95..f01e91a3a6 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -24,10 +24,12 @@ ActorInit En_Light_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnLight), - EnLight_Init, - EnLight_Destroy, - EnLight_Update, - EnLight_Draw, + { + EnLight_Init, + EnLight_Destroy, + EnLight_Update, + EnLight_Draw, + }, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index 8f0300f5e9..03fd5c86cb 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -30,10 +30,12 @@ ActorInit En_Look_Nuts_InitVars = { FLAGS, OBJECT_DNK, sizeof(EnLookNuts), - EnLookNuts_Init, - EnLookNuts_Destroy, - EnLookNuts_Update, - EnLookNuts_Draw, + { + EnLookNuts_Init, + EnLookNuts_Destroy, + EnLookNuts_Update, + EnLookNuts_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 31e5302c71..596bc765de 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -20,10 +20,12 @@ ActorInit En_M_Fire1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMFire1), - EnMFire1_Init, - EnMFire1_Destroy, - EnMFire1_Update, - NULL, + { + EnMFire1_Init, + EnMFire1_Destroy, + EnMFire1_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 3f29259bf8..17d0b9a69d 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -35,10 +35,12 @@ ActorInit En_M_Thunder_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMThunder), - EnMThunder_Init, - EnMThunder_Destroy, - EnMThunder_Update, - EnMThunder_Draw, + { + EnMThunder_Init, + EnMThunder_Destroy, + EnMThunder_Update, + EnMThunder_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index 28b6db3847..06641449db 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -60,10 +60,12 @@ ActorInit En_Ma4_InitVars = { FLAGS, OBJECT_MA1, sizeof(EnMa4), - EnMa4_Init, - EnMa4_Destroy, - EnMa4_Update, - EnMa4_Draw, + { + EnMa4_Init, + EnMa4_Destroy, + EnMa4_Update, + EnMa4_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index 7ea9fdf3fa..ac5069f469 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -75,10 +75,12 @@ ActorInit En_Ma_Yto_InitVars = { FLAGS, OBJECT_MA2, sizeof(EnMaYto), - EnMaYto_Init, - EnMaYto_Destroy, - EnMaYto_Update, - EnMaYto_Draw, + { + EnMaYto_Init, + EnMaYto_Destroy, + EnMaYto_Update, + EnMaYto_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c index 7d8ba9eb3f..250b8f28d5 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c @@ -35,10 +35,12 @@ ActorInit En_Ma_Yts_InitVars = { FLAGS, OBJECT_MA1, sizeof(EnMaYts), - EnMaYts_Init, - EnMaYts_Destroy, - EnMaYts_Update, - EnMaYts_Draw, + { + EnMaYts_Init, + EnMaYts_Destroy, + EnMaYts_Update, + EnMaYts_Draw, + }, }; void EnMaYts_UpdateEyes(EnMaYts* this) { diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index adf9197424..108e00cf01 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -91,10 +91,12 @@ ActorInit En_Mag_InitVars = { FLAGS, OBJECT_MAG, sizeof(EnMag), - EnMag_Init, - EnMag_Destroy, - EnMag_Update, - EnMag_Draw, + { + EnMag_Init, + EnMag_Destroy, + EnMag_Update, + EnMag_Draw, + }, }; void EnMag_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 39a5f60080..1410f03bef 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -42,10 +42,12 @@ ActorInit En_Maruta_InitVars = { FLAGS, OBJECT_MARUTA, sizeof(EnMaruta), - EnMaruta_Init, - EnMaruta_Destroy, - EnMaruta_Update, - EnMaruta_Draw, + { + EnMaruta_Init, + EnMaruta_Destroy, + EnMaruta_Update, + EnMaruta_Draw, + }, }; Gfx* D_80B386A0[] = { diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index 3ec0a63cdb..3df8f5e023 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -35,11 +35,11 @@ ActorInit En_Minideath_InitVars = { FLAGS, OBJECT_DEATH, sizeof(EnMinideath), - EnMinideath_Init, +{EnMinideath_Init, EnMinideath_Destroy, EnMinideath_Update, NULL, -}; +},}; // static ColliderJntSphElementInit sJntSphElementsInit[3] = { static ColliderJntSphElementInit D_808CBF50[3] = { diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index e880a4b872..6b902e6f52 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -32,10 +32,12 @@ ActorInit En_Minifrog_InitVars = { FLAGS, OBJECT_FR, sizeof(EnMinifrog), - EnMinifrog_Init, - EnMinifrog_Destroy, - EnMinifrog_Update, - EnMinifrog_Draw, + { + EnMinifrog_Init, + EnMinifrog_Destroy, + EnMinifrog_Update, + EnMinifrog_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index 376140cf79..a26361ba36 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -47,10 +47,12 @@ ActorInit En_Minislime_InitVars = { FLAGS, OBJECT_BIGSLIME, sizeof(EnMinislime), - EnMinislime_Init, - EnMinislime_Destroy, - EnMinislime_Update, - NULL, + { + EnMinislime_Init, + EnMinislime_Destroy, + EnMinislime_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index ace47381bf..5ca0c9c3b7 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -29,10 +29,12 @@ ActorInit En_Mk_InitVars = { FLAGS, OBJECT_MK, sizeof(EnMk), - EnMk_Init, - EnMk_Destroy, - EnMk_Update, - EnMk_Draw, + { + EnMk_Init, + EnMk_Destroy, + EnMk_Update, + EnMk_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index a4a6f6a5dc..9749bf1b9d 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -41,10 +41,12 @@ ActorInit En_Mkk_InitVars = { FLAGS, OBJECT_MKK, sizeof(EnMkk), - EnMkk_Init, - EnMkk_Destroy, - EnMkk_Update, - EnMkk_Draw, + { + EnMkk_Init, + EnMkk_Destroy, + EnMkk_Update, + EnMkk_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index f180cb2662..98fed51a3a 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -27,10 +27,12 @@ ActorInit En_Mm_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMm), - EnMm_Init, - EnMm_Destroy, - EnMm_Update, - EnMm_Draw, + { + EnMm_Init, + EnMm_Destroy, + EnMm_Update, + EnMm_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 1304c2b1d3..6a67658fee 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -24,10 +24,12 @@ ActorInit En_Mm2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMm2), - EnMm2_Init, - EnMm2_Destroy, - EnMm2_Update, - EnMm2_Draw, + { + EnMm2_Init, + EnMm2_Destroy, + EnMm2_Update, + EnMm2_Draw, + }, }; #include "overlays/ovl_En_Mm2/ovl_En_Mm2.c" diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index 5f398e1669..1f7c2f6074 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -35,10 +35,12 @@ ActorInit En_Mm3_InitVars = { FLAGS, OBJECT_MM, sizeof(EnMm3), - EnMm3_Init, - EnMm3_Destroy, - EnMm3_Update, - EnMm3_Draw, + { + EnMm3_Init, + EnMm3_Destroy, + EnMm3_Update, + EnMm3_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index 62f08cbf23..81f6f02d95 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -22,11 +22,11 @@ ActorInit En_Mnk_InitVars = { FLAGS, OBJECT_MNK, sizeof(EnMnk), - EnMnk_Init, +{EnMnk_Init, EnMnk_Destroy, EnMnk_Update, EnMnk_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80AB9D10 = { diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 4277de78a3..4db3565e18 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -27,10 +27,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 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index 6158545ceb..308b3bfb7e 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -34,10 +34,12 @@ ActorInit En_Mt_tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMttag), - EnMttag_Init, - EnMttag_Destroy, - EnMttag_Update, - NULL, + { + EnMttag_Init, + EnMttag_Destroy, + EnMttag_Update, + NULL, + }, }; static s32 sStartingCheckpointPerSceneExitIndex[] = { diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index 3ed19dbf3d..0d37b5c478 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -38,10 +38,12 @@ ActorInit En_Mushi2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMushi2), - EnMushi2_Init, - EnMushi2_Destroy, - EnMushi2_Update, - EnMushi2_Draw, + { + EnMushi2_Init, + EnMushi2_Destroy, + EnMushi2_Update, + EnMushi2_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c index e1b504e042..2bdd0d91b5 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -30,10 +30,12 @@ ActorInit En_Muto_InitVars = { FLAGS, OBJECT_TORYO, sizeof(EnMuto), - EnMuto_Init, - EnMuto_Destroy, - EnMuto_Update, - EnMuto_Draw, + { + EnMuto_Init, + EnMuto_Destroy, + EnMuto_Update, + EnMuto_Draw, + }, }; static u16 sTextIds[] = { 0x2ABD, 0x2ABB, 0x0624, 0x0623, 0x2AC6 }; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index b59326a284..a73af0eaa8 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -116,10 +116,12 @@ ActorInit En_Nb_InitVars = { FLAGS, OBJECT_NB, sizeof(EnNb), - EnNb_Init, - EnNb_Destroy, - EnNb_Update, - EnNb_Draw, + { + EnNb_Init, + EnNb_Destroy, + EnNb_Update, + EnNb_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index 7800c78a61..45123f72d1 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -42,10 +42,12 @@ ActorInit En_Neo_Reeba_InitVars = { FLAGS, OBJECT_RB, sizeof(EnNeoReeba), - EnNeoReeba_Init, - EnNeoReeba_Destroy, - EnNeoReeba_Update, - EnNeoReeba_Draw, + { + EnNeoReeba_Init, + EnNeoReeba_Destroy, + EnNeoReeba_Update, + EnNeoReeba_Draw, + }, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c index ea2fb06b7b..2956d56b44 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -24,10 +24,12 @@ ActorInit En_Nimotsu_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnNimotsu), - EnNimotsu_Init, - EnNimotsu_Destroy, - EnNimotsu_Update, - EnNimotsu_Draw, + { + EnNimotsu_Init, + EnNimotsu_Destroy, + EnNimotsu_Update, + EnNimotsu_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 7b09d7cacf..884c3f0998 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -54,10 +54,12 @@ ActorInit En_Niw_InitVars = { FLAGS, OBJECT_NIW, sizeof(EnNiw), - EnNiw_Init, - EnNiw_Destroy, - EnNiw_Update, - EnNiw_Draw, + { + EnNiw_Init, + EnNiw_Destroy, + EnNiw_Update, + EnNiw_Draw, + }, }; static f32 sHeadRotations[] = { 5000.0f, -5000.0f }; diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c index 6c8cda2375..332cdc02c2 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -27,10 +27,12 @@ ActorInit En_Nnh_InitVars = { FLAGS, OBJECT_NNH, sizeof(EnNnh), - EnNnh_Init, - EnNnh_Destroy, - EnNnh_Update, - EnNnh_Draw, + { + EnNnh_Init, + EnNnh_Destroy, + EnNnh_Update, + EnNnh_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 107bd3a630..7fd930eaf6 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -25,10 +25,12 @@ ActorInit En_Nutsball_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnNutsball), - EnNutsball_Init, - EnNutsball_Destroy, - EnNutsball_Update, - EnNutsball_Draw, + { + EnNutsball_Init, + EnNutsball_Destroy, + EnNutsball_Update, + EnNutsball_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 42d8b90067..dde2717c28 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -47,10 +47,12 @@ ActorInit En_Nwc_InitVars = { FLAGS, OBJECT_NWC, sizeof(EnNwc), - EnNwc_Init, - EnNwc_Destroy, - EnNwc_Update, - EnNwc_Draw, + { + EnNwc_Init, + EnNwc_Destroy, + EnNwc_Update, + EnNwc_Draw, + }, }; Color_RGBA8 sPrimColor = { 255, 255, 255, 255 }; diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 16098e3cc3..b69eecfdb7 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -25,10 +25,12 @@ ActorInit En_Okarina_Effect_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOkarinaEffect), - EnOkarinaEffect_Init, - EnOkarinaEffect_Destroy, - EnOkarinaEffect_Update, - NULL, + { + EnOkarinaEffect_Init, + EnOkarinaEffect_Destroy, + EnOkarinaEffect_Update, + NULL, + }, }; void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, EnOkarinaEffectActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index ae6066556b..755f8cbe50 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -23,10 +23,12 @@ ActorInit En_Okarina_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOkarinaTag), - EnOkarinaTag_Init, - EnOkarinaTag_Destroy, - EnOkarinaTag_Update, - NULL, + { + EnOkarinaTag_Init, + EnOkarinaTag_Destroy, + EnOkarinaTag_Update, + NULL, + }, }; void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 9907f67d51..100b233ee7 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -34,11 +34,11 @@ ActorInit En_Okuta_InitVars = { FLAGS, OBJECT_OKUTA, sizeof(EnOkuta), - EnOkuta_Init, +{EnOkuta_Init, EnOkuta_Destroy, EnOkuta_Update, EnOkuta_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_808708A0 = { diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index c659186279..dc7509c55a 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -22,10 +22,12 @@ ActorInit En_Onpuman_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOnpuman), - EnOnpuman_Init, - EnOnpuman_Destroy, - EnOnpuman_Update, - NULL, + { + EnOnpuman_Init, + EnOnpuman_Destroy, + EnOnpuman_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index f950491065..6b3359408c 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -28,10 +28,12 @@ ActorInit En_Osk_InitVars = { FLAGS, OBJECT_IKN_DEMO, sizeof(EnOsk), - EnOsk_Init, - EnOsk_Destroy, - EnOsk_Update, - EnOsk_Draw, + { + EnOsk_Init, + EnOsk_Destroy, + EnOsk_Update, + EnOsk_Draw, + }, }; AnimationHeader* D_80BF6FA0[] = { diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 6775716725..90b2d085b3 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -84,10 +84,12 @@ ActorInit En_Osn_InitVars = { FLAGS, OBJECT_OSN, sizeof(EnOsn), - EnOsn_Init, - EnOsn_Destroy, - EnOsn_Update, - EnOsn_Draw, + { + EnOsn_Init, + EnOsn_Destroy, + EnOsn_Update, + EnOsn_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 2a0c9cde67..63b73a8c7d 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -98,10 +98,12 @@ ActorInit En_Ossan_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOssan), - EnOssan_Init, - EnOssan_Destroy, - EnOssan_Update, - NULL, + { + EnOssan_Init, + EnOssan_Destroy, + EnOssan_Update, + NULL, + }, }; static AnimationInfoS sCuriosityShopManAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index 781a857211..3004a00859 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -69,10 +69,12 @@ ActorInit En_Ot_InitVars = { FLAGS, OBJECT_OT, sizeof(EnOt), - EnOt_Init, - EnOt_Destroy, - EnOt_Update, - EnOt_Draw, + { + EnOt_Init, + EnOt_Destroy, + EnOt_Update, + EnOt_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 5365d16e05..663d727bd0 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -54,10 +54,12 @@ ActorInit En_Owl_InitVars = { FLAGS, OBJECT_OWL, sizeof(EnOwl), - EnOwl_Init, - EnOwl_Destroy, - EnOwl_Update, - EnOwl_Draw, + { + EnOwl_Init, + EnOwl_Destroy, + EnOwl_Update, + EnOwl_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index 318944eaf0..603492d6f9 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -75,10 +75,12 @@ ActorInit En_Pamera_InitVars = { FLAGS, OBJECT_PAMERA, sizeof(EnPamera), - EnPamera_Init, - EnPamera_Destroy, - EnPamera_Update, - EnPamera_Draw, + { + EnPamera_Init, + EnPamera_Destroy, + EnPamera_Update, + EnPamera_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index a1c4704afa..920539bc86 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -73,10 +73,12 @@ ActorInit En_Pametfrog_InitVars = { FLAGS, OBJECT_BIGSLIME, sizeof(EnPametfrog), - EnPametfrog_Init, - EnPametfrog_Destroy, - EnPametfrog_Update, - EnPametfrog_Draw, + { + EnPametfrog_Init, + EnPametfrog_Destroy, + EnPametfrog_Update, + EnPametfrog_Draw, + }, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index 8d23ba0138..d909426138 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -29,10 +29,12 @@ ActorInit En_Paper_InitVars = { FLAGS, OBJECT_BAL, sizeof(EnPaper), - EnPaper_Init, - EnPaper_Destroy, - EnPaper_Update, - EnPaper_Draw, + { + EnPaper_Init, + EnPaper_Destroy, + EnPaper_Update, + EnPaper_Draw, + }, }; Vec3f D_80C1FC60 = { 0.0f, 0.0f, 1.0f }; diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 6c9890d68b..24dd3ef3ea 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -25,10 +25,12 @@ ActorInit En_Part_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnPart), - EnPart_Init, - EnPart_Destroy, - EnPart_Update, - EnPart_Draw, + { + EnPart_Init, + EnPart_Destroy, + EnPart_Update, + EnPart_Draw, + }, }; void EnPart_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 6944cb2a6a..2754f28a07 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -44,10 +44,12 @@ ActorInit En_Peehat_InitVars = { FLAGS, OBJECT_PH, sizeof(EnPeehat), - EnPeehat_Init, - EnPeehat_Destroy, - EnPeehat_Update, - EnPeehat_Draw, + { + EnPeehat_Init, + EnPeehat_Destroy, + EnPeehat_Update, + EnPeehat_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index 02d6f7d692..73aff4d7c0 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -478,10 +478,12 @@ ActorInit En_Pm_InitVars = { FLAGS, OBJECT_MM, sizeof(EnPm), - EnPm_Init, - EnPm_Destroy, - EnPm_Update, - EnPm_Draw, + { + EnPm_Init, + EnPm_Destroy, + EnPm_Update, + EnPm_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index 43158df9ce..df0a134d2d 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -34,11 +34,11 @@ ActorInit En_Po_Composer_InitVars = { FLAGS, OBJECT_PO_COMPOSER, sizeof(EnPoComposer), - EnPoComposer_Init, +{EnPoComposer_Init, EnPoComposer_Destroy, EnPoComposer_Update, EnPoComposer_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80BC6780 = { diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c index bdf0e8c60c..4c46077f1b 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -31,10 +31,12 @@ ActorInit En_Po_Fusen_InitVars = { FLAGS, OBJECT_PO_FUSEN, sizeof(EnPoFusen), - EnPoFusen_Init, - EnPoFusen_Destroy, - EnPoFusen_Update, - EnPoFusen_Draw, + { + EnPoFusen_Init, + EnPoFusen_Destroy, + EnPoFusen_Update, + EnPoFusen_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 3db1730741..a947ffb3f3 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -67,10 +67,12 @@ ActorInit En_Po_Sisters_InitVars = { FLAGS, OBJECT_PO_SISTERS, sizeof(EnPoSisters), - EnPoSisters_Init, - EnPoSisters_Destroy, - EnPoSisters_Update, - EnPoSisters_Draw, + { + EnPoSisters_Init, + EnPoSisters_Destroy, + EnPoSisters_Update, + EnPoSisters_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index c2d976050d..0477855979 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -52,10 +52,12 @@ ActorInit En_Poh_InitVars = { FLAGS, OBJECT_PO, sizeof(EnPoh), - EnPoh_Init, - EnPoh_Destroy, - EnPoh_Update, - EnPoh_Draw, + { + EnPoh_Init, + EnPoh_Destroy, + EnPoh_Update, + EnPoh_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index b01c1c43f4..f8f59197c0 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -121,10 +121,12 @@ ActorInit En_Pp_InitVars = { FLAGS, OBJECT_PP, sizeof(EnPp), - EnPp_Init, - EnPp_Destroy, - EnPp_Update, - EnPp_Draw, + { + EnPp_Init, + EnPp_Destroy, + EnPp_Update, + EnPp_Draw, + }, }; static ColliderJntSphElementInit sMaskColliderJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index 33d9d256b1..b5cc8c1cb8 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -74,10 +74,12 @@ ActorInit En_Pr_InitVars = { FLAGS, OBJECT_PR, sizeof(EnPr), - EnPr_Init, - EnPr_Destroy, - EnPr_Update, - EnPr_Draw, + { + EnPr_Init, + EnPr_Destroy, + EnPr_Update, + EnPr_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 43d80d48e3..40d3b3a189 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -87,10 +87,12 @@ ActorInit En_Pr2_InitVars = { FLAGS, OBJECT_PR, sizeof(EnPr2), - EnPr2_Init, - EnPr2_Destroy, - EnPr2_Update, - EnPr2_Draw, + { + EnPr2_Init, + EnPr2_Destroy, + EnPr2_Update, + EnPr2_Draw, + }, }; static AnimationHeader* sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index ebd5cf4290..9ba6120cf9 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -88,10 +88,12 @@ ActorInit En_Prz_InitVars = { FLAGS, OBJECT_PR, sizeof(EnPrz), - EnPrz_Init, - EnPrz_Destroy, - EnPrz_Update, - EnPrz_Draw, + { + EnPrz_Init, + EnPrz_Destroy, + EnPrz_Update, + EnPrz_Draw, + }, }; AnimationHeader* D_80A77240[] = { &object_pr_Anim_004340, &object_pr_Anim_004274 }; diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c index 444a6ef01f..32bd395a03 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -124,10 +124,12 @@ ActorInit En_Pst_InitVars = { FLAGS, OBJECT_PST, sizeof(EnPst), - EnPst_Init, - EnPst_Destroy, - EnPst_Update, - EnPst_Draw, + { + EnPst_Init, + EnPst_Destroy, + EnPst_Update, + EnPst_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index b63637b800..8447668619 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -77,10 +77,12 @@ ActorInit En_Racedog_InitVars = { FLAGS, OBJECT_DOG, sizeof(EnRacedog), - EnRacedog_Init, - EnRacedog_Destroy, - EnRacedog_Update, - EnRacedog_Draw, + { + EnRacedog_Init, + EnRacedog_Destroy, + EnRacedog_Update, + EnRacedog_Draw, + }, }; static s16 sNumberOfDogsFinished = 0; diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index d70b80d598..938f9ed2dc 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -73,10 +73,12 @@ ActorInit En_Raf_InitVars = { FLAGS, OBJECT_RAF, sizeof(EnRaf), - EnRaf_Init, - EnRaf_Destroy, - EnRaf_Update, - EnRaf_Draw, + { + EnRaf_Init, + EnRaf_Destroy, + EnRaf_Update, + EnRaf_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index b23ab4b87a..5c8ccec7d3 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -56,10 +56,12 @@ ActorInit En_Rail_Skb_InitVars = { FLAGS, OBJECT_SKB, sizeof(EnRailSkb), - EnRailSkb_Init, - EnRailSkb_Destroy, - EnRailSkb_Update, - EnRailSkb_Draw, + { + EnRailSkb_Init, + EnRailSkb_Destroy, + EnRailSkb_Update, + EnRailSkb_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index acd8610f80..92182bff30 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -90,10 +90,12 @@ ActorInit En_Railgibud_InitVars = { FLAGS, OBJECT_RD, sizeof(EnRailgibud), - EnRailgibud_Init, - EnRailgibud_Destroy, - EnRailgibud_Update, - EnRailgibud_Draw, + { + EnRailgibud_Init, + EnRailgibud_Destroy, + EnRailgibud_Update, + EnRailgibud_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index bff06d4db6..6fe63140be 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -41,10 +41,12 @@ ActorInit En_Rat_InitVars = { FLAGS, OBJECT_RAT, sizeof(EnRat), - EnRat_Init, - EnRat_Destroy, - EnRat_Update, - EnRat_Draw, + { + EnRat_Init, + EnRat_Destroy, + EnRat_Update, + EnRat_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index ce508c0d07..9e5d52b69d 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -103,10 +103,12 @@ ActorInit En_Rd_InitVars = { FLAGS, OBJECT_RD, sizeof(EnRd), - EnRd_Init, - EnRd_Destroy, - EnRd_Update, - EnRd_Draw, + { + EnRd_Init, + EnRd_Destroy, + EnRd_Update, + EnRd_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c index 2aff8a6346..d2e71d88c0 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -27,10 +27,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 TexturePtr sEyeTextures[] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0, diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index 49d13b0efc..0325d42302 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -28,10 +28,12 @@ ActorInit En_Rg_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnRg), - EnRg_Init, - EnRg_Destroy, - EnRg_Update, - EnRg_Draw, + { + EnRg_Init, + EnRg_Destroy, + EnRg_Update, + EnRg_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index c52fda9892..fd862f8d1d 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -20,10 +20,12 @@ ActorInit En_River_Sound_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnRiverSound), - EnRiverSound_Init, - Actor_Noop, - EnRiverSound_Update, - EnRiverSound_Draw, + { + EnRiverSound_Init, + Actor_Noop, + EnRiverSound_Update, + EnRiverSound_Draw, + }, }; void EnRiverSound_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 78c0c7adbb..8164fa4f47 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -34,10 +34,12 @@ ActorInit En_Rr_InitVars = { FLAGS, OBJECT_RR, sizeof(EnRr), - EnRr_Init, - EnRr_Destroy, - EnRr_Update, - EnRr_Draw, + { + EnRr_Init, + EnRr_Destroy, + EnRr_Update, + EnRr_Draw, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c index 9bb2e0794e..4d87e5447f 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -24,10 +24,12 @@ ActorInit En_Rsn_InitVars = { FLAGS, OBJECT_RS, sizeof(EnRsn), - EnRsn_Init, - EnRsn_Destroy, - EnRsn_Update, - EnRsn_Draw, + { + EnRsn_Init, + EnRsn_Destroy, + EnRsn_Update, + EnRsn_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { { &gBombShopkeeperSwayAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f } }; diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index ccd473e59d..184f1fff5e 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -23,10 +23,12 @@ ActorInit En_Ru_InitVars = { FLAGS, OBJECT_RU2, sizeof(EnRu), - EnRu_Init, - EnRu_Destroy, - EnRu_Update, - EnRu_Draw, + { + EnRu_Init, + EnRu_Destroy, + EnRu_Update, + EnRu_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index 50f4486653..d2f7a5db75 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -46,10 +46,12 @@ ActorInit En_Ruppecrow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnRuppecrow), - EnRuppecrow_Init, - EnRuppecrow_Destroy, - EnRuppecrow_Update, - EnRuppecrow_Draw, + { + EnRuppecrow_Init, + EnRuppecrow_Destroy, + EnRuppecrow_Update, + EnRuppecrow_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index b2a460a847..b8a600abb9 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -55,10 +55,12 @@ ActorInit En_Rz_InitVars = { FLAGS, OBJECT_RZ, sizeof(EnRz), - EnRz_Init, - EnRz_Destroy, - EnRz_Update, - EnRz_Draw, + { + EnRz_Init, + EnRz_Destroy, + EnRz_Update, + EnRz_Draw, + }, }; static TexturePtr sEyeTextures[] = { diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index df7386e109..7fd7305da1 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -100,10 +100,12 @@ ActorInit En_S_Goro_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnSGoro), - EnSGoro_Init, - EnSGoro_Destroy, - EnSGoro_Update, - EnSGoro_Draw, + { + EnSGoro_Init, + EnSGoro_Destroy, + EnSGoro_Update, + EnSGoro_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index f81f2155d5..1b3731f200 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -31,10 +31,12 @@ ActorInit En_Sb_InitVars = { FLAGS, OBJECT_SB, sizeof(EnSb), - EnSb_Init, - EnSb_Destroy, - EnSb_Update, - EnSb_Draw, + { + EnSb_Init, + EnSb_Destroy, + EnSb_Update, + EnSb_Draw, + }, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index 8a0a12209e..a857cba2c8 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -29,10 +29,12 @@ ActorInit En_Sc_Ruppe_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnScRuppe), - EnScRuppe_Init, - EnScRuppe_Destroy, - EnScRuppe_Update, - EnScRuppe_Draw, + { + EnScRuppe_Init, + EnScRuppe_Destroy, + EnScRuppe_Update, + EnScRuppe_Draw, + }, }; RuppeInfo sRupeeInfo[] = { diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index 29469d6409..dd5daa3c80 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -22,10 +22,12 @@ ActorInit En_Scopecoin_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnScopecoin), - EnScopecoin_Init, - EnScopecoin_Destroy, - EnScopecoin_Update, - EnScopecoin_Draw, + { + EnScopecoin_Init, + EnScopecoin_Destroy, + EnScopecoin_Update, + EnScopecoin_Draw, + }, }; void EnScopecoin_Spin(EnScopecoin* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c index 7523c06222..c6f003a36c 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -24,10 +24,12 @@ ActorInit En_Scopecrow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnScopecrow), - EnScopecrow_Init, - EnScopecrow_Destroy, - EnScopecrow_Update, - EnScopecrow_Draw, + { + EnScopecrow_Init, + EnScopecrow_Destroy, + EnScopecrow_Update, + EnScopecrow_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[] = { diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 9546acee11..9444a64e9c 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -39,10 +39,12 @@ ActorInit En_Scopenuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnScopenuts), - EnScopenuts_Init, - EnScopenuts_Destroy, - EnScopenuts_Update, - EnScopenuts_Draw, + { + EnScopenuts_Init, + EnScopenuts_Destroy, + EnScopenuts_Update, + EnScopenuts_Draw, + }, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index a3eaa5ad20..c06e4ea1d9 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -26,10 +26,12 @@ ActorInit En_Sda_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSda), - EnSda_Init, - EnSda_Destroy, - EnSda_Update, - EnSda_Draw, + { + EnSda_Init, + EnSda_Destroy, + EnSda_Update, + EnSda_Draw, + }, }; Vec3f D_80947A60 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index 2c433b68f8..bc9a88956d 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -30,10 +30,12 @@ ActorInit En_Sekihi_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSekihi), - EnSekihi_Init, - EnSekihi_Destroy, - EnSekihi_Update, - NULL, + { + EnSekihi_Init, + EnSekihi_Destroy, + EnSekihi_Update, + NULL, + }, }; static s16 sObjectIds[] = { OBJECT_SEKIHIL, OBJECT_SEKIHIG, OBJECT_SEKIHIN, OBJECT_SEKIHIZ, OBJECT_ZOG }; diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index e036d039f1..55cda8b267 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -55,10 +55,12 @@ ActorInit En_Sellnuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnSellnuts), - EnSellnuts_Init, - EnSellnuts_Destroy, - EnSellnuts_Update, - EnSellnuts_Draw, + { + EnSellnuts_Init, + EnSellnuts_Destroy, + EnSellnuts_Update, + EnSellnuts_Draw, + }, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c index 65472f22de..a666a751fa 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -57,10 +57,12 @@ ActorInit En_Shn_InitVars = { FLAGS, OBJECT_SHN, sizeof(EnShn), - EnShn_Init, - EnShn_Destroy, - EnShn_Update, - EnShn_Draw, + { + EnShn_Init, + EnShn_Destroy, + EnShn_Update, + EnShn_Draw, + }, }; void func_80AE6130(EnShn* this) { diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 87e6f80b5f..8931bad29a 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -25,11 +25,11 @@ ActorInit En_Si_InitVars = { FLAGS, OBJECT_ST, sizeof(EnSi), - EnSi_Init, +{EnSi_Init, EnSi_Destroy, EnSi_Update, EnSi_Draw, -}; +},}; // static ColliderSphereInit sSphereInit = { static ColliderSphereInit D_8098CD80 = { diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 5951a1a36f..14a1397c6c 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -151,10 +151,12 @@ ActorInit En_Skb_InitVars = { FLAGS, OBJECT_SKB, sizeof(EnSkb), - EnSkb_Init, - EnSkb_Destroy, - EnSkb_Update, - EnSkb_Draw, + { + EnSkb_Init, + EnSkb_Destroy, + EnSkb_Update, + EnSkb_Draw, + }, }; void func_809947B0(PlayState* play, EnSkb* this, Vec3f* inPos) { diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 318cc93552..6462a57a10 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -39,11 +39,11 @@ ActorInit En_Slime_InitVars = { FLAGS, OBJECT_SLIME, sizeof(EnSlime), - EnSlime_Init, +{EnSlime_Init, EnSlime_Destroy, EnSlime_Update, EnSlime_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80A31AF0 = { diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 64ea1e6559..8d4977acaa 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -67,10 +67,12 @@ ActorInit En_Snowman_InitVars = { FLAGS, OBJECT_SNOWMAN, sizeof(EnSnowman), - EnSnowman_Init, - EnSnowman_Destroy, - EnSnowman_Update, - EnSnowman_Draw, + { + EnSnowman_Init, + EnSnowman_Destroy, + EnSnowman_Update, + EnSnowman_Draw, + }, }; static ColliderCylinderInit sEenoCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index 166fd6924d..c79c4f6a37 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -24,11 +24,11 @@ ActorInit En_Snowwd_InitVars = { FLAGS, OBJECT_SNOWWD, sizeof(EnSnowwd), - EnSnowwd_Init, +{EnSnowwd_Init, EnSnowwd_Destroy, EnSnowwd_Update, EnSnowwd_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80AF7A90 = { diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 05ec4439d8..85e747c3ab 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -70,10 +70,12 @@ ActorInit En_Sob1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSob1), - EnSob1_Init, - EnSob1_Destroy, - EnSob1_Update, - NULL, + { + EnSob1_Init, + EnSob1_Destroy, + EnSob1_Update, + NULL, + }, }; static s16 sObjectIds[][3] = { diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 87fa6cb959..75618c2aff 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -31,10 +31,12 @@ ActorInit En_Ssh_InitVars = { FLAGS, OBJECT_SSH, sizeof(EnSsh), - EnSsh_Init, - EnSsh_Destroy, - EnSsh_Update, - EnSsh_Draw, + { + EnSsh_Init, + EnSsh_Destroy, + EnSsh_Update, + EnSsh_Draw, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 6571209ad1..a23f0921b9 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -29,10 +29,12 @@ ActorInit En_St_InitVars = { FLAGS, OBJECT_ST, sizeof(EnSt), - EnSt_Init, - EnSt_Destroy, - EnSt_Update, - NULL, + { + EnSt_Init, + EnSt_Destroy, + EnSt_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 8959ee7dd8..cb3863b464 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -33,10 +33,12 @@ ActorInit En_Sth_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSth), - EnSth_Init, - EnSth_Destroy, - EnSth_Update, - NULL, + { + EnSth_Init, + EnSth_Destroy, + EnSth_Update, + NULL, + }, }; #include "overlays/ovl_En_Sth/ovl_En_Sth.c" diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index 33306210be..d73473f6e0 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -24,10 +24,12 @@ ActorInit En_Sth2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSth2), - EnSth2_Init, - EnSth2_Destroy, - EnSth2_Update, - NULL, + { + EnSth2_Init, + EnSth2_Destroy, + EnSth2_Update, + NULL, + }, }; #include "overlays/ovl_En_Sth2/ovl_En_Sth2.c" diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index 520a288e27..18f2311436 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -33,10 +33,12 @@ ActorInit En_Stone_heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnStoneheishi), - EnStoneheishi_Init, - EnStoneheishi_Destroy, - EnStoneheishi_Update, - EnStoneheishi_Draw, + { + EnStoneheishi_Init, + EnStoneheishi_Destroy, + EnStoneheishi_Update, + EnStoneheishi_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 4807d2af6a..54ba341146 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -26,11 +26,11 @@ ActorInit En_Stop_heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnStopheishi), - EnStopheishi_Init, +{EnStopheishi_Init, EnStopheishi_Destroy, EnStopheishi_Update, EnStopheishi_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80AE88B0 = { diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 25f1e87e2c..0bd24766e4 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -24,10 +24,12 @@ ActorInit En_Stream_InitVars = { FLAGS, OBJECT_STREAM, sizeof(EnStream), - EnStream_Init, - EnStream_Destroy, - EnStream_Update, - EnStream_Draw, + { + EnStream_Init, + EnStream_Destroy, + EnStream_Update, + EnStream_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index b1b0e93910..0b669fd84d 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -44,10 +44,12 @@ ActorInit En_Suttari_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnSuttari), - EnSuttari_Init, - EnSuttari_Destroy, - EnSuttari_Update, - EnSuttari_Draw, + { + EnSuttari_Init, + EnSuttari_Destroy, + EnSuttari_Update, + EnSuttari_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 95e981ec64..ae061a2523 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -34,10 +34,12 @@ ActorInit En_Sw_InitVars = { FLAGS, OBJECT_ST, sizeof(EnSw), - EnSw_Init, - EnSw_Destroy, - EnSw_Update, - EnSw_Draw, + { + EnSw_Init, + EnSw_Destroy, + EnSw_Update, + EnSw_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index da421cd1eb..cbed71ee42 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -31,10 +31,12 @@ ActorInit En_Syateki_Crow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnSyatekiCrow), - EnSyatekiCrow_Init, - EnSyatekiCrow_Destroy, - EnSyatekiCrow_Update, - EnSyatekiCrow_Draw, + { + EnSyatekiCrow_Init, + EnSyatekiCrow_Destroy, + EnSyatekiCrow_Update, + EnSyatekiCrow_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index f6c3997c13..1622df3004 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -45,10 +45,12 @@ ActorInit En_Syateki_Dekunuts_InitVars = { FLAGS, OBJECT_DEKUNUTS, sizeof(EnSyatekiDekunuts), - EnSyatekiDekunuts_Init, - EnSyatekiDekunuts_Destroy, - EnSyatekiDekunuts_Update, - EnSyatekiDekunuts_Draw, + { + EnSyatekiDekunuts_Init, + EnSyatekiDekunuts_Destroy, + EnSyatekiDekunuts_Update, + EnSyatekiDekunuts_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 14de920706..b9382298e1 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -65,10 +65,12 @@ ActorInit En_Syateki_Man_InitVars = { FLAGS, OBJECT_SHN, sizeof(EnSyatekiMan), - EnSyatekiMan_Init, - EnSyatekiMan_Destroy, - EnSyatekiMan_Update, - EnSyatekiMan_Draw, + { + EnSyatekiMan_Init, + EnSyatekiMan_Destroy, + EnSyatekiMan_Update, + EnSyatekiMan_Draw, + }, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 4aae49e9a4..d59de598de 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -34,10 +34,12 @@ ActorInit En_Syateki_Okuta_InitVars = { FLAGS, OBJECT_OKUTA, sizeof(EnSyatekiOkuta), - EnSyatekiOkuta_Init, - EnSyatekiOkuta_Destroy, - EnSyatekiOkuta_Update, - EnSyatekiOkuta_Draw, + { + EnSyatekiOkuta_Init, + EnSyatekiOkuta_Destroy, + EnSyatekiOkuta_Update, + EnSyatekiOkuta_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index 9852fb6b41..f00091d425 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -107,10 +107,12 @@ ActorInit En_Syateki_Wf_InitVars = { FLAGS, OBJECT_WF, sizeof(EnSyatekiWf), - EnSyatekiWf_Init, - EnSyatekiWf_Destroy, - EnSyatekiWf_Update, - EnSyatekiWf_Draw, + { + EnSyatekiWf_Init, + EnSyatekiWf_Destroy, + EnSyatekiWf_Update, + EnSyatekiWf_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index b6cf822102..604ebdf504 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -72,10 +72,12 @@ ActorInit En_Tab_InitVars = { FLAGS, OBJECT_TAB, sizeof(EnTab), - EnTab_Init, - EnTab_Destroy, - EnTab_Update, - EnTab_Draw, + { + EnTab_Init, + EnTab_Destroy, + EnTab_Update, + EnTab_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c index e22ac0b4b8..f050765c2f 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -40,10 +40,12 @@ ActorInit En_Tag_Obj_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTagObj), - EnTagObj_Init, - EnTagObj_Destroy, - EnTagObj_Update, - NULL, + { + EnTagObj_Init, + EnTagObj_Destroy, + EnTagObj_Update, + NULL, + }, }; void EnTagObj_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index 7fd52d5660..6242303402 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -22,11 +22,11 @@ ActorInit En_Takaraya_InitVars = { FLAGS, OBJECT_BG, sizeof(EnTakaraya), - EnTakaraya_Init, +{EnTakaraya_Init, EnTakaraya_Destroy, EnTakaraya_Update, EnTakaraya_Draw, -}; +},}; // static InitChainEntry sInitChain[] = { static InitChainEntry D_80ADFB20[] = { diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.c b/src/overlays/actors/ovl_En_Talk/z_en_talk.c index 5e117f68b9..177ed0f82f 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.c +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -22,10 +22,12 @@ ActorInit En_Talk_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTalk), - EnTalk_Init, - EnTalk_Destroy, - EnTalk_Update, - NULL, + { + EnTalk_Init, + EnTalk_Destroy, + EnTalk_Update, + NULL, + }, }; void EnTalk_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index 6e13ef4a3d..b44812be09 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -108,10 +108,12 @@ ActorInit En_Talk_Gibud_InitVars = { FLAGS, OBJECT_RD, sizeof(EnTalkGibud), - EnTalkGibud_Init, - EnTalkGibud_Destroy, - EnTalkGibud_Update, - EnTalkGibud_Draw, + { + EnTalkGibud_Init, + EnTalkGibud_Destroy, + EnTalkGibud_Update, + EnTalkGibud_Draw, + }, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index 44393ac176..9ceaf3c428 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -24,10 +24,12 @@ ActorInit En_Tanron1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTanron1), - EnTanron1_Init, - EnTanron1_Destroy, - EnTanron1_Update, - EnTanron1_Draw, + { + EnTanron1_Init, + EnTanron1_Destroy, + EnTanron1_Update, + EnTanron1_Draw, + }, }; static u64 sPad = { 0 }; diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index ad99c9ce54..c18fe13a69 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -36,10 +36,12 @@ ActorInit En_Tanron2_InitVars = { FLAGS, OBJECT_BOSS04, sizeof(EnTanron2), - EnTanron2_Init, - EnTanron2_Destroy, - EnTanron2_Update, - EnTanron2_Draw, + { + EnTanron2_Init, + EnTanron2_Destroy, + EnTanron2_Update, + EnTanron2_Draw, + }, }; static DamageTable sDamageTable = { diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index 81e3eecdb7..2c1d8b81fe 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -37,10 +37,12 @@ ActorInit En_Tanron3_InitVars = { FLAGS, OBJECT_BOSS03, sizeof(EnTanron3), - EnTanron3_Init, - EnTanron3_Destroy, - EnTanron3_Update, - EnTanron3_Draw, + { + EnTanron3_Init, + EnTanron3_Destroy, + EnTanron3_Update, + EnTanron3_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c index 1a91989f75..12d04aa0c2 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -37,10 +37,12 @@ ActorInit En_Tanron4_InitVars = { FLAGS, OBJECT_TANRON4, sizeof(EnTanron4), - EnTanron4_Init, - EnTanron4_Destroy, - EnTanron4_Update, - EnTanron4_Draw, + { + EnTanron4_Init, + EnTanron4_Destroy, + EnTanron4_Update, + EnTanron4_Draw, + }, }; void EnTanron4_Init(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index 7966b97aa8..08760e030e 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -29,10 +29,12 @@ ActorInit En_Tanron5_InitVars = { FLAGS, OBJECT_BOSS02, sizeof(EnTanron5), - EnTanron5_Init, - EnTanron5_Destroy, - EnTanron5_Update, - EnTanron5_Draw, + { + EnTanron5_Init, + EnTanron5_Destroy, + EnTanron5_Update, + EnTanron5_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c index 2d63f454bf..a337f46fe1 100644 --- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c @@ -24,10 +24,12 @@ ActorInit En_Tanron6_InitVars = { FLAGS, OBJECT_TANRON5, sizeof(EnTanron6), - EnTanron6_Init, - EnTanron6_Destroy, - EnTanron6_Update, - EnTanron6_Draw, + { + EnTanron6_Init, + EnTanron6_Destroy, + EnTanron6_Update, + EnTanron6_Draw, + }, }; static DamageTable sDamageTable = { diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 2ca2c05b45..c1975f84dd 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -22,10 +22,12 @@ ActorInit En_Test_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest), - EnTest_Init, - EnTest_Destroy, - EnTest_Update, - EnTest_Draw, + { + EnTest_Init, + EnTest_Destroy, + EnTest_Update, + EnTest_Draw, + }, }; void func_80862B70(EnTestStruct* arg0) { diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index bf7f2c365c..c446fa821c 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -33,10 +33,12 @@ ActorInit En_Test2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest2), - EnTest2_Init, - Actor_Noop, - EnTest2_Update, - NULL, + { + EnTest2_Init, + Actor_Noop, + EnTest2_Update, + NULL, + }, }; static EnTest2ModelInfo sModelInfo[] = { diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 060121b5f4..e733d3d220 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -174,10 +174,12 @@ ActorInit En_Test3_InitVars = { FLAGS, OBJECT_TEST3, sizeof(EnTest3), - EnTest3_Init, - EnTest3_Destroy, - EnTest3_Update, - NULL, + { + EnTest3_Init, + EnTest3_Destroy, + EnTest3_Update, + NULL, + }, }; static struct_80A4168C D_80A4168C[] = { diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index 88b0c23781..f268d18619 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -26,10 +26,12 @@ ActorInit En_Test4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest4), - EnTest4_Init, - EnTest4_Destroy, - EnTest4_Update, - NULL, + { + EnTest4_Init, + EnTest4_Destroy, + EnTest4_Update, + NULL, + }, }; static s32 sIsLoaded = false; diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c index 61f54c0906..65f731188d 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -22,10 +22,12 @@ ActorInit En_Test5_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest5), - EnTest5_Init, - EnTest5_Destroy, - EnTest5_Update, - NULL, + { + EnTest5_Init, + EnTest5_Destroy, + EnTest5_Update, + NULL, + }, }; void EnTest5_SetupAction(EnTest5* this, EnTest5ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index 437799b538..8f242b59e2 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -48,10 +48,12 @@ ActorInit En_Test6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest6), - EnTest6_Init, - EnTest6_Destroy, - EnTest6_Update, - EnTest6_Draw, + { + EnTest6_Init, + EnTest6_Destroy, + EnTest6_Update, + EnTest6_Draw, + }, }; u8 D_80A93E80[] = { diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index cb60f9772b..747a54e9f6 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -40,10 +40,12 @@ ActorInit En_Test7_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest7), - EnTest7_Init, - EnTest7_Destroy, - EnTest7_Update, - EnTest7_Draw, + { + EnTest7_Init, + EnTest7_Destroy, + EnTest7_Update, + EnTest7_Draw, + }, }; void EnTest7_SetupAction(EnTest7* this, EnTest7ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 70c2d04664..c78e4abaf2 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -27,10 +27,12 @@ ActorInit En_Tg_InitVars = { FLAGS, OBJECT_MU, sizeof(EnTg), - EnTg_Init, - EnTg_Destroy, - EnTg_Update, - EnTg_Draw, + { + EnTg_Init, + EnTg_Destroy, + EnTg_Update, + EnTg_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index 6a6a682d37..1d011d9793 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -39,10 +39,12 @@ ActorInit En_Thiefbird_InitVars = { FLAGS, OBJECT_THIEFBIRD, sizeof(EnThiefbird), - EnThiefbird_Init, - EnThiefbird_Destroy, - EnThiefbird_Update, - EnThiefbird_Draw, + { + EnThiefbird_Init, + EnThiefbird_Destroy, + EnThiefbird_Update, + EnThiefbird_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[3] = { diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index d5a84f3aa7..9b82f37939 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -36,10 +36,12 @@ ActorInit En_Time_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTimeTag), - EnTimeTag_Init, - EnTimeTag_Destroy, - EnTimeTag_Update, - NULL, + { + EnTimeTag_Init, + EnTimeTag_Destroy, + EnTimeTag_Update, + NULL, + }, }; void EnTimeTag_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index b80215761f..493bb44137 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -52,10 +52,12 @@ ActorInit En_Tite_InitVars = { FLAGS, OBJECT_TITE, sizeof(EnTite), - EnTite_Init, - EnTite_Destroy, - EnTite_Update, - EnTite_Draw, + { + EnTite_Init, + EnTite_Destroy, + EnTite_Update, + EnTite_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index b59f440bac..4315583e11 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -75,10 +75,12 @@ ActorInit En_Tk_InitVars = { FLAGS, OBJECT_TK, sizeof(EnTk), - EnTk_Init, - EnTk_Destroy, - EnTk_Update, - EnTk_Draw, + { + EnTk_Init, + EnTk_Destroy, + EnTk_Update, + EnTk_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 21d7f2f3d4..89e88c26a0 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -14,8 +14,17 @@ void EnTorch_Init(Actor* thisx, PlayState* play); ActorInit En_Torch_InitVars = { - ACTOR_EN_TORCH, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch), - EnTorch_Init, NULL, NULL, NULL, + ACTOR_EN_TORCH, + ACTORCAT_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTorch), + { + EnTorch_Init, + NULL, + NULL, + NULL, + }, }; static u8 sChestContents[] = { diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 6b84db1571..44ed1dd4b0 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -25,10 +25,12 @@ ActorInit En_Torch2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch2), - EnTorch2_Init, - EnTorch2_Destroy, - EnTorch2_Update, - EnTorch2_Draw, + { + EnTorch2_Init, + EnTorch2_Destroy, + EnTorch2_Update, + EnTorch2_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index 366e6fe21c..cf20c570e1 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -56,10 +56,12 @@ ActorInit En_Toto_InitVars = { FLAGS, OBJECT_ZM, sizeof(EnToto), - EnToto_Init, - EnToto_Destroy, - EnToto_Update, - EnToto_Draw, + { + EnToto_Init, + EnToto_Destroy, + EnToto_Update, + EnToto_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index a459923135..d4456f52a4 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -96,10 +96,12 @@ ActorInit En_Trt_InitVars = { FLAGS, OBJECT_TRT, sizeof(EnTrt), - EnTrt_Init, - EnTrt_Destroy, - EnTrt_Update, - EnTrt_Draw, + { + EnTrt_Init, + EnTrt_Destroy, + EnTrt_Update, + EnTrt_Draw, + }, }; static f32 sActorScale = 0.008f; diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index a2665dd00c..891be97ec8 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -58,10 +58,12 @@ ActorInit En_Trt2_InitVars = { FLAGS, OBJECT_TRT, sizeof(EnTrt2), - EnTrt2_Init, - EnTrt2_Destroy, - EnTrt2_Update, - NULL, + { + EnTrt2_Init, + EnTrt2_Destroy, + EnTrt2_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index 9cae39d262..6d17f0ffe9 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -82,10 +82,12 @@ ActorInit En_Tru_InitVars = { FLAGS, OBJECT_TRU, sizeof(EnTru), - EnTru_Init, - EnTru_Destroy, - EnTru_Update, - EnTru_Draw, + { + EnTru_Init, + EnTru_Destroy, + EnTru_Update, + EnTru_Draw, + }, }; #include "overlays/ovl_En_Tru/ovl_En_Tru.c" diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index 9f2791fd75..eea23089d3 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -46,10 +46,12 @@ ActorInit En_Tru_Mt_InitVars = { FLAGS, OBJECT_TRU, sizeof(EnTruMt), - EnTruMt_Init, - EnTruMt_Destroy, - EnTruMt_Update, - EnTruMt_Draw, + { + EnTruMt_Init, + EnTruMt_Destroy, + EnTruMt_Update, + EnTruMt_Draw, + }, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index 703526ed09..42fa433c04 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -35,10 +35,12 @@ ActorInit En_Tsn_InitVars = { FLAGS, OBJECT_TSN, sizeof(EnTsn), - EnTsn_Init, - EnTsn_Destroy, - EnTsn_Update, - EnTsn_Draw, + { + EnTsn_Init, + EnTsn_Destroy, + EnTsn_Update, + EnTsn_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 7795556b8f..d83995ecfb 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -45,10 +45,12 @@ ActorInit En_Tubo_Trap_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(EnTuboTrap), - EnTuboTrap_Init, - EnTuboTrap_Destroy, - EnTuboTrap_Update, - EnTuboTrap_Draw, + { + EnTuboTrap_Init, + EnTuboTrap_Destroy, + EnTuboTrap_Update, + EnTuboTrap_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index bfd7b3a9a2..42223d7c10 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -31,10 +31,12 @@ ActorInit En_Twig_InitVars = { FLAGS, OBJECT_TWIG, sizeof(EnTwig), - EnTwig_Init, - EnTwig_Destroy, - EnTwig_Update, - EnTwig_Draw, + { + EnTwig_Init, + EnTwig_Destroy, + EnTwig_Update, + EnTwig_Draw, + }, }; static s32 sCurrentRing; diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 6cf5d7b7fa..c0409a7de2 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -29,10 +29,12 @@ ActorInit En_Viewer_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnViewer), - EnViewer_Init, - EnViewer_Destroy, - EnViewer_Update, - EnViewer_Draw, + { + EnViewer_Init, + EnViewer_Destroy, + EnViewer_Update, + EnViewer_Draw, + }, }; u32 D_8089F4D0; diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 1ad72c54b1..c7e1f0a769 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -35,10 +35,12 @@ ActorInit En_Vm_InitVars = { FLAGS, OBJECT_VM, sizeof(EnVm), - EnVm_Init, - EnVm_Destroy, - EnVm_Update, - EnVm_Draw, + { + EnVm_Init, + EnVm_Destroy, + EnVm_Update, + EnVm_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[] = { diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index ec50f83615..15450f63bf 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -49,10 +49,12 @@ ActorInit En_Wallmas_InitVars = { FLAGS, OBJECT_WALLMASTER, sizeof(EnWallmas), - EnWallmas_Init, - EnWallmas_Destroy, - EnWallmas_Update, - EnWallmas_Draw, + { + EnWallmas_Init, + EnWallmas_Destroy, + EnWallmas_Update, + EnWallmas_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c index a72c717d2c..e66b435ff4 100644 --- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c @@ -27,10 +27,12 @@ ActorInit En_Warp_Uzu_InitVars = { FLAGS, OBJECT_WARP_UZU, sizeof(EnWarpUzu), - EnWarpUzu_Init, - EnWarpUzu_Destroy, - EnWarpUzu_Update, - EnWarpUzu_Draw, + { + EnWarpUzu_Init, + EnWarpUzu_Destroy, + EnWarpUzu_Update, + EnWarpUzu_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index 6e2e69e7e4..82dcd72d8f 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -30,10 +30,12 @@ ActorInit En_Warp_tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnWarptag), - EnWarptag_Init, - EnWarptag_Destroy, - EnWarptag_Update, - NULL, + { + EnWarptag_Init, + EnWarptag_Destroy, + EnWarptag_Update, + NULL, + }, }; // this appears to be unused, as the code never accesses it in known vanilla cases diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index b4e63001e0..e0e0bd8d87 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -36,10 +36,12 @@ ActorInit En_Water_Effect_InitVars = { FLAGS, OBJECT_WATER_EFFECT, sizeof(EnWaterEffect), - EnWaterEffect_Init, - EnWaterEffect_Destroy, - EnWaterEffect_Update, - EnWaterEffect_Draw, + { + EnWaterEffect_Init, + EnWaterEffect_Destroy, + EnWaterEffect_Update, + EnWaterEffect_Draw, + }, }; static Vec3f D_80A5AFB0 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index 25ce4df249..ad3c5aac74 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -22,11 +22,11 @@ ActorInit En_Wdhand_InitVars = { FLAGS, OBJECT_WDHAND, sizeof(EnWdhand), - EnWdhand_Init, +{EnWdhand_Init, EnWdhand_Destroy, EnWdhand_Update, EnWdhand_Draw, -}; +},}; // static ColliderJntSphElementInit sJntSphElementsInit[7] = { static ColliderJntSphElementInit D_80AF63E0[7] = { diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 13657901c1..1b65e62839 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -41,10 +41,12 @@ ActorInit En_Weather_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnWeatherTag), - EnWeatherTag_Init, - EnWeatherTag_Destroy, - EnWeatherTag_Update, - EnWeatherTag_Draw, + { + EnWeatherTag_Init, + EnWeatherTag_Destroy, + EnWeatherTag_Update, + EnWeatherTag_Draw, + }, }; extern f32 D_801F4E74; diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index ca1bb7600f..5e7e0c13b8 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -61,10 +61,12 @@ ActorInit En_Wf_InitVars = { FLAGS, OBJECT_WF, sizeof(EnWf), - EnWf_Init, - EnWf_Destroy, - EnWf_Update, - EnWf_Draw, + { + EnWf_Init, + EnWf_Destroy, + EnWf_Update, + EnWf_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[4] = { diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index 4c09b72ffb..ab00fa310f 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -86,10 +86,12 @@ ActorInit En_Wiz_InitVars = { FLAGS, OBJECT_WIZ, sizeof(EnWiz), - EnWiz_Init, - EnWiz_Destroy, - EnWiz_Update, - EnWiz_Draw, + { + EnWiz_Init, + EnWiz_Destroy, + EnWiz_Update, + EnWiz_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[10] = { diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index 3d8f8b06fd..5b379e501c 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -27,10 +27,12 @@ ActorInit En_Wiz_Brock_InitVars = { FLAGS, OBJECT_WIZ, sizeof(EnWizBrock), - EnWizBrock_Init, - EnWizBrock_Destroy, - EnWizBrock_Update, - EnWizBrock_Draw, + { + EnWizBrock_Init, + EnWizBrock_Destroy, + EnWizBrock_Update, + EnWizBrock_Draw, + }, }; void EnWizBrock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index 8cc6ce4af2..294e84f848 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -43,10 +43,12 @@ ActorInit En_Wiz_Fire_InitVars = { FLAGS, OBJECT_WIZ, sizeof(EnWizFire), - EnWizFire_Init, - EnWizFire_Destroy, - EnWizFire_Update, - EnWizFire_Draw, + { + EnWizFire_Init, + EnWizFire_Destroy, + EnWizFire_Update, + EnWizFire_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 797a68c69e..33c16bf49b 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -44,10 +44,12 @@ ActorInit En_Wood02_InitVars = { FLAGS, OBJECT_WOOD02, sizeof(EnWood02), - EnWood02_Init, - EnWood02_Destroy, - EnWood02_Update, - EnWood02_Draw, + { + EnWood02_Init, + EnWood02_Destroy, + EnWood02_Update, + EnWood02_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index c811bd0818..c1ee7f1069 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -38,10 +38,12 @@ ActorInit En_Yb_InitVars = { FLAGS, OBJECT_YB, sizeof(EnYb), - EnYb_Init, - EnYb_Destroy, - EnYb_Update, - EnYb_Draw, + { + EnYb_Init, + EnYb_Destroy, + EnYb_Update, + EnYb_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index d8c4e774a9..d20e51e661 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -21,10 +21,12 @@ ActorInit En_Zl1_InitVars = { FLAGS, OBJECT_ZL1, sizeof(EnZl1), - EnZl1_Init, - EnZl1_Destroy, - EnZl1_Update, - EnZl1_Draw, + { + EnZl1_Init, + EnZl1_Destroy, + EnZl1_Update, + EnZl1_Draw, + }, }; void EnZl1_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 55a0b04a64..833f4aaac3 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -24,11 +24,11 @@ ActorInit En_Zl4_InitVars = { FLAGS, OBJECT_STK, sizeof(EnZl4), - EnZl4_Init, +{EnZl4_Init, EnZl4_Destroy, EnZl4_Update, EnZl4_Draw, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index c10c8ec4ab..1cf5aa3cde 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -25,10 +25,12 @@ ActorInit En_Zo_InitVars = { FLAGS, OBJECT_ZO, sizeof(EnZo), - EnZo_Init, - EnZo_Destroy, - EnZo_Update, - EnZo_Draw, + { + EnZo_Init, + EnZo_Destroy, + EnZo_Update, + EnZo_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index 9c27096ca5..217989677d 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -43,10 +43,12 @@ ActorInit En_Zob_InitVars = { FLAGS, OBJECT_ZOB, sizeof(EnZob), - EnZob_Init, - EnZob_Destroy, - EnZob_Update, - EnZob_Draw, + { + EnZob_Init, + EnZob_Destroy, + EnZob_Update, + EnZob_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index 02c5b5f7ce..3302cb7376 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -22,11 +22,11 @@ ActorInit En_Zod_InitVars = { FLAGS, OBJECT_ZOD, sizeof(EnZod), - EnZod_Init, +{EnZod_Init, EnZod_Destroy, EnZod_Update, EnZod_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80BB0540 = { diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index 506ea90f93..cac81d3ea5 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -39,10 +39,12 @@ ActorInit En_Zog_InitVars = { FLAGS, OBJECT_ZOG, sizeof(EnZog), - EnZog_Init, - EnZog_Destroy, - EnZog_Update, - EnZog_Draw, + { + EnZog_Init, + EnZog_Destroy, + EnZog_Update, + EnZog_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index 7bb51217b6..c777377296 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -44,10 +44,12 @@ ActorInit En_Zoraegg_InitVars = { FLAGS, OBJECT_ZORAEGG, sizeof(EnZoraegg), - EnZoraegg_Init, - EnZoraegg_Destroy, - EnZoraegg_Update, - EnZoraegg_Draw, + { + EnZoraegg_Init, + EnZoraegg_Destroy, + EnZoraegg_Update, + EnZoraegg_Draw, + }, }; void func_80B31590(EnZoraegg* this) { diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index c9458a3d7f..062c194041 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -56,10 +56,12 @@ ActorInit En_Zos_InitVars = { FLAGS, OBJECT_ZOS, sizeof(EnZos), - EnZos_Init, - EnZos_Destroy, - EnZos_Update, - EnZos_Draw, + { + EnZos_Init, + EnZos_Destroy, + EnZos_Update, + EnZos_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 13ea8cd8e1..3d00f45349 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -38,10 +38,12 @@ ActorInit En_Zot_InitVars = { FLAGS, OBJECT_ZO, sizeof(EnZot), - EnZot_Init, - EnZot_Destroy, - EnZot_Update, - EnZot_Draw, + { + EnZot_Init, + EnZot_Destroy, + EnZot_Update, + EnZot_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index 85a386f192..48775a12b9 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -34,10 +34,12 @@ ActorInit En_Zov_InitVars = { FLAGS, OBJECT_ZOV, sizeof(EnZov), - EnZov_Init, - EnZov_Destroy, - EnZov_Update, - EnZov_Draw, + { + EnZov_Init, + EnZov_Destroy, + EnZov_Update, + EnZov_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 004939230e..91ec9aedf6 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -28,10 +28,12 @@ ActorInit En_Zow_InitVars = { FLAGS, OBJECT_ZO, sizeof(EnZow), - EnZow_Init, - EnZow_Destroy, - EnZow_Update, - EnZow_Draw, + { + EnZow_Init, + EnZow_Destroy, + EnZow_Update, + EnZow_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index 88c699b347..1c10e5c389 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -24,10 +24,12 @@ ActorInit Item_B_Heart_InitVars = { FLAGS, OBJECT_GI_HEARTS, sizeof(ItemBHeart), - ItemBHeart_Init, - ItemBHeart_Destroy, - ItemBHeart_Update, - ItemBHeart_Draw, + { + ItemBHeart_Init, + ItemBHeart_Destroy, + ItemBHeart_Update, + ItemBHeart_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index e2654d489c..b043a2c35f 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -26,10 +26,12 @@ ActorInit Item_Etcetera_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ItemEtcetera), - ItemEtcetera_Init, - ItemEtcetera_Destroy, - ItemEtcetera_Update, - NULL, + { + ItemEtcetera_Init, + ItemEtcetera_Destroy, + ItemEtcetera_Update, + NULL, + }, }; static s16 sObjectIds[] = { diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index c3ed46fe21..4620a41e76 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -23,10 +23,12 @@ ActorInit Item_Inbox_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ItemInbox), - ItemInbox_Init, - ItemInbox_Destroy, - ItemInbox_Update, - ItemInbox_Draw, + { + ItemInbox_Init, + ItemInbox_Destroy, + ItemInbox_Update, + ItemInbox_Draw, + }, }; void ItemInbox_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 53c5740616..4b3952d78e 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -47,10 +47,12 @@ ActorInit Mir_Ray_InitVars = { FLAGS, OBJECT_MIR_RAY, sizeof(MirRay), - MirRay_Init, - MirRay_Destroy, - MirRay_Update, - MirRay_Draw, + { + MirRay_Init, + MirRay_Destroy, + MirRay_Update, + MirRay_Draw, + }, }; u8 D_808E3BF0 = false; diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c index 3dd97a8c29..e378488361 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -21,10 +21,12 @@ ActorInit Mir_Ray2_InitVars = { FLAGS, OBJECT_MIR_RAY, sizeof(MirRay2), - MirRay2_Init, - MirRay2_Destroy, - MirRay2_Update, - MirRay2_Draw, + { + MirRay2_Init, + MirRay2_Destroy, + MirRay2_Update, + MirRay2_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index f359a07ca4..eaadbb62b3 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -22,10 +22,12 @@ ActorInit Mir_Ray3_InitVars = { FLAGS, OBJECT_MIR_RAY, sizeof(MirRay3), - MirRay3_Init, - MirRay3_Destroy, - MirRay3_Update, - MirRay3_Draw, + { + MirRay3_Init, + MirRay3_Destroy, + MirRay3_Update, + MirRay3_Draw, + }, }; static ColliderQuadInit sQuadInit = { diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index b2235745b8..378bac24f7 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -30,10 +30,12 @@ ActorInit Obj_Aqua_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjAqua), - ObjAqua_Init, - ObjAqua_Destroy, - ObjAqua_Update, - ObjAqua_Draw, + { + ObjAqua_Init, + ObjAqua_Destroy, + ObjAqua_Update, + ObjAqua_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 6d8d2e539e..df9b688d74 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -29,10 +29,12 @@ ActorInit Obj_Armos_InitVars = { FLAGS, OBJECT_AM, sizeof(ObjArmos), - ObjArmos_Init, - ObjArmos_Destroy, - ObjArmos_Update, - ObjArmos_Draw, + { + ObjArmos_Init, + ObjArmos_Destroy, + ObjArmos_Update, + ObjArmos_Draw, + }, }; s16 D_809A5BB0[] = { 1, -1, 0, 0 }; diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index d319371311..d554e761f2 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -66,10 +66,12 @@ ActorInit Obj_Bean_InitVars = { FLAGS, OBJECT_MAMENOKI, sizeof(ObjBean), - ObjBean_Init, - ObjBean_Destroy, - ObjBean_Update, - NULL, + { + ObjBean_Init, + ObjBean_Destroy, + ObjBean_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index 24c4790f55..f73fa25e7a 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -25,10 +25,12 @@ ActorInit Obj_Bell_InitVars = { FLAGS, OBJECT_F52_OBJ, sizeof(ObjBell), - ObjBell_Init, - ObjBell_Destroy, - ObjBell_Update, - ObjBell_Draw, + { + ObjBell_Init, + ObjBell_Destroy, + ObjBell_Update, + ObjBell_Draw, + }, }; // Bell Post? diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index 8a9b8c9a31..1499ef11f0 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -30,10 +30,12 @@ ActorInit Obj_Bigicicle_InitVars = { FLAGS, OBJECT_BIGICICLE, sizeof(ObjBigicicle), - ObjBigicicle_Init, - ObjBigicicle_Destroy, - ObjBigicicle_Update, - ObjBigicicle_Draw, + { + ObjBigicicle_Init, + ObjBigicicle_Destroy, + ObjBigicicle_Update, + ObjBigicicle_Draw, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index a87d0e6750..48e1259bcd 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -23,10 +23,12 @@ ActorInit Obj_Blockstop_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjBlockstop), - ObjBlockstop_Init, - Actor_Noop, - ObjBlockstop_Update, - NULL, + { + ObjBlockstop_Init, + Actor_Noop, + ObjBlockstop_Update, + NULL, + }, }; void ObjBlockstop_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index b0188d145b..031c8a4dfa 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -24,10 +24,12 @@ ActorInit Obj_Boat_InitVars = { FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjBoat), - ObjBoat_Init, - ObjBoat_Destroy, - ObjBoat_Update, - ObjBoat_Draw, + { + ObjBoat_Init, + ObjBoat_Destroy, + ObjBoat_Update, + ObjBoat_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 60dc984b85..f6f6757ae4 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -30,10 +30,12 @@ ActorInit Obj_Bombiwa_InitVars = { FLAGS, OBJECT_BOMBIWA, sizeof(ObjBombiwa), - ObjBombiwa_Init, - ObjBombiwa_Destroy, - ObjBombiwa_Update, - NULL, + { + ObjBombiwa_Init, + ObjBombiwa_Destroy, + ObjBombiwa_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c index 550be1da63..54ba54d45d 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -24,10 +24,12 @@ ActorInit Obj_Boyo_InitVars = { FLAGS, OBJECT_BOYO, sizeof(ObjBoyo), - ObjBoyo_Init, - ObjBoyo_Destroy, - ObjBoyo_Update, - ObjBoyo_Draw, + { + ObjBoyo_Init, + ObjBoyo_Destroy, + ObjBoyo_Update, + ObjBoyo_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c index c751fbaa1f..d09a955d68 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -34,10 +34,12 @@ ActorInit Obj_Chan_InitVars = { FLAGS, OBJECT_OBJ_CHAN, sizeof(ObjChan), - ObjChan_Init, - ObjChan_Destroy, - ObjChan_Update, - ObjChan_Draw, + { + ObjChan_Init, + ObjChan_Destroy, + ObjChan_Update, + ObjChan_Draw, + }, }; static ColliderCylinderInit sObjChanCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index 70d1817db6..c53b9c7cde 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -23,10 +23,12 @@ ActorInit Obj_Chikuwa_InitVars = { FLAGS, OBJECT_D_LIFT, sizeof(ObjChikuwa), - ObjChikuwa_Init, - ObjChikuwa_Destroy, - ObjChikuwa_Update, - ObjChikuwa_Draw, + { + ObjChikuwa_Init, + ObjChikuwa_Destroy, + ObjChikuwa_Update, + ObjChikuwa_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 77f02ec5e8..551d220cb9 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -28,10 +28,12 @@ ActorInit Obj_Comb_InitVars = { FLAGS, OBJECT_COMB, sizeof(ObjComb), - ObjComb_Init, - ObjComb_Destroy, - ObjComb_Update, - ObjComb_Draw, + { + ObjComb_Init, + ObjComb_Destroy, + ObjComb_Update, + ObjComb_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c index c9529c8531..6cee14925c 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -27,10 +27,12 @@ ActorInit Obj_Danpeilift_InitVars = { FLAGS, OBJECT_OBJ_DANPEILIFT, sizeof(ObjDanpeilift), - ObjDanpeilift_Init, - ObjDanpeilift_Destroy, - ObjDanpeilift_Update, - ObjDanpeilift_Draw, + { + ObjDanpeilift_Init, + ObjDanpeilift_Destroy, + ObjDanpeilift_Update, + ObjDanpeilift_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c index 84761f9a7f..07ade8816c 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -23,10 +23,12 @@ ActorInit Obj_Demo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjDemo), - ObjDemo_Init, - Actor_Noop, - ObjDemo_Update, - NULL, + { + ObjDemo_Init, + Actor_Noop, + ObjDemo_Update, + NULL, + }, }; void ObjDemo_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index aebc5b7372..a7bbb9a82b 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -34,10 +34,12 @@ ActorInit Obj_Dhouse_InitVars = { FLAGS, OBJECT_DHOUSE, sizeof(ObjDhouse), - ObjDhouse_Init, - ObjDhouse_Destroy, - ObjDhouse_Update, - ObjDhouse_Draw, + { + ObjDhouse_Init, + ObjDhouse_Destroy, + ObjDhouse_Update, + ObjDhouse_Draw, + }, }; ObjDhouseStruct3 D_80B13E90[] = { diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c index 872b07488e..7b599f1961 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -22,10 +22,12 @@ ActorInit Obj_Dinner_InitVars = { FLAGS, OBJECT_OBJ_DINNER, sizeof(ObjDinner), - ObjDinner_Init, - ObjDinner_Destroy, - ObjDinner_Update, - ObjDinner_Draw, + { + ObjDinner_Init, + ObjDinner_Destroy, + ObjDinner_Update, + ObjDinner_Draw, + }, }; void ObjDinner_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index 2b8f814273..74fd6fc934 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -41,10 +41,12 @@ ActorInit Obj_Dora_InitVars = { FLAGS, OBJECT_DORA, sizeof(ObjDora), - ObjDora_Init, - ObjDora_Destroy, - ObjDora_Update, - ObjDora_Draw, + { + ObjDora_Init, + ObjDora_Destroy, + ObjDora_Update, + ObjDora_Draw, + }, }; static ColliderTrisElementInit sTrisElementsInit[6] = { diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c index ae76b4c3ce..47df3bf33e 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -23,10 +23,12 @@ ActorInit Obj_Dowsing_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjDowsing), - ObjDowsing_Init, - ObjDowsing_Destroy, - ObjDowsing_Update, - NULL, + { + ObjDowsing_Init, + ObjDowsing_Destroy, + ObjDowsing_Update, + NULL, + }, }; s32 ObjDowsing_GetFlag(ObjDowsing* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index dbf3f1d5f9..3550cf66fc 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -31,10 +31,12 @@ ActorInit Obj_Driftice_InitVars = { FLAGS, OBJECT_DRIFTICE, sizeof(ObjDriftice), - ObjDriftice_Init, - ObjDriftice_Destroy, - ObjDriftice_Update, - ObjDriftice_Draw, + { + ObjDriftice_Init, + ObjDriftice_Destroy, + ObjDriftice_Update, + ObjDriftice_Draw, + }, }; static f32 D_80A67620[][3] = { diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c index a06ac4c208..2ba67576ee 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -21,10 +21,12 @@ ActorInit Obj_Ending_InitVars = { FLAGS, OBJECT_ENDING_OBJ, sizeof(ObjEnding), - ObjEnding_Init, - Actor_Noop, - ObjEnding_Update, - ObjEnding_Draw, + { + ObjEnding_Init, + Actor_Noop, + ObjEnding_Update, + ObjEnding_Draw, + }, }; static ObjEndingModelInfo sModelInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 727eb3dc1c..205d1a67ae 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -22,10 +22,12 @@ ActorInit Obj_Entotu_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjEntotu), - ObjEntotu_Init, - ObjEntotu_Destroy, - ObjEntotu_Update, - ObjEntotu_Draw, + { + ObjEntotu_Init, + ObjEntotu_Destroy, + ObjEntotu_Update, + ObjEntotu_Draw, + }, }; #include "overlays/ovl_Obj_Entotu/ovl_Obj_Entotu.c" diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c index eb9d1e3552..d12b04af69 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -26,10 +26,12 @@ ActorInit Obj_Etcetera_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjEtcetera), - ObjEtcetera_Init, - ObjEtcetera_Destroy, - ObjEtcetera_Update, - NULL, + { + ObjEtcetera_Init, + ObjEtcetera_Destroy, + ObjEtcetera_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index e2d27e1a95..da60c458d9 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -28,10 +28,12 @@ ActorInit Obj_Fireshield_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjFireshield), - ObjFireshield_Init, - ObjFireshield_Destroy, - ObjFireshield_Update, - ObjFireshield_Draw, + { + ObjFireshield_Init, + ObjFireshield_Destroy, + ObjFireshield_Update, + ObjFireshield_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index 87a387f0ac..90069ee665 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -37,10 +37,12 @@ ActorInit Obj_Flowerpot_InitVars = { FLAGS, OBJECT_FLOWERPOT, sizeof(ObjFlowerpot), - ObjFlowerpot_Init, - ObjFlowerpot_Destroy, - ObjFlowerpot_Update, - ObjFlowerpot_Draw, + { + ObjFlowerpot_Init, + ObjFlowerpot_Destroy, + ObjFlowerpot_Update, + ObjFlowerpot_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index 25cff388f5..be69e9349c 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -15,9 +15,17 @@ void ObjFunen_Init(Actor* thisx, PlayState* play); void ObjFunen_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Funen_InitVars = { - ACTOR_OBJ_FUNEN, ACTORCAT_PROP, FLAGS, - OBJECT_FUNEN, sizeof(ObjFunen), ObjFunen_Init, - Actor_Noop, Actor_Noop, ObjFunen_Draw, + ACTOR_OBJ_FUNEN, + ACTORCAT_PROP, + FLAGS, + OBJECT_FUNEN, + sizeof(ObjFunen), + { + ObjFunen_Init, + Actor_Noop, + Actor_Noop, + ObjFunen_Draw, + }, }; f32 D_80A198D0[] = { 0.1f, 0.024390244f }; diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index 48faa330dc..61389aaf3f 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -30,10 +30,12 @@ ActorInit Obj_Ghaka_InitVars = { FLAGS, OBJECT_GHAKA, sizeof(ObjGhaka), - ObjGhaka_Init, - ObjGhaka_Destroy, - ObjGhaka_Update, - ObjGhaka_Draw, + { + ObjGhaka_Init, + ObjGhaka_Destroy, + ObjGhaka_Update, + ObjGhaka_Draw, + }, }; static Vec3f D_80B3C960 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index 1d96275fc3..2206aff3a5 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -32,10 +32,12 @@ ActorInit Obj_Grass_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrass), - ObjGrass_Init, - ObjGrass_Destroy, - ObjGrass_Update, - ObjGrass_Draw, + { + ObjGrass_Init, + ObjGrass_Destroy, + ObjGrass_Update, + ObjGrass_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index 4785057b5e..7690ec1144 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -35,10 +35,12 @@ ActorInit Obj_Grass_Carry_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassCarry), - ObjGrassCarry_Init, - ObjGrassCarry_Destroy, - ObjGrassCarry_Update, - NULL, + { + ObjGrassCarry_Init, + ObjGrassCarry_Destroy, + ObjGrassCarry_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index 1b29222090..218ea64649 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -19,11 +19,11 @@ ActorInit Obj_Grass_Unit_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassUnit), - ObjGrassUnit_Init, +{ObjGrassUnit_Init, Actor_Noop, Actor_Noop, NULL, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index 572075eb37..182852480d 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -43,10 +43,12 @@ ActorInit Obj_Hakaisi_InitVars = { FLAGS, OBJECT_HAKAISI, sizeof(ObjHakaisi), - ObjHakaisi_Init, - ObjHakaisi_Destroy, - ObjHakaisi_Update, - ObjHakaisi_Draw, + { + ObjHakaisi_Init, + ObjHakaisi_Destroy, + ObjHakaisi_Update, + ObjHakaisi_Draw, + }, }; Vec3f D_80B155B0 = { 0.0f, 25.0f, 30.0f }; diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 592b7cf39d..056d2a4e67 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -22,10 +22,12 @@ ActorInit Obj_Hamishi_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjHamishi), - ObjHamishi_Init, - ObjHamishi_Destroy, - ObjHamishi_Update, - ObjHamishi_Draw, + { + ObjHamishi_Init, + ObjHamishi_Destroy, + ObjHamishi_Update, + ObjHamishi_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 6dae1b3aed..6b42ad014b 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -22,10 +22,12 @@ ActorInit Obj_Hana_InitVars = { FLAGS, OBJECT_HANA, sizeof(ObjHana), - ObjHana_Init, - ObjHana_Destroy, - ObjHana_Update, - ObjHana_Draw, + { + ObjHana_Init, + ObjHana_Destroy, + ObjHana_Update, + ObjHana_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c index cfcfd6afbf..0b6496ef9a 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -29,10 +29,12 @@ ActorInit Obj_Hariko_InitVars = { FLAGS, OBJECT_HARIKO, sizeof(ObjHariko), - ObjHariko_Init, - ObjHariko_Destroy, - ObjHariko_Update, - ObjHariko_Draw, + { + ObjHariko_Init, + ObjHariko_Destroy, + ObjHariko_Update, + ObjHariko_Draw, + }, }; void ObjHariko_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c index 13bfc5d606..b35e05ca86 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -32,10 +32,12 @@ ActorInit Obj_Hgdoor_InitVars = { FLAGS, OBJECT_HGDOOR, sizeof(ObjHgdoor), - ObjHgdoor_Init, - ObjHgdoor_Destroy, - ObjHgdoor_Update, - ObjHgdoor_Draw, + { + ObjHgdoor_Init, + ObjHgdoor_Destroy, + ObjHgdoor_Update, + ObjHgdoor_Draw, + }, }; static s16 sOpenFlag = 0; diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c index eac1ba50e1..c5944b7d54 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -27,10 +27,12 @@ ActorInit Obj_HsStump_InitVars = { FLAGS, OBJECT_HSSTUMP, sizeof(ObjHsStump), - ObjHsStump_Init, - ObjHsStump_Destroy, - ObjHsStump_Update, - ObjHsStump_Draw, + { + ObjHsStump_Init, + ObjHsStump_Destroy, + ObjHsStump_Update, + ObjHsStump_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index dd1618dfca..184ebe3d67 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -29,10 +29,12 @@ ActorInit Obj_Hsblock_InitVars = { FLAGS, OBJECT_D_HSBLOCK, sizeof(ObjHsblock), - ObjHsblock_Init, - ObjHsblock_Destroy, - ObjHsblock_Update, - ObjHsblock_Draw, + { + ObjHsblock_Init, + ObjHsblock_Destroy, + ObjHsblock_Update, + ObjHsblock_Draw, + }, }; static f32 sFocusHeights[] = { 85.0f, 85.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index 0b29654586..75db2eb8de 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -34,10 +34,12 @@ ActorInit Obj_Hugebombiwa_InitVars = { FLAGS, OBJECT_BOMBIWA, sizeof(ObjHugebombiwa), - ObjHugebombiwa_Init, - ObjHugebombiwa_Destroy, - ObjHugebombiwa_Update, - ObjHugebombiwa_Draw, + { + ObjHugebombiwa_Init, + ObjHugebombiwa_Destroy, + ObjHugebombiwa_Update, + ObjHugebombiwa_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index ff67174e94..99eb413f84 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -52,10 +52,12 @@ ActorInit Obj_Hunsui_InitVars = { FLAGS, OBJECT_HUNSUI, sizeof(ObjHunsui), - ObjHunsui_Init, - ObjHunsui_Destroy, - ObjHunsui_Update, - ObjHunsui_Draw, + { + ObjHunsui_Init, + ObjHunsui_Destroy, + ObjHunsui_Update, + ObjHunsui_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index f83ec9e813..cf6b14d0b3 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -28,10 +28,12 @@ ActorInit Obj_Ice_Poly_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjIcePoly), - ObjIcePoly_Init, - ObjIcePoly_Destroy, - ObjIcePoly_Update, - ObjIcePoly_Draw, + { + ObjIcePoly_Init, + ObjIcePoly_Destroy, + ObjIcePoly_Update, + ObjIcePoly_Draw, + }, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index 55118ef729..41037b3bd3 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -51,10 +51,12 @@ ActorInit Obj_Iceblock_InitVars = { FLAGS, OBJECT_ICE_BLOCK, sizeof(ObjIceblock), - ObjIceblock_Init, - ObjIceblock_Destroy, - ObjIceblock_Update, - ObjIceblock_Draw, + { + ObjIceblock_Init, + ObjIceblock_Destroy, + ObjIceblock_Update, + ObjIceblock_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c index 6c0e5fa7eb..72c5c6715b 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -22,10 +22,12 @@ ActorInit Obj_Jg_Gakki_InitVars = { FLAGS, OBJECT_JG, sizeof(ObjJgGakki), - ObjJgGakki_Init, - ObjJgGakki_Destroy, - ObjJgGakki_Update, - ObjJgGakki_Draw, + { + ObjJgGakki_Init, + ObjJgGakki_Destroy, + ObjJgGakki_Update, + ObjJgGakki_Draw, + }, }; void ObjJgGakki_Init(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index 200ff752a1..2e2cd39e42 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -33,10 +33,12 @@ ActorInit Obj_Jgame_Light_InitVars = { FLAGS, OBJECT_SYOKUDAI, sizeof(ObjJgameLight), - ObjJgameLight_Init, - ObjJgameLight_Destroy, - ObjJgameLight_Update, - ObjJgameLight_Draw, + { + ObjJgameLight_Init, + ObjJgameLight_Destroy, + ObjJgameLight_Update, + ObjJgameLight_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 3801f0d0b0..b1e651b60b 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -50,10 +50,12 @@ ActorInit Obj_Kendo_Kanban_InitVars = { FLAGS, OBJECT_DORA, sizeof(ObjKendoKanban), - ObjKendoKanban_Init, - ObjKendoKanban_Destroy, - ObjKendoKanban_Update, - ObjKendoKanban_Draw, + { + ObjKendoKanban_Init, + ObjKendoKanban_Destroy, + ObjKendoKanban_Update, + ObjKendoKanban_Draw, + }, }; // Directly applied to the velocity of the actor upon object creation. diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index cb47a3d4cb..483d1abd7c 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -22,10 +22,12 @@ ActorInit Obj_Kepn_Koya_InitVars = { FLAGS, OBJECT_KEPN_KOYA, sizeof(ObjKepnKoya), - ObjKepnKoya_Init, - ObjKepnKoya_Destroy, - ObjKepnKoya_Update, - ObjKepnKoya_Draw, + { + ObjKepnKoya_Init, + ObjKepnKoya_Destroy, + ObjKepnKoya_Update, + ObjKepnKoya_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index c8142a3545..1ee5ee5585 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -42,10 +42,12 @@ ActorInit Obj_Kibako_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjKibako), - ObjKibako_Init, - ObjKibako_Destroy, - ObjKibako_Update, - NULL, + { + ObjKibako_Init, + ObjKibako_Destroy, + ObjKibako_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 35554928dc..ee9f9701f5 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -25,10 +25,12 @@ ActorInit Obj_Kibako2_InitVars = { FLAGS, OBJECT_KIBAKO2, sizeof(ObjKibako2), - ObjKibako2_Init, - ObjKibako2_Destroy, - ObjKibako2_Update, - ObjKibako2_Draw, + { + ObjKibako2_Init, + ObjKibako2_Destroy, + ObjKibako2_Update, + ObjKibako2_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index ca1fb48e52..34129abf1f 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -22,10 +22,12 @@ ActorInit Obj_Kinoko_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjKinoko), - ObjKinoko_Init, - ObjKinoko_Destroy, - ObjKinoko_Update, - ObjKinoko_Draw, + { + ObjKinoko_Init, + ObjKinoko_Destroy, + ObjKinoko_Update, + ObjKinoko_Draw, + }, }; void ObjKinoko_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index f7d253eced..e85472b5f0 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -29,10 +29,12 @@ ActorInit Obj_Kzsaku_InitVars = { FLAGS, OBJECT_KZSAKU, sizeof(ObjKzsaku), - ObjKzsaku_Init, - ObjKzsaku_Destroy, - ObjKzsaku_Update, - ObjKzsaku_Draw, + { + ObjKzsaku_Init, + ObjKzsaku_Destroy, + ObjKzsaku_Update, + ObjKzsaku_Draw, + }, }; void ObjKzsaku_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index a917a09058..a4078e4d73 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -33,10 +33,12 @@ ActorInit Obj_Lift_InitVars = { FLAGS, OBJECT_D_LIFT, sizeof(ObjLift), - ObjLift_Init, - ObjLift_Destroy, - ObjLift_Update, - ObjLift_Draw, + { + ObjLift_Init, + ObjLift_Destroy, + ObjLift_Update, + ObjLift_Draw, + }, }; static s16 D_8093DD50[] = { 0, 10, 20, 30, 40, 50, 60 }; diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c index 81c2f3bf8a..799eeba2d1 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -28,10 +28,12 @@ ActorInit Obj_Lightblock_InitVars = { FLAGS, OBJECT_LIGHTBLOCK, sizeof(ObjLightblock), - ObjLightblock_Init, - ObjLightblock_Destroy, - ObjLightblock_Update, - ObjLightblock_Draw, + { + ObjLightblock_Init, + ObjLightblock_Destroy, + ObjLightblock_Update, + ObjLightblock_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index b8fc4fc542..8ef04bc700 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -33,10 +33,12 @@ ActorInit Obj_Lightswitch_InitVars = { FLAGS, OBJECT_LIGHTSWITCH, sizeof(ObjLightswitch), - ObjLightswitch_Init, - ObjLightswitch_Destroy, - ObjLightswitch_Update, - ObjLightswitch_Draw, + { + ObjLightswitch_Init, + ObjLightswitch_Destroy, + ObjLightswitch_Update, + ObjLightswitch_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index f6d1928458..965ff3c557 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -27,10 +27,12 @@ ActorInit Obj_Lupygamelift_InitVars = { FLAGS, OBJECT_RAILLIFT, sizeof(ObjLupygamelift), - ObjLupygamelift_Init, - ObjLupygamelift_Destroy, - ObjLupygamelift_Update, - ObjLupygamelift_Draw, + { + ObjLupygamelift_Init, + ObjLupygamelift_Destroy, + ObjLupygamelift_Update, + ObjLupygamelift_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 71d5c55104..d7a7ae9a03 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -24,10 +24,12 @@ ActorInit Obj_Makekinsuta_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMakekinsuta), - ObjMakekinsuta_Init, - ObjMakekinsuta_Destroy, - ObjMakekinsuta_Update, - NULL, + { + ObjMakekinsuta_Init, + ObjMakekinsuta_Destroy, + ObjMakekinsuta_Update, + NULL, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index b054c3d294..34e3f4c1bf 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -19,10 +19,12 @@ ActorInit Obj_Makeoshihiki_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMakeoshihiki), - ObjMakeoshihiki_Init, - Actor_Noop, - ObjMakeoshihiki_Update, - NULL, + { + ObjMakeoshihiki_Init, + Actor_Noop, + ObjMakeoshihiki_Update, + NULL, + }, }; s32 ObjMakeoshihiki_GetChildSpawnPointIndex(ObjMakeoshihiki* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index a9bf58f354..6a0e2a8e62 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -22,10 +22,12 @@ ActorInit Obj_Milk_Bin_InitVars = { FLAGS, OBJECT_OBJ_MILK_BIN, sizeof(ObjMilkBin), - ObjMilkBin_Init, - ObjMilkBin_Destroy, - ObjMilkBin_Update, - ObjMilkBin_Draw, + { + ObjMilkBin_Init, + ObjMilkBin_Destroy, + ObjMilkBin_Update, + ObjMilkBin_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index 78b3fbe6b1..121d1efedf 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -22,11 +22,11 @@ ActorInit Obj_Mine_InitVars = { FLAGS, OBJECT_NY, sizeof(ObjMine), - ObjMine_Init, +{ObjMine_Init, ObjMine_Destroy, ObjMine_Update, ObjMine_Draw, -}; +},}; // static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphElementInit D_80A84570[1] = { diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index fcdab04739..71678a6121 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -31,10 +31,12 @@ ActorInit Obj_Moon_Stone_InitVars = { FLAGS, OBJECT_GI_RESERVE00, sizeof(ObjMoonStone), - ObjMoonStone_Init, - ObjMoonStone_Destroy, - ObjMoonStone_Update, - ObjMoonStone_Draw, + { + ObjMoonStone_Init, + ObjMoonStone_Destroy, + ObjMoonStone_Update, + ObjMoonStone_Draw, + }, }; void ObjMoonStone_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c index 64d848da75..546bf67c08 100644 --- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c @@ -31,10 +31,12 @@ ActorInit Obj_Mu_Pict_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMuPict), - ObjMuPict_Init, - ObjMuPict_Destroy, - ObjMuPict_Update, - ObjMuPict_Draw, + { + ObjMuPict_Init, + ObjMuPict_Destroy, + ObjMuPict_Update, + ObjMuPict_Draw, + }, }; void ObjMuPict_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index e3a13f8406..24a3fa8ce6 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -26,10 +26,12 @@ ActorInit Obj_Mure_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure), - ObjMure_Init, - ObjMure_Destroy, - ObjMure_Update, - NULL, + { + ObjMure_Init, + ObjMure_Destroy, + ObjMure_Update, + NULL, + }, }; static f32 sZClip[] = { diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 9c9c6dc39c..0a7183f4cb 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -24,11 +24,11 @@ ActorInit Obj_Mure2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure2), - ObjMure2_Init, +{ObjMure2_Init, Actor_Noop, ObjMure2_Update, NULL, -}; +},}; // static InitChainEntry sInitChain[] = { static InitChainEntry D_809615F4[] = { diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index 7ec5c79c17..e8eb3cf191 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -27,10 +27,12 @@ ActorInit Obj_Mure3_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure3), - ObjMure3_Init, - ObjMure3_Destroy, - ObjMure3_Update, - NULL, + { + ObjMure3_Init, + ObjMure3_Destroy, + ObjMure3_Update, + NULL, + }, }; static s16 sRupeeCounts[] = { 5, 5, 7, 0 }; diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index f5f81e6ecf..df94a69cce 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -38,10 +38,12 @@ ActorInit Obj_Nozoki_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjNozoki), - ObjNozoki_Init, - ObjNozoki_Destroy, - ObjNozoki_Update, - NULL, + { + ObjNozoki_Init, + ObjNozoki_Destroy, + ObjNozoki_Update, + NULL, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index 4a51236b13..2a21b28672 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -37,10 +37,12 @@ ActorInit Obj_Ocarinalift_InitVars = { FLAGS, OBJECT_RAILLIFT, sizeof(ObjOcarinalift), - ObjOcarinalift_Init, - ObjOcarinalift_Destroy, - ObjOcarinalift_Update, - ObjOcarinalift_Draw, + { + ObjOcarinalift_Init, + ObjOcarinalift_Destroy, + ObjOcarinalift_Update, + ObjOcarinalift_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index bb09c6891c..55a069343c 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -31,10 +31,12 @@ ActorInit Obj_Oshihiki_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjOshihiki), - ObjOshihiki_Init, - ObjOshihiki_Destroy, - ObjOshihiki_Update, - ObjOshihiki_Draw, + { + ObjOshihiki_Init, + ObjOshihiki_Destroy, + ObjOshihiki_Update, + ObjOshihiki_Draw, + }, }; static f32 sScales[] = { 0.1f, 0.2f, 0.4f, 0.1f, 0.2f, 0.4f }; diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index e37b7d0291..9a14fe00af 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -47,10 +47,12 @@ ActorInit Obj_Purify_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjPurify), - ObjPurify_Init, - ObjPurify_Destroy, - ObjPurify_Update, - NULL, + { + ObjPurify_Init, + ObjPurify_Destroy, + ObjPurify_Update, + NULL, + }, }; ObjPurifyInfo sObjPurifyInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index 46a4c89ca7..5677b13ce2 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -31,10 +31,12 @@ ActorInit Obj_Pzlblock_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjPzlblock), - ObjPzlblock_Init, - ObjPzlblock_Destroy, - ObjPzlblock_Update, - NULL, + { + ObjPzlblock_Init, + ObjPzlblock_Destroy, + ObjPzlblock_Update, + NULL, + }, }; s16 D_809A4050[] = { 1, -1, 0, 0 }; diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c index 97631eec9a..6864e643f7 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -34,10 +34,12 @@ ActorInit Obj_Raillift_InitVars = { FLAGS, OBJECT_RAILLIFT, sizeof(ObjRaillift), - ObjRaillift_Init, - ObjRaillift_Destroy, - ObjRaillift_Update, - ObjRaillift_Draw, + { + ObjRaillift_Init, + ObjRaillift_Destroy, + ObjRaillift_Update, + ObjRaillift_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 3be57a8fd5..00bef1cf35 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -24,10 +24,12 @@ ActorInit Obj_Roomtimer_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjRoomtimer), - ObjRoomtimer_Init, - ObjRoomtimer_Destroy, - ObjRoomtimer_Update, - NULL, + { + ObjRoomtimer_Init, + ObjRoomtimer_Destroy, + ObjRoomtimer_Update, + NULL, + }, }; void ObjRoomtimer_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index 02b64a1f6c..9d69f0da84 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -31,10 +31,12 @@ ActorInit Obj_Rotlift_InitVars = { FLAGS, OBJECT_ROTLIFT, sizeof(ObjRotlift), - ObjRotlift_Init, - ObjRotlift_Destroy, - ObjRotlift_Update, - ObjRotlift_Draw, + { + ObjRotlift_Init, + ObjRotlift_Destroy, + ObjRotlift_Update, + ObjRotlift_Draw, + }, }; struct ObjRotliftModelInfo sModelInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index a08aa86183..5893e433d4 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -22,10 +22,12 @@ ActorInit Obj_Shutter_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjShutter), - ObjShutter_Init, - ObjShutter_Destroy, - ObjShutter_Update, - ObjShutter_Draw, + { + ObjShutter_Init, + ObjShutter_Destroy, + ObjShutter_Update, + ObjShutter_Draw, + }, }; void ObjShutter_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index e251bca909..61ffb32366 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -33,10 +33,12 @@ ActorInit Obj_Skateblock_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjSkateblock), - ObjSkateblock_Init, - ObjSkateblock_Destroy, - ObjSkateblock_Update, - ObjSkateblock_Draw, + { + ObjSkateblock_Init, + ObjSkateblock_Destroy, + ObjSkateblock_Update, + ObjSkateblock_Draw, + }, }; s32 D_80A22A10 = 0; diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index be38ec613d..f4cc4ba5f3 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -22,10 +22,12 @@ ActorInit Obj_Smork_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjSmork), - ObjSmork_Init, - ObjSmork_Destroy, - ObjSmork_Update, - ObjSmork_Draw, + { + ObjSmork_Init, + ObjSmork_Destroy, + ObjSmork_Update, + ObjSmork_Draw, + }, }; #include "overlays/ovl_Obj_Smork/ovl_Obj_Smork.c" diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index 5021d57822..49a983ae9a 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -39,10 +39,12 @@ ActorInit Obj_Snowball_InitVars = { FLAGS, OBJECT_GOROIWA, sizeof(ObjSnowball), - ObjSnowball_Init, - ObjSnowball_Destroy, - ObjSnowball_Update, - ObjSnowball_Draw, + { + ObjSnowball_Init, + ObjSnowball_Destroy, + ObjSnowball_Update, + ObjSnowball_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index bd8337ff4b..a4b198c673 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -32,10 +32,12 @@ ActorInit Obj_Snowball2_InitVars = { FLAGS, OBJECT_GOROIWA, sizeof(ObjSnowball2), - ObjSnowball2_Init, - ObjSnowball2_Destroy, - ObjSnowball2_Update, - ObjSnowball2_Draw, + { + ObjSnowball2_Init, + ObjSnowball2_Destroy, + ObjSnowball2_Update, + ObjSnowball2_Draw, + }, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index eb86d26b40..260a3c2265 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -21,11 +21,11 @@ ActorInit Obj_Sound_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjSound), - ObjSound_Init, +{ObjSound_Init, ObjSound_Destroy, ObjSound_Update, NULL, -}; +},}; #endif diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index c115030159..cd74ffe707 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -29,10 +29,12 @@ ActorInit Obj_Spidertent_InitVars = { FLAGS, OBJECT_SPIDERTENT, sizeof(ObjSpidertent), - ObjSpidertent_Init, - ObjSpidertent_Destroy, - ObjSpidertent_Update, - ObjSpidertent_Draw, + { + ObjSpidertent_Init, + ObjSpidertent_Destroy, + ObjSpidertent_Update, + ObjSpidertent_Draw, + }, }; static ColliderTrisElementInit sTrisElementsInit1[] = { diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index 5fbf180d79..4447c2c594 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -34,10 +34,12 @@ ActorInit Obj_Spinyroll_InitVars = { FLAGS, OBJECT_SPINYROLL, sizeof(ObjSpinyroll), - ObjSpinyroll_Init, - ObjSpinyroll_Destroy, - ObjSpinyroll_Update, - ObjSpinyroll_Draw, + { + ObjSpinyroll_Init, + ObjSpinyroll_Destroy, + ObjSpinyroll_Update, + ObjSpinyroll_Draw, + }, }; static ColliderTrisElementInit sTrisElementsInit[] = { diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index 67450b6c3f..4346ecc5ee 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -77,10 +77,12 @@ ActorInit Obj_Switch_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjSwitch), - ObjSwitch_Init, - ObjSwitch_Destroy, - ObjSwitch_Update, - ObjSwitch_Draw, + { + ObjSwitch_Init, + ObjSwitch_Destroy, + ObjSwitch_Update, + ObjSwitch_Draw, + }, }; static f32 sHeights[] = { 10.0f, 10.0f, 0.0f, 30.0f, 30.0f, 15.0f }; diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index 745c0b1591..52cb008db5 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -29,10 +29,12 @@ ActorInit Obj_Swprize_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjSwprize), - ObjSwprize_Init, - ObjSwprize_Destroy, - ObjSwprize_Update, - NULL, + { + ObjSwprize_Init, + ObjSwprize_Destroy, + ObjSwprize_Update, + NULL, + }, }; s16 D_80C257F0[] = { 2, 0x14, 1, 8 }; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 0649b5ceb1..a8e2a7a32c 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -24,10 +24,12 @@ ActorInit Obj_Syokudai_InitVars = { FLAGS, OBJECT_SYOKUDAI, sizeof(ObjSyokudai), - ObjSyokudai_Init, - ObjSyokudai_Destroy, - ObjSyokudai_Update, - ObjSyokudai_Draw, + { + ObjSyokudai_Init, + ObjSyokudai_Destroy, + ObjSyokudai_Update, + ObjSyokudai_Draw, + }, }; static ColliderCylinderInit sStandColliderInit = { diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index db3b13f180..7aa2f13d76 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -24,11 +24,11 @@ ActorInit Obj_Takaraya_Wall_InitVars = { FLAGS, OBJECT_TAKARAYA_OBJECTS, sizeof(ObjTakarayaWall), - ObjTakarayaWall_Init, +{ObjTakarayaWall_Init, ObjTakarayaWall_Destroy, ObjTakarayaWall_Update, ObjTakarayaWall_Draw, -}; +},}; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80ADA2A0 = { diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index cae9ba563b..1d44e6dbd2 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -30,10 +30,12 @@ ActorInit Obj_Taru_InitVars = { FLAGS, OBJECT_TARU, sizeof(ObjTaru), - ObjTaru_Init, - ObjTaru_Destroy, - ObjTaru_Update, - ObjTaru_Draw, + { + ObjTaru_Init, + ObjTaru_Destroy, + ObjTaru_Update, + ObjTaru_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index d6dcb25498..77679c74b3 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -29,10 +29,12 @@ ActorInit Obj_Toge_InitVars = { FLAGS, OBJECT_TRAP, sizeof(ObjToge), - ObjToge_Init, - ObjToge_Destroy, - ObjToge_Update, - ObjToge_Draw, + { + ObjToge_Init, + ObjToge_Destroy, + ObjToge_Update, + ObjToge_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 87b8e58556..b69fb74d4a 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -34,10 +34,12 @@ ActorInit Obj_Tokei_Step_InitVars = { FLAGS, OBJECT_TOKEI_STEP, sizeof(ObjTokeiStep), - ObjTokeiStep_Init, - ObjTokeiStep_Destroy, - ObjTokeiStep_Update, - ObjTokeiStep_Draw, + { + ObjTokeiStep_Init, + ObjTokeiStep_Destroy, + ObjTokeiStep_Update, + ObjTokeiStep_Draw, + }, }; static f32 sPanelXOffsets[] = { -105.0f, -90.0f, -75.0f, -60.0f, -45.0f, -30.0f, -15.0f }; diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 2f3dc5a624..5ef23aa1d6 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -22,11 +22,11 @@ ActorInit Obj_Tokei_Tobira_InitVars = { FLAGS, OBJECT_TOKEI_TOBIRA, sizeof(ObjTokeiTobira), - ObjTokeiTobira_Init, +{ObjTokeiTobira_Init, ObjTokeiTobira_Destroy, ObjTokeiTobira_Update, ObjTokeiTobira_Draw, -}; +},}; // static InitChainEntry sInitChain[] = { static InitChainEntry D_80ABD750[] = { diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index 4a1135a500..c4b3cbf302 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -22,10 +22,12 @@ ActorInit Obj_Tokei_Turret_InitVars = { FLAGS, OBJECT_TOKEI_TURRET, sizeof(ObjTokeiTurret), - ObjTokeiTurret_Init, - ObjTokeiTurret_Destroy, - ObjTokeiTurret_Update, - ObjTokeiTurret_Draw, + { + ObjTokeiTurret_Init, + ObjTokeiTurret_Destroy, + ObjTokeiTurret_Update, + ObjTokeiTurret_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 376e2fca6b..d9245ab8d3 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -68,10 +68,12 @@ ActorInit Obj_Tokeidai_InitVars = { FLAGS, OBJECT_OBJ_TOKEIDAI, sizeof(ObjTokeidai), - ObjTokeidai_Init, - ObjTokeidai_Destroy, - ObjTokeidai_Update, - ObjTokeidai_Draw, + { + ObjTokeidai_Init, + ObjTokeidai_Destroy, + ObjTokeidai_Update, + ObjTokeidai_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index d100f8cd27..8e78e52b42 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -22,10 +22,12 @@ ActorInit Obj_Toudai_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjToudai), - ObjToudai_Init, - ObjToudai_Destroy, - ObjToudai_Update, - ObjToudai_Draw, + { + ObjToudai_Init, + ObjToudai_Destroy, + ObjToudai_Update, + ObjToudai_Draw, + }, }; #include "assets/overlays/ovl_Obj_Toudai/ovl_Obj_Toudai.c" diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index ca242a10ee..39d4094e6c 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -26,10 +26,12 @@ ActorInit Obj_Tree_InitVars = { FLAGS, OBJECT_TREE, sizeof(ObjTree), - ObjTree_Init, - ObjTree_Destroy, - ObjTree_Update, - ObjTree_Draw, + { + ObjTree_Init, + ObjTree_Destroy, + ObjTree_Update, + ObjTree_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 3a6e4fa7f3..411aaa63a3 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -47,10 +47,12 @@ ActorInit Obj_Tsubo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjTsubo), - ObjTsubo_Init, - ObjTsubo_Destroy, - ObjTsubo_Update, - NULL, + { + ObjTsubo_Init, + ObjTsubo_Destroy, + ObjTsubo_Update, + NULL, + }, }; typedef struct { diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index ba2b9f62e8..d23f5a891d 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -67,10 +67,12 @@ ActorInit Obj_Um_InitVars = { FLAGS, OBJECT_UM, sizeof(ObjUm), - ObjUm_Init, - ObjUm_Destroy, - ObjUm_Update, - ObjUm_Draw, + { + ObjUm_Init, + ObjUm_Destroy, + ObjUm_Update, + ObjUm_Draw, + }, }; static TexturePtr sEyeTextures[] = { diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index 83381f34d0..e9bc2aadf3 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -22,10 +22,12 @@ ActorInit Obj_Usiyane_InitVars = { FLAGS, OBJECT_OBJ_USIYANE, sizeof(ObjUsiyane), - ObjUsiyane_Init, - ObjUsiyane_Destroy, - ObjUsiyane_Update, - ObjUsiyane_Draw, + { + ObjUsiyane_Init, + ObjUsiyane_Destroy, + ObjUsiyane_Update, + ObjUsiyane_Draw, + }, }; PosRot D_80C08660[] = { diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index 58416da7b6..9efc685434 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -21,10 +21,12 @@ ActorInit Obj_Visiblock_InitVars = { FLAGS, OBJECT_VISIBLOCK, sizeof(ObjVisiblock), - ObjVisiblock_Init, - ObjVisiblock_Destroy, - Actor_Noop, - ObjVisiblock_Draw, + { + ObjVisiblock_Init, + ObjVisiblock_Destroy, + Actor_Noop, + ObjVisiblock_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index c4491f16d2..987d491184 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -33,10 +33,12 @@ ActorInit Obj_Vspinyroll_InitVars = { FLAGS, OBJECT_SPINYROLL, sizeof(ObjVspinyroll), - ObjVspinyroll_Init, - ObjVspinyroll_Destroy, - ObjVspinyroll_Update, - ObjVspinyroll_Draw, + { + ObjVspinyroll_Init, + ObjVspinyroll_Destroy, + ObjVspinyroll_Update, + ObjVspinyroll_Draw, + }, }; f32 D_80A3D450[] = { 1.0f, 2.0f }; diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index 5e037d5981..ddfc392bbb 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -28,10 +28,12 @@ ActorInit Obj_Warpstone_InitVars = { FLAGS, OBJECT_SEK, sizeof(ObjWarpstone), - ObjWarpstone_Init, - ObjWarpstone_Destroy, - ObjWarpstone_Update, - ObjWarpstone_Draw, + { + ObjWarpstone_Init, + ObjWarpstone_Destroy, + ObjWarpstone_Update, + ObjWarpstone_Draw, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index 9915df1288..5afb83e887 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -22,11 +22,11 @@ ActorInit Obj_Wind_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjWind), - ObjWind_Init, +{ObjWind_Init, ObjWind_Destroy, ObjWind_Update, ObjWind_Draw, -}; +},}; // static InitChainEntry sInitChain[] = { static InitChainEntry D_80B24480[] = { diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index 1522dbaed1..041b216f82 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -23,9 +23,17 @@ void func_808A7C04(ObjWturn* this, PlayState* play); void func_808A7C78(ObjWturn* this, PlayState* play); ActorInit Obj_Wturn_InitVars = { - ACTOR_OBJ_WTURN, ACTORCAT_ITEMACTION, FLAGS, - GAMEPLAY_KEEP, sizeof(ObjWturn), ObjWturn_Init, - Actor_Noop, ObjWturn_Update, NULL, + ACTOR_OBJ_WTURN, + ACTORCAT_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjWturn), + { + ObjWturn_Init, + Actor_Noop, + ObjWturn_Update, + NULL, + }, }; void ObjWturn_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index 255af285a9..99386512aa 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -22,10 +22,12 @@ ActorInit Obj_Y2lift_InitVars = { FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjY2lift), - ObjY2lift_Init, - ObjY2lift_Destroy, - ObjY2lift_Update, - ObjY2lift_Draw, + { + ObjY2lift_Init, + ObjY2lift_Destroy, + ObjY2lift_Update, + ObjY2lift_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index d5c89e4e62..d55f52ee66 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -35,10 +35,12 @@ ActorInit Obj_Y2shutter_InitVars = { FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjY2shutter), - ObjY2shutter_Init, - ObjY2shutter_Destroy, - ObjY2shutter_Update, - ObjY2shutter_Draw, + { + ObjY2shutter_Init, + ObjY2shutter_Destroy, + ObjY2shutter_Update, + ObjY2shutter_Draw, + }, }; ShutterInfo sShutterInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c index 9636b34f90..d5174e22d6 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -23,10 +23,12 @@ ActorInit Obj_Yado_InitVars = { FLAGS, OBJECT_YADO_OBJ, sizeof(ObjYado), - ObjYado_Init, - ObjYado_Destroy, - ObjYado_Update, - ObjYado_Draw, + { + ObjYado_Init, + ObjYado_Destroy, + ObjYado_Update, + ObjYado_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index a976afc75f..df6e679587 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -24,10 +24,12 @@ ActorInit Obj_Yasi_InitVars = { FLAGS, OBJECT_OBJ_YASI, sizeof(ObjYasi), - ObjYasi_Init, - ObjYasi_Destroy, - ObjYasi_Update, - ObjYasi_Draw, + { + ObjYasi_Init, + ObjYasi_Destroy, + ObjYasi_Update, + ObjYasi_Draw, + }, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 0508938262..647326cf46 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -33,10 +33,12 @@ ActorInit Object_Kankyo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjectKankyo), - ObjectKankyo_Init, - ObjectKankyo_Destroy, - ObjectKankyo_Update, - ObjectKankyo_Draw, + { + ObjectKankyo_Init, + ObjectKankyo_Destroy, + ObjectKankyo_Update, + ObjectKankyo_Draw, + }, }; static u16 D_808DE340 = 0; diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index fcfd0f76db..52b052729a 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -27,10 +27,12 @@ ActorInit Oceff_Spot_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffSpot), - OceffSpot_Init, - OceffSpot_Destroy, - OceffSpot_Update, - OceffSpot_Draw, + { + OceffSpot_Init, + OceffSpot_Destroy, + OceffSpot_Update, + OceffSpot_Draw, + }, }; #include "assets/overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.c" diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 7c4b8fdd36..522f80f2fc 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -25,10 +25,12 @@ ActorInit Oceff_Storm_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffStorm), - OceffStorm_Init, - OceffStorm_Destroy, - OceffStorm_Update, - OceffStorm_Draw, + { + OceffStorm_Init, + OceffStorm_Destroy, + OceffStorm_Update, + OceffStorm_Draw, + }, }; void OceffStorm_SetupAction(OceffStorm* this, OceffStormActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index a1ada249cb..1b2fbee43a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -21,10 +21,12 @@ ActorInit Oceff_Wipe_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe), - OceffWipe_Init, - OceffWipe_Destroy, - OceffWipe_Update, - OceffWipe_Draw, + { + OceffWipe_Init, + OceffWipe_Destroy, + OceffWipe_Update, + OceffWipe_Draw, + }, }; UNK_TYPE4 D_80977200; diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 0e457966b6..67b5d2e02d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -21,10 +21,12 @@ ActorInit Oceff_Wipe2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe2), - OceffWipe2_Init, - OceffWipe2_Destroy, - OceffWipe2_Update, - OceffWipe2_Draw, + { + OceffWipe2_Init, + OceffWipe2_Destroy, + OceffWipe2_Update, + OceffWipe2_Draw, + }, }; #include "assets/overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 778091ef46..64be5ffe0e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -22,10 +22,12 @@ ActorInit Oceff_Wipe3_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe3), - OceffWipe3_Init, - OceffWipe3_Destroy, - OceffWipe3_Update, - OceffWipe3_Draw, + { + OceffWipe3_Init, + OceffWipe3_Destroy, + OceffWipe3_Update, + OceffWipe3_Draw, + }, }; #include "assets/overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 4b8b763f0d..a9f38d0998 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -21,10 +21,12 @@ ActorInit Oceff_Wipe4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe4), - OceffWipe4_Init, - OceffWipe4_Destroy, - OceffWipe4_Update, - OceffWipe4_Draw, + { + OceffWipe4_Init, + OceffWipe4_Destroy, + OceffWipe4_Update, + OceffWipe4_Draw, + }, }; #include "assets/overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c index 4a8745762a..8c7df9f7d7 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -21,10 +21,12 @@ ActorInit Oceff_Wipe5_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe5), - OceffWipe5_Init, - OceffWipe5_Destroy, - OceffWipe5_Update, - OceffWipe5_Draw, + { + OceffWipe5_Init, + OceffWipe5_Destroy, + OceffWipe5_Update, + OceffWipe5_Draw, + }, }; UNK_TYPE4 D_80BC9260; diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index d170e9d92d..5a82aac2a3 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -21,10 +21,12 @@ ActorInit Oceff_Wipe6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe6), - OceffWipe6_Init, - OceffWipe6_Destroy, - OceffWipe6_Update, - OceffWipe6_Draw, + { + OceffWipe6_Init, + OceffWipe6_Destroy, + OceffWipe6_Update, + OceffWipe6_Draw, + }, }; #include "overlays/ovl_Oceff_Wipe6/ovl_Oceff_Wipe6.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c index 523d57ab81..85861340b5 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -21,10 +21,12 @@ ActorInit Oceff_Wipe7_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe7), - OceffWipe7_Init, - OceffWipe7_Destroy, - OceffWipe7_Update, - OceffWipe7_Draw, + { + OceffWipe7_Init, + OceffWipe7_Destroy, + OceffWipe7_Update, + OceffWipe7_Draw, + }, }; #include "assets/overlays/ovl_Oceff_Wipe7/ovl_Oceff_Wipe7.c" diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 5b52615561..ae6ca771ea 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -25,10 +25,12 @@ ActorInit Shot_Sun_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ShotSun), - ShotSun_Init, - ShotSun_Destroy, - ShotSun_Update, - NULL, + { + ShotSun_Init, + ShotSun_Destroy, + ShotSun_Update, + NULL, + }, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c index 150ccc5d3b..c3a8f1bc45 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -24,10 +24,12 @@ ActorInit TG_Sw_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(TGSw), - TGSw_Init, - TGSw_Destroy, - TGSw_Update, - TGSw_Draw, + { + TGSw_Init, + TGSw_Destroy, + TGSw_Update, + TGSw_Draw, + }, }; void TGSw_ActionDecider(TGSw* this, PlayState* play) {