diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 8f135d79bb..e4cdc31fdd 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -24,15 +24,8 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play); void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play); ActorInit En_Item00_InitVars = { - ACTOR_EN_ITEM00, - ACTORCAT_MISC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnItem00), - EnItem00_Init, - EnItem00_Destroy, - EnItem00_Update, - EnItem00_Draw, + ACTOR_EN_ITEM00, ACTORCAT_MISC, FLAGS, GAMEPLAY_KEEP, sizeof(EnItem00), + EnItem00_Init, EnItem00_Destroy, EnItem00_Update, EnItem00_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index fa52c8f23b..b819082a25 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -15,15 +15,8 @@ void PlayerCall_Update(Actor* thisx, PlayState* play); void PlayerCall_Draw(Actor* thisx, PlayState* play); ActorInit Player_InitVars = { - ACTOR_PLAYER, - ACTORCAT_PLAYER, - FLAGS, - GAMEPLAY_KEEP, - sizeof(Player), - PlayerCall_Init, - PlayerCall_Destroy, - PlayerCall_Update, - PlayerCall_Draw, + ACTOR_PLAYER, ACTORCAT_PLAYER, FLAGS, GAMEPLAY_KEEP, sizeof(Player), PlayerCall_Init, + PlayerCall_Destroy, PlayerCall_Update, PlayerCall_Draw, }; void Player_Init(Actor* thisx, PlayState* play); 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..a2f9aa3dfb 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -21,15 +21,8 @@ void ArmsHook_Wait(ArmsHook* this, PlayState* play); void ArmsHook_Shoot(ArmsHook* this, PlayState* play); ActorInit Arms_Hook_InitVars = { - ACTOR_ARMS_HOOK, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ArmsHook), - ArmsHook_Init, - ArmsHook_Destroy, - ArmsHook_Update, - ArmsHook_Draw, + ACTOR_ARMS_HOOK, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArmsHook), + ArmsHook_Init, ArmsHook_Destroy, ArmsHook_Update, ArmsHook_Draw, }; static ColliderQuadInit D_808C1BC0 = { 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..0b5556257e 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -22,15 +22,8 @@ void FireArrow_Fly(ArrowFire* this, PlayState* play); #include "overlays/ovl_Arrow_fire/ovl_Arrow_Fire.c" ActorInit Arrow_Fire_InitVars = { - ACTOR_ARROW_FIRE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ArrowFire), - ArrowFire_Init, - ArrowFire_Destroy, - ArrowFire_Update, - ArrowFire_Draw, + ACTOR_ARROW_FIRE, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArrowFire), ArrowFire_Init, + ArrowFire_Destroy, ArrowFire_Update, ArrowFire_Draw, }; static ColliderQuadInit sQuadInit = { 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..23ea8833b1 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -24,15 +24,8 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play); s32 unused; // Needed for bss ActorInit Arrow_Ice_InitVars = { - ACTOR_ARROW_ICE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ArrowIce), - ArrowIce_Init, - ArrowIce_Destroy, - ArrowIce_Update, - ArrowIce_Draw, + ACTOR_ARROW_ICE, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArrowIce), + ArrowIce_Init, ArrowIce_Destroy, ArrowIce_Update, ArrowIce_Draw, }; static InitChainEntry sInitChain[] = { 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..aa057c1299 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -22,15 +22,8 @@ void ArrowLight_Fly(ArrowLight* this, PlayState* play); #include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" ActorInit Arrow_Light_InitVars = { - ACTOR_ARROW_LIGHT, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ArrowLight), - ArrowLight_Init, - ArrowLight_Destroy, - ArrowLight_Update, - ArrowLight_Draw, + ACTOR_ARROW_LIGHT, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArrowLight), ArrowLight_Init, + ArrowLight_Destroy, ArrowLight_Update, ArrowLight_Draw, }; static InitChainEntry sInitChain[] = { 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..10d6880812 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -19,15 +19,9 @@ void BgBotihasira_Draw(Actor* thisx, PlayState* play); void BgBotihasira_DoNothing(BgBotihasira* this, PlayState* play); ActorInit Bg_Botihasira_InitVars = { - ACTOR_BG_BOTIHASIRA, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BOTIHASIRA, - sizeof(BgBotihasira), - BgBotihasira_Init, - BgBotihasira_Destroy, - BgBotihasira_Update, - BgBotihasira_Draw, + ACTOR_BG_BOTIHASIRA, ACTORCAT_ITEMACTION, FLAGS, + OBJECT_BOTIHASIRA, sizeof(BgBotihasira), BgBotihasira_Init, + BgBotihasira_Destroy, BgBotihasira_Update, BgBotihasira_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..5df6806a3b 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,15 @@ void func_808B7D34(Actor* thisx, PlayState* play); void BgBreakwall_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Breakwall_InitVars = { - ACTOR_BG_BREAKWALL, ACTORCAT_ITEMACTION, FLAGS, - GAMEPLAY_KEEP, sizeof(BgBreakwall), BgBreakwall_Init, - NULL, BgBreakwall_Update, NULL, + ACTOR_BG_BREAKWALL, + ACTORCAT_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(BgBreakwall), + BgBreakwall_Init, + NULL, + BgBreakwall_Update, + NULL, }; typedef struct { 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..46970de1ac 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 @@ -42,15 +42,9 @@ typedef enum { u8 sIsLoaded[32]; ActorInit Bg_Crace_Movebg_InitVars = { - ACTOR_BG_CRACE_MOVEBG, - ACTORCAT_BG, - FLAGS, - OBJECT_CRACE_OBJECT, - sizeof(BgCraceMovebg), - BgCraceMovebg_Init, - BgCraceMovebg_Destroy, - BgCraceMovebg_Update, - BgCraceMovebg_Draw, + ACTOR_BG_CRACE_MOVEBG, ACTORCAT_BG, FLAGS, + OBJECT_CRACE_OBJECT, sizeof(BgCraceMovebg), BgCraceMovebg_Init, + BgCraceMovebg_Destroy, BgCraceMovebg_Update, BgCraceMovebg_Draw, }; static u8 sHasInitializedIsLoaded = 0; 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..4b90e67e7a 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 @@ -20,15 +20,9 @@ void BgCtowerGear_UpdateOrgan(Actor* thisx, PlayState* play); void BgCtowerGear_DrawOrgan(Actor* thisx, PlayState* play); ActorInit Bg_Ctower_Gear_InitVars = { - ACTOR_BG_CTOWER_GEAR, - ACTORCAT_PROP, - FLAGS, - OBJECT_CTOWER_ROT, - sizeof(BgCtowerGear), - BgCtowerGear_Init, - BgCtowerGear_Destroy, - BgCtowerGear_Update, - BgCtowerGear_Draw, + ACTOR_BG_CTOWER_GEAR, ACTORCAT_PROP, FLAGS, + OBJECT_CTOWER_ROT, sizeof(BgCtowerGear), BgCtowerGear_Init, + BgCtowerGear_Destroy, BgCtowerGear_Update, BgCtowerGear_Draw, }; static Vec3f sExitSplashOffsets[] = { 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..e007db565c 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 @@ -22,15 +22,9 @@ void BgCtowerRot_DoorIdle(BgCtowerRot* this, PlayState* play); void BgCtowerRot_SetupDoorClose(BgCtowerRot* this, PlayState* play); ActorInit Bg_Ctower_Rot_InitVars = { - ACTOR_BG_CTOWER_ROT, - ACTORCAT_BG, - FLAGS, - OBJECT_CTOWER_ROT, - sizeof(BgCtowerRot), - BgCtowerRot_Init, - BgCtowerRot_Destroy, - BgCtowerRot_Update, - BgCtowerRot_Draw, + ACTOR_BG_CTOWER_ROT, ACTORCAT_BG, FLAGS, + OBJECT_CTOWER_ROT, sizeof(BgCtowerRot), BgCtowerRot_Init, + BgCtowerRot_Destroy, BgCtowerRot_Update, BgCtowerRot_Draw, }; static InitChainEntry sInitChain[] = { 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..fdcf7b2d4d 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 @@ -46,15 +46,9 @@ u8 D_80A2B870[][2] = { }; ActorInit Bg_Dblue_Movebg_InitVars = { - ACTOR_BG_DBLUE_MOVEBG, - ACTORCAT_BG, - FLAGS, - OBJECT_DBLUE_OBJECT, - sizeof(BgDblueMovebg), - BgDblueMovebg_Init, - BgDblueMovebg_Destroy, - BgDblueMovebg_Update, - BgDblueMovebg_Draw, + ACTOR_BG_DBLUE_MOVEBG, ACTORCAT_BG, FLAGS, + OBJECT_DBLUE_OBJECT, sizeof(BgDblueMovebg), BgDblueMovebg_Init, + BgDblueMovebg_Destroy, BgDblueMovebg_Update, BgDblueMovebg_Draw, }; static Gfx* sOpaDLists[] = { 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..f57deb8fad 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 @@ -25,15 +25,9 @@ void BgDkjailIvy_SetupFadeOut(BgDkjailIvy* this); void BgDkjailIvy_FadeOut(BgDkjailIvy* this, PlayState* play); ActorInit Bg_Dkjail_Ivy_InitVars = { - ACTOR_BG_DKJAIL_IVY, - ACTORCAT_BG, - FLAGS, - OBJECT_DKJAIL_OBJ, - sizeof(BgDkjailIvy), - BgDkjailIvy_Init, - BgDkjailIvy_Destroy, - BgDkjailIvy_Update, - BgDkjailIvy_Draw, + ACTOR_BG_DKJAIL_IVY, ACTORCAT_BG, FLAGS, + OBJECT_DKJAIL_OBJ, sizeof(BgDkjailIvy), BgDkjailIvy_Init, + BgDkjailIvy_Destroy, BgDkjailIvy_Update, BgDkjailIvy_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..2918046ce6 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 @@ -27,15 +27,8 @@ void func_80BC4530(BgF40Block* this, PlayState* play); void func_80BC457C(BgF40Block* this, PlayState* play); ActorInit Bg_F40_Block_InitVars = { - ACTOR_BG_F40_BLOCK, - ACTORCAT_BG, - FLAGS, - OBJECT_F40_OBJ, - sizeof(BgF40Block), - BgF40Block_Init, - BgF40Block_Destroy, - BgF40Block_Update, - BgF40Block_Draw, + ACTOR_BG_F40_BLOCK, ACTORCAT_BG, FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Block), BgF40Block_Init, + BgF40Block_Destroy, BgF40Block_Update, BgF40Block_Draw, }; static Vec3f D_80BC4620[] = { 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..a8e2e071ed 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 @@ -20,15 +20,8 @@ void func_808D75F0(BgF40Flift* this, PlayState* play); void func_808D7714(BgF40Flift* this, PlayState* play); ActorInit Bg_F40_Flift_InitVars = { - ACTOR_BG_F40_FLIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_F40_OBJ, - sizeof(BgF40Flift), - BgF40Flift_Init, - BgF40Flift_Destroy, - BgF40Flift_Update, - BgF40Flift_Draw, + ACTOR_BG_F40_FLIFT, ACTORCAT_BG, FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Flift), BgF40Flift_Init, + BgF40Flift_Destroy, BgF40Flift_Update, BgF40Flift_Draw, }; static InitChainEntry sInitChain[] = { 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..0564606f15 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 @@ -25,15 +25,9 @@ void BgF40Switch_WaitToPress(BgF40Switch* this, PlayState* play); void BgF40Switch_IdleUnpressed(BgF40Switch* this, PlayState* play); ActorInit Bg_F40_Switch_InitVars = { - ACTOR_BG_F40_SWITCH, - ACTORCAT_SWITCH, - FLAGS, - OBJECT_F40_SWITCH, - sizeof(BgF40Switch), - BgF40Switch_Init, - BgF40Switch_Destroy, - BgF40Switch_Update, - BgF40Switch_Draw, + ACTOR_BG_F40_SWITCH, ACTORCAT_SWITCH, FLAGS, + OBJECT_F40_SWITCH, sizeof(BgF40Switch), BgF40Switch_Init, + BgF40Switch_Destroy, BgF40Switch_Update, BgF40Switch_Draw, }; s32 sBgF40SwitchGlobalsInitialized = false; 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..afbfd10c3b 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 @@ -22,15 +22,8 @@ void func_809AC68C(BgFireWall* this, PlayState* play); void func_809AC6C0(BgFireWall* this, PlayState* play); ActorInit Bg_Fire_Wall_InitVars = { - ACTOR_BG_FIRE_WALL, - ACTORCAT_BG, - FLAGS, - OBJECT_FWALL, - sizeof(BgFireWall), - BgFireWall_Init, - BgFireWall_Destroy, - BgFireWall_Update, - NULL, + ACTOR_BG_FIRE_WALL, ACTORCAT_BG, FLAGS, OBJECT_FWALL, sizeof(BgFireWall), BgFireWall_Init, + BgFireWall_Destroy, BgFireWall_Update, NULL, }; static ColliderCylinderInit sCylinderInit = { 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..aac24443b4 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 @@ -17,15 +17,8 @@ void BgFuKaiten_Update(Actor* thisx, PlayState* play); void BgFuKaiten_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Fu_Kaiten_InitVars = { - ACTOR_BG_FU_KAITEN, - ACTORCAT_BG, - FLAGS, - OBJECT_FU_KAITEN, - sizeof(BgFuKaiten), - BgFuKaiten_Init, - BgFuKaiten_Destroy, - BgFuKaiten_Update, - BgFuKaiten_Draw, + ACTOR_BG_FU_KAITEN, ACTORCAT_BG, FLAGS, OBJECT_FU_KAITEN, sizeof(BgFuKaiten), BgFuKaiten_Init, + BgFuKaiten_Destroy, BgFuKaiten_Update, BgFuKaiten_Draw, }; void BgFuKaiten_Init(Actor* thisx, PlayState* play) { 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..c7d2b0b412 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 @@ -17,15 +17,8 @@ void BgFuMizu_Update(Actor* thisx, PlayState* play); void BgFuMizu_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Fu_Mizu_InitVars = { - ACTOR_BG_FU_MIZU, - ACTORCAT_BG, - FLAGS, - OBJECT_FU_KAITEN, - sizeof(BgFuMizu), - BgFuMizu_Init, - BgFuMizu_Destroy, - BgFuMizu_Update, - BgFuMizu_Draw, + ACTOR_BG_FU_MIZU, ACTORCAT_BG, FLAGS, OBJECT_FU_KAITEN, sizeof(BgFuMizu), + BgFuMizu_Init, BgFuMizu_Destroy, BgFuMizu_Update, BgFuMizu_Draw, }; void BgFuMizu_Init(Actor* thisx, PlayState* play) { 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..2a023eb8c1 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 @@ -24,15 +24,8 @@ void BgGoronOyu_SpawnEffects(BgGoronOyu* this, PlayState* play); void func_80B40160(BgGoronOyu* this, PlayState* play); ActorInit Bg_Goron_Oyu_InitVars = { - ACTOR_BG_GORON_OYU, - ACTORCAT_BG, - FLAGS, - OBJECT_OYU, - sizeof(BgGoronOyu), - BgGoronOyu_Init, - BgGoronOyu_Destroy, - BgGoronOyu_Update, - BgGoronOyu_Draw, + ACTOR_BG_GORON_OYU, ACTORCAT_BG, FLAGS, OBJECT_OYU, sizeof(BgGoronOyu), BgGoronOyu_Init, + BgGoronOyu_Destroy, BgGoronOyu_Update, BgGoronOyu_Draw, }; void func_80B40080(BgGoronOyu* this) { 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..94a82b762f 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 @@ -27,15 +27,9 @@ void func_80B6DEA8(BgHakaCurtain* this, PlayState* play); void func_80B6DE80(BgHakaCurtain* this); ActorInit Bg_Haka_Curtain_InitVars = { - ACTOR_BG_HAKA_CURTAIN, - ACTORCAT_BG, - FLAGS, - OBJECT_HAKA_OBJ, - sizeof(BgHakaCurtain), - BgHakaCurtain_Init, - BgHakaCurtain_Destroy, - BgHakaCurtain_Update, - BgHakaCurtain_Draw, + ACTOR_BG_HAKA_CURTAIN, ACTORCAT_BG, FLAGS, + OBJECT_HAKA_OBJ, sizeof(BgHakaCurtain), BgHakaCurtain_Init, + BgHakaCurtain_Destroy, BgHakaCurtain_Update, BgHakaCurtain_Draw, }; static InitChainEntry sInitChain[] = { 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..e320342513 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 @@ -24,15 +24,8 @@ void BgHakaTomb_SetupDoNothing(BgHakaTomb* this); void BgHakaTomb_DoNothing(BgHakaTomb* this, PlayState* play); ActorInit Bg_Haka_Tomb_InitVars = { - ACTOR_BG_HAKA_TOMB, - ACTORCAT_BG, - FLAGS, - OBJECT_HAKA_OBJ, - sizeof(BgHakaTomb), - BgHakaTomb_Init, - BgHakaTomb_Destroy, - BgHakaTomb_Update, - BgHakaTomb_Draw, + ACTOR_BG_HAKA_TOMB, ACTORCAT_BG, FLAGS, OBJECT_HAKA_OBJ, sizeof(BgHakaTomb), BgHakaTomb_Init, + BgHakaTomb_Destroy, BgHakaTomb_Update, BgHakaTomb_Draw, }; static InitChainEntry sInitChain[] = { 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..f78965eeb0 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 @@ -40,15 +40,8 @@ BgHakuginPostColliders D_80A9DDC0; BgHakuginPostUnkStruct D_80A9E028; ActorInit Bg_Hakugin_Post_InitVars = { - ACTOR_BG_HAKUGIN_POST, - ACTORCAT_BG, - FLAGS, - OBJECT_HAKUGIN_OBJ, - sizeof(BgHakuginPost), - BgHakuginPost_Init, - BgHakuginPost_Destroy, - BgHakuginPost_Update, - NULL, + ACTOR_BG_HAKUGIN_POST, ACTORCAT_BG, FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginPost), BgHakuginPost_Init, + BgHakuginPost_Destroy, BgHakuginPost_Update, NULL, }; typedef struct { 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..254e316324 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 @@ -39,15 +39,9 @@ void func_80B165E0(BgHakuginSwitch* this, PlayState* play); u32 D_80B16AF0; ActorInit Bg_Hakugin_Switch_InitVars = { - ACTOR_BG_HAKUGIN_SWITCH, - ACTORCAT_SWITCH, - FLAGS, - OBJECT_GORONSWITCH, - sizeof(BgHakuginSwitch), - BgHakuginSwitch_Init, - BgHakuginSwitch_Destroy, - BgHakuginSwitch_Update, - BgHakuginSwitch_Draw, + ACTOR_BG_HAKUGIN_SWITCH, ACTORCAT_SWITCH, FLAGS, + OBJECT_GORONSWITCH, sizeof(BgHakuginSwitch), BgHakuginSwitch_Init, + BgHakuginSwitch_Destroy, BgHakuginSwitch_Update, BgHakuginSwitch_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..9a470a916c 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -24,15 +24,8 @@ void func_80AC4C34(BgIcefloe* this, PlayState* play); void func_80AC4CF0(BgIcefloe* this); ActorInit Bg_Icefloe_InitVars = { - ACTOR_BG_ICEFLOE, - ACTORCAT_BG, - FLAGS, - OBJECT_ICEFLOE, - sizeof(BgIcefloe), - BgIcefloe_Init, - BgIcefloe_Destroy, - BgIcefloe_Update, - BgIcefloe_Draw, + ACTOR_BG_ICEFLOE, ACTORCAT_BG, FLAGS, OBJECT_ICEFLOE, sizeof(BgIcefloe), BgIcefloe_Init, + BgIcefloe_Destroy, BgIcefloe_Update, BgIcefloe_Draw, }; static BgIcefloe* sSpawnedInstances[] = { NULL, NULL, NULL }; 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..0c2fa1b8a4 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -43,15 +43,8 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit Bg_Icicle_InitVars = { - ACTOR_BG_ICICLE, - ACTORCAT_PROP, - FLAGS, - OBJECT_ICICLE, - sizeof(BgIcicle), - BgIcicle_Init, - BgIcicle_Destroy, - BgIcicle_Update, - BgIcicle_Draw, + ACTOR_BG_ICICLE, ACTORCAT_PROP, FLAGS, OBJECT_ICICLE, sizeof(BgIcicle), + BgIcicle_Init, BgIcicle_Destroy, BgIcicle_Update, BgIcicle_Draw, }; static InitChainEntry sInitChain[] = { 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..762815f1da 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 @@ -26,15 +26,8 @@ void func_80B7F398(BgIkanaBlock* this, PlayState* play); void func_80B7F564(Actor* thisx, PlayState* play); ActorInit Bg_Ikana_Block_InitVars = { - ACTOR_BG_IKANA_BLOCK, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(BgIkanaBlock), - BgIkanaBlock_Init, - BgIkanaBlock_Destroy, - BgIkanaBlock_Update, - NULL, + ACTOR_BG_IKANA_BLOCK, ACTORCAT_BG, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(BgIkanaBlock), BgIkanaBlock_Init, + BgIkanaBlock_Destroy, BgIkanaBlock_Update, NULL, }; static InitChainEntry sInitChain[] = { 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..aec5569f3b 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 @@ -25,15 +25,9 @@ void BgIkanaDharma_SetupWaitForCutsceneToEnd(BgIkanaDharma* this); void BgIkanaDharma_WaitForCutsceneToEnd(BgIkanaDharma* this, PlayState* play); ActorInit Bg_Ikana_Dharma_InitVars = { - ACTOR_BG_IKANA_DHARMA, - ACTORCAT_BG, - FLAGS, - OBJECT_IKANA_OBJ, - sizeof(BgIkanaDharma), - BgIkanaDharma_Init, - BgIkanaDharma_Destroy, - BgIkanaDharma_Update, - BgIkanaDharma_Draw, + ACTOR_BG_IKANA_DHARMA, ACTORCAT_BG, FLAGS, + OBJECT_IKANA_OBJ, sizeof(BgIkanaDharma), BgIkanaDharma_Init, + BgIkanaDharma_Destroy, BgIkanaDharma_Update, BgIkanaDharma_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..900e725018 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 @@ -27,15 +27,9 @@ void BgIkanaMirror_SetupEmitLight(BgIkanaMirror* this); void BgIkanaMirror_EmitLight(BgIkanaMirror* this, PlayState* play); ActorInit Bg_Ikana_Mirror_InitVars = { - ACTOR_BG_IKANA_MIRROR, - ACTORCAT_PROP, - FLAGS, - OBJECT_IKANA_OBJ, - sizeof(BgIkanaMirror), - BgIkanaMirror_Init, - BgIkanaMirror_Destroy, - BgIkanaMirror_Update, - BgIkanaMirror_Draw, + ACTOR_BG_IKANA_MIRROR, ACTORCAT_PROP, FLAGS, + OBJECT_IKANA_OBJ, sizeof(BgIkanaMirror), BgIkanaMirror_Init, + BgIkanaMirror_Destroy, BgIkanaMirror_Update, BgIkanaMirror_Draw, }; static ColliderTrisElementInit sMirrorColliderElementsInit[] = { 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..a219f46a80 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 @@ -22,15 +22,8 @@ void BgIkanaRay_SetActivated(BgIkanaRay* this); void BgIkanaRay_UpdateActivated(BgIkanaRay* this, PlayState* play); ActorInit Bg_Ikana_Ray_InitVars = { - ACTOR_BG_IKANA_RAY, - ACTORCAT_PROP, - FLAGS, - OBJECT_IKANA_OBJ, - sizeof(BgIkanaRay), - BgIkanaRay_Init, - BgIkanaRay_Destroy, - BgIkanaRay_Update, - BgIkanaRay_Draw, + ACTOR_BG_IKANA_RAY, ACTORCAT_PROP, FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaRay), BgIkanaRay_Init, + BgIkanaRay_Destroy, BgIkanaRay_Update, BgIkanaRay_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..84e7b039f3 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 @@ -37,15 +37,9 @@ void BgIkanaShutter_SetupDoNothing(BgIkanaShutter* this); void BgIkanaShutter_DoNothing(BgIkanaShutter* this, PlayState* play); ActorInit Bg_Ikana_Shutter_InitVars = { - ACTOR_BG_IKANA_SHUTTER, - ACTORCAT_SWITCH, - FLAGS, - OBJECT_IKANA_OBJ, - sizeof(BgIkanaShutter), - BgIkanaShutter_Init, - BgIkanaShutter_Destroy, - BgIkanaShutter_Update, - BgIkanaShutter_Draw, + ACTOR_BG_IKANA_SHUTTER, ACTORCAT_SWITCH, FLAGS, + OBJECT_IKANA_OBJ, sizeof(BgIkanaShutter), BgIkanaShutter_Init, + BgIkanaShutter_Destroy, BgIkanaShutter_Update, BgIkanaShutter_Draw, }; static InitChainEntry sInitChain[] = { 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..3929b521dd 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -19,15 +19,9 @@ void BgIkninside_Draw(Actor* thisx, PlayState* play); void func_80C072D0(BgIkninside* this, PlayState* play); ActorInit Bg_Ikninside_InitVars = { - ACTOR_BG_IKNINSIDE, - ACTORCAT_BG, - FLAGS, - OBJECT_IKNINSIDE_OBJ, - sizeof(BgIkninside), - BgIkninside_Init, - BgIkninside_Destroy, - BgIkninside_Update, - BgIkninside_Draw, + ACTOR_BG_IKNINSIDE, ACTORCAT_BG, FLAGS, + OBJECT_IKNINSIDE_OBJ, sizeof(BgIkninside), BgIkninside_Init, + BgIkninside_Destroy, BgIkninside_Update, BgIkninside_Draw, }; static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_obj_DL_00A5A8 }; 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..87e53e08f1 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 @@ -28,15 +28,9 @@ void func_80BD78C4(Actor* thisx, PlayState* play); void func_80BD7538(Actor* thisx, PlayState* play); ActorInit Bg_Iknv_Doukutu_InitVars = { - ACTOR_BG_IKNV_DOUKUTU, - ACTORCAT_BG, - FLAGS, - OBJECT_IKNV_OBJ, - sizeof(BgIknvDoukutu), - BgIknvDoukutu_Init, - BgIknvDoukutu_Destroy, - BgIknvDoukutu_Update, - BgIknvDoukutu_Draw, + ACTOR_BG_IKNV_DOUKUTU, ACTORCAT_BG, FLAGS, + OBJECT_IKNV_OBJ, sizeof(BgIknvDoukutu), BgIknvDoukutu_Init, + BgIknvDoukutu_Destroy, BgIknvDoukutu_Update, BgIknvDoukutu_Draw, }; void BgIknvDoukutu_Init(Actor* thisx, PlayState* play) { 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..d15685a106 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 @@ -22,15 +22,8 @@ void BgIknvObj_UpdateRaisedDoor(BgIknvObj* this, PlayState* play); void BgIknvObj_UpdateSakonDoor(BgIknvObj* this, PlayState* play); ActorInit Bg_Iknv_Obj_InitVars = { - ACTOR_BG_IKNV_OBJ, - ACTORCAT_BG, - FLAGS, - OBJECT_IKNV_OBJ, - sizeof(BgIknvObj), - BgIknvObj_Init, - BgIknvObj_Destroy, - BgIknvObj_Update, - BgIknvObj_Draw, + ACTOR_BG_IKNV_OBJ, ACTORCAT_BG, FLAGS, OBJECT_IKNV_OBJ, sizeof(BgIknvObj), BgIknvObj_Init, + BgIknvObj_Destroy, BgIknvObj_Update, BgIknvObj_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..0055626cf7 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -27,15 +27,8 @@ void func_80954340(BgIngate* this, PlayState* play); void func_809543D4(BgIngate* this, PlayState* play); ActorInit Bg_Ingate_InitVars = { - ACTOR_BG_INGATE, - ACTORCAT_BG, - FLAGS, - OBJECT_SICHITAI_OBJ, - sizeof(BgIngate), - BgIngate_Init, - BgIngate_Destroy, - BgIngate_Update, - BgIngate_Draw, + ACTOR_BG_INGATE, ACTORCAT_BG, FLAGS, OBJECT_SICHITAI_OBJ, sizeof(BgIngate), + BgIngate_Init, BgIngate_Destroy, BgIngate_Update, BgIngate_Draw, }; /** 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..9955e1091e 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 @@ -16,15 +16,8 @@ void BgInibsMovebg_Destroy(Actor* thisx, PlayState* play); void BgInibsMovebg_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Inibs_Movebg_InitVars = { - ACTOR_BG_INIBS_MOVEBG, - ACTORCAT_BG, - FLAGS, - OBJECT_INIBS_OBJECT, - sizeof(BgInibsMovebg), - BgInibsMovebg_Init, - BgInibsMovebg_Destroy, - Actor_Noop, - BgInibsMovebg_Draw, + ACTOR_BG_INIBS_MOVEBG, ACTORCAT_BG, FLAGS, OBJECT_INIBS_OBJECT, sizeof(BgInibsMovebg), + BgInibsMovebg_Init, BgInibsMovebg_Destroy, Actor_Noop, BgInibsMovebg_Draw, }; Gfx* sOpaDLists[] = { gTwinmoldArenaNormalModeSandDL, gTwinmoldArenaGiantModeSandDL }; 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..e6b3d98e4b 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 @@ -21,15 +21,9 @@ void func_80A538E0(BgKeikokuSaku* this, PlayState* play); void func_80A53994(BgKeikokuSaku* this, PlayState* play); ActorInit Bg_Keikoku_Saku_InitVars = { - ACTOR_BG_KEIKOKU_SAKU, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_KEIKOKU_OBJ, - sizeof(BgKeikokuSaku), - BgKeikokuSaku_Init, - BgKeikokuSaku_Destroy, - BgKeikokuSaku_Update, - BgKeikokuSaku_Draw, + ACTOR_BG_KEIKOKU_SAKU, ACTORCAT_ITEMACTION, FLAGS, + OBJECT_KEIKOKU_OBJ, sizeof(BgKeikokuSaku), BgKeikokuSaku_Init, + BgKeikokuSaku_Destroy, BgKeikokuSaku_Update, BgKeikokuSaku_Draw, }; void BgKeikokuSaku_Init(Actor* thisx, PlayState* play) { 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..3ea4c724e4 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 @@ -17,15 +17,9 @@ void BgKeikokuSpr_Update(Actor* thisx, PlayState* play); void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Keikoku_Spr_InitVars = { - ACTOR_BG_KEIKOKU_SPR, - ACTORCAT_PROP, - FLAGS, - OBJECT_KEIKOKU_OBJ, - sizeof(BgKeikokuSpr), - BgKeikokuSpr_Init, - BgKeikokuSpr_Destroy, - BgKeikokuSpr_Update, - BgKeikokuSpr_Draw, + ACTOR_BG_KEIKOKU_SPR, ACTORCAT_PROP, FLAGS, + OBJECT_KEIKOKU_OBJ, sizeof(BgKeikokuSpr), BgKeikokuSpr_Init, + BgKeikokuSpr_Destroy, BgKeikokuSpr_Update, BgKeikokuSpr_Draw, }; static InitChainEntry sInitChain[] = { 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..c9d6c80110 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 @@ -28,15 +28,9 @@ void BgKin2Fence_SetupDoNothing(BgKin2Fence* this); void BgKin2Fence_DoNothing(BgKin2Fence* this, PlayState* play); ActorInit Bg_Kin2_Fence_InitVars = { - ACTOR_BG_KIN2_FENCE, - ACTORCAT_BG, - FLAGS, - OBJECT_KIN2_OBJ, - sizeof(BgKin2Fence), - BgKin2Fence_Init, - BgKin2Fence_Destroy, - BgKin2Fence_Update, - BgKin2Fence_Draw, + ACTOR_BG_KIN2_FENCE, ACTORCAT_BG, FLAGS, + OBJECT_KIN2_OBJ, sizeof(BgKin2Fence), BgKin2Fence_Init, + BgKin2Fence_Destroy, BgKin2Fence_Update, BgKin2Fence_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[4] = { 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..d6ddf00274 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 @@ -28,15 +28,9 @@ void BgKin2Picture_SetupDoNothing(BgKin2Picture* this); void BgKin2Picture_DoNothing(BgKin2Picture* this, PlayState* play); ActorInit Bg_Kin2_Picture_InitVars = { - ACTOR_BG_KIN2_PICTURE, - ACTORCAT_PROP, - FLAGS, - OBJECT_KIN2_OBJ, - sizeof(BgKin2Picture), - BgKin2Picture_Init, - BgKin2Picture_Destroy, - BgKin2Picture_Update, - BgKin2Picture_Draw, + ACTOR_BG_KIN2_PICTURE, ACTORCAT_PROP, FLAGS, + OBJECT_KIN2_OBJ, sizeof(BgKin2Picture), BgKin2Picture_Init, + BgKin2Picture_Destroy, BgKin2Picture_Update, BgKin2Picture_Draw, }; static ColliderTrisElementInit sTrisElementsInit[] = { 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..52ec8a6786 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 @@ -24,15 +24,9 @@ void func_80B70498(BgKin2Shelf* this); void func_80B704B4(BgKin2Shelf* this, PlayState* play); ActorInit Bg_Kin2_Shelf_InitVars = { - ACTOR_BG_KIN2_SHELF, - ACTORCAT_BG, - FLAGS, - OBJECT_KIN2_OBJ, - sizeof(BgKin2Shelf), - BgKin2Shelf_Init, - BgKin2Shelf_Destroy, - BgKin2Shelf_Update, - BgKin2Shelf_Draw, + ACTOR_BG_KIN2_SHELF, ACTORCAT_BG, FLAGS, + OBJECT_KIN2_OBJ, sizeof(BgKin2Shelf), BgKin2Shelf_Init, + BgKin2Shelf_Destroy, BgKin2Shelf_Update, BgKin2Shelf_Draw, }; f32 D_80B70750[] = { 60.0f, 120.0f }; 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..c079293cf7 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -21,15 +21,8 @@ void BgLadder_FadeIn(BgLadder* this, PlayState* play); void BgLadder_DoNothing(BgLadder* this, PlayState* play); ActorInit Bg_Ladder_InitVars = { - ACTOR_BG_LADDER, - ACTORCAT_PROP, - FLAGS, - OBJECT_LADDER, - sizeof(BgLadder), - BgLadder_Init, - BgLadder_Destroy, - BgLadder_Update, - BgLadder_Draw, + ACTOR_BG_LADDER, ACTORCAT_PROP, FLAGS, OBJECT_LADDER, sizeof(BgLadder), + BgLadder_Init, BgLadder_Destroy, BgLadder_Update, BgLadder_Draw, }; static InitChainEntry sInitChain[] = { 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..4b02773e5f 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 @@ -38,15 +38,9 @@ void func_80C188C4(BgLastBwall* this, PlayState* play); void BgLastBwall_DoNothing(BgLastBwall* this, PlayState* play); ActorInit Bg_Last_Bwall_InitVars = { - ACTOR_BG_LAST_BWALL, - ACTORCAT_BG, - FLAGS, - OBJECT_LAST_OBJ, - sizeof(BgLastBwall), - BgLastBwall_Init, - BgLastBwall_Destroy, - BgLastBwall_Update, - BgLastBwall_Draw, + ACTOR_BG_LAST_BWALL, ACTORCAT_BG, FLAGS, + OBJECT_LAST_OBJ, sizeof(BgLastBwall), BgLastBwall_Init, + BgLastBwall_Destroy, BgLastBwall_Update, BgLastBwall_Draw, }; static ColliderTrisElementInit sTrisElementsInit[] = { 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..a5b243707e 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -16,15 +16,8 @@ void BgLbfshot_Destroy(Actor* thisx, PlayState* play); void BgLbfshot_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Lbfshot_InitVars = { - ACTOR_BG_LBFSHOT, - ACTORCAT_BG, - FLAGS, - OBJECT_LBFSHOT, - sizeof(BgLbfshot), - BgLbfshot_Init, - BgLbfshot_Destroy, - Actor_Noop, - BgLbfshot_Draw, + ACTOR_BG_LBFSHOT, ACTORCAT_BG, FLAGS, OBJECT_LBFSHOT, sizeof(BgLbfshot), + BgLbfshot_Init, BgLbfshot_Destroy, Actor_Noop, BgLbfshot_Draw, }; static InitChainEntry sInitChain[] = { 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..4ffb3ddbcd 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -21,15 +21,8 @@ void BgLotus_Sink(BgLotus* this, PlayState* play); void BgLotus_WaitToAppear(BgLotus* this, PlayState* play); ActorInit Bg_Lotus_InitVars = { - ACTOR_BG_LOTUS, - ACTORCAT_BG, - FLAGS, - OBJECT_LOTUS, - sizeof(BgLotus), - BgLotus_Init, - BgLotus_Destroy, - BgLotus_Update, - BgLotus_Draw, + ACTOR_BG_LOTUS, ACTORCAT_BG, FLAGS, OBJECT_LOTUS, sizeof(BgLotus), + BgLotus_Init, BgLotus_Destroy, BgLotus_Update, BgLotus_Draw, }; static InitChainEntry sInitChain[] = { 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..612c0b2976 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,8 @@ void BgMarketStep_Init(Actor* thisx, PlayState* play); void BgMarketStep_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Market_Step_InitVars = { - ACTOR_BG_MARKET_STEP, ACTORCAT_BG, FLAGS, - OBJECT_MARKET_OBJ, sizeof(BgMarketStep), BgMarketStep_Init, - Actor_Noop, Actor_Noop, BgMarketStep_Draw, + ACTOR_BG_MARKET_STEP, ACTORCAT_BG, FLAGS, OBJECT_MARKET_OBJ, sizeof(BgMarketStep), + BgMarketStep_Init, Actor_Noop, Actor_Noop, BgMarketStep_Draw, }; static InitChainEntry sInitChain[] = { 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..605703a31f 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 @@ -17,15 +17,9 @@ void BgMbarChair_Update(Actor* thisx, PlayState* play); void BgMbarChair_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Mbar_Chair_InitVars = { - ACTOR_BG_MBAR_CHAIR, - ACTORCAT_BG, - FLAGS, - OBJECT_MBAR_OBJ, - sizeof(BgMbarChair), - BgMbarChair_Init, - BgMbarChair_Destroy, - BgMbarChair_Update, - BgMbarChair_Draw, + ACTOR_BG_MBAR_CHAIR, ACTORCAT_BG, FLAGS, + OBJECT_MBAR_OBJ, sizeof(BgMbarChair), BgMbarChair_Init, + BgMbarChair_Destroy, BgMbarChair_Update, BgMbarChair_Draw, }; static InitChainEntry sInitChain[] = { 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..1b5fab4119 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 @@ -31,15 +31,8 @@ void BgNumaHana_SetupOpenedIdle(BgNumaHana* this); void BgNumaHana_OpenedIdle(BgNumaHana* this, PlayState* play); ActorInit Bg_Numa_Hana_InitVars = { - ACTOR_BG_NUMA_HANA, - ACTORCAT_BG, - FLAGS, - OBJECT_NUMA_OBJ, - sizeof(BgNumaHana), - BgNumaHana_Init, - BgNumaHana_Destroy, - BgNumaHana_Update, - BgNumaHana_Draw, + ACTOR_BG_NUMA_HANA, ACTORCAT_BG, FLAGS, OBJECT_NUMA_OBJ, sizeof(BgNumaHana), BgNumaHana_Init, + BgNumaHana_Destroy, BgNumaHana_Update, BgNumaHana_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..b01713ae80 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 @@ -28,15 +28,9 @@ typedef enum { } BGOpenShutterDoorState; ActorInit Bg_Open_Shutter_InitVars = { - ACTOR_BG_OPEN_SHUTTER, - ACTORCAT_DOOR, - FLAGS, - OBJECT_OPEN_OBJ, - sizeof(BgOpenShutter), - BgOpenShutter_Init, - BgOpenShutter_Destroy, - BgOpenShutter_Update, - BgOpenShutter_Draw, + ACTOR_BG_OPEN_SHUTTER, ACTORCAT_DOOR, FLAGS, + OBJECT_OPEN_OBJ, sizeof(BgOpenShutter), BgOpenShutter_Init, + BgOpenShutter_Destroy, BgOpenShutter_Update, BgOpenShutter_Draw, }; static InitChainEntry sInitChain[] = { 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..43db0ba97e 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 @@ -17,15 +17,8 @@ void BgOpenSpot_Update(Actor* thisx, PlayState* play); void BgOpenSpot_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Open_Spot_InitVars = { - ACTOR_BG_OPEN_SPOT, - ACTORCAT_PROP, - FLAGS, - OBJECT_OPEN_OBJ, - sizeof(BgOpenSpot), - BgOpenSpot_Init, - BgOpenSpot_Destroy, - BgOpenSpot_Update, - NULL, + ACTOR_BG_OPEN_SPOT, ACTORCAT_PROP, FLAGS, OBJECT_OPEN_OBJ, sizeof(BgOpenSpot), BgOpenSpot_Init, + BgOpenSpot_Destroy, BgOpenSpot_Update, NULL, }; static InitChainEntry sInitChain[] = { 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..55c5dade6b 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 @@ -25,15 +25,8 @@ void BgSinkaiKabe_Update(Actor* thisx, PlayState* play); void BgSinkaiKabe_WaitForPlayer(BgSinkaiKabe* this, PlayState* play); ActorInit Bg_Sinkai_Kabe_InitVars = { - ACTOR_BG_SINKAI_KABE, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_SINKAI_KABE, - sizeof(BgSinkaiKabe), - BgSinkaiKabe_Init, - BgSinkaiKabe_Destroy, - BgSinkaiKabe_Update, - NULL, + ACTOR_BG_SINKAI_KABE, ACTORCAT_ITEMACTION, FLAGS, OBJECT_SINKAI_KABE, sizeof(BgSinkaiKabe), BgSinkaiKabe_Init, + BgSinkaiKabe_Destroy, BgSinkaiKabe_Update, NULL, }; static s32 sCurrentPythonIndex = 0; 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..6faf8221a0 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -25,15 +25,8 @@ void func_809CEE74(BgSpdweb* this); void func_809CEEAC(BgSpdweb* this, PlayState* play); ActorInit Bg_Spdweb_InitVars = { - ACTOR_BG_SPDWEB, - ACTORCAT_BG, - FLAGS, - OBJECT_SPDWEB, - sizeof(BgSpdweb), - BgSpdweb_Init, - BgSpdweb_Destroy, - BgSpdweb_Update, - BgSpdweb_Draw, + ACTOR_BG_SPDWEB, ACTORCAT_BG, FLAGS, OBJECT_SPDWEB, sizeof(BgSpdweb), + BgSpdweb_Init, BgSpdweb_Destroy, BgSpdweb_Update, BgSpdweb_Draw, }; static ColliderTrisElementInit sTrisElementsInit1[2] = { 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..5b1c3845d7 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 @@ -23,15 +23,8 @@ void func_80A60D10(BgSpoutFire* this, PlayState* play); void func_80A60E08(BgSpoutFire* this, PlayState* play); ActorInit Bg_Spout_Fire_InitVars = { - ACTOR_BG_SPOUT_FIRE, - ACTORCAT_BG, - FLAGS, - OBJECT_FWALL, - sizeof(BgSpoutFire), - BgSpoutFire_Init, - BgSpoutFire_Destroy, - BgSpoutFire_Update, - NULL, + ACTOR_BG_SPOUT_FIRE, ACTORCAT_BG, FLAGS, OBJECT_FWALL, sizeof(BgSpoutFire), BgSpoutFire_Init, + BgSpoutFire_Destroy, BgSpoutFire_Update, NULL, }; static ColliderCylinderInit sCylinderInit = { 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..81fa8153de 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -17,15 +17,8 @@ void BgTobira01_Update(Actor* thisx, PlayState* play); void BgTobira01_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Tobira01_InitVars = { - ACTOR_BG_TOBIRA01, - ACTORCAT_PROP, - FLAGS, - OBJECT_SPOT11_OBJ, - sizeof(BgTobira01), - BgTobira01_Init, - BgTobira01_Destroy, - BgTobira01_Update, - BgTobira01_Draw, + ACTOR_BG_TOBIRA01, ACTORCAT_PROP, FLAGS, OBJECT_SPOT11_OBJ, sizeof(BgTobira01), BgTobira01_Init, + BgTobira01_Destroy, BgTobira01_Update, BgTobira01_Draw, }; void BgTobira01_Open(BgTobira01* this, PlayState* play) { 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..ac5da9696b 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -19,15 +19,8 @@ void BgUmajump_Draw(Actor* thisx, PlayState* play); void func_8091A5A0(Actor* thisx, PlayState* play); ActorInit Bg_Umajump_InitVars = { - ACTOR_BG_UMAJUMP, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(BgUmajump), - BgUmajump_Init, - BgUmajump_Destroy, - BgUmajump_Update, - NULL, + ACTOR_BG_UMAJUMP, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(BgUmajump), BgUmajump_Init, + BgUmajump_Destroy, BgUmajump_Update, NULL, }; static InitChainEntry sInitChain[] = { 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..1177b5224a 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -113,15 +113,8 @@ static DamageTable sRedTwinmoldDamageTable = { }; ActorInit Boss_02_InitVars = { - ACTOR_BOSS_02, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS02, - sizeof(Boss02), - Boss02_Init, - Boss02_Destroy, - Boss02_Twinmold_Update, - Boss02_Twinmold_Draw, + ACTOR_BOSS_02, ACTORCAT_BOSS, FLAGS, OBJECT_BOSS02, sizeof(Boss02), Boss02_Init, Boss02_Destroy, + Boss02_Twinmold_Update, Boss02_Twinmold_Draw, }; f32 D_809DF5B0 = 1.0f; 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..f2b27baedb 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -275,15 +275,8 @@ Actor* Boss03_FindActorDblueMovebg(PlayState* play) { /* Start of Gyorg's Init and actionFuncs section */ ActorInit Boss_03_InitVars = { - ACTOR_BOSS_03, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS03, - sizeof(Boss03), - Boss03_Init, - Boss03_Destroy, - Boss03_Update, - Boss03_Draw, + ACTOR_BOSS_03, ACTORCAT_BOSS, FLAGS, OBJECT_BOSS03, sizeof(Boss03), + Boss03_Init, Boss03_Destroy, Boss03_Update, Boss03_Draw, }; // The limbs referenced here are not used. The spheres are positioned manually by Boss03_PostLimbDraw 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..7d6e8339de 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -63,15 +63,8 @@ static DamageTable sDamageTable = { }; ActorInit Boss_04_InitVars = { - ACTOR_BOSS_04, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS04, - sizeof(Boss04), - Boss04_Init, - Boss04_Destroy, - Boss04_Update, - Boss04_Draw, + ACTOR_BOSS_04, ACTORCAT_BOSS, FLAGS, OBJECT_BOSS04, sizeof(Boss04), + Boss04_Init, Boss04_Destroy, Boss04_Update, Boss04_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit1[1] = { 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..2754d6ac22 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -70,15 +70,8 @@ static DamageTable sDamageTable = { }; ActorInit Boss_06_InitVars = { - ACTOR_BOSS_06, - ACTORCAT_BOSS, - FLAGS, - OBJECT_KNIGHT, - sizeof(Boss06), - Boss06_Init, - Boss06_Destroy, - Boss06_Update, - Boss06_Draw, + ACTOR_BOSS_06, ACTORCAT_BOSS, FLAGS, OBJECT_KNIGHT, sizeof(Boss06), + Boss06_Init, Boss06_Destroy, Boss06_Update, Boss06_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..00b017f8b9 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -26,15 +26,8 @@ void func_808CDFF8(Actor* thisx, PlayState* play); void func_808CE078(Actor* thisx, PlayState* play2); ActorInit Demo_Effect_InitVars = { - ACTOR_DEMO_EFFECT, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DemoEffect), - DemoEffect_Init, - DemoEffect_Destroy, - DemoEffect_Update, - NULL, + ACTOR_DEMO_EFFECT, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(DemoEffect), DemoEffect_Init, + DemoEffect_Destroy, DemoEffect_Update, NULL, }; void DemoEffect_Init(Actor* thisx, PlayState* play) { 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..4f9bce7615 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -19,15 +19,8 @@ void func_80A4FB68(DemoGetitem* this, PlayState* play2); void DemoGetitem_Draw(Actor* thisx, PlayState* play); ActorInit Demo_Getitem_InitVars = { - ACTOR_DEMO_GETITEM, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DemoGetitem), - DemoGetitem_Init, - DemoGetitem_Destroy, - DemoGetitem_Update, - NULL, + ACTOR_DEMO_GETITEM, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(DemoGetitem), DemoGetitem_Init, + DemoGetitem_Destroy, DemoGetitem_Update, NULL, }; static s16 sObjectBankIndices[] = { OBJECT_GI_MASK14, OBJECT_GI_SWORD_4 }; 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..5505149466 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -23,15 +23,8 @@ static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at on static s16 sLostWoodsSkyFishParticleNum = 0; ActorInit Demo_Kankyo_InitVars = { - ACTOR_DEMO_KANKYO, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DemoKankyo), - DemoKankyo_Init, - DemoKankyo_Destroy, - DemoKankyo_Update, - DemoKankyo_Draw, + ACTOR_DEMO_KANKYO, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(DemoKankyo), DemoKankyo_Init, + DemoKankyo_Destroy, DemoKankyo_Update, DemoKankyo_Draw, }; static s32 sObjectBubbleIndex = OBJECT_BUBBLE | 0x10000; 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..7163d7dd9a 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -16,15 +16,8 @@ void DemoShd_Update(Actor* thisx, PlayState* play); void DemoShd_Draw(Actor* thisx, PlayState* play); ActorInit Demo_Shd_InitVars = { - ACTOR_DEMO_SHD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_FWALL, - sizeof(DemoShd), - DemoShd_Init, - DemoShd_Destroy, - DemoShd_Update, - DemoShd_Draw, + ACTOR_DEMO_SHD, ACTORCAT_ENEMY, FLAGS, OBJECT_FWALL, sizeof(DemoShd), + DemoShd_Init, DemoShd_Destroy, DemoShd_Update, DemoShd_Draw, }; void DemoShd_Init(Actor* thisx, PlayState* play) { 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..52124b438e 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -26,15 +26,8 @@ void func_80C173B4(Actor* thisx, PlayState* play); void func_80C17690(Actor* thisx, PlayState* play); ActorInit Demo_Syoten_InitVars = { - ACTOR_DEMO_SYOTEN, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_SYOTEN, - sizeof(DemoSyoten), - DemoSyoten_Init, - DemoSyoten_Destroy, - DemoSyoten_Update, - DemoSyoten_Draw, + ACTOR_DEMO_SYOTEN, ACTORCAT_ITEMACTION, FLAGS, OBJECT_SYOTEN, sizeof(DemoSyoten), DemoSyoten_Init, + DemoSyoten_Destroy, DemoSyoten_Update, DemoSyoten_Draw, }; u8 D_80C177D0[] = { 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..638637fbda 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 @@ -36,15 +36,8 @@ static DemoTreLgtInfo D_808E1490[2] = { }; ActorInit Demo_Tre_Lgt_InitVars = { - ACTOR_DEMO_TRE_LGT, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BOX, - sizeof(DemoTreLgt), - DemoTreLgt_Init, - DemoTreLgt_Destroy, - DemoTreLgt_Update, - DemoTreLgt_Draw, + ACTOR_DEMO_TRE_LGT, ACTORCAT_ITEMACTION, FLAGS, OBJECT_BOX, sizeof(DemoTreLgt), DemoTreLgt_Init, + DemoTreLgt_Destroy, DemoTreLgt_Update, DemoTreLgt_Draw, }; static TransformUpdateIndex* sBoxLightAnimations[] = { 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..1af8052b36 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -16,15 +16,7 @@ void DmAh_Update(Actor* thisx, PlayState* play); void DmAh_Draw(Actor* thisx, PlayState* play); ActorInit Dm_Ah_InitVars = { - ACTOR_DM_AH, - ACTORCAT_NPC, - FLAGS, - OBJECT_AH, - sizeof(DmAh), - DmAh_Init, - DmAh_Destroy, - DmAh_Update, - DmAh_Draw, + ACTOR_DM_AH, ACTORCAT_NPC, FLAGS, OBJECT_AH, sizeof(DmAh), DmAh_Init, DmAh_Destroy, DmAh_Update, DmAh_Draw, }; static AnimationInfoS sAnimations[] = { 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..c1202c07db 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -16,15 +16,7 @@ void DmAl_Update(Actor* thisx, PlayState* play); void DmAl_Draw(Actor* thisx, PlayState* play); ActorInit Dm_Al_InitVars = { - ACTOR_EN_AL, - ACTORCAT_NPC, - FLAGS, - OBJECT_AL, - sizeof(DmAl), - DmAl_Init, - DmAl_Destroy, - DmAl_Update, - DmAl_Draw, + ACTOR_EN_AL, ACTORCAT_NPC, FLAGS, OBJECT_AL, sizeof(DmAl), DmAl_Init, DmAl_Destroy, DmAl_Update, DmAl_Draw, }; typedef enum { 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..d723f9d310 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -22,15 +22,7 @@ void func_80C1CC80(DmAn* this, PlayState* play); void func_80C1D0B0(Actor* thisx, PlayState* play); ActorInit Dm_An_InitVars = { - ACTOR_DM_AN, - ACTORCAT_NPC, - FLAGS, - OBJECT_AN1, - sizeof(DmAn), - DmAn_Init, - DmAn_Destroy, - DmAn_Update, - NULL, + ACTOR_DM_AN, ACTORCAT_NPC, FLAGS, OBJECT_AN1, sizeof(DmAn), DmAn_Init, DmAn_Destroy, DmAn_Update, NULL, }; static AnimationInfoS sAnimationInfo[] = { 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..764373ca6f 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -19,15 +19,7 @@ void func_80C1EAC4(DmBal* this); void func_80C1EAD8(DmBal* this, PlayState* play); ActorInit Dm_Bal_InitVars = { - ACTOR_DM_BAL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BAL, - sizeof(DmBal), - DmBal_Init, - DmBal_Destroy, - DmBal_Update, - DmBal_Draw, + ACTOR_DM_BAL, ACTORCAT_NPC, FLAGS, OBJECT_BAL, sizeof(DmBal), DmBal_Init, DmBal_Destroy, DmBal_Update, DmBal_Draw, }; static AnimationInfo sAnimationInfo[] = { 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..fd39650a3e 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -21,15 +21,8 @@ void func_80AA67F8(DmChar00* this, PlayState* play); void func_80AA695C(DmChar00* this, PlayState* play); ActorInit Dm_Char00_InitVars = { - ACTOR_DM_CHAR00, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_DELF, - sizeof(DmChar00), - DmChar00_Init, - DmChar00_Destroy, - DmChar00_Update, - DmChar00_Draw, + ACTOR_DM_CHAR00, ACTORCAT_ITEMACTION, FLAGS, OBJECT_DELF, sizeof(DmChar00), + DmChar00_Init, DmChar00_Destroy, DmChar00_Update, DmChar00_Draw, }; static AnimationInfo sAnimationInfo[] = { 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..ed760be6bc 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -36,15 +36,8 @@ s16 D_80AAAE26; #include "overlays/ovl_Dm_Char01/ovl_Dm_Char01.c" ActorInit Dm_Char01_InitVars = { - ACTOR_DM_CHAR01, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_MTORIDE, - sizeof(DmChar01), - DmChar01_Init, - DmChar01_Destroy, - DmChar01_Update, - DmChar01_Draw, + ACTOR_DM_CHAR01, ACTORCAT_ITEMACTION, FLAGS, OBJECT_MTORIDE, sizeof(DmChar01), + DmChar01_Init, DmChar01_Destroy, DmChar01_Update, DmChar01_Draw, }; static InitChainEntry sInitChain[] = { 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..d9c2652399 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -19,15 +19,8 @@ void DmChar02_Draw(Actor* thisx, PlayState* play); void DmChar02_PerformCutsceneActions(DmChar02* this, PlayState* play); ActorInit Dm_Char02_InitVars = { - ACTOR_DM_CHAR02, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_STK2, - sizeof(DmChar02), - DmChar02_Init, - DmChar02_Destroy, - DmChar02_Update, - DmChar02_Draw, + ACTOR_DM_CHAR02, ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK2, sizeof(DmChar02), + DmChar02_Init, DmChar02_Destroy, DmChar02_Update, DmChar02_Draw, }; 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..eecc704d8d 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -21,15 +21,8 @@ void DmChar03_DoNothing(DmChar03* this, PlayState* play); void func_80AABA84(PlayState* play, DmChar03* this); ActorInit Dm_Char03_InitVars = { - ACTOR_DM_CHAR03, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_OSN, - sizeof(DmChar03), - DmChar03_Init, - DmChar03_Destroy, - DmChar03_Update, - DmChar03_Draw, + ACTOR_DM_CHAR03, ACTORCAT_ITEMACTION, FLAGS, OBJECT_OSN, sizeof(DmChar03), + DmChar03_Init, DmChar03_Destroy, DmChar03_Update, DmChar03_Draw, }; AnimationInfo sAnimationInfo[] = { 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..5fc1ebe3e6 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -19,15 +19,8 @@ void DmChar04_Draw(Actor* thisx, PlayState* play); void func_80AABE34(DmChar04* this, PlayState* play); ActorInit Dm_Char04_InitVars = { - ACTOR_DM_CHAR04, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DmChar04), - DmChar04_Init, - DmChar04_Destroy, - DmChar04_Update, - DmChar04_Draw, + ACTOR_DM_CHAR04, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(DmChar04), + DmChar04_Init, DmChar04_Destroy, DmChar04_Update, DmChar04_Draw, }; void DmChar04_ChangeAnim(SkelAnime* skelAnime, AnimationInfo* animation, u16 animIndex) { 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..2e076578d0 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -36,15 +36,8 @@ void func_80AAE030(PlayState* play, DmChar05* this); void func_80AAE114(PlayState* play, DmChar05* this); ActorInit Dm_Char05_InitVars = { - ACTOR_DM_CHAR05, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_DMASK, - sizeof(DmChar05), - DmChar05_Init, - DmChar05_Destroy, - DmChar05_Update, - DmChar05_Draw, + ACTOR_DM_CHAR05, ACTORCAT_ITEMACTION, FLAGS, OBJECT_DMASK, sizeof(DmChar05), + DmChar05_Init, DmChar05_Destroy, DmChar05_Update, DmChar05_Draw, }; static AnimationInfo sAnimationInfo[] = { 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..1e0ee68e6c 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -19,15 +19,8 @@ void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc); void func_80AAE6F0(DmChar06* this, PlayState* play); ActorInit Dm_Char06_InitVars = { - ACTOR_DM_CHAR06, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_YUKIYAMA, - sizeof(DmChar06), - DmChar06_Init, - DmChar06_Destroy, - DmChar06_Update, - DmChar06_Draw, + ACTOR_DM_CHAR06, ACTORCAT_ITEMACTION, FLAGS, OBJECT_YUKIYAMA, sizeof(DmChar06), + DmChar06_Init, DmChar06_Destroy, DmChar06_Update, DmChar06_Draw, }; void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc) { 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..fe85469804 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -19,15 +19,8 @@ void DmChar07_Draw(Actor* thisx, PlayState* play); void DmChar07_DoNothing(DmChar07* this, PlayState* play); ActorInit Dm_Char07_InitVars = { - ACTOR_DM_CHAR07, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_MILKBAR, - sizeof(DmChar07), - DmChar07_Init, - DmChar07_Destroy, - DmChar07_Update, - DmChar07_Draw, + ACTOR_DM_CHAR07, ACTORCAT_ITEMACTION, FLAGS, OBJECT_MILKBAR, sizeof(DmChar07), + DmChar07_Init, DmChar07_Destroy, DmChar07_Update, DmChar07_Draw, }; void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) { 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..f4535bdbe8 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -52,15 +52,8 @@ typedef enum { } TurtleAnimation; ActorInit Dm_Char08_InitVars = { - ACTOR_DM_CHAR08, - ACTORCAT_BG, - FLAGS, - OBJECT_KAMEJIMA, - sizeof(DmChar08), - DmChar08_Init, - DmChar08_Destroy, - DmChar08_Update, - DmChar08_Draw, + ACTOR_DM_CHAR08, ACTORCAT_BG, FLAGS, OBJECT_KAMEJIMA, sizeof(DmChar08), + DmChar08_Init, DmChar08_Destroy, DmChar08_Update, DmChar08_Draw, }; #include "overlays/ovl_Dm_Char08/ovl_Dm_Char08.c" 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..4149543071 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -19,15 +19,8 @@ void DmChar09_DoNothing(DmChar09* this, PlayState* play); void func_80AB2268(DmChar09* this, PlayState* play); ActorInit Dm_Char09_InitVars = { - ACTOR_DM_CHAR09, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BEE, - sizeof(DmChar09), - DmChar09_Init, - DmChar09_Destroy, - DmChar09_Update, - DmChar09_Draw, + ACTOR_DM_CHAR09, ACTORCAT_ITEMACTION, FLAGS, OBJECT_BEE, sizeof(DmChar09), + DmChar09_Init, DmChar09_Destroy, DmChar09_Update, DmChar09_Draw, }; static AnimationInfo sAnimationInfo[] = { 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..32259bdb19 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -22,15 +22,7 @@ void func_80C24BD0(DmGm* this, PlayState* play); void func_80C25000(Actor* thisx, PlayState* play); ActorInit Dm_Gm_InitVars = { - ACTOR_DM_GM, - ACTORCAT_NPC, - FLAGS, - OBJECT_AN1, - sizeof(DmGm), - DmGm_Init, - DmGm_Destroy, - DmGm_Update, - NULL, + ACTOR_DM_GM, ACTORCAT_NPC, FLAGS, OBJECT_AN1, sizeof(DmGm), DmGm_Init, DmGm_Destroy, DmGm_Update, NULL, }; static AnimationInfoS sAnimationInfo[] = { 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..1aeb5f506c 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -16,15 +16,7 @@ void DmNb_Update(Actor* thisx, PlayState* play); void DmNb_Draw(Actor* thisx, PlayState* play); ActorInit Dm_Nb_InitVars = { - ACTOR_DM_NB, - ACTORCAT_NPC, - FLAGS, - OBJECT_NB, - sizeof(DmNb), - DmNb_Init, - DmNb_Destroy, - DmNb_Update, - DmNb_Draw, + ACTOR_DM_NB, ACTORCAT_NPC, FLAGS, OBJECT_NB, sizeof(DmNb), DmNb_Init, DmNb_Destroy, DmNb_Update, DmNb_Draw, }; static AnimationInfoS sAnimationInfo[] = { 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..f8644bef72 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -19,15 +19,8 @@ void DmOpstage_Draw(Actor* thisx, PlayState* play); void DmOpstage_FollowCutsceneScript(DmOpstage* this, PlayState* play); ActorInit Dm_Opstage_InitVars = { - ACTOR_DM_OPSTAGE, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_KEIKOKU_DEMO, - sizeof(DmOpstage), - DmOpstage_Init, - DmOpstage_Destroy, - DmOpstage_Update, - DmOpstage_Draw, + ACTOR_DM_OPSTAGE, ACTORCAT_ITEMACTION, FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmOpstage), DmOpstage_Init, + DmOpstage_Destroy, DmOpstage_Update, DmOpstage_Draw, }; static InitChainEntry sInitChain[] = { 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..b24441aeeb 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -17,15 +17,8 @@ void DmRavine_Update(Actor* thisx, PlayState* play); void DmRavine_Draw(Actor* thisx, PlayState* play); ActorInit Dm_Ravine_InitVars = { - ACTOR_DM_RAVINE, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_KEIKOKU_DEMO, - sizeof(DmRavine), - DmRavine_Init, - DmRavine_Destroy, - DmRavine_Update, - DmRavine_Draw, + ACTOR_DM_RAVINE, ACTORCAT_ITEMACTION, FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmRavine), + DmRavine_Init, DmRavine_Destroy, DmRavine_Update, DmRavine_Draw, }; void DmRavine_Init(Actor* thisx, PlayState* play) { 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..efec7935fc 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -19,15 +19,7 @@ void DmSa_Draw(Actor* thisx, PlayState* play); void DmSa_DoNothing(DmSa* this, PlayState* play); ActorInit Dm_Sa_InitVars = { - ACTOR_DM_SA, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_STK, - sizeof(DmSa), - DmSa_Init, - DmSa_Destroy, - DmSa_Update, - DmSa_Draw, + ACTOR_DM_SA, ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK, sizeof(DmSa), DmSa_Init, DmSa_Destroy, DmSa_Update, DmSa_Draw, }; static AnimationInfo sAnimationInfo[] = { { &gSkullKidTPoseAnim, 1.0f, 0, -1.0f, ANIMMODE_LOOP, 0 } }; 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..d4657e38da 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -17,15 +17,8 @@ void DmStatue_Update(Actor* thisx, PlayState* play); void DmStatue_Draw(Actor* thisx, PlayState* play); ActorInit Dm_Statue_InitVars = { - ACTOR_DM_STATUE, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_SMTOWER, - sizeof(DmStatue), - DmStatue_Init, - DmStatue_Destroy, - DmStatue_Update, - DmStatue_Draw, + ACTOR_DM_STATUE, ACTORCAT_ITEMACTION, FLAGS, OBJECT_SMTOWER, sizeof(DmStatue), + DmStatue_Init, DmStatue_Destroy, DmStatue_Update, DmStatue_Draw, }; void DmStatue_Init(Actor* thisx, PlayState* play) { 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..6c8cb46d88 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -151,15 +151,8 @@ typedef enum { } SkullKidDekuPipesCutsceneState; ActorInit Dm_Stk_InitVars = { - ACTOR_DM_STK, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_STK, - sizeof(DmStk), - DmStk_Init, - DmStk_Destroy, - DmStk_Update, - DmStk_Draw, + ACTOR_DM_STK, ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK, sizeof(DmStk), + DmStk_Init, DmStk_Destroy, DmStk_Update, DmStk_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..f2b4bceb78 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -19,15 +19,8 @@ void func_80C229EC(DmTag* this, PlayState* play); void func_80C229FC(DmTag* this, PlayState* play); ActorInit Dm_Tag_InitVars = { - ACTOR_DM_TAG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DmTag), - DmTag_Init, - DmTag_Destroy, - DmTag_Update, - NULL, + ACTOR_DM_TAG, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(DmTag), + DmTag_Init, DmTag_Destroy, DmTag_Update, NULL, }; s32 D_80C22BF0[] = { 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..110c67e360 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -18,15 +18,7 @@ void DmZl_Draw(Actor* thisx, PlayState* play); void DmZl_DoNothing(DmZl* this, PlayState* play); ActorInit Dm_Zl_InitVars = { - ACTOR_DM_ZL, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_ZL4, - sizeof(DmZl), - DmZl_Init, - DmZl_Destroy, - DmZl_Update, - DmZl_Draw, + ACTOR_DM_ZL, ACTORCAT_ITEMACTION, FLAGS, OBJECT_ZL4, sizeof(DmZl), DmZl_Init, DmZl_Destroy, DmZl_Update, DmZl_Draw, }; static AnimationInfo sAnimationInfo[] = { 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..fcb462441a 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -21,15 +21,8 @@ void DoorAna_WaitOpen(DoorAna* this, PlayState* play); void DoorAna_GrabLink(DoorAna* this, PlayState* play); ActorInit Door_Ana_InitVars = { - ACTOR_DOOR_ANA, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(DoorAna), - DoorAna_Init, - DoorAna_Destroy, - DoorAna_Update, - DoorAna_Draw, + ACTOR_DOOR_ANA, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(DoorAna), + DoorAna_Init, DoorAna_Destroy, DoorAna_Update, DoorAna_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..9ebb4720ac 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -41,15 +41,8 @@ void func_808A1C50(DoorShutter* this, PlayState* play); void DoorShutter_Draw(Actor* thisx, PlayState* play); ActorInit Door_Shutter_InitVars = { - ACTOR_DOOR_SHUTTER, - ACTORCAT_DOOR, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DoorShutter), - DoorShutter_Init, - DoorShutter_Destroy, - DoorShutter_Update, - NULL, + ACTOR_DOOR_SHUTTER, ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(DoorShutter), DoorShutter_Init, + DoorShutter_Destroy, DoorShutter_Update, NULL, }; typedef struct { 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..e06764a250 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -68,15 +68,8 @@ void DoorSpiral_Wait(DoorSpiral* this, PlayState* play); void DoorSpiral_PlayerClimb(DoorSpiral* this, PlayState* play); ActorInit Door_Spiral_InitVars = { - ACTOR_DOOR_SPIRAL, - ACTORCAT_DOOR, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DoorSpiral), - DoorSpiral_Init, - DoorSpiral_Destroy, - DoorSpiral_Update, - DoorSpiral_Draw, + ACTOR_DOOR_SPIRAL, ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(DoorSpiral), DoorSpiral_Init, + DoorSpiral_Destroy, DoorSpiral_Update, DoorSpiral_Draw, }; // Parameters for each staircase, indexed with SpiralType 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..441a3b951e 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -50,15 +50,8 @@ static s16 D_808BC000; static f32 D_808BC004; ActorInit Door_Warp1_InitVars = { - ACTOR_DOOR_WARP1, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_WARP1, - sizeof(DoorWarp1), - DoorWarp1_Init, - DoorWarp1_Destroy, - DoorWarp1_Update, - DoorWarp1_Draw, + ACTOR_DOOR_WARP1, ACTORCAT_ITEMACTION, FLAGS, OBJECT_WARP1, sizeof(DoorWarp1), DoorWarp1_Init, + DoorWarp1_Destroy, DoorWarp1_Update, DoorWarp1_Draw, }; static InitChainEntry sInitChain[] = { 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..db3dcdf833 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -19,15 +19,8 @@ void EffChange_SetColors(EffChange* this, s32 arg1); void func_80A4C5CC(EffChange* this, PlayState* play); ActorInit Eff_Change_InitVars = { - ACTOR_EFF_CHANGE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EffChange), - EffChange_Init, - EffChange_Destroy, - EffChange_Update, - NULL, + ACTOR_EFF_CHANGE, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EffChange), EffChange_Init, + EffChange_Destroy, EffChange_Update, NULL, }; static u8 D_80A4C920[] = { 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..ea74ab45ae 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -25,15 +25,8 @@ void func_80919768(Actor* thisx, PlayState* play2); void func_809199FC(Actor* thisx, PlayState* play2); ActorInit Eff_Dust_InitVars = { - ACTOR_EFF_DUST, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EffDust), - EffDust_Init, - EffDust_Destroy, - EffDust_Update, - EffDust_Draw, + ACTOR_EFF_DUST, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EffDust), + EffDust_Init, EffDust_Destroy, EffDust_Update, EffDust_Draw, }; void func_80918B40(EffDust* this) { 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..2c0f06a30c 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 @@ -24,15 +24,9 @@ void func_80BCED34(EffKamejimaWave* this, PlayState* play); void EffKamejimaWave_SetVtxAlpha(u8 alpha); ActorInit Eff_Kamejima_Wave_InitVars = { - ACTOR_EFF_KAMEJIMA_WAVE, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_KAMEJIMA, - sizeof(EffKamejimaWave), - EffKamejimaWave_Init, - EffKamejimaWave_Destroy, - EffKamejimaWave_Update, - NULL, + ACTOR_EFF_KAMEJIMA_WAVE, ACTORCAT_ITEMACTION, FLAGS, + OBJECT_KAMEJIMA, sizeof(EffKamejimaWave), EffKamejimaWave_Init, + EffKamejimaWave_Destroy, EffKamejimaWave_Update, NULL, }; static Color_RGBA8 sPrimColors[] = { 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..be1db20c9e 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -29,15 +29,8 @@ typedef enum EffLastDayAction { } EffLastDayAction; ActorInit Eff_Lastday_InitVars = { - ACTOR_EFF_LASTDAY, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_LASTDAY, - sizeof(EffLastday), - EffLastday_Init, - EffLastday_Destroy, - EffLastday_Update, - EffLastday_Draw, + ACTOR_EFF_LASTDAY, ACTORCAT_ITEMACTION, FLAGS, OBJECT_LASTDAY, sizeof(EffLastday), EffLastday_Init, + EffLastday_Destroy, EffLastday_Update, EffLastday_Draw, }; void EffLastday_Init(Actor* thisx, PlayState* play2) { 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..86203882b2 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -19,15 +19,9 @@ void EffZoraband_Draw(Actor* thisx, PlayState* play2); void EffZoraband_MikauFadeOut(EffZoraband* this, PlayState* play); ActorInit Eff_Zoraband_InitVars = { - ACTOR_EFF_ZORABAND, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_ZORABAND, - sizeof(EffZoraband), - EffZoraband_Init, - EffZoraband_Destroy, - EffZoraband_Update, - EffZoraband_Draw, + ACTOR_EFF_ZORABAND, ACTORCAT_ITEMACTION, FLAGS, + OBJECT_ZORABAND, sizeof(EffZoraband), EffZoraband_Init, + EffZoraband_Destroy, EffZoraband_Update, EffZoraband_Draw, }; void EffZoraband_Init(Actor* thisx, PlayState* play) { 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..2f424d2f94 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -19,15 +19,8 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc); void func_8092E284(ElfMsg* this, PlayState* play); ActorInit Elf_Msg_InitVars = { - ACTOR_ELF_MSG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ElfMsg), - ElfMsg_Init, - ElfMsg_Destroy, - ElfMsg_Update, - NULL, + ACTOR_ELF_MSG, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg), + ElfMsg_Init, ElfMsg_Destroy, ElfMsg_Update, NULL, }; static InitChainEntry sInitChain[] = { 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..7f2c36b10b 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -19,15 +19,8 @@ void func_8096EF98(ElfMsg2* this, PlayState* play); void func_8096EFD0(ElfMsg2* this, PlayState* play); ActorInit Elf_Msg2_InitVars = { - ACTOR_ELF_MSG2, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ElfMsg2), - ElfMsg2_Init, - ElfMsg2_Destroy, - ElfMsg2_Update, - NULL, + ACTOR_ELF_MSG2, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg2), + ElfMsg2_Init, ElfMsg2_Destroy, ElfMsg2_Update, NULL, }; static InitChainEntry sInitChain[] = { 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..d0e5a287ac 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -18,15 +18,8 @@ void ElfMsg3_Update(Actor* thisx, PlayState* play); void func_80A2CF7C(ElfMsg3* this, PlayState* play); ActorInit Elf_Msg3_InitVars = { - ACTOR_ELF_MSG3, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ElfMsg3), - ElfMsg3_Init, - ElfMsg3_Destroy, - ElfMsg3_Update, - NULL, + ACTOR_ELF_MSG3, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg3), + ElfMsg3_Init, ElfMsg3_Destroy, ElfMsg3_Update, NULL, }; static InitChainEntry sInitChain[] = { 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..d70b5400f8 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -23,15 +23,8 @@ s32 ElfMsg4_GetTextId(ElfMsg4* this); s32 func_80AFD5E0(ElfMsg4* this); ActorInit Elf_Msg4_InitVars = { - ACTOR_ELF_MSG4, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ElfMsg4), - ElfMsg4_Init, - ElfMsg4_Destroy, - ElfMsg4_Update, - NULL, + ACTOR_ELF_MSG4, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg4), + 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..aab635eefb 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -18,15 +18,8 @@ void func_80AFDB38(ElfMsg5* this, PlayState* play); s32 func_80AFD990(ElfMsg5* this, PlayState* play); ActorInit Elf_Msg5_InitVars = { - ACTOR_ELF_MSG5, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ElfMsg5), - ElfMsg5_Init, - ElfMsg5_Destroy, - ElfMsg5_Update, - NULL, + ACTOR_ELF_MSG5, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg5), + 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..c87bce6e0b 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -24,15 +24,8 @@ void func_80BA215C(ElfMsg6* this, PlayState* play); void func_80BA21C4(ElfMsg6* this, PlayState* play); ActorInit Elf_Msg6_InitVars = { - ACTOR_ELF_MSG6, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ElfMsg6), - ElfMsg6_Init, - ElfMsg6_Destroy, - ElfMsg6_Update, - NULL, + ACTOR_ELF_MSG6, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg6), + 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..b803bdcee1 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -48,15 +48,7 @@ s32 D_80BD3DF8[] = { 0x00330100, 0x050E28FE, 0x0C100E28, -0x03F3F000 }; s32 D_80BD3E08[] = { 0x0E28FD0C, 0x0F29540C, 0x10000000 }; ActorInit En_Ah_InitVars = { - ACTOR_EN_AH, - ACTORCAT_NPC, - FLAGS, - OBJECT_AH, - sizeof(EnAh), - EnAh_Init, - EnAh_Destroy, - EnAh_Update, - EnAh_Draw, + ACTOR_EN_AH, ACTORCAT_NPC, FLAGS, OBJECT_AH, sizeof(EnAh), 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..f533efcaf6 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -32,15 +32,9 @@ void func_80BEFAF0(EnAkindonuts* this, PlayState* play); void func_80BEFD74(EnAkindonuts* this, PlayState* play); ActorInit En_Akindonuts_InitVars = { - ACTOR_EN_AKINDONUTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNT, - sizeof(EnAkindonuts), - EnAkindonuts_Init, - EnAkindonuts_Destroy, - EnAkindonuts_Update, - EnAkindonuts_Draw, + ACTOR_EN_AKINDONUTS, ACTORCAT_NPC, FLAGS, + OBJECT_DNT, sizeof(EnAkindonuts), 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..49759566eb 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -86,15 +86,7 @@ s32 D_80BDFF24[] = { }; ActorInit En_Al_InitVars = { - ACTOR_EN_AL, - ACTORCAT_NPC, - FLAGS, - OBJECT_AL, - sizeof(EnAl), - EnAl_Init, - EnAl_Destroy, - EnAl_Update, - EnAl_Draw, + ACTOR_EN_AL, ACTORCAT_NPC, FLAGS, OBJECT_AL, sizeof(EnAl), 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..f48f2e8290 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -38,15 +38,7 @@ void func_808B0B4C(EnAm* this, PlayState* play); void EnAm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx); ActorInit En_Am_InitVars = { - ACTOR_EN_AM, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_AM, - sizeof(EnAm), - EnAm_Init, - EnAm_Destroy, - EnAm_Update, - EnAm_Draw, + ACTOR_EN_AM, ACTORCAT_ENEMY, FLAGS, OBJECT_AM, sizeof(EnAm), EnAm_Init, EnAm_Destroy, EnAm_Update, EnAm_Draw, }; static ColliderCylinderInit sEnemyCylinderInit = { 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..0d7366c6fb 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -41,15 +41,7 @@ void EnAni_Talk(EnAni* this, PlayState* play); void EnAni_IdleStanding(EnAni* this, PlayState* play); ActorInit En_Ani_InitVars = { - ACTOR_EN_ANI, - ACTORCAT_NPC, - FLAGS, - OBJECT_ANI, - sizeof(EnAni), - EnAni_Init, - EnAni_Destroy, - EnAni_Update, - EnAni_Draw, + ACTOR_EN_ANI, ACTORCAT_NPC, FLAGS, OBJECT_ANI, sizeof(EnAni), 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..89a5008568 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 @@ -35,15 +35,8 @@ void func_809C2D0C(EnAob01* this, PlayState* play); s32 func_809C2EC4(EnAob01* this, PlayState* play); ActorInit En_Aob_01_InitVars = { - ACTOR_EN_AOB_01, - ACTORCAT_NPC, - FLAGS, - OBJECT_AOB, - sizeof(EnAob01), - EnAob01_Init, - EnAob01_Destroy, - EnAob01_Update, - EnAob01_Draw, + ACTOR_EN_AOB_01, ACTORCAT_NPC, FLAGS, OBJECT_AOB, sizeof(EnAob01), + 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..bca5ae5c0a 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -23,15 +23,8 @@ void func_8088B630(EnArrow* this, PlayState* play); void func_8088B6B0(EnArrow* this, PlayState* play); ActorInit En_Arrow_InitVars = { - ACTOR_EN_ARROW, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnArrow), - EnArrow_Init, - EnArrow_Destroy, - EnArrow_Update, - EnArrow_Draw, + ACTOR_EN_ARROW, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnArrow), + 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..59790298f7 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 @@ -21,15 +21,9 @@ void EnAttackNiw_AimAtPlayer(EnAttackNiw* this, PlayState* play); void EnAttackNiw_FlyAway(EnAttackNiw* this, PlayState* play); ActorInit En_Attack_Niw_InitVars = { - ACTOR_EN_ATTACK_NIW, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_NIW, - sizeof(EnAttackNiw), - EnAttackNiw_Init, - EnAttackNiw_Destroy, - EnAttackNiw_Update, - EnAttackNiw_Draw, + ACTOR_EN_ATTACK_NIW, ACTORCAT_ENEMY, FLAGS, + OBJECT_NIW, sizeof(EnAttackNiw), 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..1169c996de 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -93,15 +93,7 @@ static AnimationSpeedInfo sAnimationInfo[] = { }; ActorInit En_Az_InitVars = { - ACTOR_EN_AZ, - ACTORCAT_NPC, - FLAGS, - OBJECT_AZ, - sizeof(EnAz), - EnAz_Init, - EnAz_Destroy, - EnAz_Update, - EnAz_Draw, + ACTOR_EN_AZ, ACTORCAT_NPC, FLAGS, OBJECT_AZ, sizeof(EnAz), 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..84b67d4423 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -51,15 +51,8 @@ typedef enum { } BombShopLadyScheduleResult; ActorInit En_Baba_InitVars = { - ACTOR_EN_BABA, - ACTORCAT_NPC, - FLAGS, - OBJECT_BBA, - sizeof(EnBaba), - EnBaba_Init, - EnBaba_Destroy, - EnBaba_Update, - EnBaba_Draw, + ACTOR_EN_BABA, ACTORCAT_NPC, FLAGS, OBJECT_BBA, sizeof(EnBaba), + 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..99f73959fd 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -42,15 +42,8 @@ typedef enum { } NejironRollDirection; ActorInit En_Baguo_InitVars = { - ACTOR_EN_BAGUO, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_GMO, - sizeof(EnBaguo), - EnBaguo_Init, - EnBaguo_Destroy, - EnBaguo_Update, - NULL, + ACTOR_EN_BAGUO, ACTORCAT_ENEMY, FLAGS, OBJECT_GMO, sizeof(EnBaguo), + 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..e02764d8ff 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -24,15 +24,8 @@ void func_80BE8AAC(EnBaisen* this, PlayState* play); void func_80BE89D8(EnBaisen* this, PlayState* play); ActorInit En_Baisen_InitVars = { - ACTOR_EN_BAISEN, - ACTORCAT_NPC, - FLAGS, - OBJECT_BAI, - sizeof(EnBaisen), - EnBaisen_Init, - EnBaisen_Destroy, - EnBaisen_Update, - EnBaisen_Draw, + ACTOR_EN_BAISEN, ACTORCAT_NPC, FLAGS, OBJECT_BAI, sizeof(EnBaisen), + EnBaisen_Init, EnBaisen_Destroy, EnBaisen_Update, EnBaisen_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..a2811898e9 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -29,15 +29,7 @@ void EnBat_Die(EnBat* this, PlayState* play); void EnBat_Stunned(EnBat* this, PlayState* play); ActorInit En_Bat_InitVars = { - ACTOR_EN_BAT, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BAT, - sizeof(EnBat), - EnBat_Init, - EnBat_Destroy, - EnBat_Update, - EnBat_Draw, + ACTOR_EN_BAT, ACTORCAT_ENEMY, FLAGS, OBJECT_BAT, sizeof(EnBat), 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..d881dc80f1 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -36,15 +36,7 @@ typedef enum { } EnBbBodyPartDrawStatus; ActorInit En_Bb_InitVars = { - ACTOR_EN_BB, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BB, - sizeof(EnBb), - EnBb_Init, - EnBb_Destroy, - EnBb_Update, - EnBb_Draw, + ACTOR_EN_BB, ACTORCAT_ENEMY, FLAGS, OBJECT_BB, sizeof(EnBb), 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..292fab6759 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 @@ -29,15 +29,8 @@ void EnBba01_FaceFoward(EnHy* this, PlayState* play); void EnBba01_Talk(EnHy* this, PlayState* play); ActorInit En_Bba_01_InitVars = { - ACTOR_EN_BBA_01, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBba01), - EnBba01_Init, - EnBba01_Destroy, - EnBba01_Update, - EnBba01_Draw, + ACTOR_EN_BBA_01, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBba01), + 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..f538768388 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -36,15 +36,8 @@ typedef enum { } EnBbfallBodyPartDrawStatus; ActorInit En_Bbfall_InitVars = { - ACTOR_EN_BBFALL, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BB, - sizeof(EnBbfall), - EnBbfall_Init, - EnBbfall_Destroy, - EnBbfall_Update, - EnBbfall_Draw, + ACTOR_EN_BBFALL, ACTORCAT_ENEMY, FLAGS, OBJECT_BB, sizeof(EnBbfall), + 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..45a1bf06e5 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -23,15 +23,7 @@ void EnBee_Attack(EnBee* this, PlayState* play); s32 sNumLoadedBees = 0; ActorInit En_Bee_InitVars = { - ACTOR_EN_BEE, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BEE, - sizeof(EnBee), - EnBee_Init, - EnBee_Destroy, - EnBee_Update, - EnBee_Draw, + ACTOR_EN_BEE, ACTORCAT_ENEMY, FLAGS, OBJECT_BEE, sizeof(EnBee), 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..82c6a63297 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.c +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -18,15 +18,7 @@ void EnBh_Draw(Actor* thisx, PlayState* play); void func_80C22DEC(EnBh* this, PlayState* play); ActorInit En_Bh_InitVars = { - ACTOR_EN_BH, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BH, - sizeof(EnBh), - EnBh_Init, - EnBh_Destroy, - EnBh_Update, - EnBh_Draw, + ACTOR_EN_BH, ACTORCAT_ITEMACTION, FLAGS, OBJECT_BH, sizeof(EnBh), 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..af032158d2 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -31,15 +31,8 @@ void EnBigokuta_SetupDeathEffects(EnBigokuta* this); void EnBigokuta_PlayDeathEffects(EnBigokuta* this, PlayState* play); ActorInit En_Bigokuta_InitVars = { - ACTOR_EN_BIGOKUTA, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BIGOKUTA, - sizeof(EnBigokuta), - EnBigokuta_Init, - EnBigokuta_Destroy, - EnBigokuta_Update, - EnBigokuta_Draw, + ACTOR_EN_BIGOKUTA, ACTORCAT_BOSS, FLAGS, OBJECT_BIGOKUTA, sizeof(EnBigokuta), 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..caa9f7685f 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -47,15 +47,8 @@ void func_80A28D80(EnBigpamet* this); void func_80A28ED4(EnBigpamet* this); ActorInit En_Bigpamet_InitVars = { - ACTOR_EN_BIGPAMET, - ACTORCAT_BOSS, - FLAGS, - OBJECT_TL, - sizeof(EnBigpamet), - EnBigpamet_Init, - EnBigpamet_Destroy, - EnBigpamet_Update, - EnBigpamet_Draw, + ACTOR_EN_BIGPAMET, ACTORCAT_BOSS, FLAGS, OBJECT_TL, sizeof(EnBigpamet), 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..0e9aa19300 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -83,15 +83,8 @@ void EnBigpo_DrawCircleFlames(Actor* thisx, PlayState* play); void EnBigpo_RevealedFire(Actor* thisx, PlayState* play); ActorInit En_Bigpo_InitVars = { - ACTOR_EN_BIGPO, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BIGPO, - sizeof(EnBigpo), - EnBigpo_Init, - EnBigpo_Destroy, - EnBigpo_Update, - NULL, + ACTOR_EN_BIGPO, ACTORCAT_ENEMY, FLAGS, OBJECT_BIGPO, sizeof(EnBigpo), + 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..8d308b082a 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -212,15 +212,9 @@ static EnBigslimeTri sBigslimeTri[BIGSLIME_NUM_FACES] = { }; ActorInit En_Bigslime_InitVars = { - ACTOR_EN_BIGSLIME, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BIGSLIME, - sizeof(EnBigslime), - EnBigslime_Init, - EnBigslime_Destroy, - EnBigslime_UpdateGekko, - EnBigslime_DrawGekko, + ACTOR_EN_BIGSLIME, ACTORCAT_BOSS, FLAGS, + OBJECT_BIGSLIME, sizeof(EnBigslime), 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..48fbfe8424 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 @@ -30,15 +30,8 @@ s32 EnBji01_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* void EnBji01_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx); ActorInit En_Bji_01_InitVars = { - ACTOR_EN_BJI_01, - ACTORCAT_NPC, - FLAGS, - OBJECT_BJI, - sizeof(EnBji01), - EnBji01_Init, - EnBji01_Destroy, - EnBji01_Update, - EnBji01_Draw, + ACTOR_EN_BJI_01, ACTORCAT_NPC, FLAGS, OBJECT_BJI, sizeof(EnBji01), + 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..d60c770698 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -47,15 +47,7 @@ static u8 sMsgEventScript[] = { }; ActorInit En_Bjt_InitVars = { - ACTOR_EN_BJT, - ACTORCAT_NPC, - FLAGS, - OBJECT_BJT, - sizeof(EnBjt), - EnBjt_Init, - EnBjt_Destroy, - EnBjt_Update, - EnBjt_Draw, + ACTOR_EN_BJT, ACTORCAT_NPC, FLAGS, OBJECT_BJT, sizeof(EnBjt), 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..0695846628 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 @@ -16,15 +16,8 @@ void EnBoj01_Update(Actor* thisx, PlayState* play); void EnBoj01_Draw(Actor* thisx, PlayState* play); ActorInit En_Boj_01_InitVars = { - ACTOR_EN_BOJ_01, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBoj01), - EnBoj01_Init, - EnBoj01_Destroy, - EnBoj01_Update, - EnBoj01_Draw, + ACTOR_EN_BOJ_01, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj01), + 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..248fc5bb15 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 @@ -16,15 +16,8 @@ void EnBoj02_Update(Actor* thisx, PlayState* play); void EnBoj02_Draw(Actor* thisx, PlayState* play); ActorInit En_Boj_02_InitVars = { - ACTOR_EN_BOJ_02, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBoj02), - EnBoj02_Init, - EnBoj02_Destroy, - EnBoj02_Update, - EnBoj02_Draw, + ACTOR_EN_BOJ_02, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj02), + 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..d9feac1ca1 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 @@ -16,15 +16,8 @@ void EnBoj03_Update(Actor* thisx, PlayState* play); void EnBoj03_Draw(Actor* thisx, PlayState* play); ActorInit En_Boj_03_InitVars = { - ACTOR_EN_BOJ_03, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBoj03), - EnBoj03_Init, - EnBoj03_Destroy, - EnBoj03_Update, - EnBoj03_Draw, + ACTOR_EN_BOJ_03, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj03), + 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..a26bc6451f 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 @@ -16,15 +16,8 @@ void EnBoj04_Update(Actor* thisx, PlayState* play); void EnBoj04_Draw(Actor* thisx, PlayState* play); ActorInit En_Boj_04_InitVars = { - ACTOR_EN_BOJ_04, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBoj04), - EnBoj04_Init, - EnBoj04_Destroy, - EnBoj04_Update, - EnBoj04_Draw, + ACTOR_EN_BOJ_04, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj04), + 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..ffe23299b6 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 @@ -16,15 +16,8 @@ void EnBoj05_Update(Actor* thisx, PlayState* play); void EnBoj05_Draw(Actor* thisx, PlayState* play); ActorInit En_Boj_05_InitVars = { - ACTOR_EN_BOJ_05, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBoj05), - EnBoj05_Init, - EnBoj05_Destroy, - EnBoj05_Update, - EnBoj05_Draw, + ACTOR_EN_BOJ_05, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj05), + 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..81d354b4e3 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -33,15 +33,8 @@ typedef struct { static PowderKegFuseSegment sPowderKegFuseSegments[16]; ActorInit En_Bom_InitVars = { - ACTOR_EN_BOM, - ACTORCAT_EXPLOSIVES, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBom), - EnBom_Init, - EnBom_Destroy, - EnBom_Update, - EnBom_Draw, + ACTOR_EN_BOM, ACTORCAT_EXPLOSIVES, FLAGS, GAMEPLAY_KEEP, sizeof(EnBom), + EnBom_Init, EnBom_Destroy, EnBom_Update, EnBom_Draw, }; static f32 enBomScales[] = { 0.01f, 0.03f }; 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..ffafa9a596 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 @@ -26,15 +26,8 @@ void EnBomChu_Explode(EnBomChu* this, PlayState* play); void EnBomChu_WaitForDeath(EnBomChu* this, PlayState* play); ActorInit En_Bom_Chu_InitVars = { - ACTOR_EN_BOM_CHU, - ACTORCAT_EXPLOSIVES, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBomChu), - EnBomChu_Init, - EnBomChu_Destroy, - EnBomChu_Update, - EnBomChu_Draw, + ACTOR_EN_BOM_CHU, ACTORCAT_EXPLOSIVES, FLAGS, GAMEPLAY_KEEP, sizeof(EnBomChu), + 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..8a5039697b 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -26,15 +26,8 @@ void EnBombal_UpdateEffects(EnBombal* this, PlayState* play); void EnBombal_DrawEffects(EnBombal*, PlayState*); ActorInit En_Bombal_InitVars = { - ACTOR_EN_BOMBAL, - ACTORCAT_PROP, - FLAGS, - OBJECT_FUSEN, - sizeof(EnBombal), - EnBombal_Init, - EnBombal_Destroy, - EnBombal_Update, - EnBombal_Draw, + ACTOR_EN_BOMBAL, ACTORCAT_PROP, FLAGS, OBJECT_FUSEN, sizeof(EnBombal), + 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..be87f40d7b 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -26,15 +26,8 @@ void func_80C04354(EnBombers* this, PlayState* play); void func_80C043C8(EnBombers* this, PlayState* play); ActorInit En_Bombers_InitVars = { - ACTOR_EN_BOMBERS, - ACTORCAT_NPC, - FLAGS, - OBJECT_CS, - sizeof(EnBombers), - EnBombers_Init, - EnBombers_Destroy, - EnBombers_Update, - EnBombers_Draw, + ACTOR_EN_BOMBERS, ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBombers), 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..dba78fad40 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -24,15 +24,8 @@ void func_80C04D00(EnBombers2* this); void func_80C050B8(EnBombers2* this, PlayState* play); ActorInit En_Bombers2_InitVars = { - ACTOR_EN_BOMBERS2, - ACTORCAT_NPC, - FLAGS, - OBJECT_CS, - sizeof(EnBombers2), - EnBombers2_Init, - EnBombers2_Destroy, - EnBombers2_Update, - EnBombers2_Draw, + ACTOR_EN_BOMBERS2, ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBombers2), 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..90b2adc3c4 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -25,15 +25,8 @@ void func_808AEF68(EnBombf* this, PlayState* play); void func_808AEFD4(EnBombf* this, PlayState* play); ActorInit En_Bombf_InitVars = { - ACTOR_EN_BOMBF, - ACTORCAT_PROP, - FLAGS, - OBJECT_BOMBF, - sizeof(EnBombf), - EnBombf_Init, - EnBombf_Destroy, - EnBombf_Update, - EnBombf_Draw, + ACTOR_EN_BOMBF, ACTORCAT_PROP, FLAGS, OBJECT_BOMBF, sizeof(EnBombf), + 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..1a34d77756 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -54,15 +54,8 @@ static s32 D_80C009F0 = 0; static s32 D_80C009F4 = 0; ActorInit En_Bomjima_InitVars = { - ACTOR_EN_BOMJIMA, - ACTORCAT_NPC, - FLAGS, - OBJECT_CS, - sizeof(EnBomjima), - EnBomjima_Init, - EnBomjima_Destroy, - EnBomjima_Update, - EnBomjima_Draw, + ACTOR_EN_BOMJIMA, ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBomjima), 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..5a7940ea73 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -41,15 +41,8 @@ void func_80C02DAC(EnBomjimb* this, PlayState* play); static Actor* D_80C03170 = NULL; ActorInit En_Bomjimb_InitVars = { - ACTOR_EN_BOMJIMB, - ACTORCAT_NPC, - FLAGS, - OBJECT_CS, - sizeof(EnBomjimb), - EnBomjimb_Init, - EnBomjimb_Destroy, - EnBomjimb_Update, - EnBomjimb_Draw, + ACTOR_EN_BOMJIMB, ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBomjimb), 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..6dcdba7ed2 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -20,15 +20,8 @@ void EnBoom_SetupAction(EnBoom* this, EnBoomActionFunc actionFunc); void func_808A2918(EnBoom* this, PlayState* play); ActorInit En_Boom_InitVars = { - ACTOR_EN_BOOM, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBoom), - EnBoom_Init, - EnBoom_Destroy, - EnBoom_Update, - EnBoom_Draw, + ACTOR_EN_BOOM, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoom), + 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..90bd65eae9 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -57,15 +57,7 @@ void func_80867FBC(struct_80867BDC_a0* arg0, PlayState* play, s32 arg2); void func_80867FE4(struct_80867BDC_a0* arg0, PlayState* play); ActorInit En_Box_InitVars = { - ACTOR_EN_BOX, - ACTORCAT_CHEST, - FLAGS, - OBJECT_BOX, - sizeof(EnBox), - EnBox_Init, - EnBox_Destroy, - EnBox_Update, - EnBox_Draw, + ACTOR_EN_BOX, ACTORCAT_CHEST, FLAGS, OBJECT_BOX, sizeof(EnBox), EnBox_Init, EnBox_Destroy, EnBox_Update, EnBox_Draw, }; static InitChainEntry sInitChain[] = { 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..b259dcd75d 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.c +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -18,15 +18,7 @@ void EnBu_Draw(Actor* thisx, PlayState* play); void EnBu_DoNothing(EnBu* this, PlayState* play); ActorInit En_Bu_InitVars = { - ACTOR_EN_BU, - ACTORCAT_ENEMY, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBu), - EnBu_Init, - EnBu_Destroy, - EnBu_Update, - EnBu_Draw, + ACTOR_EN_BU, ACTORCAT_ENEMY, FLAGS, GAMEPLAY_KEEP, sizeof(EnBu), 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..74ae3fc500 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -20,15 +20,8 @@ void EnBubble_Pop(EnBubble* this, PlayState* play); void EnBubble_Regrow(EnBubble* this, PlayState* play); ActorInit En_Bubble_InitVars = { - ACTOR_EN_BUBBLE, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BUBBLE, - sizeof(EnBubble), - EnBubble_Init, - EnBubble_Destroy, - EnBubble_Update, - EnBubble_Draw, + ACTOR_EN_BUBBLE, ACTORCAT_ENEMY, FLAGS, OBJECT_BUBBLE, sizeof(EnBubble), + 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..92783b32d8 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -54,15 +54,8 @@ static ColliderJntSphInit sJntSphInit = { }; ActorInit En_Butte_InitVars = { - ACTOR_EN_BUTTE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(EnButte), - EnButte_Init, - EnButte_Destroy, - EnButte_Update, - EnButte_Draw, + ACTOR_EN_BUTTE, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnButte), + 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..dd486a8813 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -19,15 +19,7 @@ void EnCha_Draw(Actor* thisx, PlayState* play); void EnCha_Idle(EnCha* this, PlayState* play); ActorInit En_Cha_InitVars = { - ACTOR_EN_CHA, - ACTORCAT_PROP, - FLAGS, - OBJECT_CHA, - sizeof(EnCha), - EnCha_Init, - EnCha_Destroy, - EnCha_Update, - EnCha_Draw, + ACTOR_EN_CHA, ACTORCAT_PROP, FLAGS, OBJECT_CHA, sizeof(EnCha), 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..c80d215cb3 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 @@ -32,15 +32,8 @@ void EnClearTag_UpdateEffects(EnClearTag* this, PlayState* play); void EnClearTag_DrawEffects(Actor* thisx, PlayState* play); ActorInit En_Clear_Tag_InitVars = { - ACTOR_EN_CLEAR_TAG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnClearTag), - EnClearTag_Init, - EnClearTag_Destroy, - EnClearTag_Update, - EnClearTag_Draw, + ACTOR_EN_CLEAR_TAG, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnClearTag), 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..4f86232648 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 @@ -21,15 +21,8 @@ void EnCne01_FaceForward(EnHy* this, PlayState* play); void EnCne01_Talk(EnHy* this, PlayState* play); ActorInit En_Cne_01_InitVars = { - ACTOR_EN_CNE_01, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnCne01), - EnCne01_Init, - EnCne01_Destroy, - EnCne01_Update, - EnCne01_Draw, + ACTOR_EN_CNE_01, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnCne01), + 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..d8a96f5526 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 @@ -48,15 +48,8 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Col_Man_InitVars = { - ACTOR_EN_COL_MAN, - ACTORCAT_MISC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnColMan), - EnColMan_Init, - EnColMan_Destroy, - EnColMan_Update, - NULL, + ACTOR_EN_COL_MAN, ACTORCAT_MISC, FLAGS, GAMEPLAY_KEEP, sizeof(EnColMan), + 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..16cf7135d4 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -28,15 +28,7 @@ void EnCow_UpdateTail(Actor* thisx, PlayState* play); void EnCow_DrawTail(Actor* thisx, PlayState* play); ActorInit En_Cow_InitVars = { - ACTOR_EN_COW, - ACTORCAT_NPC, - FLAGS, - OBJECT_COW, - sizeof(EnCow), - EnCow_Init, - EnCow_Destroy, - EnCow_Update, - EnCow_Draw, + ACTOR_EN_COW, ACTORCAT_NPC, FLAGS, OBJECT_COW, sizeof(EnCow), 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..163a46489f 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -28,15 +28,8 @@ void EnCrow_TurnAway(EnCrow* this, PlayState* play); void EnCrow_Respawn(EnCrow* this, PlayState* play); ActorInit En_Crow_InitVars = { - ACTOR_EN_CROW, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_CROW, - sizeof(EnCrow), - EnCrow_Init, - EnCrow_Destroy, - EnCrow_Update, - EnCrow_Draw, + ACTOR_EN_CROW, ACTORCAT_ENEMY, FLAGS, OBJECT_CROW, sizeof(EnCrow), + 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..fd7e43a91a 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -20,15 +20,7 @@ void func_80B3F00C(EnDai* this, PlayState* play); void func_80B3EF90(EnDai* this, PlayState* play); ActorInit En_Dai_InitVars = { - ACTOR_EN_DAI, - ACTORCAT_NPC, - FLAGS, - OBJECT_DAI, - sizeof(EnDai), - EnDai_Init, - EnDai_Destroy, - EnDai_Update, - EnDai_Draw, + ACTOR_EN_DAI, ACTORCAT_NPC, FLAGS, OBJECT_DAI, sizeof(EnDai), 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..ef16483535 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -22,15 +22,8 @@ void func_80943BDC(EnDaiku* this, PlayState* play); void func_809438F8(EnDaiku* this, PlayState* play); ActorInit En_Daiku_InitVars = { - ACTOR_EN_DAIKU, - ACTORCAT_NPC, - FLAGS, - OBJECT_DAIKU, - sizeof(EnDaiku), - EnDaiku_Init, - EnDaiku_Destroy, - EnDaiku_Update, - EnDaiku_Draw, + ACTOR_EN_DAIKU, ACTORCAT_NPC, FLAGS, OBJECT_DAIKU, sizeof(EnDaiku), + 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..2aaa9f7e53 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -33,15 +33,8 @@ void func_80BE7504(EnDaiku2* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 ar void func_80BE7718(EnDaiku2* this, PlayState* play); ActorInit En_Daiku2_InitVars = { - ACTOR_EN_DAIKU2, - ACTORCAT_NPC, - FLAGS, - OBJECT_DAIKU, - sizeof(EnDaiku2), - EnDaiku2_Init, - EnDaiku2_Destroy, - EnDaiku2_Update, - EnDaiku2_Draw, + ACTOR_EN_DAIKU2, ACTORCAT_NPC, FLAGS, OBJECT_DAIKU, sizeof(EnDaiku2), + EnDaiku2_Init, EnDaiku2_Destroy, EnDaiku2_Update, EnDaiku2_Draw, }; static u16 sTextIds[] = { 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..83004f99a9 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -40,15 +40,8 @@ void func_808BE680(EnDekunuts* this); void func_808BE6C4(EnDekunuts* this, PlayState* play); ActorInit En_Dekunuts_InitVars = { - ACTOR_EN_DEKUNUTS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DEKUNUTS, - sizeof(EnDekunuts), - EnDekunuts_Init, - EnDekunuts_Destroy, - EnDekunuts_Update, - EnDekunuts_Draw, + ACTOR_EN_DEKUNUTS, ACTORCAT_ENEMY, FLAGS, OBJECT_DEKUNUTS, sizeof(EnDekunuts), 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..44c3af933c 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 @@ -31,15 +31,9 @@ typedef enum { } EnDemoheishiAnimation; ActorInit En_Demo_heishi_InitVars = { - ACTOR_EN_DEMO_HEISHI, - ACTORCAT_NPC, - FLAGS, - OBJECT_SDN, - sizeof(EnDemoheishi), - EnDemoheishi_Init, - EnDemoheishi_Destroy, - EnDemoheishi_Update, - EnDemoheishi_Draw, + ACTOR_EN_DEMO_HEISHI, ACTORCAT_NPC, FLAGS, + OBJECT_SDN, sizeof(EnDemoheishi), 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..0dacf6e87e 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -39,15 +39,7 @@ void EnDg_SetupTalk(EnDg* this, PlayState* play); void EnDg_Talk(EnDg* this, PlayState* play); ActorInit En_Dg_InitVars = { - ACTOR_EN_DG, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DOG, - sizeof(EnDg), - EnDg_Init, - EnDg_Destroy, - EnDg_Update, - EnDg_Draw, + ACTOR_EN_DG, ACTORCAT_ENEMY, FLAGS, OBJECT_DOG, sizeof(EnDg), 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..af7cdf0270 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -58,15 +58,8 @@ void func_8089C164(EnDinofos* this); void func_8089C244(EnDinofos* this); ActorInit En_Dinofos_InitVars = { - ACTOR_EN_DINOFOS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DINOFOS, - sizeof(EnDinofos), - EnDinofos_Init, - EnDinofos_Destroy, - EnDinofos_Update, - EnDinofos_Draw, + ACTOR_EN_DINOFOS, ACTORCAT_ENEMY, FLAGS, OBJECT_DINOFOS, sizeof(EnDinofos), 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..06297e3079 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -22,15 +22,8 @@ s32 func_80A5086C(EnDnbUnkStruct* arg0); s32 func_80A50950(EnDnbUnkStruct* arg0, PlayState* play2); ActorInit En_Dnb_InitVars = { - ACTOR_EN_DNB, - ACTORCAT_BG, - FLAGS, - OBJECT_HANAREYAMA_OBJ, - sizeof(EnDnb), - EnDnb_Init, - EnDnb_Destroy, - EnDnb_Update, - EnDnb_Draw, + ACTOR_EN_DNB, ACTORCAT_BG, FLAGS, OBJECT_HANAREYAMA_OBJ, sizeof(EnDnb), 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_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index 8723994276..4d39f887d7 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -25,15 +25,7 @@ void func_80A52134(EnDnk* this, PlayState* play); static s16 D_80A521A0 = 0; ActorInit En_Dnk_InitVars = { - ACTOR_EN_DNK, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnDnk), - EnDnk_Init, - EnDnk_Destroy, - EnDnk_Update, - NULL, + ACTOR_EN_DNK, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnDnk), 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..ff6a702a00 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -90,15 +90,7 @@ static AnimationSpeedInfo sAnimations[] = { }; ActorInit En_Dno_InitVars = { - ACTOR_EN_DNO, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNJ, - sizeof(EnDno), - EnDno_Init, - EnDno_Destroy, - EnDno_Update, - EnDno_Draw, + ACTOR_EN_DNO, ACTORCAT_NPC, FLAGS, OBJECT_DNJ, sizeof(EnDno), 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..f7204105cb 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -33,15 +33,7 @@ typedef enum { } EnDnpEyeIndex; ActorInit En_Dnp_InitVars = { - ACTOR_EN_DNP, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNQ, - sizeof(EnDnp), - EnDnp_Init, - EnDnp_Destroy, - EnDnp_Update, - EnDnp_Draw, + ACTOR_EN_DNP, ACTORCAT_NPC, FLAGS, OBJECT_DNQ, sizeof(EnDnp), 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..7ffb5ebbe5 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -26,15 +26,7 @@ static s32 D_80A53400[] = { }; ActorInit En_Dnq_InitVars = { - ACTOR_EN_DNQ, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNO, - sizeof(EnDnq), - EnDnq_Init, - EnDnq_Destroy, - EnDnq_Update, - EnDnq_Draw, + ACTOR_EN_DNQ, ACTORCAT_NPC, FLAGS, OBJECT_DNO, sizeof(EnDnq), 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..bbc9aa0d9a 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -40,15 +40,7 @@ static s32 D_8092DCB0[] = { }; ActorInit En_Dns_InitVars = { - ACTOR_EN_DNS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNS, - sizeof(EnDns), - EnDns_Init, - EnDns_Destroy, - EnDns_Update, - EnDns_Draw, + ACTOR_EN_DNS, ACTORCAT_NPC, FLAGS, OBJECT_DNS, sizeof(EnDns), 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..33253b4fba 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -36,15 +36,8 @@ void func_80878724(EnDodongo* this); void func_808787B0(EnDodongo* this, PlayState* play); ActorInit En_Dodongo_InitVars = { - ACTOR_EN_DODONGO, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DODONGO, - sizeof(EnDodongo), - EnDodongo_Init, - EnDodongo_Destroy, - EnDodongo_Update, - EnDodongo_Draw, + ACTOR_EN_DODONGO, ACTORCAT_ENEMY, FLAGS, OBJECT_DODONGO, sizeof(EnDodongo), 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..80ce49e35f 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -278,15 +278,8 @@ u8* D_8086778C[] = { }; ActorInit En_Door_InitVars = { - ACTOR_EN_DOOR, - ACTORCAT_DOOR, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnDoor), - EnDoor_Init, - EnDoor_Destroy, - EnDoor_Update, - EnDoor_Draw, + ACTOR_EN_DOOR, ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(EnDoor), + 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..be8c55e115 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 @@ -21,15 +21,8 @@ void func_80AC2354(EnDoorEtc* this, PlayState* play); void EnDoorEtc_Draw(Actor* thisx, PlayState* play); ActorInit En_Door_Etc_InitVars = { - ACTOR_EN_DOOR_ETC, - ACTORCAT_DOOR, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnDoorEtc), - EnDoorEtc_Init, - EnDoorEtc_Destroy, - EnDoorEtc_Update, - NULL, + ACTOR_EN_DOOR_ETC, ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(EnDoorEtc), 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..bda1951a5d 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -51,15 +51,8 @@ typedef enum { static s32 sNumPythonsDead = 0; ActorInit En_Dragon_InitVars = { - ACTOR_EN_DRAGON, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_UTUBO, - sizeof(EnDragon), - EnDragon_Init, - EnDragon_Destroy, - EnDragon_Update, - EnDragon_Draw, + ACTOR_EN_DRAGON, ACTORCAT_ENEMY, FLAGS, OBJECT_UTUBO, sizeof(EnDragon), + 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..d83abe046e 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -18,15 +18,7 @@ void EnDrs_Draw(Actor* thisx, PlayState* play); void EnDrs_Idle(EnDrs* this, PlayState* play); ActorInit En_Drs_InitVars = { - ACTOR_EN_DRS, - ACTORCAT_PROP, - FLAGS, - OBJECT_DRS, - sizeof(EnDrs), - EnDrs_Init, - EnDrs_Destroy, - EnDrs_Update, - NULL, + ACTOR_EN_DRS, ACTORCAT_PROP, FLAGS, OBJECT_DRS, sizeof(EnDrs), 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..7f5d2a34dc 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -21,15 +21,8 @@ void EnDs2n_Draw(Actor* thisx, PlayState* play); void EnDs2n_Idle(EnDs2n* this, PlayState* play); ActorInit En_Ds2n_InitVars = { - ACTOR_EN_DS2N, - ACTORCAT_NPC, - FLAGS, - OBJECT_DS2N, - sizeof(EnDs2n), - EnDs2n_Init, - EnDs2n_Destroy, - EnDs2n_Update, - EnDs2n_Draw, + ACTOR_EN_DS2N, ACTORCAT_NPC, FLAGS, OBJECT_DS2N, sizeof(EnDs2n), + EnDs2n_Init, EnDs2n_Destroy, EnDs2n_Update, EnDs2n_Draw, }; static AnimationInfo sAnimationInfo[] = { 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..9f40cecd39 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 @@ -20,15 +20,8 @@ void func_80A61334(EnDyExtra* this, PlayState* play); void func_80A613C8(EnDyExtra* this, PlayState* play); ActorInit En_Dy_Extra_InitVars = { - ACTOR_EN_DY_EXTRA, - ACTORCAT_PROP, - FLAGS, - OBJECT_DY_OBJ, - sizeof(EnDyExtra), - EnDyExtra_Init, - EnDyExtra_Destroy, - EnDyExtra_Update, - EnDyExtra_Draw, + ACTOR_EN_DY_EXTRA, ACTORCAT_PROP, FLAGS, OBJECT_DY_OBJ, sizeof(EnDyExtra), 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..24431d5763 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -30,15 +30,8 @@ void EnEgblock_UpdateEffects(EnEgblock* this, PlayState* play); void EnEgblock_DrawEffects(EnEgblock* this, PlayState* play); ActorInit En_Egblock_InitVars = { - ACTOR_EN_EGBLOCK, - ACTORCAT_PROP, - FLAGS, - OBJECT_EG, - sizeof(EnEgblock), - EnEgblock_Init, - EnEgblock_Destroy, - EnEgblock_Update, - EnEgblock_Draw, + ACTOR_EN_EGBLOCK, ACTORCAT_PROP, FLAGS, OBJECT_EG, sizeof(EnEgblock), 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..fcb7f4b0d7 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -294,15 +294,8 @@ static Color_RGB8 sLightOrbColors[] = { }; ActorInit En_Egol_InitVars = { - ACTOR_EN_EGOL, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_EG, - sizeof(EnEgol), - EnEgol_Init, - EnEgol_Destroy, - EnEgol_Update, - EnEgol_Draw, + ACTOR_EN_EGOL, ACTORCAT_ENEMY, FLAGS, OBJECT_EG, sizeof(EnEgol), + 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..a7215e38ad 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -34,15 +34,8 @@ void func_8089010C(Actor* thisx, PlayState* play); void func_808908D0(Vec3f* vec, PlayState* play, u32 action); ActorInit En_Elf_InitVars = { - ACTOR_EN_ELF, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnElf), - EnElf_Init, - EnElf_Destroy, - EnElf_Update, - EnElf_Draw, + ACTOR_EN_ELF, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnElf), + 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..c36f5ccb90 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -21,15 +21,8 @@ void EnElfbub_Pop(EnElfbub* this, PlayState* play); void EnElfbub_Idle(EnElfbub* this, PlayState* play); ActorInit En_Elfbub_InitVars = { - ACTOR_EN_ELFBUB, - ACTORCAT_MISC, - FLAGS, - OBJECT_BUBBLE, - sizeof(EnElfbub), - EnElfbub_Init, - EnElfbub_Destroy, - EnElfbub_Update, - EnElfbub_Draw, + ACTOR_EN_ELFBUB, ACTORCAT_MISC, FLAGS, OBJECT_BUBBLE, sizeof(EnElfbub), + 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..35b705b946 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -36,15 +36,8 @@ void func_80A3A7FC(EnElfgrp* this, PlayState* play); void func_80A3A8F8(EnElfgrp* this, PlayState* play); ActorInit En_Elfgrp_InitVars = { - ACTOR_EN_ELFGRP, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnElfgrp), - EnElfgrp_Init, - EnElfgrp_Destroy, - EnElfgrp_Update, - NULL, + ACTOR_EN_ELFGRP, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnElfgrp), + 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..ea881fdfc0 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -23,15 +23,8 @@ void EnElforg_SetupTrappedByEnemy(EnElforg* this, PlayState* play); void EnElforg_HiddenByCollider(EnElforg* this, PlayState* play); ActorInit En_Elforg_InitVars = { - ACTOR_EN_ELFORG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnElforg), - EnElforg_Init, - EnElforg_Destroy, - EnElforg_Update, - EnElforg_Draw, + ACTOR_EN_ELFORG, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnElforg), + 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..04ad9f9a73 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -16,15 +16,8 @@ void EnEncount1_Update(Actor* thisx, PlayState* play); void func_808E0954(EnEncount1* this, PlayState* play); ActorInit En_Encount1_InitVars = { - ACTOR_EN_ENCOUNT1, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnEncount1), - EnEncount1_Init, - NULL, - EnEncount1_Update, - NULL, + ACTOR_EN_ENCOUNT1, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount1), 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..609565aadc 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -26,15 +26,8 @@ void EnEncount2_UpdateEffects(EnEncount2* this, PlayState* play); void EnEncount2_DrawEffects(EnEncount2* this, PlayState* play); ActorInit En_Encount2_InitVars = { - ACTOR_EN_ENCOUNT2, - ACTORCAT_PROP, - FLAGS, - OBJECT_FUSEN, - sizeof(EnEncount2), - EnEncount2_Init, - EnEncount2_Destroy, - EnEncount2_Update, - EnEncount2_Draw, + ACTOR_EN_ENCOUNT2, ACTORCAT_PROP, FLAGS, OBJECT_FUSEN, sizeof(EnEncount2), EnEncount2_Init, + EnEncount2_Destroy, EnEncount2_Update, EnEncount2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { 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..62c22a2b49 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -21,15 +21,8 @@ void func_809C4598(EnEncount4* this, PlayState* play); void func_809C464C(EnEncount4* this, PlayState* play); ActorInit En_Encount4_InitVars = { - ACTOR_EN_ENCOUNT4, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnEncount4), - EnEncount4_Init, - EnEncount4_Destroy, - EnEncount4_Update, - NULL, + ACTOR_EN_ENCOUNT4, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount4), EnEncount4_Init, + EnEncount4_Destroy, EnEncount4_Update, NULL, }; s16 D_809C46D0[] = { 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..8cd4956514 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 @@ -20,15 +20,9 @@ void func_80C23518(EnEndingHero3* this); void func_80C23534(EnEndingHero3* this, PlayState* play); ActorInit En_Ending_Hero3_InitVars = { - ACTOR_EN_ENDING_HERO3, - ACTORCAT_NPC, - FLAGS, - OBJECT_TORYO, - sizeof(EnEndingHero3), - EnEndingHero3_Init, - EnEndingHero3_Destroy, - EnEndingHero3_Update, - EnEndingHero3_Draw, + ACTOR_EN_ENDING_HERO3, ACTORCAT_NPC, FLAGS, + OBJECT_TORYO, sizeof(EnEndingHero3), EnEndingHero3_Init, + EnEndingHero3_Destroy, EnEndingHero3_Update, EnEndingHero3_Draw, }; void EnEndingHero3_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..a72f307b99 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 @@ -20,15 +20,9 @@ void func_80C23980(EnEndingHero5* this); void func_80C2399C(EnEndingHero5* this, PlayState* play); ActorInit En_Ending_Hero5_InitVars = { - ACTOR_EN_ENDING_HERO5, - ACTORCAT_NPC, - FLAGS, - OBJECT_DAIKU, - sizeof(EnEndingHero5), - EnEndingHero5_Init, - EnEndingHero5_Destroy, - EnEndingHero5_Update, - EnEndingHero5_Draw, + ACTOR_EN_ENDING_HERO5, ACTORCAT_NPC, FLAGS, + OBJECT_DAIKU, sizeof(EnEndingHero5), 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..55747b5981 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 @@ -25,15 +25,9 @@ void EnEndingHero6_SetupIdle(EnEndingHero6* this); void EnEndingHero6_Idle(EnEndingHero6* this, PlayState* play); ActorInit En_Ending_Hero6_InitVars = { - ACTOR_EN_ENDING_HERO6, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnEndingHero6), - EnEndingHero6_Init, - EnEndingHero6_Destroy, - EnEndingHero6_Update, - EnEndingHero6_Draw, + ACTOR_EN_ENDING_HERO6, ACTORCAT_NPC, FLAGS, + GAMEPLAY_KEEP, sizeof(EnEndingHero6), 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..af2b608cbd 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -24,15 +24,8 @@ void EnEstone_UpdateEffects(EnEstone* this, PlayState* play); void EnEstone_DrawEffects(EnEstone* this, PlayState* play); ActorInit En_Estone_InitVars = { - ACTOR_EN_ESTONE, - ACTORCAT_PROP, - FLAGS, - OBJECT_EG, - sizeof(EnEstone), - EnEstone_Init, - EnEstone_Destroy, - EnEstone_Update, - EnEstone_Draw, + ACTOR_EN_ESTONE, ACTORCAT_PROP, FLAGS, OBJECT_EG, sizeof(EnEstone), + 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..87db20f99e 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -63,15 +63,8 @@ typedef struct { EnFallDebrisEffect debrisEffects[EN_FALL_DEBRIS_EFFECT_COUNT]; ActorInit En_Fall_InitVars = { - ACTOR_EN_FALL, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnFall), - EnFall_Init, - EnFall_Destroy, - EnFall_Update, - NULL, + ACTOR_EN_FALL, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnFall), + 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..2bdb89946f 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -22,15 +22,8 @@ void func_80C1B8F0(EnFall2* this); void func_80C1B9D4(EnFall2* this, PlayState* play); ActorInit En_Fall2_InitVars = { - ACTOR_EN_FALL2, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_FALL2, - sizeof(EnFall2), - EnFall2_Init, - EnFall2_Destroy, - EnFall2_Update, - EnFall2_Draw, + ACTOR_EN_FALL2, ACTORCAT_ITEMACTION, FLAGS, OBJECT_FALL2, sizeof(EnFall2), + 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..80d0da332d 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -52,15 +52,8 @@ void EnFamos_DeathFade(EnFamos* this, PlayState* play); void EnFamos_DrawDebris(EnFamos* this, PlayState* play); ActorInit En_Famos_InitVars = { - ACTOR_EN_FAMOS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_FAMOS, - sizeof(EnFamos), - EnFamos_Init, - EnFamos_Destroy, - EnFamos_Update, - EnFamos_Draw, + ACTOR_EN_FAMOS, ACTORCAT_ENEMY, FLAGS, OBJECT_FAMOS, sizeof(EnFamos), + 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..a8642a9dcf 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -25,15 +25,7 @@ void EnFg_UpdateDust(EnFgEffectDust* dustEffect); void EnFg_DrawDust(PlayState* play, EnFgEffectDust* dustEffect); ActorInit En_Fg_InitVars = { - ACTOR_EN_FG, - ACTORCAT_NPC, - FLAGS, - OBJECT_FR, - sizeof(EnFg), - EnFg_Init, - EnFg_Destroy, - EnFg_Update, - EnFg_Draw, + ACTOR_EN_FG, ACTORCAT_NPC, FLAGS, OBJECT_FR, sizeof(EnFg), 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..e249dcd3d2 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 @@ -16,15 +16,8 @@ void EnFireRock_Update(Actor* thisx, PlayState* play); void EnFireRock_Draw(Actor* thisx, PlayState* play); ActorInit En_Fire_Rock_InitVars = { - ACTOR_EN_FIRE_ROCK, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_EFC_STAR_FIELD, - sizeof(EnFireRock), - EnFireRock_Init, - EnFireRock_Destroy, - EnFireRock_Update, - EnFireRock_Draw, + ACTOR_EN_FIRE_ROCK, ACTORCAT_ENEMY, FLAGS, OBJECT_EFC_STAR_FIELD, sizeof(EnFireRock), 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..56870219cb 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -45,15 +45,8 @@ typedef enum { } KeeseAuraType; ActorInit En_Firefly_InitVars = { - ACTOR_EN_FIREFLY, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_FIREFLY, - sizeof(EnFirefly), - EnFirefly_Init, - EnFirefly_Destroy, - EnFirefly_Update, - EnFirefly_Draw, + ACTOR_EN_FIREFLY, ACTORCAT_ENEMY, FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly), 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..fdef2e03eb 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -16,15 +16,8 @@ void EnFirefly2_Update(Actor* thisx, PlayState* play); void EnFirefly2_Draw(Actor* thisx, PlayState* play); ActorInit En_Firefly2_InitVars = { - ACTOR_EN_FIREFLY2, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_FIREFLY, - sizeof(EnFirefly2), - EnFirefly2_Init, - EnFirefly2_Destroy, - EnFirefly2_Update, - EnFirefly2_Draw, + ACTOR_EN_FIREFLY2, ACTORCAT_ENEMY, FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly2), 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..ecaba48d19 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -69,15 +69,8 @@ static Color_RGB8 D_8091FA94[] = { }; ActorInit En_Fish_InitVars = { - ACTOR_EN_FISH, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnFish), - EnFish_Init, - EnFish_Destroy, - EnFish_Update, - EnFish_Draw, + ACTOR_EN_FISH, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnFish), + 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..4c8d99a4a3 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -50,15 +50,8 @@ static s32 D_80B2B2F0 = 0; static Actor* D_80B2B2F4 = NULL; ActorInit En_Fish2_InitVars = { - ACTOR_EN_FISH2, - ACTORCAT_PROP, - FLAGS, - OBJECT_FB, - sizeof(EnFish2), - EnFish2_Init, - EnFish2_Destroy, - EnFish2_Update, - EnFish2_Draw, + ACTOR_EN_FISH2, ACTORCAT_PROP, FLAGS, OBJECT_FB, sizeof(EnFish2), + 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..6f2cd6df88 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -202,15 +202,8 @@ u8 D_80917274; Vec3f D_80917278; ActorInit En_Fishing_InitVars = { - ACTOR_EN_FISHING, - ACTORCAT_NPC, - FLAGS, - OBJECT_FISH, - sizeof(EnFishing), - EnFishing_Init, - EnFishing_Destroy, - EnFishing_UpdateFish, - EnFishing_DrawFish, + ACTOR_EN_FISHING, ACTORCAT_NPC, FLAGS, OBJECT_FISH, sizeof(EnFishing), 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..96c9fa3b0c 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -60,15 +60,8 @@ void func_808D2DC0(EnFloormas* this, PlayState* play); void func_808D3754(Actor* thisx, PlayState* play); ActorInit En_Floormas_InitVars = { - ACTOR_EN_FLOORMAS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WALLMASTER, - sizeof(EnFloormas), - EnFloormas_Init, - EnFloormas_Destroy, - EnFloormas_Update, - EnFloormas_Draw, + ACTOR_EN_FLOORMAS, ACTORCAT_ENEMY, FLAGS, OBJECT_WALLMASTER, sizeof(EnFloormas), 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..da41b8fcc5 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -15,15 +15,7 @@ void EnFr_Destroy(Actor* thisx, PlayState* play); void EnFr_Update(Actor* thisx, PlayState* play); ActorInit En_Fr_InitVars = { - ACTOR_EN_FR, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnFr), - EnFr_Init, - EnFr_Destroy, - EnFr_Update, - NULL, + ACTOR_EN_FR, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnFr), 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..badd8fa6f0 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -70,15 +70,7 @@ typedef enum { } FsnAnimation; ActorInit En_Fsn_InitVars = { - ACTOR_EN_FSN, - ACTORCAT_NPC, - FLAGS, - OBJECT_FSN, - sizeof(EnFsn), - EnFsn_Init, - EnFsn_Destroy, - EnFsn_Update, - EnFsn_Draw, + ACTOR_EN_FSN, ACTORCAT_NPC, FLAGS, OBJECT_FSN, sizeof(EnFsn), 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..d296bdc625 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -56,15 +56,7 @@ void func_809647EC(PlayState* play, EnFuUnkStruct* ptr, s32 len); void func_80964950(PlayState* play, EnFuUnkStruct* ptr, s32 len); ActorInit En_Fu_InitVars = { - ACTOR_EN_FU, - ACTORCAT_NPC, - FLAGS, - OBJECT_MU, - sizeof(EnFu), - EnFu_Init, - EnFu_Destroy, - EnFu_Update, - EnFu_Draw, + ACTOR_EN_FU, ACTORCAT_NPC, FLAGS, OBJECT_MU, sizeof(EnFu), 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..b3278e8d70 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 @@ -29,15 +29,8 @@ void func_80AD0274(EnFuKago* this); void func_80AD0288(EnFuKago* this, PlayState* play); ActorInit En_Fu_Kago_InitVars = { - ACTOR_EN_FU_KAGO, - ACTORCAT_BG, - FLAGS, - OBJECT_FU_MATO, - sizeof(EnFuKago), - EnFuKago_Init, - EnFuKago_Destroy, - EnFuKago_Update, - EnFuKago_Draw, + ACTOR_EN_FU_KAGO, ACTORCAT_BG, FLAGS, OBJECT_FU_MATO, sizeof(EnFuKago), + 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..3266b71445 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 @@ -28,15 +28,8 @@ void func_80ACEFC4(EnFuMato* this); void func_80ACEFD8(EnFuMato* this, PlayState* play); ActorInit En_Fu_Mato_InitVars = { - ACTOR_EN_FU_MATO, - ACTORCAT_BG, - FLAGS, - OBJECT_FU_MATO, - sizeof(EnFuMato), - EnFuMato_Init, - EnFuMato_Destroy, - EnFuMato_Update, - EnFuMato_Draw, + ACTOR_EN_FU_MATO, ACTORCAT_BG, FLAGS, OBJECT_FU_MATO, sizeof(EnFuMato), + 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..17049b0978 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -50,15 +50,7 @@ void func_80934178(EnFz* this, PlayState* play); void func_80934464(EnFz* this, PlayState* play); ActorInit En_Fz_InitVars = { - ACTOR_EN_FZ, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_FZ, - sizeof(EnFz), - EnFz_Init, - EnFz_Destroy, - EnFz_Update, - EnFz_Draw, + ACTOR_EN_FZ, ACTORCAT_ENEMY, FLAGS, OBJECT_FZ, sizeof(EnFz), 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..6f9ef5d456 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -26,15 +26,8 @@ void EnGakufu_PlayRewardCutscene(EnGakufu* this, PlayState* play); void EnGakufu_WaitForSong(EnGakufu* this, PlayState* play); ActorInit En_Gakufu_InitVars = { - ACTOR_EN_GAKUFU, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnGakufu), - EnGakufu_Init, - EnGakufu_Destroy, - EnGakufu_Update, - EnGakufu_Draw, + ACTOR_EN_GAKUFU, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnGakufu), + 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..ed6af84005 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -24,15 +24,8 @@ void func_80AF6994(EnGamelupy* this); void func_80AF6A38(EnGamelupy* this); ActorInit En_Gamelupy_InitVars = { - ACTOR_EN_GAMELUPY, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnGamelupy), - EnGamelupy_Init, - EnGamelupy_Destroy, - EnGamelupy_Update, - EnGamelupy_Draw, + ACTOR_EN_GAMELUPY, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnGamelupy), 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..cdc30f2c64 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -37,15 +37,7 @@ void func_80B11268(EnGb2* this, PlayState* play); void func_80B11344(EnGb2* this, PlayState* play); ActorInit En_Gb2_InitVars = { - ACTOR_EN_GB2, - ACTORCAT_NPC, - FLAGS, - OBJECT_PS, - sizeof(EnGb2), - EnGb2_Init, - EnGb2_Destroy, - EnGb2_Update, - EnGb2_Draw, + ACTOR_EN_GB2, ACTORCAT_NPC, FLAGS, OBJECT_PS, sizeof(EnGb2), 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..2956b65b77 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -16,15 +16,7 @@ void EnGe1_Update(Actor* thisx, PlayState* play); void EnGe1_Draw(Actor* thisx, PlayState* play); ActorInit En_Ge1_InitVars = { - ACTOR_EN_GE1, - ACTORCAT_NPC, - FLAGS, - OBJECT_GE1, - sizeof(EnGe1), - EnGe1_Init, - EnGe1_Destroy, - EnGe1_Update, - EnGe1_Draw, + ACTOR_EN_GE1, ACTORCAT_NPC, FLAGS, OBJECT_GE1, sizeof(EnGe1), EnGe1_Init, EnGe1_Destroy, EnGe1_Update, EnGe1_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..f8a8d94f48 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -38,15 +38,8 @@ void func_80BB3318(EnGeg* this, PlayState* play); void func_80BB347C(EnGeg* this, PlayState* play); ActorInit En_Geg_InitVars = { - ACTOR_EN_GEG, - ACTORCAT_NPC, - FLAGS, - OBJECT_OF1D_MAP, - sizeof(EnGeg), - EnGeg_Init, - EnGeg_Destroy, - EnGeg_Update, - EnGeg_Draw, + ACTOR_EN_GEG, ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnGeg), + 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..4f1edb1d64 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -27,15 +27,7 @@ void func_80B363E8(EnGgStruct* ptr, PlayState* play, Vec3f* arg1, Vec3f* arg2, V void func_80B364D4(EnGgStruct* ptr, PlayState* play); ActorInit En_Gg_InitVars = { - ACTOR_EN_GG, - ACTORCAT_NPC, - FLAGS, - OBJECT_GG, - sizeof(EnGg), - EnGg_Init, - EnGg_Destroy, - EnGg_Update, - EnGg_Draw, + ACTOR_EN_GG, ACTORCAT_NPC, FLAGS, OBJECT_GG, sizeof(EnGg), 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..7213c77eb2 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -28,15 +28,7 @@ s32 func_80B3B648(EnGg2* this, Path* path, s32 arg2_); f32 func_80B3B7E4(Path* path, s32 arg1, Vec3f* arg2, Vec3s* arg3); ActorInit En_Gg2_InitVars = { - ACTOR_EN_GG2, - ACTORCAT_NPC, - FLAGS, - OBJECT_GG, - sizeof(EnGg2), - EnGg2_Init, - EnGg2_Destroy, - EnGg2_Update, - EnGg2_Draw, + ACTOR_EN_GG2, ACTORCAT_NPC, FLAGS, OBJECT_GG, sizeof(EnGg2), 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..69f3a66c6c 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -73,15 +73,8 @@ typedef enum { } GiantCsActionIndex; ActorInit En_Giant_InitVars = { - ACTOR_EN_GIANT, - ACTORCAT_NPC, - FLAGS, - OBJECT_GIANT, - sizeof(EnGiant), - EnGiant_Init, - EnGiant_Destroy, - EnGiant_Update, - EnGiant_Draw, + ACTOR_EN_GIANT, ACTORCAT_NPC, FLAGS, OBJECT_GIANT, sizeof(EnGiant), + 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..882e921592 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 @@ -31,15 +31,8 @@ void EnGinkoMan_Dialogue(EnGinkoMan* this, PlayState* play); void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, PlayState* play); ActorInit En_Ginko_Man_InitVars = { - ACTOR_EN_GINKO_MAN, - ACTORCAT_NPC, - FLAGS, - OBJECT_BOJ, - sizeof(EnGinkoMan), - EnGinkoMan_Init, - EnGinkoMan_Destroy, - EnGinkoMan_Update, - EnGinkoMan_Draw, + ACTOR_EN_GINKO_MAN, ACTORCAT_NPC, FLAGS, OBJECT_BOJ, sizeof(EnGinkoMan), 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..d2477b32a8 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -52,15 +52,8 @@ void EnGirlA_BuyShieldMirror(PlayState* play, EnGirlA* this); void EnGirlA_BuyFanfare(PlayState* play, EnGirlA* this); ActorInit En_GirlA_InitVars = { - ACTOR_EN_GIRLA, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnGirlA), - EnGirlA_Init, - EnGirlA_Destroy, - EnGirlA_Update, - NULL, + ACTOR_EN_GIRLA, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnGirlA), + 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..428c27f38b 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -34,15 +34,7 @@ void func_80B525E0(EnGk* this, PlayState* play); void func_80B52654(EnGk* this, PlayState* play); ActorInit En_Gk_InitVars = { - ACTOR_EN_GK, - ACTORCAT_NPC, - FLAGS, - OBJECT_GK, - sizeof(EnGk), - EnGk_Init, - EnGk_Destroy, - EnGk_Update, - EnGk_Draw, + ACTOR_EN_GK, ACTORCAT_NPC, FLAGS, OBJECT_GK, sizeof(EnGk), 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..13023a242c 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -156,15 +156,7 @@ static s32 D_80951C2C[] = { 0x0E295A2D, 0x000A0C10 }; static s32 D_80951C34[] = { 0x0E29622D, 0x000A0C10 }; ActorInit En_Gm_InitVars = { - ACTOR_EN_GM, - ACTORCAT_NPC, - FLAGS, - OBJECT_IN2, - sizeof(EnGm), - EnGm_Init, - EnGm_Destroy, - EnGm_Update, - EnGm_Draw, + ACTOR_EN_GM, ACTORCAT_NPC, FLAGS, OBJECT_IN2, sizeof(EnGm), 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..372ca8c74c 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -79,15 +79,7 @@ static s32 D_80A163FC[4] = { 0x100060E, 0xE060C12, 0x100E0E07, 0xC121000 }; static s32 D_80A1640C[2] = { 0xE023A0C, 0x12100000 }; ActorInit En_Go_InitVars = { - ACTOR_EN_GO, - ACTORCAT_NPC, - FLAGS, - OBJECT_OF1D_MAP, - sizeof(EnGo), - EnGo_Init, - EnGo_Destroy, - EnGo_Update, - NULL, + ACTOR_EN_GO, ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnGo), 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..91d707ea7d 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -34,15 +34,8 @@ void func_80942084(EnGoroiwa* this); void func_809420F0(EnGoroiwa* this, PlayState* play); ActorInit En_Goroiwa_InitVars = { - ACTOR_EN_GOROIWA, - ACTORCAT_PROP, - FLAGS, - OBJECT_GOROIWA, - sizeof(EnGoroiwa), - EnGoroiwa_Init, - EnGoroiwa_Destroy, - EnGoroiwa_Update, - EnGoroiwa_Draw, + ACTOR_EN_GOROIWA, ACTORCAT_PROP, FLAGS, OBJECT_GOROIWA, sizeof(EnGoroiwa), 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..c5f1bb788b 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -138,15 +138,9 @@ static DamageTable sDamageTable = { }; ActorInit En_Grasshopper_InitVars = { - ACTOR_EN_GRASSHOPPER, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_GRASSHOPPER, - sizeof(EnGrasshopper), - EnGrasshopper_Init, - EnGrasshopper_Destroy, - EnGrasshopper_Update, - EnGrasshopper_Draw, + ACTOR_EN_GRASSHOPPER, ACTORCAT_ENEMY, FLAGS, + OBJECT_GRASSHOPPER, sizeof(EnGrasshopper), 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..e97b85ee91 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -38,15 +38,7 @@ void func_80999A8C(EnGs* this, PlayState* play); void func_80999AC0(EnGs* this); ActorInit En_Gs_InitVars = { - ACTOR_EN_GS, - ACTORCAT_PROP, - FLAGS, - OBJECT_GS, - sizeof(EnGs), - EnGs_Init, - EnGs_Destroy, - EnGs_Update, - EnGs_Draw, + ACTOR_EN_GS, ACTORCAT_PROP, FLAGS, OBJECT_GS, sizeof(EnGs), 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..67a262353d 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 @@ -26,15 +26,9 @@ void EnGuardNuts_SetupUnburrow(EnGuardNuts* this, PlayState* play); void EnGuardNuts_Unburrow(EnGuardNuts* this, PlayState* play); ActorInit En_Guard_Nuts_InitVars = { - ACTOR_EN_GUARD_NUTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNK, - sizeof(EnGuardNuts), - EnGuardNuts_Init, - EnGuardNuts_Destroy, - EnGuardNuts_Update, - EnGuardNuts_Draw, + ACTOR_EN_GUARD_NUTS, ACTORCAT_NPC, FLAGS, + OBJECT_DNK, sizeof(EnGuardNuts), 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..120a4b943f 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -28,15 +28,8 @@ void func_80BC7520(EnGuruguru* this, PlayState* play); extern ColliderCylinderInit D_80BC79A0; ActorInit En_Guruguru_InitVars = { - ACTOR_EN_GURUGURU, - ACTORCAT_NPC, - FLAGS, - OBJECT_FU, - sizeof(EnGuruguru), - EnGuruguru_Init, - EnGuruguru_Destroy, - EnGuruguru_Update, - EnGuruguru_Draw, + ACTOR_EN_GURUGURU, ACTORCAT_NPC, FLAGS, OBJECT_FU, sizeof(EnGuruguru), 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..cd064a4e85 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -33,15 +33,8 @@ void func_80B228F4(Actor* thisx, PlayState* play); void EnHakurock_Draw(Actor* thisx, PlayState* play); ActorInit En_Hakurock_InitVars = { - ACTOR_EN_HAKUROCK, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BOSS_HAKUGIN, - sizeof(EnHakurock), - EnHakurock_Init, - EnHakurock_Destroy, - EnHakurock_Update, - NULL, + ACTOR_EN_HAKUROCK, ACTORCAT_ITEMACTION, FLAGS, OBJECT_BOSS_HAKUGIN, sizeof(EnHakurock), 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..9de00e19bd 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -22,15 +22,8 @@ void func_80B23934(EnHanabi* this, PlayState* play); void EnHanabi_Draw(Actor* thisx, PlayState* play); ActorInit En_Hanabi_InitVars = { - ACTOR_EN_HANABI, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnHanabi), - EnHanabi_Init, - EnHanabi_Destroy, - EnHanabi_Update, - NULL, + ACTOR_EN_HANABI, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnHanabi), + 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..0851a823e9 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -17,15 +17,8 @@ void EnHata_Update(Actor* thisx, PlayState* play2); void EnHata_Draw(Actor* thisx, PlayState* play); ActorInit En_Hata_InitVars = { - ACTOR_EN_HATA, - ACTORCAT_PROP, - FLAGS, - OBJECT_HATA, - sizeof(EnHata), - EnHata_Init, - EnHata_Destroy, - EnHata_Update, - EnHata_Draw, + ACTOR_EN_HATA, ACTORCAT_PROP, FLAGS, OBJECT_HATA, sizeof(EnHata), + 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..d3dc08c725 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -29,15 +29,8 @@ typedef enum { } EnHeishiAnimation; ActorInit En_Heishi_InitVars = { - ACTOR_EN_HEISHI, - ACTORCAT_NPC, - FLAGS, - OBJECT_SDN, - sizeof(EnHeishi), - EnHeishi_Init, - EnHeishi_Destroy, - EnHeishi_Update, - EnHeishi_Draw, + ACTOR_EN_HEISHI, ACTORCAT_NPC, FLAGS, OBJECT_SDN, sizeof(EnHeishi), + 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..20c19f4177 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -48,15 +48,7 @@ typedef enum { } HgCsIndex; ActorInit En_Hg_InitVars = { - ACTOR_EN_HG, - ACTORCAT_PROP, - FLAGS, - OBJECT_HARFGIBUD, - sizeof(EnHg), - EnHg_Init, - EnHg_Destroy, - EnHg_Update, - EnHg_Draw, + ACTOR_EN_HG, ACTORCAT_PROP, FLAGS, OBJECT_HARFGIBUD, sizeof(EnHg), 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..0f532beeae 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -49,15 +49,8 @@ typedef enum { } HgoAnimation; ActorInit En_Hgo_InitVars = { - ACTOR_EN_HGO, - ACTORCAT_NPC, - FLAGS, - OBJECT_HARFGIBUD, - sizeof(EnHgo), - EnHgo_Init, - EnHgo_Destroy, - EnHgo_Update, - EnHgo_Draw, + ACTOR_EN_HGO, ACTORCAT_NPC, FLAGS, OBJECT_HARFGIBUD, sizeof(EnHgo), + 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..85f971bfcd 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 @@ -32,15 +32,9 @@ void func_80BDBE70(EnHiddenNuts* this, PlayState* play); void func_80BDBED4(EnHiddenNuts* this, PlayState* play); ActorInit En_Hidden_Nuts_InitVars = { - ACTOR_EN_HIDDEN_NUTS, - ACTORCAT_PROP, - FLAGS, - OBJECT_HINTNUTS, - sizeof(EnHiddenNuts), - EnHiddenNuts_Init, - EnHiddenNuts_Destroy, - EnHiddenNuts_Update, - EnHiddenNuts_Draw, + ACTOR_EN_HIDDEN_NUTS, ACTORCAT_PROP, FLAGS, + OBJECT_HINTNUTS, sizeof(EnHiddenNuts), 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..9d84ddf2fb 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 @@ -40,15 +40,8 @@ void func_80C21468(EnHintSkb* this, PlayState* play); void func_80C215E4(PlayState* play, EnHintSkb* this, Vec3f* arg2); ActorInit En_Hint_Skb_InitVars = { - ACTOR_EN_HINT_SKB, - ACTORCAT_NPC, - FLAGS, - OBJECT_SKB, - sizeof(EnHintSkb), - EnHintSkb_Init, - EnHintSkb_Destroy, - EnHintSkb_Update, - EnHintSkb_Draw, + ACTOR_EN_HINT_SKB, ACTORCAT_NPC, FLAGS, OBJECT_SKB, sizeof(EnHintSkb), 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..1026bf7b91 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 @@ -17,15 +17,8 @@ void EnHitTag_Update(Actor* thisx, PlayState* play); void EnHitTag_WaitForHit(EnHitTag* this, PlayState* play); ActorInit En_Hit_Tag_InitVars = { - ACTOR_EN_HIT_TAG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnHitTag), - EnHitTag_Init, - EnHitTag_Destroy, - EnHitTag_Update, - NULL, + ACTOR_EN_HIT_TAG, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnHitTag), + 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..0f5a45f8b3 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -58,15 +58,8 @@ void EnHoll_VerticalBgCoverIdle(EnHoll* this, PlayState* play); void EnHoll_RoomTransitionIdle(EnHoll* this, PlayState* play); ActorInit En_Holl_InitVars = { - ACTOR_EN_HOLL, - ACTORCAT_DOOR, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnHoll), - EnHoll_Init, - EnHoll_Destroy, - EnHoll_Update, - EnHoll_Draw, + ACTOR_EN_HOLL, ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(EnHoll), + 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_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index cf8ed1fc41..a62c027999 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -145,15 +145,8 @@ static SkeletonHeader* sSkeletonHeaders[] = { }; ActorInit En_Horse_InitVars = { - ACTOR_EN_HORSE, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnHorse), - EnHorse_Init, - EnHorse_Destroy, - EnHorse_Update, - EnHorse_Draw, + ACTOR_EN_HORSE, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(EnHorse), + EnHorse_Init, EnHorse_Destroy, EnHorse_Update, EnHorse_Draw, }; static ColliderCylinderInit sCylinderInit1 = { 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..fdd391c395 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -24,15 +24,7 @@ void func_80953354(EnHs* this, PlayState* play); void func_8095345C(EnHs* this, PlayState* play); ActorInit En_Hs_InitVars = { - ACTOR_EN_HS, - ACTORCAT_NPC, - FLAGS, - OBJECT_HS, - sizeof(EnHs), - EnHs_Init, - EnHs_Destroy, - EnHs_Update, - EnHs_Draw, + ACTOR_EN_HS, ACTORCAT_NPC, FLAGS, OBJECT_HS, sizeof(EnHs), 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..77b24d075e 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -18,15 +18,8 @@ void EnHs2_Draw(Actor* thisx, PlayState* play); void EnHs2_DoNothing(EnHs2* this, PlayState* play); ActorInit En_Hs2_InitVars = { - ACTOR_EN_HS2, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnHs2), - EnHs2_Init, - EnHs2_Destroy, - EnHs2_Update, - EnHs2_Draw, + ACTOR_EN_HS2, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnHs2), + 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..d56e1763a4 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -90,15 +90,7 @@ static s32 D_80BF33F0[] = { }; ActorInit En_Ig_InitVars = { - ACTOR_EN_IG, - ACTORCAT_NPC, - FLAGS, - OBJECT_DAI, - sizeof(EnIg), - EnIg_Init, - EnIg_Destroy, - EnIg_Update, - EnIg_Draw, + ACTOR_EN_IG, ACTORCAT_NPC, FLAGS, OBJECT_DAI, sizeof(EnIg), 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..9f6354aa22 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -75,15 +75,7 @@ static Gfx* sIronKnuckleArmorType[3][3] = { }; ActorInit En_Ik_InitVars = { - ACTOR_EN_IK, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_IK, - sizeof(EnIk), - EnIk_Init, - EnIk_Destroy, - EnIk_Update, - EnIk_Draw, + ACTOR_EN_IK, ACTORCAT_ENEMY, FLAGS, OBJECT_IK, sizeof(EnIk), 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..a40bb21a88 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -23,15 +23,7 @@ void func_808F5A34(EnIn* this, PlayState* play); s32 func_808F5994(EnIn* this, PlayState* play, Vec3f* arg2, s16 arg3); ActorInit En_In_InitVars = { - ACTOR_EN_IN, - ACTORCAT_NPC, - FLAGS, - OBJECT_IN, - sizeof(EnIn), - EnIn_Init, - EnIn_Destroy, - EnIn_Update, - EnIn_Draw, + ACTOR_EN_IN, ACTORCAT_NPC, FLAGS, OBJECT_IN, sizeof(EnIn), 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..594cd117ac 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -33,15 +33,8 @@ void func_8091B984(EnInsect* this, PlayState* play); s16 D_8091BD60 = 0; ActorInit En_Insect_InitVars = { - ACTOR_EN_INSECT, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnInsect), - EnInsect_Init, - EnInsect_Destroy, - EnInsect_Update, - EnInsect_Draw, + ACTOR_EN_INSECT, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnInsect), + 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..32dd4b84ce 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -179,15 +179,8 @@ void func_80B45B1C(EnInvadePohStruct* s, unkstructInvadepoh4** u); extern s32 D_801BDA9C; ActorInit En_Invadepoh_InitVars = { - ACTOR_EN_INVADEPOH, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnInvadepoh), - EnInvadepoh_Init, - EnInvadepoh_Destroy, - EnInvadepoh_Update, - NULL, + ACTOR_EN_INVADEPOH, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnInvadepoh), EnInvadepoh_Init, + EnInvadepoh_Destroy, EnInvadepoh_Update, NULL, }; static ColliderCylinderInit sCylinderInitAlien = { 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..f831b56d06 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -45,15 +45,8 @@ static s16 D_8095F690 = 0; static s16 D_8095F694 = 0; ActorInit En_Ishi_InitVars = { - ACTOR_EN_ISHI, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnIshi), - EnIshi_Init, - EnIshi_Destroy, - EnIshi_Update, - NULL, + ACTOR_EN_ISHI, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnIshi), + 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..4d1160c796 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -51,15 +51,7 @@ s32 D_80BC366C[] = { }; ActorInit En_Ja_InitVars = { - ACTOR_EN_JA, - ACTORCAT_NPC, - FLAGS, - OBJECT_BOJ, - sizeof(EnJa), - EnJa_Init, - EnJa_Destroy, - EnJa_Update, - EnJa_Draw, + ACTOR_EN_JA, ACTORCAT_NPC, FLAGS, OBJECT_BOJ, sizeof(EnJa), 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..6293d17f84 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 @@ -21,15 +21,8 @@ void EnJcMato_SetupIdle(EnJcMato* this); void EnJcMato_Idle(EnJcMato* this, PlayState* play); ActorInit En_Jc_Mato_InitVars = { - ACTOR_EN_JC_MATO, - ACTORCAT_PROP, - FLAGS, - OBJECT_TRU, - sizeof(EnJcMato), - EnJcMato_Init, - EnJcMato_Destroy, - EnJcMato_Update, - EnJcMato_Draw, + ACTOR_EN_JC_MATO, ACTORCAT_PROP, FLAGS, OBJECT_TRU, sizeof(EnJcMato), + 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..6532310cac 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -65,15 +65,7 @@ typedef enum { } EnJgAction; ActorInit En_Jg_InitVars = { - ACTOR_EN_JG, - ACTORCAT_NPC, - FLAGS, - OBJECT_JG, - sizeof(EnJg), - EnJg_Init, - EnJg_Destroy, - EnJg_Update, - EnJg_Draw, + ACTOR_EN_JG, ACTORCAT_NPC, FLAGS, OBJECT_JG, sizeof(EnJg), 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..977051cde1 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 @@ -37,15 +37,8 @@ s32 func_80C149B0(PlayState* play, EnJgameTsnStruct* arg1); s32 func_80C14BCC(EnJgameTsn* this, PlayState* play); ActorInit En_Jgame_Tsn_InitVars = { - ACTOR_EN_JGAME_TSN, - ACTORCAT_NPC, - FLAGS, - OBJECT_TSN, - sizeof(EnJgameTsn), - EnJgameTsn_Init, - EnJgameTsn_Destroy, - EnJgameTsn_Update, - EnJgameTsn_Draw, + ACTOR_EN_JGAME_TSN, ACTORCAT_NPC, FLAGS, OBJECT_TSN, sizeof(EnJgameTsn), 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..64d768ae63 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -28,15 +28,7 @@ void func_8096A38C(EnJs* this, PlayState* play); void func_8096A6F4(EnJs* this, PlayState* play); ActorInit En_Js_InitVars = { - ACTOR_EN_JS, - ACTORCAT_NPC, - FLAGS, - OBJECT_OB, - sizeof(EnJs), - EnJs_Init, - EnJs_Destroy, - EnJs_Update, - EnJs_Draw, + ACTOR_EN_JS, ACTORCAT_NPC, FLAGS, OBJECT_OB, sizeof(EnJs), EnJs_Init, EnJs_Destroy, EnJs_Update, EnJs_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..d60a6fb742 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -150,15 +150,8 @@ static DamageTable sDamageTable = { }; ActorInit En_Kaizoku_InitVars = { - ACTOR_EN_KAIZOKU, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_KZ, - sizeof(EnKaizoku), - EnKaizoku_Init, - EnKaizoku_Destroy, - EnKaizoku_Update, - NULL, + ACTOR_EN_KAIZOKU, ACTORCAT_ENEMY, FLAGS, OBJECT_KZ, sizeof(EnKaizoku), 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..20ca56fb38 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -68,15 +68,8 @@ static ColliderCylinderInit D_80971D80 = { }; ActorInit En_Kakasi_InitVars = { - ACTOR_EN_KAKASI, - ACTORCAT_NPC, - FLAGS, - OBJECT_KA, - sizeof(EnKakasi), - EnKakasi_Init, - EnKakasi_Destroy, - EnKakasi_Update, - EnKakasi_Draw, + ACTOR_EN_KAKASI, ACTORCAT_NPC, FLAGS, OBJECT_KA, sizeof(EnKakasi), + 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..c25898deb2 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -42,15 +42,8 @@ void func_80AD8388(EnKame* this, PlayState* play); void func_80AD8D64(Actor* thisx, PlayState* play); ActorInit En_Kame_InitVars = { - ACTOR_EN_KAME, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_TL, - sizeof(EnKame), - EnKame_Init, - EnKame_Destroy, - EnKame_Update, - EnKame_Draw, + ACTOR_EN_KAME, ACTORCAT_ENEMY, FLAGS, OBJECT_TL, sizeof(EnKame), + 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..30d304c35c 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -18,15 +18,8 @@ void EnKanban_Update(Actor* thisx, PlayState* play); void EnKanban_Draw(Actor* thisx, PlayState* play); ActorInit En_Kanban_InitVars = { - ACTOR_EN_KANBAN, - ACTORCAT_PROP, - FLAGS, - OBJECT_KANBAN, - sizeof(EnKanban), - EnKanban_Init, - EnKanban_Destroy, - EnKanban_Update, - EnKanban_Draw, + ACTOR_EN_KANBAN, ACTORCAT_PROP, FLAGS, OBJECT_KANBAN, sizeof(EnKanban), + 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..39e27b53a3 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -41,15 +41,8 @@ void func_808F241C(EnKarebaba* this, PlayState* play); void func_808F254C(EnKarebaba* this, PlayState* play); ActorInit En_Karebaba_InitVars = { - ACTOR_EN_KAREBABA, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DEKUBABA, - sizeof(EnKarebaba), - EnKarebaba_Init, - EnKarebaba_Destroy, - EnKarebaba_Update, - EnKarebaba_Draw, + ACTOR_EN_KAREBABA, ACTORCAT_ENEMY, FLAGS, OBJECT_DEKUBABA, sizeof(EnKarebaba), 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..05408f0324 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -23,15 +23,7 @@ void func_80B34314(EnKbt* this, PlayState* play); void func_80B34598(EnKbt* this, PlayState* play); ActorInit En_Kbt_InitVars = { - ACTOR_EN_KBT, - ACTORCAT_NPC, - FLAGS, - OBJECT_KBT, - sizeof(EnKbt), - EnKbt_Init, - EnKbt_Destroy, - EnKbt_Update, - EnKbt_Draw, + ACTOR_EN_KBT, ACTORCAT_NPC, FLAGS, OBJECT_KBT, sizeof(EnKbt), 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..0b709d3fcd 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 @@ -38,15 +38,8 @@ void func_80B279F0(EnKendoJs* this, PlayState* play, s32 arg2); void func_80B27A90(EnKendoJs* this, PlayState* play); ActorInit En_Kendo_Js_InitVars = { - ACTOR_EN_KENDO_JS, - ACTORCAT_NPC, - FLAGS, - OBJECT_JS, - sizeof(EnKendoJs), - EnKendoJs_Init, - EnKendoJs_Destroy, - EnKendoJs_Update, - EnKendoJs_Draw, + ACTOR_EN_KENDO_JS, ACTORCAT_NPC, FLAGS, OBJECT_JS, sizeof(EnKendoJs), 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..606dd9ba94 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -32,15 +32,7 @@ void func_80B42714(EnKgy* this, PlayState* play); void func_80B42D28(EnKgy* this, PlayState* play); ActorInit En_Kgy_InitVars = { - ACTOR_EN_KGY, - ACTORCAT_NPC, - FLAGS, - OBJECT_KGY, - sizeof(EnKgy), - EnKgy_Init, - EnKgy_Destroy, - EnKgy_Update, - EnKgy_Draw, + ACTOR_EN_KGY, ACTORCAT_NPC, FLAGS, OBJECT_KGY, sizeof(EnKgy), EnKgy_Init, EnKgy_Destroy, EnKgy_Update, EnKgy_Draw, }; void EnKgy_Init(Actor* thisx, PlayState* play) { 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..1a30c59383 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -35,15 +35,8 @@ void EnKujiya_SetupTurnToClosed(EnKujiya* this); void EnKujiya_TurnToClosed(EnKujiya* this, PlayState* play); ActorInit En_Kujiya_InitVars = { - ACTOR_EN_KUJIYA, - ACTORCAT_NPC, - FLAGS, - OBJECT_KUJIYA, - sizeof(EnKujiya), - EnKujiya_Init, - EnKujiya_Destroy, - EnKujiya_Update, - EnKujiya_Draw, + ACTOR_EN_KUJIYA, ACTORCAT_NPC, FLAGS, OBJECT_KUJIYA, sizeof(EnKujiya), + 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..bd6a258c64 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -58,15 +58,8 @@ s16 D_80936CDE; s16 D_80936CE0; ActorInit En_Kusa_InitVars = { - ACTOR_EN_KUSA, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnKusa), - EnKusa_Init, - EnKusa_Destroy, - EnKusa_Update, - NULL, + ACTOR_EN_KUSA, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnKusa), + 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..623b7b7de6 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -54,15 +54,8 @@ s16 D_80A60B0E; s16 D_80A60B10; ActorInit En_Kusa2_InitVars = { - ACTOR_EN_KUSA2, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(EnKusa2), - EnKusa2_Init, - EnKusa2_Destroy, - EnKusa2_Update, - EnKusa2_Draw, + ACTOR_EN_KUSA2, ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnKusa2), + 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..190203c4fd 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 @@ -50,15 +50,8 @@ void func_80AEB974(EnLiftNuts* this); void func_80AEB9E0(EnLiftNuts* this, PlayState* play); ActorInit En_Lift_Nuts_InitVars = { - ACTOR_EN_LIFT_NUTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNT, - sizeof(EnLiftNuts), - EnLiftNuts_Init, - EnLiftNuts_Destroy, - EnLiftNuts_Update, - EnLiftNuts_Draw, + ACTOR_EN_LIFT_NUTS, ACTORCAT_NPC, FLAGS, OBJECT_DNT, sizeof(EnLiftNuts), 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..add2f4bb85 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -19,15 +19,8 @@ void EnLight_Draw(Actor* thisx, PlayState* play); void func_80865F38(Actor* thisx, PlayState* play); ActorInit En_Light_InitVars = { - ACTOR_EN_LIGHT, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnLight), - EnLight_Init, - EnLight_Destroy, - EnLight_Update, - EnLight_Draw, + ACTOR_EN_LIGHT, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnLight), + 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..fa027e4d2d 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 @@ -25,15 +25,8 @@ void EnLookNuts_SetupSendPlayerToSpawn(EnLookNuts* this); void EnLookNuts_SendPlayerToSpawn(EnLookNuts* this, PlayState* play); ActorInit En_Look_Nuts_InitVars = { - ACTOR_EN_LOOK_NUTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNK, - sizeof(EnLookNuts), - EnLookNuts_Init, - EnLookNuts_Destroy, - EnLookNuts_Update, - EnLookNuts_Draw, + ACTOR_EN_LOOK_NUTS, ACTORCAT_NPC, FLAGS, OBJECT_DNK, sizeof(EnLookNuts), 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..92c833ee3d 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 @@ -15,15 +15,8 @@ void EnMFire1_Destroy(Actor* thisx, PlayState* play); void EnMFire1_Update(Actor* thisx, PlayState* play); ActorInit En_M_Fire1_InitVars = { - ACTOR_EN_M_FIRE1, - ACTORCAT_MISC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnMFire1), - EnMFire1_Init, - EnMFire1_Destroy, - EnMFire1_Update, - NULL, + ACTOR_EN_M_FIRE1, ACTORCAT_MISC, FLAGS, GAMEPLAY_KEEP, sizeof(EnMFire1), + 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..33897d56b8 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 @@ -30,15 +30,8 @@ void EnMThunder_UnkType_Attack(EnMThunder* this, PlayState* play); #define ENMTHUNDER_TYPE_MAX 4 ActorInit En_M_Thunder_InitVars = { - ACTOR_EN_M_THUNDER, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnMThunder), - EnMThunder_Init, - EnMThunder_Destroy, - EnMThunder_Update, - EnMThunder_Draw, + ACTOR_EN_M_THUNDER, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMThunder), 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..265b02d301 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -55,15 +55,7 @@ typedef enum { } EnMa4State; ActorInit En_Ma4_InitVars = { - ACTOR_EN_MA4, - ACTORCAT_NPC, - FLAGS, - OBJECT_MA1, - sizeof(EnMa4), - EnMa4_Init, - EnMa4_Destroy, - EnMa4_Update, - EnMa4_Draw, + ACTOR_EN_MA4, ACTORCAT_NPC, FLAGS, OBJECT_MA1, sizeof(EnMa4), 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..0795c76215 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 @@ -70,15 +70,8 @@ s32 EnMaYto_HasSpokenToPlayer(void); void EnMaYto_SetTalkedFlag(void); ActorInit En_Ma_Yto_InitVars = { - ACTOR_EN_MA_YTO, - ACTORCAT_NPC, - FLAGS, - OBJECT_MA2, - sizeof(EnMaYto), - EnMaYto_Init, - EnMaYto_Destroy, - EnMaYto_Update, - EnMaYto_Draw, + ACTOR_EN_MA_YTO, ACTORCAT_NPC, FLAGS, OBJECT_MA2, sizeof(EnMaYto), + 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..7e9db25c9d 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 @@ -30,15 +30,8 @@ void EnMaYts_SetFaceExpression(EnMaYts* this, s16 overrideEyeTexIndex, s16 mouth void EnMaYts_DrawSleeping(Actor* thisx, PlayState* play); ActorInit En_Ma_Yts_InitVars = { - ACTOR_EN_MA_YTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_MA1, - sizeof(EnMaYts), - EnMaYts_Init, - EnMaYts_Destroy, - EnMaYts_Update, - EnMaYts_Draw, + ACTOR_EN_MA_YTS, ACTORCAT_NPC, FLAGS, OBJECT_MA1, sizeof(EnMaYts), + 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..0268636c34 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -86,15 +86,7 @@ static s16 sTextAlphaTargetIndex = 0; static s16 sTextAlphaTimer = 20; ActorInit En_Mag_InitVars = { - ACTOR_EN_MAG, - ACTORCAT_PROP, - FLAGS, - OBJECT_MAG, - sizeof(EnMag), - EnMag_Init, - EnMag_Destroy, - EnMag_Update, - EnMag_Draw, + ACTOR_EN_MAG, ACTORCAT_PROP, FLAGS, OBJECT_MAG, sizeof(EnMag), 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..9b569d59bb 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -37,15 +37,8 @@ void func_80B3828C(Vec3f* arg0, Vec3f* arg1, s16 arg2, s16 arg3, s32 arg4); void func_80B382E4(PlayState* play, Vec3f arg1); ActorInit En_Maruta_InitVars = { - ACTOR_EN_MARUTA, - ACTORCAT_PROP, - FLAGS, - OBJECT_MARUTA, - sizeof(EnMaruta), - EnMaruta_Init, - EnMaruta_Destroy, - EnMaruta_Update, - EnMaruta_Draw, + ACTOR_EN_MARUTA, ACTORCAT_PROP, FLAGS, OBJECT_MARUTA, sizeof(EnMaruta), + EnMaruta_Init, EnMaruta_Destroy, EnMaruta_Update, EnMaruta_Draw, }; Gfx* D_80B386A0[] = { 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..656080497b 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -27,15 +27,8 @@ void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play); void EnMinifrog_SetupYellowFrogDialog(EnMinifrog* this, PlayState* play); ActorInit En_Minifrog_InitVars = { - ACTOR_EN_MINIFROG, - ACTORCAT_NPC, - FLAGS, - OBJECT_FR, - sizeof(EnMinifrog), - EnMinifrog_Init, - EnMinifrog_Destroy, - EnMinifrog_Update, - EnMinifrog_Draw, + ACTOR_EN_MINIFROG, ACTORCAT_NPC, FLAGS, OBJECT_FR, sizeof(EnMinifrog), 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..67bbc69c00 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -42,15 +42,8 @@ void EnMinislime_SetupGekkoThrow(EnMinislime* this); void EnMinislime_GekkoThrow(EnMinislime* this, PlayState* play); ActorInit En_Minislime_InitVars = { - ACTOR_EN_MINISLIME, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BIGSLIME, - sizeof(EnMinislime), - EnMinislime_Init, - EnMinislime_Destroy, - EnMinislime_Update, - NULL, + ACTOR_EN_MINISLIME, ACTORCAT_BOSS, FLAGS, OBJECT_BIGSLIME, sizeof(EnMinislime), 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..33d28fec20 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -24,15 +24,7 @@ void func_80959D28(EnMk* this, PlayState* play); void func_80959E18(EnMk* this, PlayState* play); ActorInit En_Mk_InitVars = { - ACTOR_EN_MK, - ACTORCAT_NPC, - FLAGS, - OBJECT_MK, - sizeof(EnMk), - EnMk_Init, - EnMk_Destroy, - EnMk_Update, - EnMk_Draw, + ACTOR_EN_MK, ACTORCAT_NPC, FLAGS, OBJECT_MK, sizeof(EnMk), 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..7b7d094a82 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -36,15 +36,7 @@ void func_80A4E84C(EnMkk* this); void func_80A4EBBC(EnMkk* this, PlayState* play); ActorInit En_Mkk_InitVars = { - ACTOR_EN_MKK, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_MKK, - sizeof(EnMkk), - EnMkk_Init, - EnMkk_Destroy, - EnMkk_Update, - EnMkk_Draw, + ACTOR_EN_MKK, ACTORCAT_ENEMY, FLAGS, OBJECT_MKK, sizeof(EnMkk), 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..8e4226d0f6 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -22,15 +22,8 @@ void func_8096611C(EnMm* this, PlayState* play); void EnMm_SetupAction(EnMm* this, EnMmActionFunc actionFunc); ActorInit En_Mm_InitVars = { - ACTOR_EN_MM, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnMm), - EnMm_Init, - EnMm_Destroy, - EnMm_Update, - EnMm_Draw, + ACTOR_EN_MM, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMm), + 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..a0311ad828 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -19,15 +19,8 @@ void EnMm2_Reading(EnMm2* this, PlayState* play); void EnMm2_WaitForRead(EnMm2* this, PlayState* play); ActorInit En_Mm2_InitVars = { - ACTOR_EN_MM2, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnMm2), - EnMm2_Init, - EnMm2_Destroy, - EnMm2_Update, - EnMm2_Draw, + ACTOR_EN_MM2, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMm2), + 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..76dd419136 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -30,15 +30,7 @@ s32 func_80A6FFAC(EnMm3* this, PlayState* play); void func_80A70084(EnMm3* this, PlayState* play); ActorInit En_Mm3_InitVars = { - ACTOR_EN_MM3, - ACTORCAT_NPC, - FLAGS, - OBJECT_MM, - sizeof(EnMm3), - EnMm3_Init, - EnMm3_Destroy, - EnMm3_Update, - EnMm3_Draw, + ACTOR_EN_MM3, ACTORCAT_NPC, FLAGS, OBJECT_MM, sizeof(EnMm3), EnMm3_Init, EnMm3_Destroy, EnMm3_Update, EnMm3_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..e8c70abbbf 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -22,15 +22,7 @@ void EnMs_Sell(EnMs* this, PlayState* play); void EnMs_TalkAfterPurchase(EnMs* this, PlayState* play); ActorInit En_Ms_InitVars = { - ACTOR_EN_MS, - ACTORCAT_NPC, - FLAGS, - OBJECT_MS, - sizeof(EnMs), - EnMs_Init, - EnMs_Destroy, - EnMs_Update, - EnMs_Draw, + ACTOR_EN_MS, ACTORCAT_NPC, FLAGS, OBJECT_MS, sizeof(EnMs), 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..db9a732462 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 @@ -29,15 +29,8 @@ typedef enum { } PlayerCheatStatus; ActorInit En_Mt_tag_InitVars = { - ACTOR_EN_MT_TAG, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnMttag), - EnMttag_Init, - EnMttag_Destroy, - EnMttag_Update, - NULL, + ACTOR_EN_MT_TAG, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(EnMttag), + 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..9149ea5495 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -33,15 +33,8 @@ void func_80A6B078(EnMushi2* this); void func_80A6B0D8(EnMushi2* this, PlayState* play); ActorInit En_Mushi2_InitVars = { - ACTOR_EN_MUSHI2, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnMushi2), - EnMushi2_Init, - EnMushi2_Destroy, - EnMushi2_Update, - EnMushi2_Draw, + ACTOR_EN_MUSHI2, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMushi2), + 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..e221d66003 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -25,15 +25,8 @@ void EnMuto_InDialogue(EnMuto* this, PlayState* play); s32 EnMuto_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx); ActorInit En_Muto_InitVars = { - ACTOR_EN_MUTO, - ACTORCAT_NPC, - FLAGS, - OBJECT_TORYO, - sizeof(EnMuto), - EnMuto_Init, - EnMuto_Destroy, - EnMuto_Update, - EnMuto_Draw, + ACTOR_EN_MUTO, ACTORCAT_NPC, FLAGS, OBJECT_TORYO, sizeof(EnMuto), + 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..e76e3ffce0 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -111,15 +111,7 @@ u8 D_80BC15C8[] = { }; ActorInit En_Nb_InitVars = { - ACTOR_EN_NB, - ACTORCAT_NPC, - FLAGS, - OBJECT_NB, - sizeof(EnNb), - EnNb_Init, - EnNb_Destroy, - EnNb_Update, - EnNb_Draw, + ACTOR_EN_NB, ACTORCAT_NPC, FLAGS, OBJECT_NB, sizeof(EnNb), 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..4d8d0f8f38 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 @@ -37,15 +37,8 @@ void EnNeoReeba_PlayDeathEffects(EnNeoReeba* this, PlayState* play); void EnNeoReeba_SpawnIce(EnNeoReeba* this, PlayState* play); ActorInit En_Neo_Reeba_InitVars = { - ACTOR_EN_NEO_REEBA, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RB, - sizeof(EnNeoReeba), - EnNeoReeba_Init, - EnNeoReeba_Destroy, - EnNeoReeba_Update, - EnNeoReeba_Draw, + ACTOR_EN_NEO_REEBA, ACTORCAT_ENEMY, FLAGS, OBJECT_RB, sizeof(EnNeoReeba), 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..cc79e6c446 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -19,15 +19,8 @@ void EnNimotsu_Draw(Actor* thisx, PlayState* play); void EnNimotsu_UpdateCollision(EnNimotsu* this, PlayState* play); ActorInit En_Nimotsu_InitVars = { - ACTOR_EN_NIMOTSU, - ACTORCAT_PROP, - FLAGS, - OBJECT_BOJ, - sizeof(EnNimotsu), - EnNimotsu_Init, - EnNimotsu_Destroy, - EnNimotsu_Update, - EnNimotsu_Draw, + ACTOR_EN_NIMOTSU, ACTORCAT_PROP, FLAGS, OBJECT_BOJ, sizeof(EnNimotsu), 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..1b5f080d28 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -49,15 +49,7 @@ enum EnNiwState { }; ActorInit En_Niw_InitVars = { - ACTOR_EN_NIW, - ACTORCAT_PROP, - FLAGS, - OBJECT_NIW, - sizeof(EnNiw), - EnNiw_Init, - EnNiw_Destroy, - EnNiw_Update, - EnNiw_Draw, + ACTOR_EN_NIW, ACTORCAT_PROP, FLAGS, OBJECT_NIW, sizeof(EnNiw), 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..0f39fbe327 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -22,15 +22,7 @@ void EnNnh_SetupDialogue(EnNnh* this); void EnNnh_Dialogue(EnNnh* this, PlayState* play); ActorInit En_Nnh_InitVars = { - ACTOR_EN_NNH, - ACTORCAT_PROP, - FLAGS, - OBJECT_NNH, - sizeof(EnNnh), - EnNnh_Init, - EnNnh_Destroy, - EnNnh_Update, - EnNnh_Draw, + ACTOR_EN_NNH, ACTORCAT_PROP, FLAGS, OBJECT_NNH, sizeof(EnNnh), 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..26471fcc86 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -20,15 +20,8 @@ void EnNutsball_Draw(Actor* thisx, PlayState* play); void EnNutsball_InitColliderParams(EnNutsball* this); ActorInit En_Nutsball_InitVars = { - ACTOR_EN_NUTSBALL, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnNutsball), - EnNutsball_Init, - EnNutsball_Destroy, - EnNutsball_Update, - EnNutsball_Draw, + ACTOR_EN_NUTSBALL, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnNutsball), 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..befc23facf 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -42,15 +42,7 @@ enum EnNiwState { }; ActorInit En_Nwc_InitVars = { - ACTOR_EN_NWC, - ACTORCAT_PROP, - FLAGS, - OBJECT_NWC, - sizeof(EnNwc), - EnNwc_Init, - EnNwc_Destroy, - EnNwc_Update, - EnNwc_Draw, + ACTOR_EN_NWC, ACTORCAT_PROP, FLAGS, OBJECT_NWC, sizeof(EnNwc), 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..36a9c54429 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 @@ -20,15 +20,9 @@ void func_8096B174(EnOkarinaEffect* this, PlayState* play); void func_8096B1FC(EnOkarinaEffect* this, PlayState* play); ActorInit En_Okarina_Effect_InitVars = { - ACTOR_EN_OKARINA_EFFECT, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnOkarinaEffect), - EnOkarinaEffect_Init, - EnOkarinaEffect_Destroy, - EnOkarinaEffect_Update, - NULL, + ACTOR_EN_OKARINA_EFFECT, ACTORCAT_ITEMACTION, FLAGS, + GAMEPLAY_KEEP, sizeof(EnOkarinaEffect), 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..63adecb2bd 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 @@ -18,15 +18,8 @@ void func_8093E518(EnOkarinaTag* this, PlayState* play); void func_8093E68C(EnOkarinaTag* this, PlayState* play); ActorInit En_Okarina_Tag_InitVars = { - ACTOR_EN_OKARINA_TAG, - ACTORCAT_SWITCH, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnOkarinaTag), - EnOkarinaTag_Init, - EnOkarinaTag_Destroy, - EnOkarinaTag_Update, - NULL, + ACTOR_EN_OKARINA_TAG, ACTORCAT_SWITCH, FLAGS, GAMEPLAY_KEEP, sizeof(EnOkarinaTag), EnOkarinaTag_Init, + EnOkarinaTag_Destroy, EnOkarinaTag_Update, NULL, }; void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { 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..b4496e513f 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -17,15 +17,8 @@ void EnOnpuman_Update(Actor* thisx, PlayState* play); void func_80B121D8(EnOnpuman* this, PlayState* play); ActorInit En_Onpuman_InitVars = { - ACTOR_EN_ONPUMAN, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnOnpuman), - EnOnpuman_Init, - EnOnpuman_Destroy, - EnOnpuman_Update, - NULL, + ACTOR_EN_ONPUMAN, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnOnpuman), 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..f2401fe4a4 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -23,15 +23,8 @@ void func_80BF656C(EnOsk* this, PlayState* play); void func_80BF6A20(EnOsk* this, PlayState* play); ActorInit En_Osk_InitVars = { - ACTOR_EN_OSK, - ACTORCAT_NPC, - FLAGS, - OBJECT_IKN_DEMO, - sizeof(EnOsk), - EnOsk_Init, - EnOsk_Destroy, - EnOsk_Update, - EnOsk_Draw, + ACTOR_EN_OSK, ACTORCAT_NPC, FLAGS, OBJECT_IKN_DEMO, sizeof(EnOsk), + 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..36db6a4719 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -79,15 +79,7 @@ typedef enum { } OsnAnimation; ActorInit En_Osn_InitVars = { - ACTOR_EN_OSN, - ACTORCAT_NPC, - FLAGS, - OBJECT_OSN, - sizeof(EnOsn), - EnOsn_Init, - EnOsn_Destroy, - EnOsn_Update, - EnOsn_Draw, + ACTOR_EN_OSN, ACTORCAT_NPC, FLAGS, OBJECT_OSN, sizeof(EnOsn), 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..028507c1a7 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -93,15 +93,8 @@ typedef enum { } AniAnimation; ActorInit En_Ossan_InitVars = { - ACTOR_EN_OSSAN, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnOssan), - EnOssan_Init, - EnOssan_Destroy, - EnOssan_Update, - NULL, + ACTOR_EN_OSSAN, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnOssan), + 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..07acb8b9f4 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -64,15 +64,7 @@ static EnOt* D_80B5E884; static EnOt* D_80B5E888; ActorInit En_Ot_InitVars = { - ACTOR_EN_OT, - ACTORCAT_NPC, - FLAGS, - OBJECT_OT, - sizeof(EnOt), - EnOt_Init, - EnOt_Destroy, - EnOt_Update, - EnOt_Draw, + ACTOR_EN_OT, ACTORCAT_NPC, FLAGS, OBJECT_OT, sizeof(EnOt), 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..a5570072f0 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -49,15 +49,7 @@ typedef enum { } EnOwlMessageChoice; ActorInit En_Owl_InitVars = { - ACTOR_EN_OWL, - ACTORCAT_NPC, - FLAGS, - OBJECT_OWL, - sizeof(EnOwl), - EnOwl_Init, - EnOwl_Destroy, - EnOwl_Update, - EnOwl_Draw, + ACTOR_EN_OWL, ACTORCAT_NPC, FLAGS, OBJECT_OWL, sizeof(EnOwl), 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..bea1035c6e 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -70,15 +70,8 @@ void func_80BDA2E0(EnPamera* this, PlayState* play); void func_80BDA344(Actor* thisx, PlayState* play); ActorInit En_Pamera_InitVars = { - ACTOR_EN_PAMERA, - ACTORCAT_NPC, - FLAGS, - OBJECT_PAMERA, - sizeof(EnPamera), - EnPamera_Init, - EnPamera_Destroy, - EnPamera_Update, - EnPamera_Draw, + ACTOR_EN_PAMERA, ACTORCAT_NPC, FLAGS, OBJECT_PAMERA, sizeof(EnPamera), + 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..23bc916cf3 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -68,15 +68,9 @@ void EnPametfrog_SetupTransitionGekkoSnapper(EnPametfrog* this, PlayState* play) void EnPametfrog_TransitionGekkoSnapper(EnPametfrog* this, PlayState* play); ActorInit En_Pametfrog_InitVars = { - ACTOR_EN_PAMETFROG, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BIGSLIME, - sizeof(EnPametfrog), - EnPametfrog_Init, - EnPametfrog_Destroy, - EnPametfrog_Update, - EnPametfrog_Draw, + ACTOR_EN_PAMETFROG, ACTORCAT_BOSS, FLAGS, + OBJECT_BIGSLIME, sizeof(EnPametfrog), 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..afa5f45aa7 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -24,15 +24,8 @@ void func_80C1F55C(EnPaper* this, EnPaperStruct* arg1); void func_80C1F6E0(EnPaper* this, EnPaperStruct* arg1); ActorInit En_Paper_InitVars = { - ACTOR_EN_PAPER, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BAL, - sizeof(EnPaper), - EnPaper_Init, - EnPaper_Destroy, - EnPaper_Update, - EnPaper_Draw, + ACTOR_EN_PAPER, ACTORCAT_ITEMACTION, FLAGS, OBJECT_BAL, sizeof(EnPaper), + 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..9d421b057c 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -20,15 +20,8 @@ void func_80865390(EnPart* this, PlayState* play); void func_808654C4(EnPart* this, PlayState* play); ActorInit En_Part_InitVars = { - ACTOR_EN_PART, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnPart), - EnPart_Init, - EnPart_Destroy, - EnPart_Update, - EnPart_Draw, + ACTOR_EN_PART, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnPart), + 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..3d37fe397a 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -39,15 +39,8 @@ void func_80898654(EnPeehat* this); void func_808986A4(EnPeehat* this, PlayState* play); ActorInit En_Peehat_InitVars = { - ACTOR_EN_PEEHAT, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PH, - sizeof(EnPeehat), - EnPeehat_Init, - EnPeehat_Destroy, - EnPeehat_Update, - EnPeehat_Draw, + ACTOR_EN_PEEHAT, ACTORCAT_ENEMY, FLAGS, OBJECT_PH, sizeof(EnPeehat), + 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..5032262329 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -473,15 +473,7 @@ static UNK_TYPE D_80AFB764[] = { }; ActorInit En_Pm_InitVars = { - ACTOR_EN_PM, - ACTORCAT_NPC, - FLAGS, - OBJECT_MM, - sizeof(EnPm), - EnPm_Init, - EnPm_Destroy, - EnPm_Update, - EnPm_Draw, + ACTOR_EN_PM, ACTORCAT_NPC, FLAGS, OBJECT_MM, sizeof(EnPm), EnPm_Init, EnPm_Destroy, EnPm_Update, EnPm_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..f15a6676a2 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 @@ -26,15 +26,8 @@ void EnPoFusen_IdleFuse(EnPoFusen* this, PlayState* play); s32 EnPoFusen_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx); ActorInit En_Po_Fusen_InitVars = { - ACTOR_EN_PO_FUSEN, - ACTORCAT_PROP, - FLAGS, - OBJECT_PO_FUSEN, - sizeof(EnPoFusen), - EnPoFusen_Init, - EnPoFusen_Destroy, - EnPoFusen_Update, - EnPoFusen_Draw, + ACTOR_EN_PO_FUSEN, ACTORCAT_PROP, FLAGS, OBJECT_PO_FUSEN, sizeof(EnPoFusen), 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..8c4ce6534b 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 @@ -62,15 +62,9 @@ static Color_RGBA8 sPoSisterEnvColors[] = { }; ActorInit En_Po_Sisters_InitVars = { - ACTOR_EN_PO_SISTERS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PO_SISTERS, - sizeof(EnPoSisters), - EnPoSisters_Init, - EnPoSisters_Destroy, - EnPoSisters_Update, - EnPoSisters_Draw, + ACTOR_EN_PO_SISTERS, ACTORCAT_ENEMY, FLAGS, + OBJECT_PO_SISTERS, sizeof(EnPoSisters), 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..7b734c3c4e 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -47,15 +47,7 @@ void func_80B2F328(Actor* thisx, PlayState* play); void func_80B2F37C(Actor* thisx, PlayState* play); ActorInit En_Poh_InitVars = { - ACTOR_EN_POH, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PO, - sizeof(EnPoh), - EnPoh_Init, - EnPoh_Destroy, - EnPoh_Update, - EnPoh_Draw, + ACTOR_EN_POH, ACTORCAT_ENEMY, FLAGS, OBJECT_PO, sizeof(EnPoh), 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..ac67119050 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -116,15 +116,7 @@ static DamageTable sDamageTable = { }; ActorInit En_Pp_InitVars = { - ACTOR_EN_PP, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PP, - sizeof(EnPp), - EnPp_Init, - EnPp_Destroy, - EnPp_Update, - EnPp_Draw, + ACTOR_EN_PP, ACTORCAT_ENEMY, FLAGS, OBJECT_PP, sizeof(EnPp), 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..0f5345bd52 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -69,15 +69,7 @@ static DamageTable sDamageTable = { f32 D_80A338C0[PLAYER_FORM_MAX] = { 30.0f, 30.0f, 30.0f, 15.0f, 15.0f }; ActorInit En_Pr_InitVars = { - ACTOR_EN_PR, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PR, - sizeof(EnPr), - EnPr_Init, - EnPr_Destroy, - EnPr_Update, - EnPr_Draw, + ACTOR_EN_PR, ACTORCAT_ENEMY, FLAGS, OBJECT_PR, sizeof(EnPr), 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..2730acd577 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -82,15 +82,7 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Pr2_InitVars = { - ACTOR_EN_PR2, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PR, - sizeof(EnPr2), - EnPr2_Init, - EnPr2_Destroy, - EnPr2_Update, - EnPr2_Draw, + ACTOR_EN_PR2, ACTORCAT_ENEMY, FLAGS, OBJECT_PR, sizeof(EnPr2), 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..e4146b92b9 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -83,15 +83,7 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Prz_InitVars = { - ACTOR_EN_PRZ, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PR, - sizeof(EnPrz), - EnPrz_Init, - EnPrz_Destroy, - EnPrz_Update, - EnPrz_Draw, + ACTOR_EN_PRZ, ACTORCAT_ENEMY, FLAGS, OBJECT_PR, sizeof(EnPrz), 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..55870b877f 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -119,15 +119,7 @@ s32 D_80B2C488[] = { 0x2C27A40C, 0x10000000 }; s32 D_80B2C490[] = { 0x2C27850C, 0x10000000 }; ActorInit En_Pst_InitVars = { - ACTOR_EN_PST, - ACTORCAT_PROP, - FLAGS, - OBJECT_PST, - sizeof(EnPst), - EnPst_Init, - EnPst_Destroy, - EnPst_Update, - EnPst_Draw, + ACTOR_EN_PST, ACTORCAT_PROP, FLAGS, OBJECT_PST, sizeof(EnPst), 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..1d8789e778 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -72,15 +72,8 @@ typedef struct { } RaceDogInfo; ActorInit En_Racedog_InitVars = { - ACTOR_EN_RACEDOG, - ACTORCAT_NPC, - FLAGS, - OBJECT_DOG, - sizeof(EnRacedog), - EnRacedog_Init, - EnRacedog_Destroy, - EnRacedog_Update, - EnRacedog_Draw, + ACTOR_EN_RACEDOG, ACTORCAT_NPC, FLAGS, OBJECT_DOG, sizeof(EnRacedog), 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..36fdbd5299 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -68,15 +68,7 @@ typedef enum { } EnRafPetalScaleType; ActorInit En_Raf_InitVars = { - ACTOR_EN_RAF, - ACTORCAT_PROP, - FLAGS, - OBJECT_RAF, - sizeof(EnRaf), - EnRaf_Init, - EnRaf_Destroy, - EnRaf_Update, - EnRaf_Draw, + ACTOR_EN_RAF, ACTORCAT_PROP, FLAGS, OBJECT_RAF, sizeof(EnRaf), 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..c7bfb90d5c 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 @@ -51,15 +51,8 @@ void func_80B72830(EnRailSkb* this, s16 arg1); s32 func_80B7285C(EnRailSkb* this); ActorInit En_Rail_Skb_InitVars = { - ACTOR_EN_RAIL_SKB, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SKB, - sizeof(EnRailSkb), - EnRailSkb_Init, - EnRailSkb_Destroy, - EnRailSkb_Update, - EnRailSkb_Draw, + ACTOR_EN_RAIL_SKB, ACTORCAT_ENEMY, FLAGS, OBJECT_SKB, sizeof(EnRailSkb), 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..75a5e2062d 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -85,15 +85,8 @@ typedef enum { } EnRailgibudGrabState; ActorInit En_Railgibud_InitVars = { - ACTOR_EN_RAILGIBUD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RD, - sizeof(EnRailgibud), - EnRailgibud_Init, - EnRailgibud_Destroy, - EnRailgibud_Update, - EnRailgibud_Draw, + ACTOR_EN_RAILGIBUD, ACTORCAT_ENEMY, FLAGS, OBJECT_RD, sizeof(EnRailgibud), 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..535fde0523 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -36,15 +36,7 @@ typedef enum { } EnRatHookedState; ActorInit En_Rat_InitVars = { - ACTOR_EN_RAT, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RAT, - sizeof(EnRat), - EnRat_Init, - EnRat_Destroy, - EnRat_Update, - EnRat_Draw, + ACTOR_EN_RAT, ACTORCAT_ENEMY, FLAGS, OBJECT_RAT, sizeof(EnRat), 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..51fa1eb040 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -98,15 +98,7 @@ typedef enum { } EnRdGrabState; ActorInit En_Rd_InitVars = { - ACTOR_EN_RD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RD, - sizeof(EnRd), - EnRd_Init, - EnRd_Destroy, - EnRd_Update, - EnRd_Draw, + ACTOR_EN_RD, ACTORCAT_ENEMY, FLAGS, OBJECT_RD, sizeof(EnRd), 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..72ac8f17c1 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -22,15 +22,8 @@ void EnRecepgirl_SetupTalk(EnRecepgirl* this); void EnRecepgirl_Talk(EnRecepgirl* this, PlayState* play); ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, - sizeof(EnRecepgirl), - EnRecepgirl_Init, - EnRecepgirl_Destroy, - EnRecepgirl_Update, - EnRecepgirl_Draw, + ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, OBJECT_BG, sizeof(EnRecepgirl), 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..5c2e3b311d 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -23,15 +23,7 @@ void func_80BF4FC4(EnRg* this, PlayState* play); s32 D_80BF5C10; ActorInit En_Rg_InitVars = { - ACTOR_EN_RG, - ACTORCAT_NPC, - FLAGS, - OBJECT_OF1D_MAP, - sizeof(EnRg), - EnRg_Init, - EnRg_Destroy, - EnRg_Update, - EnRg_Draw, + ACTOR_EN_RG, ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnRg), 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..9d9df4a8f2 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 @@ -15,15 +15,9 @@ void EnRiverSound_Update(Actor* thisx, PlayState* play); void EnRiverSound_Draw(Actor* thisx, PlayState* play); ActorInit En_River_Sound_InitVars = { - ACTOR_EN_RIVER_SOUND, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnRiverSound), - EnRiverSound_Init, - Actor_Noop, - EnRiverSound_Update, - EnRiverSound_Draw, + ACTOR_EN_RIVER_SOUND, ACTORCAT_ITEMACTION, FLAGS, + GAMEPLAY_KEEP, sizeof(EnRiverSound), 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..b62ec477d7 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -29,15 +29,7 @@ void func_808FAD1C(EnRr* this, PlayState* play); void func_808FB398(EnRr* this, PlayState* play); ActorInit En_Rr_InitVars = { - ACTOR_EN_RR, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RR, - sizeof(EnRr), - EnRr_Init, - EnRr_Destroy, - EnRr_Update, - EnRr_Draw, + ACTOR_EN_RR, ACTORCAT_ENEMY, FLAGS, OBJECT_RR, sizeof(EnRr), 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..3e285206ea 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -19,15 +19,7 @@ void EnRsn_Draw(Actor* thisx, PlayState* play); void func_80C25D84(EnRsn* this, PlayState* play); ActorInit En_Rsn_InitVars = { - ACTOR_EN_RSN, - ACTORCAT_NPC, - FLAGS, - OBJECT_RS, - sizeof(EnRsn), - EnRsn_Init, - EnRsn_Destroy, - EnRsn_Update, - EnRsn_Draw, + ACTOR_EN_RSN, ACTORCAT_NPC, FLAGS, OBJECT_RS, sizeof(EnRsn), 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..56428dd5d7 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -18,15 +18,7 @@ void EnRu_Draw(Actor* thisx, PlayState* play); void EnRu_DoNothing(EnRu* this, PlayState* play); ActorInit En_Ru_InitVars = { - ACTOR_EN_RU, - ACTORCAT_NPC, - FLAGS, - OBJECT_RU2, - sizeof(EnRu), - EnRu_Init, - EnRu_Destroy, - EnRu_Update, - EnRu_Draw, + ACTOR_EN_RU, ACTORCAT_NPC, FLAGS, OBJECT_RU2, sizeof(EnRu), 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..d12210feff 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -41,15 +41,9 @@ void EnRuppecrow_UpdateSpeed(EnRuppecrow*, PlayState*); void EnRuppecrow_FlyToDespawn(EnRuppecrow*, PlayState*); ActorInit En_Ruppecrow_InitVars = { - ACTOR_EN_RUPPECROW, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_CROW, - sizeof(EnRuppecrow), - EnRuppecrow_Init, - EnRuppecrow_Destroy, - EnRuppecrow_Update, - EnRuppecrow_Draw, + ACTOR_EN_RUPPECROW, ACTORCAT_ENEMY, FLAGS, + OBJECT_CROW, sizeof(EnRuppecrow), 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..9491e4594b 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -50,15 +50,7 @@ typedef enum { } EnRzPathStatus; ActorInit En_Rz_InitVars = { - ACTOR_EN_RZ, - ACTORCAT_NPC, - FLAGS, - OBJECT_RZ, - sizeof(EnRz), - EnRz_Init, - EnRz_Destroy, - EnRz_Update, - EnRz_Draw, + ACTOR_EN_RZ, ACTORCAT_NPC, FLAGS, OBJECT_RZ, sizeof(EnRz), 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..929d46b39a 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 @@ -95,15 +95,8 @@ typedef enum EnSGoroAnimation { } EnSGoroAnimation; ActorInit En_S_Goro_InitVars = { - ACTOR_EN_S_GORO, - ACTORCAT_NPC, - FLAGS, - OBJECT_OF1D_MAP, - sizeof(EnSGoro), - EnSGoro_Init, - EnSGoro_Destroy, - EnSGoro_Update, - EnSGoro_Draw, + ACTOR_EN_S_GORO, ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnSGoro), + 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..46789f5de0 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -26,15 +26,7 @@ void EnSb_Bounce(EnSb* this, PlayState* play); void EnSb_ReturnToIdle(EnSb* this, PlayState* play); ActorInit En_Sb_InitVars = { - ACTOR_EN_SB, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SB, - sizeof(EnSb), - EnSb_Init, - EnSb_Destroy, - EnSb_Update, - EnSb_Draw, + ACTOR_EN_SB, ACTORCAT_ENEMY, FLAGS, OBJECT_SB, sizeof(EnSb), 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..1588996ba1 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 @@ -24,15 +24,8 @@ typedef struct { } RuppeInfo; ActorInit En_Sc_Ruppe_InitVars = { - ACTOR_EN_SC_RUPPE, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnScRuppe), - EnScRuppe_Init, - EnScRuppe_Destroy, - EnScRuppe_Update, - EnScRuppe_Draw, + ACTOR_EN_SC_RUPPE, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnScRuppe), 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..b1351ec45d 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -17,15 +17,9 @@ void EnScopecoin_Update(Actor* thisx, PlayState* play); void EnScopecoin_Draw(Actor* thisx, PlayState* play); ActorInit En_Scopecoin_InitVars = { - ACTOR_EN_SCOPECOIN, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnScopecoin), - EnScopecoin_Init, - EnScopecoin_Destroy, - EnScopecoin_Update, - EnScopecoin_Draw, + ACTOR_EN_SCOPECOIN, ACTORCAT_NPC, FLAGS, + GAMEPLAY_KEEP, sizeof(EnScopecoin), 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..b231f90569 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -19,15 +19,9 @@ void func_80BCD590(EnScopecrow* this, PlayState* play); void func_80BCD640(EnScopecrow* this, PlayState* play); ActorInit En_Scopecrow_InitVars = { - ACTOR_EN_SCOPECROW, - ACTORCAT_NPC, - FLAGS, - OBJECT_CROW, - sizeof(EnScopecrow), - EnScopecrow_Init, - EnScopecrow_Destroy, - EnScopecrow_Update, - EnScopecrow_Draw, + ACTOR_EN_SCOPECROW, ACTORCAT_NPC, FLAGS, + OBJECT_CROW, sizeof(EnScopecrow), 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..1153c9ad12 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -34,15 +34,8 @@ s32 func_80BCC2AC(EnScopenuts* this, Path* path, s32 arg2_); f32 func_80BCC448(Path* path, s32 arg1, Vec3f* arg2, Vec3s* arg3); ActorInit En_Scopenuts_InitVars = { - ACTOR_EN_SCOPENUTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNT, - sizeof(EnScopenuts), - EnScopenuts_Init, - EnScopenuts_Destroy, - EnScopenuts_Update, - EnScopenuts_Draw, + ACTOR_EN_SCOPENUTS, ACTORCAT_NPC, FLAGS, OBJECT_DNT, sizeof(EnScopenuts), 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..fe95124d8e 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -21,15 +21,8 @@ void func_80947668(u8* shadowTexture, Player* player, PlayState* play); Vec3f D_80947EA0[16]; ActorInit En_Sda_InitVars = { - ACTOR_EN_SDA, - ACTORCAT_BOSS, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnSda), - EnSda_Init, - EnSda_Destroy, - EnSda_Update, - EnSda_Draw, + ACTOR_EN_SDA, ACTORCAT_BOSS, FLAGS, GAMEPLAY_KEEP, sizeof(EnSda), + 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..035a7e6009 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -25,15 +25,8 @@ void func_80A450B0(EnSekihi* this, PlayState* play); void EnSekihi_DoNothing(EnSekihi* this, PlayState* play); ActorInit En_Sekihi_InitVars = { - ACTOR_EN_SEKIHI, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnSekihi), - EnSekihi_Init, - EnSekihi_Destroy, - EnSekihi_Update, - NULL, + ACTOR_EN_SEKIHI, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnSekihi), + 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..3d56f42aa7 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -50,15 +50,8 @@ static u16 D_80ADD938[] = { 0x0615, 0x060F, 0x060F }; static u8 D_80ADD940 = 0; ActorInit En_Sellnuts_InitVars = { - ACTOR_EN_SELLNUTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNT, - sizeof(EnSellnuts), - EnSellnuts_Init, - EnSellnuts_Destroy, - EnSellnuts_Update, - EnSellnuts_Draw, + ACTOR_EN_SELLNUTS, ACTORCAT_NPC, FLAGS, OBJECT_DNT, sizeof(EnSellnuts), 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..937fd1fbb2 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -52,15 +52,7 @@ static UNK_TYPE D_80AE71C4[] = { 0x00374000, 0x1C2C09DB, 0x0C2F0000, 0x0C0F09DC, 0x0C113740, 0x102C09E0, 0x0C2F0000, 0x0C0F09E1, 0x0C0F09E2, 0x0C100000 }; ActorInit En_Shn_InitVars = { - ACTOR_EN_SHN, - ACTORCAT_NPC, - FLAGS, - OBJECT_SHN, - sizeof(EnShn), - EnShn_Init, - EnShn_Destroy, - EnShn_Update, - EnShn_Draw, + ACTOR_EN_SHN, ACTORCAT_NPC, FLAGS, OBJECT_SHN, sizeof(EnShn), EnShn_Init, EnShn_Destroy, EnShn_Update, EnShn_Draw, }; void func_80AE6130(EnShn* this) { 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..b92313ea44 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -146,15 +146,7 @@ static DamageTable sDamageTable = { }; ActorInit En_Skb_InitVars = { - ACTOR_EN_SKB, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SKB, - sizeof(EnSkb), - EnSkb_Init, - EnSkb_Destroy, - EnSkb_Update, - EnSkb_Draw, + ACTOR_EN_SKB, ACTORCAT_ENEMY, FLAGS, OBJECT_SKB, sizeof(EnSkb), 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_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 64ea1e6559..fca11a945c 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -62,15 +62,8 @@ typedef enum { } EnSnowmanCombineState; ActorInit En_Snowman_InitVars = { - ACTOR_EN_SNOWMAN, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SNOWMAN, - sizeof(EnSnowman), - EnSnowman_Init, - EnSnowman_Destroy, - EnSnowman_Update, - EnSnowman_Draw, + ACTOR_EN_SNOWMAN, ACTORCAT_ENEMY, FLAGS, OBJECT_SNOWMAN, sizeof(EnSnowman), EnSnowman_Init, + EnSnowman_Destroy, EnSnowman_Update, EnSnowman_Draw, }; static ColliderCylinderInit sEenoCylinderInit = { 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..47f796e468 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -65,15 +65,8 @@ static AnimationInfoS sAnimationInfoBombShopkeeper[] = { }; ActorInit En_Sob1_InitVars = { - ACTOR_EN_OSSAN, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnSob1), - EnSob1_Init, - EnSob1_Destroy, - EnSob1_Update, - NULL, + ACTOR_EN_OSSAN, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnSob1), + 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..9d79eabdc4 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -26,15 +26,7 @@ void EnSsh_Start(EnSsh* this, PlayState* play); extern AnimationHeader D_06000304; ActorInit En_Ssh_InitVars = { - ACTOR_EN_SSH, - ACTORCAT_NPC, - FLAGS, - OBJECT_SSH, - sizeof(EnSsh), - EnSsh_Init, - EnSsh_Destroy, - EnSsh_Update, - EnSsh_Draw, + ACTOR_EN_SSH, ACTORCAT_NPC, FLAGS, OBJECT_SSH, sizeof(EnSsh), 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..fc1ed65baf 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -24,15 +24,7 @@ void func_808A701C(EnSt* this, PlayState* play); void func_808A7478(Actor* thisx, PlayState* play); ActorInit En_St_InitVars = { - ACTOR_EN_ST, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_ST, - sizeof(EnSt), - EnSt_Init, - EnSt_Destroy, - EnSt_Update, - NULL, + ACTOR_EN_ST, ACTORCAT_ENEMY, FLAGS, OBJECT_ST, sizeof(EnSt), 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..b761e734f9 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -28,15 +28,7 @@ void func_80B680A8(Actor* thisx, PlayState* play); void func_80B6849C(Actor* thisx, PlayState* play); ActorInit En_Sth_InitVars = { - ACTOR_EN_STH, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnSth), - EnSth_Init, - EnSth_Destroy, - EnSth_Update, - NULL, + ACTOR_EN_STH, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnSth), 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..0c85dc71df 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -19,15 +19,7 @@ void EnSth2_UpdateSkelAnime(EnSth2* this, PlayState* play); void EnSth2_UpdateActionFunc(Actor* thisx, PlayState* play); ActorInit En_Sth2_InitVars = { - ACTOR_EN_STH2, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnSth2), - EnSth2_Init, - EnSth2_Destroy, - EnSth2_Update, - NULL, + ACTOR_EN_STH2, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnSth2), EnSth2_Init, EnSth2_Destroy, EnSth2_Update, NULL, }; #include "overlays/ovl_En_Sth2/ovl_En_Sth2.c" 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..2d5ba4f771 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -19,15 +19,8 @@ void EnStream_Draw(Actor* thisx, PlayState* play); void EnStream_WaitForPlayer(EnStream* this, PlayState* play); ActorInit En_Stream_InitVars = { - ACTOR_EN_STREAM, - ACTORCAT_BG, - FLAGS, - OBJECT_STREAM, - sizeof(EnStream), - EnStream_Init, - EnStream_Destroy, - EnStream_Update, - EnStream_Draw, + ACTOR_EN_STREAM, ACTORCAT_BG, FLAGS, OBJECT_STREAM, sizeof(EnStream), + 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..6740b92ff5 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -39,15 +39,8 @@ void func_80BADE8C(EnSuttari* this, PlayState* play); void func_80BADF3C(EnSuttari* this, PlayState* play); ActorInit En_Suttari_InitVars = { - ACTOR_EN_SUTTARI, - ACTORCAT_NPC, - FLAGS, - OBJECT_BOJ, - sizeof(EnSuttari), - EnSuttari_Init, - EnSuttari_Destroy, - EnSuttari_Update, - EnSuttari_Draw, + ACTOR_EN_SUTTARI, ACTORCAT_NPC, FLAGS, OBJECT_BOJ, sizeof(EnSuttari), 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..65a4b56e5e 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -29,15 +29,7 @@ void func_808DB25C(EnSw* this, PlayState* play); void func_808DB2E0(EnSw* this, PlayState* play); ActorInit En_Sw_InitVars = { - ACTOR_EN_SW, - ACTORCAT_NPC, - FLAGS, - OBJECT_ST, - sizeof(EnSw), - EnSw_Init, - EnSw_Destroy, - EnSw_Update, - EnSw_Draw, + ACTOR_EN_SW, ACTORCAT_NPC, FLAGS, OBJECT_ST, sizeof(EnSw), 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..4110627844 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 @@ -26,15 +26,9 @@ void EnSyatekiCrow_Dead(EnSyatekiCrow* this, PlayState* play); static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; ActorInit En_Syateki_Crow_InitVars = { - ACTOR_EN_SYATEKI_CROW, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_CROW, - sizeof(EnSyatekiCrow), - EnSyatekiCrow_Init, - EnSyatekiCrow_Destroy, - EnSyatekiCrow_Update, - EnSyatekiCrow_Draw, + ACTOR_EN_SYATEKI_CROW, ACTORCAT_ENEMY, FLAGS, + OBJECT_CROW, sizeof(EnSyatekiCrow), EnSyatekiCrow_Init, + EnSyatekiCrow_Destroy, EnSyatekiCrow_Update, EnSyatekiCrow_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { 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..c922597683 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 @@ -60,15 +60,9 @@ void EnSyatekiMan_Town_EndGame(EnSyatekiMan* this, PlayState* play); #define COLUMN_RIGHT 2 ActorInit En_Syateki_Man_InitVars = { - ACTOR_EN_SYATEKI_MAN, - ACTORCAT_NPC, - FLAGS, - OBJECT_SHN, - sizeof(EnSyatekiMan), - EnSyatekiMan_Init, - EnSyatekiMan_Destroy, - EnSyatekiMan_Update, - EnSyatekiMan_Draw, + ACTOR_EN_SYATEKI_MAN, ACTORCAT_NPC, FLAGS, + OBJECT_SHN, sizeof(EnSyatekiMan), 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..04864aa1ff 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 @@ -29,15 +29,9 @@ void func_80A365EC(EnSyatekiOkuta* this, PlayState* play); void func_80A36CB0(EnSyatekiOkuta* this); ActorInit En_Syateki_Okuta_InitVars = { - ACTOR_EN_SYATEKI_OKUTA, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_OKUTA, - sizeof(EnSyatekiOkuta), - EnSyatekiOkuta_Init, - EnSyatekiOkuta_Destroy, - EnSyatekiOkuta_Update, - EnSyatekiOkuta_Draw, + ACTOR_EN_SYATEKI_OKUTA, ACTORCAT_ENEMY, FLAGS, + OBJECT_OKUTA, sizeof(EnSyatekiOkuta), 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..96ca0f284e 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 @@ -102,15 +102,8 @@ static Vec3f D_80A20EDC = { 0.0f, 20.0f, 0.0f }; static Vec3f D_80A20EE8 = { 0.0f, 0.0f, 0.0f }; ActorInit En_Syateki_Wf_InitVars = { - ACTOR_EN_SYATEKI_WF, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WF, - sizeof(EnSyatekiWf), - EnSyatekiWf_Init, - EnSyatekiWf_Destroy, - EnSyatekiWf_Update, - EnSyatekiWf_Draw, + ACTOR_EN_SYATEKI_WF, ACTORCAT_ENEMY, FLAGS, OBJECT_WF, sizeof(EnSyatekiWf), 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..efa600bf16 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -67,15 +67,7 @@ s32 D_80BE1A0C[] = { }; ActorInit En_Tab_InitVars = { - ACTOR_EN_TAB, - ACTORCAT_NPC, - FLAGS, - OBJECT_TAB, - sizeof(EnTab), - EnTab_Init, - EnTab_Destroy, - EnTab_Update, - EnTab_Draw, + ACTOR_EN_TAB, ACTORCAT_NPC, FLAGS, OBJECT_TAB, sizeof(EnTab), 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..c56f395fc2 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 @@ -35,15 +35,8 @@ static ColliderCylinderInit sUnusedColliderInit = { }; ActorInit En_Tag_Obj_InitVars = { - ACTOR_EN_TAG_OBJ, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTagObj), - EnTagObj_Init, - EnTagObj_Destroy, - EnTagObj_Update, - NULL, + ACTOR_EN_TAG_OBJ, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnTagObj), + EnTagObj_Init, EnTagObj_Destroy, EnTagObj_Update, NULL, }; void EnTagObj_Init(Actor* thisx, PlayState* play) { 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..f95c0fdf9c 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.c +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -17,15 +17,8 @@ void func_80BDE058(EnTalk* this, PlayState* play); void func_80BDE090(EnTalk* this, PlayState* play); ActorInit En_Talk_InitVars = { - ACTOR_EN_TALK, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTalk), - EnTalk_Init, - EnTalk_Destroy, - EnTalk_Update, - NULL, + ACTOR_EN_TALK, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTalk), + 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..177a254e36 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 @@ -103,15 +103,8 @@ typedef enum { } EnTalkGibudGrabState; ActorInit En_Talk_Gibud_InitVars = { - ACTOR_EN_TALK_GIBUD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RD, - sizeof(EnTalkGibud), - EnTalkGibud_Init, - EnTalkGibud_Destroy, - EnTalkGibud_Update, - EnTalkGibud_Draw, + ACTOR_EN_TALK_GIBUD, ACTORCAT_ENEMY, FLAGS, OBJECT_RD, sizeof(EnTalkGibud), 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..9fcff05af2 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -19,15 +19,8 @@ void func_80BB5318(EnTanron1* this, PlayState* play); void func_80BB5AAC(EnTanron1* this, PlayState* play); ActorInit En_Tanron1_InitVars = { - ACTOR_EN_TANRON1, - ACTORCAT_ENEMY, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTanron1), - EnTanron1_Init, - EnTanron1_Destroy, - EnTanron1_Update, - EnTanron1_Draw, + ACTOR_EN_TANRON1, ACTORCAT_ENEMY, FLAGS, GAMEPLAY_KEEP, sizeof(EnTanron1), 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..efc5ae3d83 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -31,15 +31,8 @@ f32 D_80BB8454; EnTanron2* D_80BB8458[82]; ActorInit En_Tanron2_InitVars = { - ACTOR_EN_TANRON2, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS04, - sizeof(EnTanron2), - EnTanron2_Init, - EnTanron2_Destroy, - EnTanron2_Update, - EnTanron2_Draw, + ACTOR_EN_TANRON2, ACTORCAT_BOSS, FLAGS, OBJECT_BOSS04, sizeof(EnTanron2), 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..255cffe5a1 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -32,15 +32,8 @@ static Vec3f sZeroVec[] = { 0.0f, 0.0f, 0.0f }; static Boss03* sGyorg = NULL; ActorInit En_Tanron3_InitVars = { - ACTOR_EN_TANRON3, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS03, - sizeof(EnTanron3), - EnTanron3_Init, - EnTanron3_Destroy, - EnTanron3_Update, - EnTanron3_Draw, + ACTOR_EN_TANRON3, ACTORCAT_BOSS, FLAGS, OBJECT_BOSS03, sizeof(EnTanron3), 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..c857531e49 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -32,15 +32,8 @@ typedef enum { } SeagullTimers; ActorInit En_Tanron4_InitVars = { - ACTOR_EN_TANRON4, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_TANRON4, - sizeof(EnTanron4), - EnTanron4_Init, - EnTanron4_Destroy, - EnTanron4_Update, - EnTanron4_Draw, + ACTOR_EN_TANRON4, ACTORCAT_ITEMACTION, FLAGS, OBJECT_TANRON4, sizeof(EnTanron4), 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..9db1619443 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -24,15 +24,8 @@ void func_80BE5C10(Actor* thisx, PlayState* play); s32 D_80BE5D80 = 0; ActorInit En_Tanron5_InitVars = { - ACTOR_EN_TANRON5, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS02, - sizeof(EnTanron5), - EnTanron5_Init, - EnTanron5_Destroy, - EnTanron5_Update, - EnTanron5_Draw, + ACTOR_EN_TANRON5, ACTORCAT_BOSS, FLAGS, OBJECT_BOSS02, sizeof(EnTanron5), 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..68645128d5 100644 --- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c @@ -19,15 +19,8 @@ void EnTanron6_DoNothing(EnTanron6* this); void func_80BE60D0(EnTanron6* this, PlayState* play); ActorInit En_Tanron6_InitVars = { - ACTOR_EN_TANRON6, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_TANRON5, - sizeof(EnTanron6), - EnTanron6_Init, - EnTanron6_Destroy, - EnTanron6_Update, - EnTanron6_Draw, + ACTOR_EN_TANRON6, ACTORCAT_ENEMY, FLAGS, OBJECT_TANRON5, sizeof(EnTanron6), 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..6d168fba84 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -17,15 +17,8 @@ void EnTest_Update(Actor* thisx, PlayState* play); void EnTest_Draw(Actor* thisx, PlayState* play); ActorInit En_Test_InitVars = { - ACTOR_EN_TEST, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest), - EnTest_Init, - EnTest_Destroy, - EnTest_Update, - EnTest_Draw, + ACTOR_EN_TEST, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest), + 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..389a8981a3 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -28,15 +28,7 @@ typedef struct EnTest2ModelInfo { } EnTest2ModelInfo; // size = 0xC ActorInit En_Test2_InitVars = { - ACTOR_EN_TEST2, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest2), - EnTest2_Init, - Actor_Noop, - EnTest2_Update, - NULL, + ACTOR_EN_TEST2, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest2), 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..94420446c5 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -169,15 +169,8 @@ static u8 sScheduleScript[] = { }; ActorInit En_Test3_InitVars = { - ACTOR_EN_TEST3, - ACTORCAT_NPC, - FLAGS, - OBJECT_TEST3, - sizeof(EnTest3), - EnTest3_Init, - EnTest3_Destroy, - EnTest3_Update, - NULL, + ACTOR_EN_TEST3, ACTORCAT_NPC, FLAGS, OBJECT_TEST3, sizeof(EnTest3), + 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..1253278ea1 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -21,15 +21,8 @@ void func_80A42AB8(EnTest4* this, PlayState* play); void func_80A42F20(EnTest4* this, PlayState* play); ActorInit En_Test4_InitVars = { - ACTOR_EN_TEST4, - ACTORCAT_SWITCH, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest4), - EnTest4_Init, - EnTest4_Destroy, - EnTest4_Update, - NULL, + ACTOR_EN_TEST4, ACTORCAT_SWITCH, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest4), + 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..556b3d6e32 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -17,15 +17,8 @@ void EnTest5_HandleBottleAction(EnTest5* this, PlayState* play); void EnTest5_SetupAction(EnTest5* this, EnTest5ActionFunc actionFunc); ActorInit En_Test5_InitVars = { - ACTOR_EN_TEST5, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest5), - EnTest5_Init, - EnTest5_Destroy, - EnTest5_Update, - NULL, + ACTOR_EN_TEST5, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest5), + 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..8bd3dd31c8 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -43,15 +43,8 @@ void func_80A92950(EnTest6* this, PlayState* play); EnTest6Struct D_80A94910[12]; ActorInit En_Test6_InitVars = { - ACTOR_EN_TEST6, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest6), - EnTest6_Init, - EnTest6_Destroy, - EnTest6_Update, - EnTest6_Draw, + ACTOR_EN_TEST6, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest6), + 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..5b8dcd6698 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -35,15 +35,8 @@ void func_80AF2F98(EnTest7* this, PlayState* play); void func_80AF30F4(EnTest7* this, PlayState* play); ActorInit En_Test7_InitVars = { - ACTOR_EN_TEST7, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest7), - EnTest7_Init, - EnTest7_Destroy, - EnTest7_Update, - EnTest7_Draw, + ACTOR_EN_TEST7, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest7), + 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..868b87dd9e 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -22,15 +22,7 @@ void EnTg_DrawHearts(PlayState* play, EnTgHeartEffect* effect, s32 numEffects); void EnTg_SpawnHeart(EnTg* this, EnTgHeartEffect* effect, Vec3f* heartStartPos, s32 numEffects); ActorInit En_Tg_InitVars = { - ACTOR_EN_TG, - ACTORCAT_NPC, - FLAGS, - OBJECT_MU, - sizeof(EnTg), - EnTg_Init, - EnTg_Destroy, - EnTg_Update, - EnTg_Draw, + ACTOR_EN_TG, ACTORCAT_NPC, FLAGS, OBJECT_MU, sizeof(EnTg), 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..4b30059024 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -34,15 +34,9 @@ void func_80C12744(EnThiefbird* this); void func_80C127F4(EnThiefbird* this, PlayState* play); ActorInit En_Thiefbird_InitVars = { - ACTOR_EN_THIEFBIRD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_THIEFBIRD, - sizeof(EnThiefbird), - EnThiefbird_Init, - EnThiefbird_Destroy, - EnThiefbird_Update, - EnThiefbird_Draw, + ACTOR_EN_THIEFBIRD, ACTORCAT_ENEMY, FLAGS, + OBJECT_THIEFBIRD, sizeof(EnThiefbird), 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..94ed10a406 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 @@ -31,15 +31,8 @@ void func_80ACA7C4(EnTimeTag* this, PlayState* play); void func_80ACA840(EnTimeTag* this, PlayState* play); ActorInit En_Time_Tag_InitVars = { - ACTOR_EN_TIME_TAG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTimeTag), - EnTimeTag_Init, - EnTimeTag_Destroy, - EnTimeTag_Update, - NULL, + ACTOR_EN_TIME_TAG, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTimeTag), 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..bdc9fc02e8 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -47,15 +47,8 @@ void func_80895D08(EnTite* this, PlayState* play); void func_80895E28(EnTite* this, PlayState* play); ActorInit En_Tite_InitVars = { - ACTOR_EN_TITE, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_TITE, - sizeof(EnTite), - EnTite_Init, - EnTite_Destroy, - EnTite_Update, - EnTite_Draw, + ACTOR_EN_TITE, ACTORCAT_ENEMY, FLAGS, OBJECT_TITE, sizeof(EnTite), + 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..23a3b50eb7 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -70,15 +70,7 @@ static u8 D_80AEF800[] = { }; ActorInit En_Tk_InitVars = { - ACTOR_EN_TK, - ACTORCAT_NPC, - FLAGS, - OBJECT_TK, - sizeof(EnTk), - EnTk_Init, - EnTk_Destroy, - EnTk_Update, - EnTk_Draw, + ACTOR_EN_TK, ACTORCAT_NPC, FLAGS, OBJECT_TK, sizeof(EnTk), 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..953933a8a5 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,7 @@ 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..e71a31d17c 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -20,15 +20,8 @@ void EnTorch2_UpdateIdle(Actor* thisx, PlayState* play); void EnTorch2_UpdateDeath(Actor* thisx, PlayState* play); ActorInit En_Torch2_InitVars = { - ACTOR_EN_TORCH2, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTorch2), - EnTorch2_Init, - EnTorch2_Destroy, - EnTorch2_Update, - EnTorch2_Draw, + ACTOR_EN_TORCH2, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch2), + 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..55c5d29ec1 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -51,15 +51,8 @@ s32 func_80BA4C0C(EnToto* this, PlayState* play); s32 func_80BA4C44(EnToto* this, PlayState* play); ActorInit En_Toto_InitVars = { - ACTOR_EN_TOTO, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZM, - sizeof(EnToto), - EnToto_Init, - EnToto_Destroy, - EnToto_Update, - EnToto_Draw, + ACTOR_EN_TOTO, ACTORCAT_NPC, FLAGS, OBJECT_ZM, sizeof(EnToto), + 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..2ab697daba 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -91,15 +91,7 @@ static AnimationInfoS sAnimationInfo[] = { }; ActorInit En_Trt_InitVars = { - ACTOR_EN_TRT, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRT, - sizeof(EnTrt), - EnTrt_Init, - EnTrt_Destroy, - EnTrt_Update, - EnTrt_Draw, + ACTOR_EN_TRT, ACTORCAT_NPC, FLAGS, OBJECT_TRT, sizeof(EnTrt), 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..01c69560ea 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -53,15 +53,7 @@ static AnimationInfoS sAnimationInfo[] = { }; ActorInit En_Trt2_InitVars = { - ACTOR_EN_TRT2, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRT, - sizeof(EnTrt2), - EnTrt2_Init, - EnTrt2_Destroy, - EnTrt2_Update, - NULL, + ACTOR_EN_TRT2, ACTORCAT_NPC, FLAGS, OBJECT_TRT, sizeof(EnTrt2), 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..997041e844 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -77,15 +77,7 @@ static UNK_TYPE D_80A889A4[] = { }; ActorInit En_Tru_InitVars = { - ACTOR_EN_TRU, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRU, - sizeof(EnTru), - EnTru_Init, - EnTru_Destroy, - EnTru_Update, - EnTru_Draw, + ACTOR_EN_TRU, ACTORCAT_NPC, FLAGS, OBJECT_TRU, sizeof(EnTru), 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..5ad82491a9 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 @@ -41,15 +41,8 @@ typedef enum { } KoumeMtAnimation; ActorInit En_Tru_Mt_InitVars = { - ACTOR_EN_TRU_MT, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRU, - sizeof(EnTruMt), - EnTruMt_Init, - EnTruMt_Destroy, - EnTruMt_Update, - EnTruMt_Draw, + ACTOR_EN_TRU_MT, ACTORCAT_NPC, FLAGS, OBJECT_TRU, sizeof(EnTruMt), + 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..723f005104 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -30,15 +30,7 @@ void func_80AE0D78(EnTsn* this, PlayState* play); void func_80AE0F84(Actor* thisx, PlayState* play); ActorInit En_Tsn_InitVars = { - ACTOR_EN_TSN, - ACTORCAT_NPC, - FLAGS, - OBJECT_TSN, - sizeof(EnTsn), - EnTsn_Init, - EnTsn_Destroy, - EnTsn_Update, - EnTsn_Draw, + ACTOR_EN_TSN, ACTORCAT_NPC, FLAGS, OBJECT_TSN, sizeof(EnTsn), 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..50c22fe5b6 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 @@ -40,15 +40,8 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Tubo_Trap_InitVars = { - ACTOR_EN_TUBO_TRAP, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(EnTuboTrap), - EnTuboTrap_Init, - EnTuboTrap_Destroy, - EnTuboTrap_Update, - EnTuboTrap_Draw, + ACTOR_EN_TUBO_TRAP, ACTORCAT_PROP, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(EnTuboTrap), 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..e8a26af4b8 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -26,15 +26,8 @@ void func_80AC0CC4(EnTwig* this, PlayState* play); void func_80AC0D2C(EnTwig* this, PlayState* play); ActorInit En_Twig_InitVars = { - ACTOR_EN_TWIG, - ACTORCAT_MISC, - FLAGS, - OBJECT_TWIG, - sizeof(EnTwig), - EnTwig_Init, - EnTwig_Destroy, - EnTwig_Update, - EnTwig_Draw, + ACTOR_EN_TWIG, ACTORCAT_MISC, FLAGS, OBJECT_TWIG, sizeof(EnTwig), + 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..a11f19d2e9 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -24,15 +24,8 @@ static u8 D_8089F3E0 = 0; static u8 D_8089F3E4 = 0; ActorInit En_Viewer_InitVars = { - ACTOR_EN_VIEWER, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnViewer), - EnViewer_Init, - EnViewer_Destroy, - EnViewer_Update, - EnViewer_Draw, + ACTOR_EN_VIEWER, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnViewer), + 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..653aa92fd5 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -30,15 +30,7 @@ void func_808CCB50(EnVm* this, PlayState* play); void func_808CCCF0(EnVm* this, PlayState* play); ActorInit En_Vm_InitVars = { - ACTOR_EN_VM, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_VM, - sizeof(EnVm), - EnVm_Init, - EnVm_Destroy, - EnVm_Update, - EnVm_Draw, + ACTOR_EN_VM, ACTORCAT_ENEMY, FLAGS, OBJECT_VM, sizeof(EnVm), 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..db77ff098c 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -44,15 +44,8 @@ void EnWallmas_WaitForSwitchFlag(EnWallmas* this, PlayState* play); void EnWallmas_Stun(EnWallmas* this, PlayState* play); ActorInit En_Wallmas_InitVars = { - ACTOR_EN_WALLMAS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WALLMASTER, - sizeof(EnWallmas), - EnWallmas_Init, - EnWallmas_Destroy, - EnWallmas_Update, - EnWallmas_Draw, + ACTOR_EN_WALLMAS, ACTORCAT_ENEMY, FLAGS, OBJECT_WALLMASTER, sizeof(EnWallmas), 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..f399b3c702 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 @@ -22,15 +22,8 @@ void func_80A66384(EnWarpUzu* this, PlayState* play); void EnWarpUzu_DoNothing(EnWarpUzu* this, PlayState* play); ActorInit En_Warp_Uzu_InitVars = { - ACTOR_EN_WARP_UZU, - ACTORCAT_PROP, - FLAGS, - OBJECT_WARP_UZU, - sizeof(EnWarpUzu), - EnWarpUzu_Init, - EnWarpUzu_Destroy, - EnWarpUzu_Update, - EnWarpUzu_Draw, + ACTOR_EN_WARP_UZU, ACTORCAT_PROP, FLAGS, OBJECT_WARP_UZU, sizeof(EnWarpUzu), 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..cecedb9d51 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 @@ -25,15 +25,8 @@ void EnWarpTag_RespawnPlayer(EnWarptag* this, PlayState* play); void EnWarpTag_GrottoReturn(EnWarptag* this, PlayState* play); ActorInit En_Warp_tag_InitVars = { - ACTOR_EN_WARP_TAG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnWarptag), - EnWarptag_Init, - EnWarptag_Destroy, - EnWarptag_Update, - NULL, + ACTOR_EN_WARP_TAG, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnWarptag), 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..2e849d7470 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 @@ -31,15 +31,9 @@ void func_80A5A534(Actor* thisx, PlayState* play); void func_80A5A6B8(Actor* thisx, PlayState* play2); ActorInit En_Water_Effect_InitVars = { - ACTOR_EN_WATER_EFFECT, - ACTORCAT_BOSS, - FLAGS, - OBJECT_WATER_EFFECT, - sizeof(EnWaterEffect), - EnWaterEffect_Init, - EnWaterEffect_Destroy, - EnWaterEffect_Update, - EnWaterEffect_Draw, + ACTOR_EN_WATER_EFFECT, ACTORCAT_BOSS, FLAGS, + OBJECT_WATER_EFFECT, sizeof(EnWaterEffect), 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_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 13657901c1..be4b895858 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 @@ -36,15 +36,9 @@ void func_809674C8(EnWeatherTag* this, PlayState* play); void func_80967608(EnWeatherTag* this, PlayState* play); ActorInit En_Weather_Tag_InitVars = { - ACTOR_EN_WEATHER_TAG, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnWeatherTag), - EnWeatherTag_Init, - EnWeatherTag_Destroy, - EnWeatherTag_Update, - EnWeatherTag_Draw, + ACTOR_EN_WEATHER_TAG, ACTORCAT_PROP, FLAGS, + GAMEPLAY_KEEP, sizeof(EnWeatherTag), 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..7a00501546 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -56,15 +56,7 @@ void func_8099357C(EnWf* this, PlayState* play); s32 func_8099408C(PlayState* play, EnWf* this); ActorInit En_Wf_InitVars = { - ACTOR_EN_WF, - ACTORCAT_PROP, - FLAGS, - OBJECT_WF, - sizeof(EnWf), - EnWf_Init, - EnWf_Destroy, - EnWf_Update, - EnWf_Draw, + ACTOR_EN_WF, ACTORCAT_PROP, FLAGS, OBJECT_WF, sizeof(EnWf), 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..a05becd0bc 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -81,15 +81,7 @@ typedef enum { } EnWizAnimation; ActorInit En_Wiz_InitVars = { - ACTOR_EN_WIZ, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WIZ, - sizeof(EnWiz), - EnWiz_Init, - EnWiz_Destroy, - EnWiz_Update, - EnWiz_Draw, + ACTOR_EN_WIZ, ACTORCAT_ENEMY, FLAGS, OBJECT_WIZ, sizeof(EnWiz), 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..cb6ec73894 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 @@ -22,15 +22,8 @@ void EnWizBrock_UpdateStatus(EnWizBrock* this, PlayState* play); s16 sPlatformIndex = 0; ActorInit En_Wiz_Brock_InitVars = { - ACTOR_EN_WIZ_BROCK, - ACTORCAT_PROP, - FLAGS, - OBJECT_WIZ, - sizeof(EnWizBrock), - EnWizBrock_Init, - EnWizBrock_Destroy, - EnWizBrock_Update, - EnWizBrock_Draw, + ACTOR_EN_WIZ_BROCK, ACTORCAT_PROP, FLAGS, OBJECT_WIZ, sizeof(EnWizBrock), 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..97fd865590 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 @@ -38,15 +38,8 @@ typedef enum { static s32 sPoolHitByIceArrow = false; ActorInit En_Wiz_Fire_InitVars = { - ACTOR_EN_WIZ_FIRE, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WIZ, - sizeof(EnWizFire), - EnWizFire_Init, - EnWizFire_Destroy, - EnWizFire_Update, - EnWizFire_Draw, + ACTOR_EN_WIZ_FIRE, ACTORCAT_ENEMY, FLAGS, OBJECT_WIZ, sizeof(EnWizFire), 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..c4480ed041 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -39,15 +39,8 @@ static f32 sSpawnCos; static f32 sSpawnSin; ActorInit En_Wood02_InitVars = { - ACTOR_EN_WOOD02, - ACTORCAT_PROP, - FLAGS, - OBJECT_WOOD02, - sizeof(EnWood02), - EnWood02_Init, - EnWood02_Destroy, - EnWood02_Update, - EnWood02_Draw, + ACTOR_EN_WOOD02, ACTORCAT_PROP, FLAGS, OBJECT_WOOD02, sizeof(EnWood02), + 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..11b0c8c347 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -33,15 +33,7 @@ void EnYb_ChangeAnim(PlayState* play, EnYb* this, s16 animIndex, u8 animMode, f3 s32 EnYb_CanTalk(EnYb* this, PlayState* play); ActorInit En_Yb_InitVars = { - ACTOR_EN_YB, - ACTORCAT_NPC, - FLAGS, - OBJECT_YB, - sizeof(EnYb), - EnYb_Init, - EnYb_Destroy, - EnYb_Update, - EnYb_Draw, + ACTOR_EN_YB, ACTORCAT_NPC, FLAGS, OBJECT_YB, sizeof(EnYb), 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..e60cbe8d20 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -16,15 +16,7 @@ void EnZl1_Update(Actor* thisx, PlayState* play); void EnZl1_Draw(Actor* thisx, PlayState* play); ActorInit En_Zl1_InitVars = { - ACTOR_EN_ZL1, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZL1, - sizeof(EnZl1), - EnZl1_Init, - EnZl1_Destroy, - EnZl1_Update, - EnZl1_Draw, + ACTOR_EN_ZL1, ACTORCAT_NPC, FLAGS, OBJECT_ZL1, sizeof(EnZl1), EnZl1_Init, EnZl1_Destroy, EnZl1_Update, EnZl1_Draw, }; void EnZl1_Init(Actor* thisx, PlayState* play) { 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..45cc7e67b6 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -20,15 +20,7 @@ void EnZo_TreadWater(EnZo* this, PlayState* play); void EnZo_DoNothing(EnZo* this, PlayState* play); ActorInit En_Zo_InitVars = { - ACTOR_EN_ZO, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZO, - sizeof(EnZo), - EnZo_Init, - EnZo_Destroy, - EnZo_Update, - EnZo_Draw, + ACTOR_EN_ZO, ACTORCAT_NPC, FLAGS, OBJECT_ZO, sizeof(EnZo), 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..bfaabb266a 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -38,15 +38,7 @@ void func_80BA0C14(EnZob* this, PlayState* play); void func_80BA0CF4(EnZob* this, PlayState* play); ActorInit En_Zob_InitVars = { - ACTOR_EN_ZOB, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZOB, - sizeof(EnZob), - EnZob_Init, - EnZob_Destroy, - EnZob_Update, - EnZob_Draw, + ACTOR_EN_ZOB, ACTORCAT_NPC, FLAGS, OBJECT_ZOB, sizeof(EnZob), EnZob_Init, EnZob_Destroy, EnZob_Update, EnZob_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..d74340d11e 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -34,15 +34,7 @@ void func_80B95240(EnZog* this, PlayState* play); static u8 D_80B95E10; ActorInit En_Zog_InitVars = { - ACTOR_EN_ZOG, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZOG, - sizeof(EnZog), - EnZog_Init, - EnZog_Destroy, - EnZog_Update, - EnZog_Draw, + ACTOR_EN_ZOG, ACTORCAT_NPC, FLAGS, OBJECT_ZOG, sizeof(EnZog), 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..ad9be920bd 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -39,15 +39,8 @@ void func_80B32C34(EnZoraegg* this, PlayState* play); void func_80B32D08(EnZoraegg* this, PlayState* play); ActorInit En_Zoraegg_InitVars = { - ACTOR_EN_ZORAEGG, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_ZORAEGG, - sizeof(EnZoraegg), - EnZoraegg_Init, - EnZoraegg_Destroy, - EnZoraegg_Update, - EnZoraegg_Draw, + ACTOR_EN_ZORAEGG, ACTORCAT_ITEMACTION, FLAGS, OBJECT_ZORAEGG, sizeof(EnZoraegg), 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..966aab35f6 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -51,15 +51,7 @@ typedef enum { } EnZosAnimation; ActorInit En_Zos_InitVars = { - ACTOR_EN_ZOS, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZOS, - sizeof(EnZos), - EnZos_Init, - EnZos_Destroy, - EnZos_Update, - EnZos_Draw, + ACTOR_EN_ZOS, ACTORCAT_NPC, FLAGS, OBJECT_ZOS, sizeof(EnZos), 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..aae916bb25 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -33,15 +33,7 @@ void func_80B992C0(EnZot* this, PlayState* play); void func_80B99384(EnZot* this, PlayState* play); ActorInit En_Zot_InitVars = { - ACTOR_EN_ZOT, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZO, - sizeof(EnZot), - EnZot_Init, - EnZot_Destroy, - EnZot_Update, - EnZot_Draw, + ACTOR_EN_ZOT, ACTORCAT_NPC, FLAGS, OBJECT_ZO, sizeof(EnZot), 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..30dd51505d 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -29,15 +29,7 @@ void func_80BD1F1C(EnZov* this, PlayState* play); s32 EnZov_ValidatePictograph(PlayState* play, Actor* thisx); ActorInit En_Zov_InitVars = { - ACTOR_EN_ZOV, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZOV, - sizeof(EnZov), - EnZov_Init, - EnZov_Destroy, - EnZov_Update, - EnZov_Draw, + ACTOR_EN_ZOV, ACTORCAT_NPC, FLAGS, OBJECT_ZOV, sizeof(EnZov), 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..f41ac729d4 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -23,15 +23,7 @@ void func_80BDD6BC(EnZow* this, PlayState* play); void func_80BDD79C(EnZow* this, PlayState* play); ActorInit En_Zow_InitVars = { - ACTOR_EN_ZOW, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZO, - sizeof(EnZow), - EnZow_Init, - EnZow_Destroy, - EnZow_Update, - EnZow_Draw, + ACTOR_EN_ZOW, ACTORCAT_NPC, FLAGS, OBJECT_ZO, sizeof(EnZow), 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..24bd3b28af 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 @@ -19,15 +19,8 @@ void ItemBHeart_Draw(Actor* thisx, PlayState* play); void func_808BCF54(ItemBHeart* this, PlayState* play); ActorInit Item_B_Heart_InitVars = { - ACTOR_ITEM_B_HEART, - ACTORCAT_BOSS, - FLAGS, - OBJECT_GI_HEARTS, - sizeof(ItemBHeart), - ItemBHeart_Init, - ItemBHeart_Destroy, - ItemBHeart_Update, - ItemBHeart_Draw, + ACTOR_ITEM_B_HEART, ACTORCAT_BOSS, FLAGS, OBJECT_GI_HEARTS, sizeof(ItemBHeart), 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..5cae4c804e 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -21,15 +21,8 @@ void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play); void ItemEtcetera_Draw(Actor* thisx, PlayState* play); ActorInit Item_Etcetera_InitVars = { - ACTOR_ITEM_ETCETERA, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ItemEtcetera), - ItemEtcetera_Init, - ItemEtcetera_Destroy, - ItemEtcetera_Update, - NULL, + ACTOR_ITEM_ETCETERA, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ItemEtcetera), 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..dfa32c4607 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -18,15 +18,8 @@ void ItemInbox_Draw(Actor* thisx, PlayState* play); void ItemInbox_Idle(ItemInbox* this, PlayState* play); ActorInit Item_Inbox_InitVars = { - ACTOR_ITEM_INBOX, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ItemInbox), - ItemInbox_Init, - ItemInbox_Destroy, - ItemInbox_Update, - ItemInbox_Draw, + ACTOR_ITEM_INBOX, ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(ItemInbox), 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..162bbca02e 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -42,15 +42,8 @@ typedef struct { } MirRayDataEntry; // size = 0x20 ActorInit Mir_Ray_InitVars = { - ACTOR_MIR_RAY, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_MIR_RAY, - sizeof(MirRay), - MirRay_Init, - MirRay_Destroy, - MirRay_Update, - MirRay_Draw, + ACTOR_MIR_RAY, ACTORCAT_ITEMACTION, FLAGS, OBJECT_MIR_RAY, sizeof(MirRay), + 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..764bd5afdc 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -16,15 +16,8 @@ void MirRay2_Update(Actor* thisx, PlayState* play); void MirRay2_Draw(Actor* thisx, PlayState* play); ActorInit Mir_Ray2_InitVars = { - ACTOR_MIR_RAY2, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_MIR_RAY, - sizeof(MirRay2), - MirRay2_Init, - MirRay2_Destroy, - MirRay2_Update, - MirRay2_Draw, + ACTOR_MIR_RAY2, ACTORCAT_ITEMACTION, FLAGS, OBJECT_MIR_RAY, sizeof(MirRay2), + 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..be054d398a 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -17,15 +17,8 @@ void MirRay3_Update(Actor* thisx, PlayState* play); void MirRay3_Draw(Actor* thisx, PlayState* play); ActorInit Mir_Ray3_InitVars = { - ACTOR_MIR_RAY3, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_MIR_RAY, - sizeof(MirRay3), - MirRay3_Init, - MirRay3_Destroy, - MirRay3_Update, - MirRay3_Draw, + ACTOR_MIR_RAY3, ACTORCAT_ITEMACTION, FLAGS, OBJECT_MIR_RAY, sizeof(MirRay3), + 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..fd1ef88f70 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -25,15 +25,8 @@ void func_80ACBDFC(ObjAqua* this, PlayState* play); void func_80ACBD34(ObjAqua* this); ActorInit Obj_Aqua_InitVars = { - ACTOR_OBJ_AQUA, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjAqua), - ObjAqua_Init, - ObjAqua_Destroy, - ObjAqua_Update, - ObjAqua_Draw, + ACTOR_OBJ_AQUA, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjAqua), + 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..11a7221809 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -24,15 +24,8 @@ void func_809A57D8(ObjArmos* this); void func_809A57F4(ObjArmos* this, PlayState* play); ActorInit Obj_Armos_InitVars = { - ACTOR_OBJ_ARMOS, - ACTORCAT_PROP, - FLAGS, - OBJECT_AM, - sizeof(ObjArmos), - ObjArmos_Init, - ObjArmos_Destroy, - ObjArmos_Update, - ObjArmos_Draw, + ACTOR_OBJ_ARMOS, ACTORCAT_PROP, FLAGS, OBJECT_AM, sizeof(ObjArmos), + 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..000f24cedb 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -61,15 +61,8 @@ void func_80938E00(Actor* thisx, PlayState* play); void func_80938F50(Actor* thisx, PlayState* play); ActorInit Obj_Bean_InitVars = { - ACTOR_OBJ_BEAN, - ACTORCAT_BG, - FLAGS, - OBJECT_MAMENOKI, - sizeof(ObjBean), - ObjBean_Init, - ObjBean_Destroy, - ObjBean_Update, - NULL, + ACTOR_OBJ_BEAN, ACTORCAT_BG, FLAGS, OBJECT_MAMENOKI, sizeof(ObjBean), 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..f6a2346199 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -20,15 +20,8 @@ s32 func_80A356D8(ObjBell* this); s32 func_80A357A8(ObjBell* this, PlayState* play); ActorInit Obj_Bell_InitVars = { - ACTOR_OBJ_BELL, - ACTORCAT_PROP, - FLAGS, - OBJECT_F52_OBJ, - sizeof(ObjBell), - ObjBell_Init, - ObjBell_Destroy, - ObjBell_Update, - ObjBell_Draw, + ACTOR_OBJ_BELL, ACTORCAT_PROP, FLAGS, OBJECT_F52_OBJ, sizeof(ObjBell), + 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..af15d2250a 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -25,15 +25,9 @@ void func_80AE9258(ObjBigicicle* this, PlayState* play); void func_80AE939C(ObjBigicicle* this, PlayState* play); ActorInit Obj_Bigicicle_InitVars = { - ACTOR_OBJ_BIGICICLE, - ACTORCAT_PROP, - FLAGS, - OBJECT_BIGICICLE, - sizeof(ObjBigicicle), - ObjBigicicle_Init, - ObjBigicicle_Destroy, - ObjBigicicle_Update, - ObjBigicicle_Draw, + ACTOR_OBJ_BIGICICLE, ACTORCAT_PROP, FLAGS, + OBJECT_BIGICICLE, sizeof(ObjBigicicle), 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..5932bd3e5d 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -18,15 +18,8 @@ void ObjBlockstop_CheckForBlock(ObjBlockstop* this, PlayState* play); void ObjBlockstop_TryPlayCutscene(ObjBlockstop* this, PlayState* play); ActorInit Obj_Blockstop_InitVars = { - ACTOR_OBJ_BLOCKSTOP, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjBlockstop), - ObjBlockstop_Init, - Actor_Noop, - ObjBlockstop_Update, - NULL, + ACTOR_OBJ_BLOCKSTOP, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjBlockstop), 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..14d4681e38 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -19,15 +19,8 @@ void ObjBoat_Draw(Actor* thisx, PlayState* play); void func_80B9B428(Actor* thisx, PlayState* play2); ActorInit Obj_Boat_InitVars = { - ACTOR_OBJ_BOAT, - ACTORCAT_BG, - FLAGS, - OBJECT_KAIZOKU_OBJ, - sizeof(ObjBoat), - ObjBoat_Init, - ObjBoat_Destroy, - ObjBoat_Update, - ObjBoat_Draw, + ACTOR_OBJ_BOAT, ACTORCAT_BG, FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjBoat), + 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..e452f98567 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -25,15 +25,8 @@ void func_8093A418(Actor* thisx, PlayState* play); void func_8093A608(Actor* thisx, PlayState* play); ActorInit Obj_Bombiwa_InitVars = { - ACTOR_OBJ_BOMBIWA, - ACTORCAT_PROP, - FLAGS, - OBJECT_BOMBIWA, - sizeof(ObjBombiwa), - ObjBombiwa_Init, - ObjBombiwa_Destroy, - ObjBombiwa_Update, - NULL, + ACTOR_OBJ_BOMBIWA, ACTORCAT_PROP, FLAGS, OBJECT_BOMBIWA, sizeof(ObjBombiwa), 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..3d981086c8 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -19,15 +19,8 @@ void ObjBoyo_Update(Actor* thisx, PlayState* play2); void ObjBoyo_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Boyo_InitVars = { - ACTOR_OBJ_BOYO, - ACTORCAT_PROP, - FLAGS, - OBJECT_BOYO, - sizeof(ObjBoyo), - ObjBoyo_Init, - ObjBoyo_Destroy, - ObjBoyo_Update, - ObjBoyo_Draw, + ACTOR_OBJ_BOYO, ACTORCAT_PROP, FLAGS, OBJECT_BOYO, sizeof(ObjBoyo), + 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..9928ef2768 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -29,15 +29,8 @@ void ObjChan_ChandelierAction(ObjChan* this2, PlayState* play); void ObjChan_PotAction(ObjChan* this, PlayState* play); ActorInit Obj_Chan_InitVars = { - ACTOR_OBJ_CHAN, - ACTORCAT_BG, - FLAGS, - OBJECT_OBJ_CHAN, - sizeof(ObjChan), - ObjChan_Init, - ObjChan_Destroy, - ObjChan_Update, - ObjChan_Draw, + ACTOR_OBJ_CHAN, ACTORCAT_BG, FLAGS, OBJECT_OBJ_CHAN, sizeof(ObjChan), + 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..990888dbb0 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -18,15 +18,8 @@ void ObjChikuwa_Update(Actor* thisx, PlayState* play); void ObjChikuwa_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Chikuwa_InitVars = { - ACTOR_OBJ_CHIKUWA, - ACTORCAT_BG, - FLAGS, - OBJECT_D_LIFT, - sizeof(ObjChikuwa), - ObjChikuwa_Init, - ObjChikuwa_Destroy, - ObjChikuwa_Update, - ObjChikuwa_Draw, + ACTOR_OBJ_CHIKUWA, ACTORCAT_BG, FLAGS, OBJECT_D_LIFT, sizeof(ObjChikuwa), 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..558cf1974b 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -23,15 +23,8 @@ void func_8098E098(ObjComb* this); void func_8098E0B8(ObjComb* this, PlayState* play); ActorInit Obj_Comb_InitVars = { - ACTOR_OBJ_COMB, - ACTORCAT_PROP, - FLAGS, - OBJECT_COMB, - sizeof(ObjComb), - ObjComb_Init, - ObjComb_Destroy, - ObjComb_Update, - ObjComb_Draw, + ACTOR_OBJ_COMB, ACTORCAT_PROP, FLAGS, OBJECT_COMB, sizeof(ObjComb), + 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..3518cb3c8f 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -22,15 +22,9 @@ void ObjDanpeilift_Teleport(ObjDanpeilift* this, PlayState* play); void ObjDanpeilift_Wait(ObjDanpeilift* this, PlayState* play); ActorInit Obj_Danpeilift_InitVars = { - ACTOR_OBJ_DANPEILIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_OBJ_DANPEILIFT, - sizeof(ObjDanpeilift), - ObjDanpeilift_Init, - ObjDanpeilift_Destroy, - ObjDanpeilift_Update, - ObjDanpeilift_Draw, + ACTOR_OBJ_DANPEILIFT, ACTORCAT_BG, FLAGS, + OBJECT_OBJ_DANPEILIFT, sizeof(ObjDanpeilift), 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..76276dc4d9 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -18,15 +18,8 @@ void func_80983704(ObjDemo* this, PlayState* play); void func_80983634(PlayState* play); ActorInit Obj_Demo_InitVars = { - ACTOR_OBJ_DEMO, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjDemo), - ObjDemo_Init, - Actor_Noop, - ObjDemo_Update, - NULL, + ACTOR_OBJ_DEMO, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjDemo), + 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..9bc0467af9 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -29,15 +29,8 @@ void func_80B13C08(Actor* thisx, PlayState* play); void func_80B13E40(Actor* thisx, PlayState* play); ActorInit Obj_Dhouse_InitVars = { - ACTOR_OBJ_DHOUSE, - ACTORCAT_BG, - FLAGS, - OBJECT_DHOUSE, - sizeof(ObjDhouse), - ObjDhouse_Init, - ObjDhouse_Destroy, - ObjDhouse_Update, - ObjDhouse_Draw, + ACTOR_OBJ_DHOUSE, ACTORCAT_BG, FLAGS, OBJECT_DHOUSE, sizeof(ObjDhouse), 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..bf870552b9 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -17,15 +17,8 @@ void ObjDinner_Update(Actor* thisx, PlayState* play); void ObjDinner_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Dinner_InitVars = { - ACTOR_OBJ_DINNER, - ACTORCAT_PROP, - FLAGS, - OBJECT_OBJ_DINNER, - sizeof(ObjDinner), - ObjDinner_Init, - ObjDinner_Destroy, - ObjDinner_Update, - ObjDinner_Draw, + ACTOR_OBJ_DINNER, ACTORCAT_PROP, FLAGS, OBJECT_OBJ_DINNER, sizeof(ObjDinner), 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..30682c69cf 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -36,15 +36,8 @@ typedef enum { } ObjDoraDamageEffect; ActorInit Obj_Dora_InitVars = { - ACTOR_OBJ_DORA, - ACTORCAT_NPC, - FLAGS, - OBJECT_DORA, - sizeof(ObjDora), - ObjDora_Init, - ObjDora_Destroy, - ObjDora_Update, - ObjDora_Draw, + ACTOR_OBJ_DORA, ACTORCAT_NPC, FLAGS, OBJECT_DORA, sizeof(ObjDora), + 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..41a4d15c99 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -18,15 +18,8 @@ s32 ObjDowsing_GetFlag(ObjDowsing* this, PlayState* play); s32 ObjDowsing_CheckValidSpawn(ObjDowsing* this, PlayState* play); ActorInit Obj_Dowsing_InitVars = { - ACTOR_OBJ_DOWSING, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjDowsing), - ObjDowsing_Init, - ObjDowsing_Destroy, - ObjDowsing_Update, - NULL, + ACTOR_OBJ_DOWSING, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjDowsing), 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..710ac2b16e 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -26,15 +26,9 @@ void func_80A674A8(ObjDriftice* this); void func_80A674C4(ObjDriftice* this, PlayState* play); ActorInit Obj_Driftice_InitVars = { - ACTOR_OBJ_DRIFTICE, - ACTORCAT_BG, - FLAGS, - OBJECT_DRIFTICE, - sizeof(ObjDriftice), - ObjDriftice_Init, - ObjDriftice_Destroy, - ObjDriftice_Update, - ObjDriftice_Draw, + ACTOR_OBJ_DRIFTICE, ACTORCAT_BG, FLAGS, + OBJECT_DRIFTICE, sizeof(ObjDriftice), 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..6fa1c9baab 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -16,15 +16,8 @@ void ObjEnding_Update(Actor* thisx, PlayState* play); void ObjEnding_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Ending_InitVars = { - ACTOR_OBJ_ENDING, - ACTORCAT_BG, - FLAGS, - OBJECT_ENDING_OBJ, - sizeof(ObjEnding), - ObjEnding_Init, - Actor_Noop, - ObjEnding_Update, - ObjEnding_Draw, + ACTOR_OBJ_ENDING, ACTORCAT_BG, FLAGS, OBJECT_ENDING_OBJ, sizeof(ObjEnding), 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..e23e41aff1 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -17,15 +17,8 @@ void ObjEntotu_Update(Actor* thisx, PlayState* play); void ObjEntotu_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Entotu_InitVars = { - ACTOR_OBJ_ENTOTU, - ACTORCAT_PROP, - FLAGS, - OBJECT_F53_OBJ, - sizeof(ObjEntotu), - ObjEntotu_Init, - ObjEntotu_Destroy, - ObjEntotu_Update, - ObjEntotu_Draw, + ACTOR_OBJ_ENTOTU, ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjEntotu), 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..f8d1199c95 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -21,15 +21,8 @@ void ObjEtcetera_DrawIdle(Actor* thisx, PlayState* play); void ObjEtcetera_DrawAnimated(Actor* thisx, PlayState* play); ActorInit Obj_Etcetera_InitVars = { - ACTOR_OBJ_ETCETERA, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjEtcetera), - ObjEtcetera_Init, - ObjEtcetera_Destroy, - ObjEtcetera_Update, - NULL, + ACTOR_OBJ_ETCETERA, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ObjEtcetera), 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..b9048ec156 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -23,15 +23,9 @@ void func_80A4CCBC(ObjFireshield* this); void func_80A4CD28(ObjFireshield* this); ActorInit Obj_Fireshield_InitVars = { - ACTOR_OBJ_FIRESHIELD, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjFireshield), - ObjFireshield_Init, - ObjFireshield_Destroy, - ObjFireshield_Update, - ObjFireshield_Draw, + ACTOR_OBJ_FIRESHIELD, ACTORCAT_PROP, FLAGS, + GAMEPLAY_KEEP, sizeof(ObjFireshield), 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..6b5181e642 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -32,15 +32,9 @@ s16 D_80A1DA3E; s16 D_80A1DA40; ActorInit Obj_Flowerpot_InitVars = { - ACTOR_OBJ_FLOWERPOT, - ACTORCAT_PROP, - FLAGS, - OBJECT_FLOWERPOT, - sizeof(ObjFlowerpot), - ObjFlowerpot_Init, - ObjFlowerpot_Destroy, - ObjFlowerpot_Update, - ObjFlowerpot_Draw, + ACTOR_OBJ_FLOWERPOT, ACTORCAT_PROP, FLAGS, + OBJECT_FLOWERPOT, sizeof(ObjFlowerpot), 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..43291ea083 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,8 @@ 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..bec0d31acb 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -25,15 +25,8 @@ void func_80B3C4E0(ObjGhaka* this, PlayState* play); void func_80B3C624(ObjGhaka* this, PlayState* play); ActorInit Obj_Ghaka_InitVars = { - ACTOR_OBJ_GHAKA, - ACTORCAT_PROP, - FLAGS, - OBJECT_GHAKA, - sizeof(ObjGhaka), - ObjGhaka_Init, - ObjGhaka_Destroy, - ObjGhaka_Update, - ObjGhaka_Draw, + ACTOR_OBJ_GHAKA, ACTORCAT_PROP, FLAGS, OBJECT_GHAKA, sizeof(ObjGhaka), + 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..8d23e610b8 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -27,15 +27,8 @@ f32 D_809AAE10[20]; #include "overlays/ovl_Obj_Grass/ovl_Obj_Grass.c" ActorInit Obj_Grass_InitVars = { - ACTOR_OBJ_GRASS, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(ObjGrass), - ObjGrass_Init, - ObjGrass_Destroy, - ObjGrass_Update, - ObjGrass_Draw, + ACTOR_OBJ_GRASS, ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrass), + 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..121ba80798 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 @@ -30,15 +30,8 @@ void func_809AB77C(ObjGrassCarry* this, PlayState* play); void func_809ABB7C(Actor* this, PlayState* play); ActorInit Obj_Grass_Carry_InitVars = { - ACTOR_OBJ_GRASS_CARRY, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(ObjGrassCarry), - ObjGrassCarry_Init, - ObjGrassCarry_Destroy, - ObjGrassCarry_Update, - NULL, + ACTOR_OBJ_GRASS_CARRY, ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassCarry), ObjGrassCarry_Init, + ObjGrassCarry_Destroy, ObjGrassCarry_Update, NULL, }; static ColliderCylinderInit sCylinderInit = { 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..aba701a5f0 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -38,15 +38,8 @@ void func_80B1544C(Actor* thisx, PlayState* play); void func_80B154A0(Actor* thisx, PlayState* play); ActorInit Obj_Hakaisi_InitVars = { - ACTOR_OBJ_HAKAISI, - ACTORCAT_PROP, - FLAGS, - OBJECT_HAKAISI, - sizeof(ObjHakaisi), - ObjHakaisi_Init, - ObjHakaisi_Destroy, - ObjHakaisi_Update, - ObjHakaisi_Draw, + ACTOR_OBJ_HAKAISI, ACTORCAT_PROP, FLAGS, OBJECT_HAKAISI, sizeof(ObjHakaisi), 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..33ac7b7b40 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -17,15 +17,8 @@ void ObjHamishi_Update(Actor* thisx, PlayState* play); void ObjHamishi_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Hamishi_InitVars = { - ACTOR_OBJ_HAMISHI, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(ObjHamishi), - ObjHamishi_Init, - ObjHamishi_Destroy, - ObjHamishi_Update, - ObjHamishi_Draw, + ACTOR_OBJ_HAMISHI, ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjHamishi), 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..4ce144dd50 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -17,15 +17,8 @@ void ObjHana_Update(Actor* thisx, PlayState* play); void ObjHana_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Hana_InitVars = { - ACTOR_OBJ_HANA, - ACTORCAT_PROP, - FLAGS, - OBJECT_HANA, - sizeof(ObjHana), - ObjHana_Init, - ObjHana_Destroy, - ObjHana_Update, - ObjHana_Draw, + ACTOR_OBJ_HANA, ACTORCAT_PROP, FLAGS, OBJECT_HANA, sizeof(ObjHana), + 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..638a9d59b2 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -24,15 +24,8 @@ void ObjHariko_BobHead(ObjHariko* this, PlayState* play); void ObjHariko_CheckForQuakes(ObjHariko* this); ActorInit Obj_Hariko_InitVars = { - ACTOR_OBJ_HARIKO, - ACTORCAT_PROP, - FLAGS, - OBJECT_HARIKO, - sizeof(ObjHariko), - ObjHariko_Init, - ObjHariko_Destroy, - ObjHariko_Update, - ObjHariko_Draw, + ACTOR_OBJ_HARIKO, ACTORCAT_PROP, FLAGS, OBJECT_HARIKO, sizeof(ObjHariko), 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..c2479b9845 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -27,15 +27,8 @@ void ObjHgdoor_StopCs(ObjHgdoor* this, PlayState* play); s32 ObjHgdoor_Rotate(ObjHgdoor* this, PlayState* play); ActorInit Obj_Hgdoor_InitVars = { - ACTOR_OBJ_HGDOOR, - ACTORCAT_PROP, - FLAGS, - OBJECT_HGDOOR, - sizeof(ObjHgdoor), - ObjHgdoor_Init, - ObjHgdoor_Destroy, - ObjHgdoor_Update, - ObjHgdoor_Draw, + ACTOR_OBJ_HGDOOR, ACTORCAT_PROP, FLAGS, OBJECT_HGDOOR, sizeof(ObjHgdoor), 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..e5fe7b9c34 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -22,15 +22,8 @@ void ObjHsStump_SetupAppear(ObjHsStump* this, PlayState* play); void ObjHsStump_Appear(ObjHsStump* this, PlayState* play); ActorInit Obj_HsStump_InitVars = { - ACTOR_OBJ_HSSTUMP, - ACTORCAT_BG, - FLAGS, - OBJECT_HSSTUMP, - sizeof(ObjHsStump), - ObjHsStump_Init, - ObjHsStump_Destroy, - ObjHsStump_Update, - ObjHsStump_Draw, + ACTOR_OBJ_HSSTUMP, ACTORCAT_BG, FLAGS, OBJECT_HSSTUMP, sizeof(ObjHsStump), 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..ac60c8cedc 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -24,15 +24,8 @@ void func_8093E0E8(ObjHsblock* this); void func_8093E10C(ObjHsblock* this, PlayState* play); ActorInit Obj_Hsblock_InitVars = { - ACTOR_OBJ_HSBLOCK, - ACTORCAT_BG, - FLAGS, - OBJECT_D_HSBLOCK, - sizeof(ObjHsblock), - ObjHsblock_Init, - ObjHsblock_Destroy, - ObjHsblock_Update, - ObjHsblock_Draw, + ACTOR_OBJ_HSBLOCK, ACTORCAT_BG, FLAGS, OBJECT_D_HSBLOCK, sizeof(ObjHsblock), 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..0593247d0d 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -29,15 +29,9 @@ void func_80A55564(ObjHugebombiwa* this, PlayState* play); void func_80A55B34(Actor* thisx, PlayState* play); ActorInit Obj_Hugebombiwa_InitVars = { - ACTOR_OBJ_HUGEBOMBIWA, - ACTORCAT_PROP, - FLAGS, - OBJECT_BOMBIWA, - sizeof(ObjHugebombiwa), - ObjHugebombiwa_Init, - ObjHugebombiwa_Destroy, - ObjHugebombiwa_Update, - ObjHugebombiwa_Draw, + ACTOR_OBJ_HUGEBOMBIWA, ACTORCAT_PROP, FLAGS, + OBJECT_BOMBIWA, sizeof(ObjHugebombiwa), 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..2ee0fbcb13 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -47,15 +47,8 @@ ObjHansuiStruct D_80B9DC70[] = { }; ActorInit Obj_Hunsui_InitVars = { - ACTOR_OBJ_HUNSUI, - ACTORCAT_BG, - FLAGS, - OBJECT_HUNSUI, - sizeof(ObjHunsui), - ObjHunsui_Init, - ObjHunsui_Destroy, - ObjHunsui_Update, - ObjHunsui_Draw, + ACTOR_OBJ_HUNSUI, ACTORCAT_BG, FLAGS, OBJECT_HUNSUI, sizeof(ObjHunsui), 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..4a922d5fc7 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 @@ -23,15 +23,8 @@ void func_80931E58(ObjIcePoly* this, PlayState* play); void func_80931EEC(ObjIcePoly* this, PlayState* play); ActorInit Obj_Ice_Poly_InitVars = { - ACTOR_OBJ_ICE_POLY, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjIcePoly), - ObjIcePoly_Init, - ObjIcePoly_Destroy, - ObjIcePoly_Update, - ObjIcePoly_Draw, + ACTOR_OBJ_ICE_POLY, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjIcePoly), 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..948f55d4e3 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -46,15 +46,9 @@ void func_80A26B74(ObjIceblock* this, PlayState* play); void func_80A26BF8(ObjIceblock* this, PlayState* play); ActorInit Obj_Iceblock_InitVars = { - ACTOR_OBJ_ICEBLOCK, - ACTORCAT_BG, - FLAGS, - OBJECT_ICE_BLOCK, - sizeof(ObjIceblock), - ObjIceblock_Init, - ObjIceblock_Destroy, - ObjIceblock_Update, - ObjIceblock_Draw, + ACTOR_OBJ_ICEBLOCK, ACTORCAT_BG, FLAGS, + OBJECT_ICE_BLOCK, sizeof(ObjIceblock), 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..48a86a26d7 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 @@ -17,15 +17,8 @@ void ObjJgGakki_Update(Actor* thisx, PlayState* play); void ObjJgGakki_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Jg_Gakki_InitVars = { - ACTOR_OBJ_JG_GAKKI, - ACTORCAT_PROP, - FLAGS, - OBJECT_JG, - sizeof(ObjJgGakki), - ObjJgGakki_Init, - ObjJgGakki_Destroy, - ObjJgGakki_Update, - ObjJgGakki_Draw, + ACTOR_OBJ_JG_GAKKI, ACTORCAT_PROP, FLAGS, OBJECT_JG, sizeof(ObjJgGakki), 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..18f8c1e599 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 @@ -28,15 +28,9 @@ void ObjJgameLight_UpdateCollision(ObjJgameLight* this, PlayState* play); void func_80C15718(ObjJgameLight* this, PlayState* play); ActorInit Obj_Jgame_Light_InitVars = { - ACTOR_OBJ_JGAME_LIGHT, - ACTORCAT_PROP, - FLAGS, - OBJECT_SYOKUDAI, - sizeof(ObjJgameLight), - ObjJgameLight_Init, - ObjJgameLight_Destroy, - ObjJgameLight_Update, - ObjJgameLight_Draw, + ACTOR_OBJ_JGAME_LIGHT, ACTORCAT_PROP, FLAGS, + OBJECT_SYOKUDAI, sizeof(ObjJgameLight), ObjJgameLight_Init, + ObjJgameLight_Destroy, ObjJgameLight_Update, ObjJgameLight_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..a1e49833d0 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 @@ -17,15 +17,9 @@ void ObjKepnKoya_Update(Actor* thisx, PlayState* play); void ObjKepnKoya_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Kepn_Koya_InitVars = { - ACTOR_OBJ_KEPN_KOYA, - ACTORCAT_PROP, - FLAGS, - OBJECT_KEPN_KOYA, - sizeof(ObjKepnKoya), - ObjKepnKoya_Init, - ObjKepnKoya_Destroy, - ObjKepnKoya_Update, - ObjKepnKoya_Draw, + ACTOR_OBJ_KEPN_KOYA, ACTORCAT_PROP, FLAGS, + OBJECT_KEPN_KOYA, sizeof(ObjKepnKoya), 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..421f0b6ca8 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -37,15 +37,8 @@ static s16 D_80927388 = 0; static s16 D_8092738C = 0; ActorInit Obj_Kibako_InitVars = { - ACTOR_OBJ_KIBAKO, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjKibako), - ObjKibako_Init, - ObjKibako_Destroy, - ObjKibako_Update, - NULL, + ACTOR_OBJ_KIBAKO, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjKibako), 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..842e3ff45c 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -20,15 +20,8 @@ void ObjKibako2_Idle(ObjKibako2* this, PlayState* play); void ObjKibako2_Kill(ObjKibako2* this, PlayState* play); ActorInit Obj_Kibako2_InitVars = { - ACTOR_OBJ_KIBAKO2, - ACTORCAT_BG, - FLAGS, - OBJECT_KIBAKO2, - sizeof(ObjKibako2), - ObjKibako2_Init, - ObjKibako2_Destroy, - ObjKibako2_Update, - ObjKibako2_Draw, + ACTOR_OBJ_KIBAKO2, ACTORCAT_BG, FLAGS, OBJECT_KIBAKO2, sizeof(ObjKibako2), 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..4ec0ece5d3 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -17,15 +17,8 @@ void ObjKinoko_Update(Actor* thisx, PlayState* play); void ObjKinoko_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Kinoko_InitVars = { - ACTOR_OBJ_KINOKO, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjKinoko), - ObjKinoko_Init, - ObjKinoko_Destroy, - ObjKinoko_Update, - ObjKinoko_Draw, + ACTOR_OBJ_KINOKO, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjKinoko), 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..de7fbb15ec 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -24,15 +24,8 @@ void ObjKzsaku_Rise(ObjKzsaku* this, PlayState* play); void func_80C08CB0(ObjKzsaku* this, PlayState* play); ActorInit Obj_Kzsaku_InitVars = { - ACTOR_OBJ_KZSAKU, - ACTORCAT_PROP, - FLAGS, - OBJECT_KZSAKU, - sizeof(ObjKzsaku), - ObjKzsaku_Init, - ObjKzsaku_Destroy, - ObjKzsaku_Update, - ObjKzsaku_Draw, + ACTOR_OBJ_KZSAKU, ACTORCAT_PROP, FLAGS, OBJECT_KZSAKU, sizeof(ObjKzsaku), 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..510a9e91e7 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -28,15 +28,8 @@ void func_8093DB90(ObjLift* this, PlayState* play); void func_8093DC90(Actor* thisx, PlayState* play); ActorInit Obj_Lift_InitVars = { - ACTOR_OBJ_LIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_D_LIFT, - sizeof(ObjLift), - ObjLift_Init, - ObjLift_Destroy, - ObjLift_Update, - ObjLift_Draw, + ACTOR_OBJ_LIFT, ACTORCAT_BG, FLAGS, OBJECT_D_LIFT, sizeof(ObjLift), + 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..70c68887b1 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -23,15 +23,9 @@ void func_80AF3C18(ObjLightblock* this); void func_80AF3C34(ObjLightblock* this, PlayState* play); ActorInit Obj_Lightblock_InitVars = { - ACTOR_OBJ_LIGHTBLOCK, - ACTORCAT_BG, - FLAGS, - OBJECT_LIGHTBLOCK, - sizeof(ObjLightblock), - ObjLightblock_Init, - ObjLightblock_Destroy, - ObjLightblock_Update, - ObjLightblock_Draw, + ACTOR_OBJ_LIGHTBLOCK, ACTORCAT_BG, FLAGS, + OBJECT_LIGHTBLOCK, sizeof(ObjLightblock), 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..4eaafc347c 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -28,15 +28,9 @@ void ObjLightSwitch_Disabled(ObjLightswitch* this, PlayState* play); void ObjLightswitch_Idle(ObjLightswitch* this, PlayState* play); ActorInit Obj_Lightswitch_InitVars = { - ACTOR_OBJ_LIGHTSWITCH, - ACTORCAT_SWITCH, - FLAGS, - OBJECT_LIGHTSWITCH, - sizeof(ObjLightswitch), - ObjLightswitch_Init, - ObjLightswitch_Destroy, - ObjLightswitch_Update, - ObjLightswitch_Draw, + ACTOR_OBJ_LIGHTSWITCH, ACTORCAT_SWITCH, FLAGS, + OBJECT_LIGHTSWITCH, sizeof(ObjLightswitch), ObjLightswitch_Init, + ObjLightswitch_Destroy, ObjLightswitch_Update, ObjLightswitch_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { 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..9e1afb99a2 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -19,15 +19,8 @@ void func_8099FB64(Actor* thisx, PlayState* play); void func_8099FD7C(Actor* thisx, PlayState* play); ActorInit Obj_Makekinsuta_InitVars = { - ACTOR_OBJ_MAKEKINSUTA, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjMakekinsuta), - ObjMakekinsuta_Init, - ObjMakekinsuta_Destroy, - ObjMakekinsuta_Update, - NULL, + ACTOR_OBJ_MAKEKINSUTA, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMakekinsuta), ObjMakekinsuta_Init, + ObjMakekinsuta_Destroy, ObjMakekinsuta_Update, NULL, }; static InitChainEntry sInitChain[] = { 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..dd094bee00 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 @@ -17,15 +17,8 @@ void ObjMilkBin_Update(Actor* thisx, PlayState* play2); void ObjMilkBin_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Milk_Bin_InitVars = { - ACTOR_OBJ_MILK_BIN, - ACTORCAT_PROP, - FLAGS, - OBJECT_OBJ_MILK_BIN, - sizeof(ObjMilkBin), - ObjMilkBin_Init, - ObjMilkBin_Destroy, - ObjMilkBin_Update, - ObjMilkBin_Draw, + ACTOR_OBJ_MILK_BIN, ACTORCAT_PROP, FLAGS, OBJECT_OBJ_MILK_BIN, sizeof(ObjMilkBin), ObjMilkBin_Init, + ObjMilkBin_Destroy, ObjMilkBin_Update, ObjMilkBin_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..f9e4cb4865 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 @@ -26,15 +26,9 @@ void func_80C0685C(ObjMoonStone* this); void func_80C06870(ObjMoonStone* this, PlayState* play); ActorInit Obj_Moon_Stone_InitVars = { - ACTOR_OBJ_MOON_STONE, - ACTORCAT_PROP, - FLAGS, - OBJECT_GI_RESERVE00, - sizeof(ObjMoonStone), - ObjMoonStone_Init, - ObjMoonStone_Destroy, - ObjMoonStone_Update, - ObjMoonStone_Draw, + ACTOR_OBJ_MOON_STONE, ACTORCAT_PROP, FLAGS, + OBJECT_GI_RESERVE00, sizeof(ObjMoonStone), 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..e24ee15fae 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 @@ -26,15 +26,8 @@ void func_80C06DC8(ObjMuPict* this, PlayState* play); void func_80C06E88(ObjMuPict* this, PlayState* play); ActorInit Obj_Mu_Pict_InitVars = { - ACTOR_OBJ_MU_PICT, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjMuPict), - ObjMuPict_Init, - ObjMuPict_Destroy, - ObjMuPict_Update, - ObjMuPict_Draw, + ACTOR_OBJ_MU_PICT, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMuPict), 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..c607237ec9 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -21,15 +21,8 @@ void ObjMure_KillActors(ObjMure* this, PlayState* play); void ObjMure_CheckChildren(ObjMure* this, PlayState* play); ActorInit Obj_Mure_InitVars = { - ACTOR_OBJ_MURE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjMure), - ObjMure_Init, - ObjMure_Destroy, - ObjMure_Update, - NULL, + ACTOR_OBJ_MURE, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure), + ObjMure_Init, ObjMure_Destroy, ObjMure_Update, NULL, }; static f32 sZClip[] = { 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..5f8864bd2a 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -22,15 +22,8 @@ void func_8098F66C(ObjMure3* this); void func_8098F680(ObjMure3* this, PlayState* play); ActorInit Obj_Mure3_InitVars = { - ACTOR_OBJ_MURE3, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjMure3), - ObjMure3_Init, - ObjMure3_Destroy, - ObjMure3_Update, - NULL, + ACTOR_OBJ_MURE3, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure3), + 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..18833a517f 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -33,15 +33,8 @@ s32 D_80BA36B4; f32 D_80BA36B8; ActorInit Obj_Nozoki_InitVars = { - ACTOR_OBJ_NOZOKI, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjNozoki), - ObjNozoki_Init, - ObjNozoki_Destroy, - ObjNozoki_Update, - NULL, + ACTOR_OBJ_NOZOKI, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjNozoki), ObjNozoki_Init, + ObjNozoki_Destroy, ObjNozoki_Update, NULL, }; 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..c440199250 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -26,15 +26,9 @@ void ObjOshihiki_SetupFall(ObjOshihiki* this, PlayState* play); void ObjOshihiki_Fall(ObjOshihiki* this, PlayState* play); ActorInit Obj_Oshihiki_InitVars = { - ACTOR_OBJ_OSHIHIKI, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(ObjOshihiki), - ObjOshihiki_Init, - ObjOshihiki_Destroy, - ObjOshihiki_Update, - ObjOshihiki_Draw, + ACTOR_OBJ_OSHIHIKI, ACTORCAT_PROP, FLAGS, + GAMEPLAY_DANGEON_KEEP, sizeof(ObjOshihiki), 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..a6221e16a5 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -42,15 +42,8 @@ typedef struct ObjPurifyInfo { } ObjPurifyInfo; // size = 0x28 ActorInit Obj_Purify_InitVars = { - ACTOR_OBJ_PURIFY, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjPurify), - ObjPurify_Init, - ObjPurify_Destroy, - ObjPurify_Update, - NULL, + ACTOR_OBJ_PURIFY, ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ObjPurify), 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..c0b82fd387 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -26,15 +26,8 @@ void func_809A3E58(Actor* thisx, PlayState* play); void func_809A3F0C(Actor* thisx, PlayState* play); ActorInit Obj_Pzlblock_InitVars = { - ACTOR_OBJ_PZLBLOCK, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjPzlblock), - ObjPzlblock_Init, - ObjPzlblock_Destroy, - ObjPzlblock_Update, - NULL, + ACTOR_OBJ_PZLBLOCK, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjPzlblock), 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..44fbe8eea1 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -29,15 +29,9 @@ void ObjRaillift_Wait(ObjRaillift* this, PlayState* play); void ObjRaillift_Move(ObjRaillift* this, PlayState* play); ActorInit Obj_Raillift_InitVars = { - ACTOR_OBJ_RAILLIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_RAILLIFT, - sizeof(ObjRaillift), - ObjRaillift_Init, - ObjRaillift_Destroy, - ObjRaillift_Update, - ObjRaillift_Draw, + ACTOR_OBJ_RAILLIFT, ACTORCAT_BG, FLAGS, + OBJECT_RAILLIFT, sizeof(ObjRaillift), 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..99747ee376 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -19,15 +19,8 @@ void func_80973D3C(ObjRoomtimer* this, PlayState* play); void func_80973DE0(ObjRoomtimer* this, PlayState* play); ActorInit Obj_Roomtimer_InitVars = { - ACTOR_OBJ_ROOMTIMER, - ACTORCAT_ENEMY, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjRoomtimer), - ObjRoomtimer_Init, - ObjRoomtimer_Destroy, - ObjRoomtimer_Update, - NULL, + ACTOR_OBJ_ROOMTIMER, ACTORCAT_ENEMY, FLAGS, GAMEPLAY_KEEP, sizeof(ObjRoomtimer), 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..e86745b0ec 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -26,15 +26,8 @@ typedef struct ObjRotliftModelInfo { } ObjRotliftModelInfo; // size = 0xC ActorInit Obj_Rotlift_InitVars = { - ACTOR_OBJ_ROTLIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_ROTLIFT, - sizeof(ObjRotlift), - ObjRotlift_Init, - ObjRotlift_Destroy, - ObjRotlift_Update, - ObjRotlift_Draw, + ACTOR_OBJ_ROTLIFT, ACTORCAT_BG, FLAGS, OBJECT_ROTLIFT, sizeof(ObjRotlift), 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..6a5ee6070b 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -17,15 +17,8 @@ void ObjShutter_Update(Actor* thisx, PlayState* play2); void ObjShutter_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Shutter_InitVars = { - ACTOR_OBJ_SHUTTER, - ACTORCAT_PROP, - FLAGS, - OBJECT_F53_OBJ, - sizeof(ObjShutter), - ObjShutter_Init, - ObjShutter_Destroy, - ObjShutter_Update, - ObjShutter_Draw, + ACTOR_OBJ_SHUTTER, ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjShutter), 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..ba86b50a54 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -28,15 +28,9 @@ void func_80A227A4(ObjSkateblock* this); void func_80A227C0(ObjSkateblock* this, PlayState* play); ActorInit Obj_Skateblock_InitVars = { - ACTOR_OBJ_SKATEBLOCK, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(ObjSkateblock), - ObjSkateblock_Init, - ObjSkateblock_Destroy, - ObjSkateblock_Update, - ObjSkateblock_Draw, + ACTOR_OBJ_SKATEBLOCK, ACTORCAT_BG, FLAGS, + GAMEPLAY_DANGEON_KEEP, sizeof(ObjSkateblock), 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..da3fcc189b 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -17,15 +17,8 @@ void ObjSmork_Update(Actor* thisx, PlayState* play); void ObjSmork_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Smork_InitVars = { - ACTOR_OBJ_SMORK, - ACTORCAT_PROP, - FLAGS, - OBJECT_F53_OBJ, - sizeof(ObjSmork), - ObjSmork_Init, - ObjSmork_Destroy, - ObjSmork_Update, - ObjSmork_Draw, + ACTOR_OBJ_SMORK, ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjSmork), + 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..df9fb4c388 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -34,15 +34,9 @@ void func_80B04B60(ObjSnowball* this, PlayState* play); void func_80B04D34(Actor* thisx, PlayState* play); ActorInit Obj_Snowball_InitVars = { - ACTOR_OBJ_SNOWBALL, - ACTORCAT_PROP, - FLAGS, - OBJECT_GOROIWA, - sizeof(ObjSnowball), - ObjSnowball_Init, - ObjSnowball_Destroy, - ObjSnowball_Update, - ObjSnowball_Draw, + ACTOR_OBJ_SNOWBALL, ACTORCAT_PROP, FLAGS, + OBJECT_GOROIWA, sizeof(ObjSnowball), 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..93c6298320 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -27,15 +27,9 @@ void func_80B3A498(ObjSnowball2* this); void func_80B3A500(ObjSnowball2* this, PlayState* play); ActorInit Obj_Snowball2_InitVars = { - ACTOR_OBJ_SNOWBALL2, - ACTORCAT_PROP, - FLAGS, - OBJECT_GOROIWA, - sizeof(ObjSnowball2), - ObjSnowball2_Init, - ObjSnowball2_Destroy, - ObjSnowball2_Update, - ObjSnowball2_Draw, + ACTOR_OBJ_SNOWBALL2, ACTORCAT_PROP, FLAGS, + OBJECT_GOROIWA, sizeof(ObjSnowball2), ObjSnowball2_Init, + ObjSnowball2_Destroy, ObjSnowball2_Update, ObjSnowball2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { 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..2d4faa186e 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -24,15 +24,9 @@ void func_80B30AD4(ObjSpidertent* this); void func_80B30AF8(ObjSpidertent* this, PlayState* play); ActorInit Obj_Spidertent_InitVars = { - ACTOR_OBJ_SPIDERTENT, - ACTORCAT_BG, - FLAGS, - OBJECT_SPIDERTENT, - sizeof(ObjSpidertent), - ObjSpidertent_Init, - ObjSpidertent_Destroy, - ObjSpidertent_Update, - ObjSpidertent_Draw, + ACTOR_OBJ_SPIDERTENT, ACTORCAT_BG, FLAGS, + OBJECT_SPIDERTENT, sizeof(ObjSpidertent), 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..fa28a3ab53 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -29,15 +29,9 @@ void func_80A1ECC0(ObjSpinyroll* this); void func_80A1ECD4(ObjSpinyroll* this, PlayState* play); ActorInit Obj_Spinyroll_InitVars = { - ACTOR_OBJ_SPINYROLL, - ACTORCAT_PROP, - FLAGS, - OBJECT_SPINYROLL, - sizeof(ObjSpinyroll), - ObjSpinyroll_Init, - ObjSpinyroll_Destroy, - ObjSpinyroll_Update, - ObjSpinyroll_Draw, + ACTOR_OBJ_SPINYROLL, ACTORCAT_PROP, FLAGS, + OBJECT_SPINYROLL, sizeof(ObjSpinyroll), 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..355d9899e1 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -72,15 +72,8 @@ static TexturePtr sEyeSwitchTextures[][4] = { static s32 sIsSegmentTableInit = false; ActorInit Obj_Switch_InitVars = { - ACTOR_OBJ_SWITCH, - ACTORCAT_SWITCH, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(ObjSwitch), - ObjSwitch_Init, - ObjSwitch_Destroy, - ObjSwitch_Update, - ObjSwitch_Draw, + ACTOR_OBJ_SWITCH, ACTORCAT_SWITCH, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjSwitch), 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..6914acdd6b 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -24,15 +24,8 @@ void func_80C2572C(ObjSwprize* this, PlayState* play); void ObjSwprize_SetupDoNothing(ObjSwprize* this); ActorInit Obj_Swprize_InitVars = { - ACTOR_OBJ_SWPRIZE, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjSwprize), - ObjSwprize_Init, - ObjSwprize_Destroy, - ObjSwprize_Update, - NULL, + ACTOR_OBJ_SWPRIZE, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjSwprize), 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..88e76fbfb9 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -19,15 +19,9 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2); void ObjSyokudai_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Syokudai_InitVars = { - ACTOR_OBJ_SYOKUDAI, - ACTORCAT_PROP, - FLAGS, - OBJECT_SYOKUDAI, - sizeof(ObjSyokudai), - ObjSyokudai_Init, - ObjSyokudai_Destroy, - ObjSyokudai_Update, - ObjSyokudai_Draw, + ACTOR_OBJ_SYOKUDAI, ACTORCAT_PROP, FLAGS, + OBJECT_SYOKUDAI, sizeof(ObjSyokudai), ObjSyokudai_Init, + ObjSyokudai_Destroy, ObjSyokudai_Update, ObjSyokudai_Draw, }; static ColliderCylinderInit sStandColliderInit = { 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..e61bf9ced7 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -25,15 +25,8 @@ void func_80B9C174(ObjTaru* this, PlayState* play); void func_80B9C1A0(ObjTaru* this, PlayState* play); ActorInit Obj_Taru_InitVars = { - ACTOR_OBJ_TARU, - ACTORCAT_BG, - FLAGS, - OBJECT_TARU, - sizeof(ObjTaru), - ObjTaru_Init, - ObjTaru_Destroy, - ObjTaru_Update, - ObjTaru_Draw, + ACTOR_OBJ_TARU, ACTORCAT_BG, FLAGS, OBJECT_TARU, sizeof(ObjTaru), + 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..89f4f10836 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -24,15 +24,8 @@ void func_809A488C(ObjToge* this); void func_809A48AC(ObjToge* this, PlayState* play); ActorInit Obj_Toge_InitVars = { - ACTOR_OBJ_TOGE, - ACTORCAT_PROP, - FLAGS, - OBJECT_TRAP, - sizeof(ObjToge), - ObjToge_Init, - ObjToge_Destroy, - ObjToge_Update, - ObjToge_Draw, + ACTOR_OBJ_TOGE, ACTORCAT_PROP, FLAGS, OBJECT_TRAP, sizeof(ObjToge), + 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..946435c933 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 @@ -29,15 +29,9 @@ void ObjTokeiStep_DoNothingOpen(ObjTokeiStep* this, PlayState* play); void ObjTokeiStep_DrawOpen(Actor* thisx, PlayState* play); ActorInit Obj_Tokei_Step_InitVars = { - ACTOR_OBJ_TOKEI_STEP, - ACTORCAT_BG, - FLAGS, - OBJECT_TOKEI_STEP, - sizeof(ObjTokeiStep), - ObjTokeiStep_Init, - ObjTokeiStep_Destroy, - ObjTokeiStep_Update, - ObjTokeiStep_Draw, + ACTOR_OBJ_TOKEI_STEP, ACTORCAT_BG, FLAGS, + OBJECT_TOKEI_STEP, sizeof(ObjTokeiStep), 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_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 376e2fca6b..9365ee9f61 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -63,15 +63,9 @@ void ObjTokeidai_Counterweight_Draw(Actor* thisx, PlayState* play); void ObjTokeidai_ExteriorGear_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Tokeidai_InitVars = { - ACTOR_OBJ_TOKEIDAI, - ACTORCAT_PROP, - FLAGS, - OBJECT_OBJ_TOKEIDAI, - sizeof(ObjTokeidai), - ObjTokeidai_Init, - ObjTokeidai_Destroy, - ObjTokeidai_Update, - ObjTokeidai_Draw, + ACTOR_OBJ_TOKEIDAI, ACTORCAT_PROP, FLAGS, + OBJECT_OBJ_TOKEIDAI, sizeof(ObjTokeidai), 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..4cbf2f1580 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -17,15 +17,8 @@ void ObjToudai_Update(Actor* thisx, PlayState* play); void ObjToudai_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Toudai_InitVars = { - ACTOR_OBJ_TOUDAI, - ACTORCAT_PROP, - FLAGS, - OBJECT_F53_OBJ, - sizeof(ObjToudai), - ObjToudai_Init, - ObjToudai_Destroy, - ObjToudai_Update, - ObjToudai_Draw, + ACTOR_OBJ_TOUDAI, ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjToudai), 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..9f5b136f78 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -21,15 +21,8 @@ void ObjTree_SetupDoNothing(ObjTree* this); void ObjTree_Sway(ObjTree* this, PlayState* play); ActorInit Obj_Tree_InitVars = { - ACTOR_OBJ_TREE, - ACTORCAT_PROP, - FLAGS, - OBJECT_TREE, - sizeof(ObjTree), - ObjTree_Init, - ObjTree_Destroy, - ObjTree_Update, - ObjTree_Draw, + ACTOR_OBJ_TREE, ACTORCAT_PROP, FLAGS, OBJECT_TREE, sizeof(ObjTree), + 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..e1012ecdf2 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -42,15 +42,8 @@ s16 D_80929508 = 0; s16 D_8092950C = 0; ActorInit Obj_Tsubo_InitVars = { - ACTOR_OBJ_TSUBO, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjTsubo), - ObjTsubo_Init, - ObjTsubo_Destroy, - ObjTsubo_Update, - NULL, + ACTOR_OBJ_TSUBO, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjTsubo), + 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..93084db326 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -62,15 +62,7 @@ void ObjUm_ChangeAnim(ObjUm* this, PlayState* play, ObjUmAnimation animIndex); void ObjUm_SetupAction(ObjUm* this, ObjUmActionFunc actionFunc); ActorInit Obj_Um_InitVars = { - ACTOR_OBJ_UM, - ACTORCAT_NPC, - FLAGS, - OBJECT_UM, - sizeof(ObjUm), - ObjUm_Init, - ObjUm_Destroy, - ObjUm_Update, - ObjUm_Draw, + ACTOR_OBJ_UM, ACTORCAT_NPC, FLAGS, OBJECT_UM, sizeof(ObjUm), 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..8eff8e6852 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -17,15 +17,8 @@ void ObjUsiyane_Update(Actor* thisx, PlayState* play); void ObjUsiyane_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Usiyane_InitVars = { - ACTOR_OBJ_USIYANE, - ACTORCAT_PROP, - FLAGS, - OBJECT_OBJ_USIYANE, - sizeof(ObjUsiyane), - ObjUsiyane_Init, - ObjUsiyane_Destroy, - ObjUsiyane_Update, - ObjUsiyane_Draw, + ACTOR_OBJ_USIYANE, ACTORCAT_PROP, FLAGS, OBJECT_OBJ_USIYANE, sizeof(ObjUsiyane), 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..19110f393f 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -16,15 +16,8 @@ void ObjVisiblock_Destroy(Actor* thisx, PlayState* play); void ObjVisiblock_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Visiblock_InitVars = { - ACTOR_OBJ_VISIBLOCK, - ACTORCAT_BG, - FLAGS, - OBJECT_VISIBLOCK, - sizeof(ObjVisiblock), - ObjVisiblock_Init, - ObjVisiblock_Destroy, - Actor_Noop, - ObjVisiblock_Draw, + ACTOR_OBJ_VISIBLOCK, ACTORCAT_BG, FLAGS, OBJECT_VISIBLOCK, sizeof(ObjVisiblock), + 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..eada5353bf 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -28,15 +28,9 @@ void func_80A3D0FC(ObjVspinyroll* this, PlayState* play); void func_80A3D2C0(Actor* thisx, PlayState* play); ActorInit Obj_Vspinyroll_InitVars = { - ACTOR_OBJ_VSPINYROLL, - ACTORCAT_PROP, - FLAGS, - OBJECT_SPINYROLL, - sizeof(ObjVspinyroll), - ObjVspinyroll_Init, - ObjVspinyroll_Destroy, - ObjVspinyroll_Update, - ObjVspinyroll_Draw, + ACTOR_OBJ_VSPINYROLL, ACTORCAT_PROP, FLAGS, + OBJECT_SPINYROLL, sizeof(ObjVspinyroll), 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..9bd645f4bc 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -23,15 +23,9 @@ s32 ObjWarpstone_PlayOpeningCutscene(ObjWarpstone* this, PlayState* play); s32 ObjWarpstone_OpenedIdle(ObjWarpstone* this, PlayState* play); ActorInit Obj_Warpstone_InitVars = { - ACTOR_OBJ_WARPSTONE, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_SEK, - sizeof(ObjWarpstone), - ObjWarpstone_Init, - ObjWarpstone_Destroy, - ObjWarpstone_Update, - ObjWarpstone_Draw, + ACTOR_OBJ_WARPSTONE, ACTORCAT_ITEMACTION, FLAGS, + OBJECT_SEK, sizeof(ObjWarpstone), ObjWarpstone_Init, + ObjWarpstone_Destroy, ObjWarpstone_Update, ObjWarpstone_Draw, }; static ColliderCylinderInit sCylinderInit = { 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..6afe2e56f8 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,8 @@ 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..9e1f0ddeea 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -17,15 +17,8 @@ void ObjY2lift_Update(Actor* thisx, PlayState* play); void ObjY2lift_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Y2lift_InitVars = { - ACTOR_OBJ_Y2LIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_KAIZOKU_OBJ, - sizeof(ObjY2lift), - ObjY2lift_Init, - ObjY2lift_Destroy, - ObjY2lift_Update, - ObjY2lift_Draw, + ACTOR_OBJ_Y2LIFT, ACTORCAT_BG, FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjY2lift), 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..9f41d671e0 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -30,15 +30,9 @@ typedef struct ShutterInfo { } ShutterInfo; // size = 0x20 ActorInit Obj_Y2shutter_InitVars = { - ACTOR_OBJ_Y2SHUTTER, - ACTORCAT_BG, - FLAGS, - OBJECT_KAIZOKU_OBJ, - sizeof(ObjY2shutter), - ObjY2shutter_Init, - ObjY2shutter_Destroy, - ObjY2shutter_Update, - ObjY2shutter_Draw, + ACTOR_OBJ_Y2SHUTTER, ACTORCAT_BG, FLAGS, + OBJECT_KAIZOKU_OBJ, sizeof(ObjY2shutter), 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..2aa6a48d4b 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -18,15 +18,8 @@ void ObjYado_Update(Actor* thisx, PlayState* play); void ObjYado_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Yado_InitVars = { - ACTOR_OBJ_YADO, - ACTORCAT_BG, - FLAGS, - OBJECT_YADO_OBJ, - sizeof(ObjYado), - ObjYado_Init, - ObjYado_Destroy, - ObjYado_Update, - ObjYado_Draw, + ACTOR_OBJ_YADO, ACTORCAT_BG, FLAGS, OBJECT_YADO_OBJ, sizeof(ObjYado), + 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..6551a50895 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -19,15 +19,8 @@ void ObjYasi_Update(Actor* thisx, PlayState* play); void ObjYasi_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Yasi_InitVars = { - ACTOR_OBJ_YASI, - ACTORCAT_PROP, - FLAGS, - OBJECT_OBJ_YASI, - sizeof(ObjYasi), - ObjYasi_Init, - ObjYasi_Destroy, - ObjYasi_Update, - ObjYasi_Draw, + ACTOR_OBJ_YASI, ACTORCAT_PROP, FLAGS, OBJECT_OBJ_YASI, sizeof(ObjYasi), + 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..f2991396b8 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -28,15 +28,9 @@ void func_808DDE9C(Actor* thisx, PlayState* play2); static f32 D_808DE5B0; ActorInit Object_Kankyo_InitVars = { - ACTOR_OBJECT_KANKYO, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjectKankyo), - ObjectKankyo_Init, - ObjectKankyo_Destroy, - ObjectKankyo_Update, - ObjectKankyo_Draw, + ACTOR_OBJECT_KANKYO, ACTORCAT_ITEMACTION, FLAGS, + GAMEPLAY_KEEP, sizeof(ObjectKankyo), 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..8b1a7c15eb 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -22,15 +22,8 @@ void OceffSpot_End(OceffSpot* this, PlayState* play); void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc); ActorInit Oceff_Spot_InitVars = { - ACTOR_OCEFF_SPOT, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffSpot), - OceffSpot_Init, - OceffSpot_Destroy, - OceffSpot_Update, - OceffSpot_Draw, + ACTOR_OCEFF_SPOT, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffSpot), 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..e5c6065019 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -20,15 +20,8 @@ void func_80981B48(OceffStorm* this, PlayState* play); void OceffStorm_Draw2(Actor* thisx, PlayState* play); ActorInit Oceff_Storm_InitVars = { - ACTOR_OCEFF_STORM, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffStorm), - OceffStorm_Init, - OceffStorm_Destroy, - OceffStorm_Update, - OceffStorm_Draw, + ACTOR_OCEFF_STORM, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffStorm), 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..aa5e6861c0 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -16,15 +16,8 @@ void OceffWipe_Update(Actor* thisx, PlayState* play); void OceffWipe_Draw(Actor* thisx, PlayState* play); ActorInit Oceff_Wipe_InitVars = { - ACTOR_OCEFF_WIPE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffWipe), - OceffWipe_Init, - OceffWipe_Destroy, - OceffWipe_Update, - OceffWipe_Draw, + ACTOR_OCEFF_WIPE, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe), 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..875fe056ae 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -16,15 +16,8 @@ void OceffWipe2_Update(Actor* thisx, PlayState* play); void OceffWipe2_Draw(Actor* thisx, PlayState* play); ActorInit Oceff_Wipe2_InitVars = { - ACTOR_OCEFF_WIPE2, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffWipe2), - OceffWipe2_Init, - OceffWipe2_Destroy, - OceffWipe2_Update, - OceffWipe2_Draw, + ACTOR_OCEFF_WIPE2, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe2), 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..b2ab538322 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -17,15 +17,8 @@ void OceffWipe3_Update(Actor* thisx, PlayState* play); void OceffWipe3_Draw(Actor* thisx, PlayState* play); ActorInit Oceff_Wipe3_InitVars = { - ACTOR_OCEFF_WIPE3, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffWipe3), - OceffWipe3_Init, - OceffWipe3_Destroy, - OceffWipe3_Update, - OceffWipe3_Draw, + ACTOR_OCEFF_WIPE3, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe3), 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..08452b38c7 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -16,15 +16,8 @@ void OceffWipe4_Update(Actor* thisx, PlayState* play); void OceffWipe4_Draw(Actor* thisx, PlayState* play); ActorInit Oceff_Wipe4_InitVars = { - ACTOR_OCEFF_WIPE4, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffWipe4), - OceffWipe4_Init, - OceffWipe4_Destroy, - OceffWipe4_Update, - OceffWipe4_Draw, + ACTOR_OCEFF_WIPE4, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe4), 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..6d1d57d562 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -16,15 +16,8 @@ void OceffWipe5_Update(Actor* thisx, PlayState* play); void OceffWipe5_Draw(Actor* thisx, PlayState* play); ActorInit Oceff_Wipe5_InitVars = { - ACTOR_OCEFF_WIPE5, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffWipe5), - OceffWipe5_Init, - OceffWipe5_Destroy, - OceffWipe5_Update, - OceffWipe5_Draw, + ACTOR_OCEFF_WIPE5, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe5), 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..9bcaa02b47 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -16,15 +16,8 @@ void OceffWipe6_Update(Actor* thisx, PlayState* play); void OceffWipe6_Draw(Actor* thisx, PlayState* play); ActorInit Oceff_Wipe6_InitVars = { - ACTOR_OCEFF_WIPE6, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffWipe6), - OceffWipe6_Init, - OceffWipe6_Destroy, - OceffWipe6_Update, - OceffWipe6_Draw, + ACTOR_OCEFF_WIPE6, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe6), 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..4d75d39209 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -16,15 +16,8 @@ void OceffWipe7_Update(Actor* thisx, PlayState* play); void OceffWipe7_Draw(Actor* thisx, PlayState* play); ActorInit Oceff_Wipe7_InitVars = { - ACTOR_OCEFF_WIPE7, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(OceffWipe7), - OceffWipe7_Init, - OceffWipe7_Destroy, - OceffWipe7_Update, - OceffWipe7_Draw, + ACTOR_OCEFF_WIPE7, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe7), 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..536187e660 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -20,15 +20,8 @@ void ShotSun_UpdateForOcarina(ShotSun* this, PlayState* play); void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play); ActorInit Shot_Sun_InitVars = { - ACTOR_SHOT_SUN, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ShotSun), - ShotSun_Init, - ShotSun_Destroy, - ShotSun_Update, - NULL, + ACTOR_SHOT_SUN, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ShotSun), + 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..a7e3f60782 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -19,15 +19,7 @@ void TGSw_Draw(Actor* thisx, PlayState* play); void TGSw_ActionExecuteOneShot(struct TGSw* this, PlayState* play); ActorInit TG_Sw_InitVars = { - ACTOR_TG_SW, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(TGSw), - TGSw_Init, - TGSw_Destroy, - TGSw_Update, - TGSw_Draw, + ACTOR_TG_SW, ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(TGSw), TGSw_Init, TGSw_Destroy, TGSw_Update, TGSw_Draw, }; void TGSw_ActionDecider(TGSw* this, PlayState* play) {