diff --git a/assets/xml/objects/object_boss01.xml b/assets/xml/objects/object_boss01.xml index 08730f034..ff37d2bc9 100644 --- a/assets/xml/objects/object_boss01.xml +++ b/assets/xml/objects/object_boss01.xml @@ -142,10 +142,10 @@ - + - + diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md index 83d55f7ad..896edcb1d 100644 --- a/docs/tutorial/advanced_control_flow.md +++ b/docs/tutorial/advanced_control_flow.md @@ -27,15 +27,15 @@ void func_809529AC(EnMs* this, PlayState* play); void func_80952A1C(EnMs* this, PlayState* play); ActorInit En_Ms_InitVars = { - ACTOR_EN_MS, - ACTORCAT_NPC, - FLAGS, - OBJECT_MS, - sizeof(EnMs), - (ActorFunc)EnMs_Init, - (ActorFunc)EnMs_Destroy, - (ActorFunc)EnMs_Update, - (ActorFunc)EnMs_Draw, + /**/ ACTOR_EN_MS, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_MS, + /**/ sizeof(EnMs), + /**/ EnMs_Init, + /**/ EnMs_Destroy, + /**/ EnMs_Update, + /**/ EnMs_Draw, }; static ColliderCylinderInitType1 D_80952BA0 = { diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md index 2685f9276..8e67b91bf 100644 --- a/docs/tutorial/beginning_decomp.md +++ b/docs/tutorial/beginning_decomp.md @@ -28,15 +28,15 @@ void EnRecepgirl_Draw(Actor* thisx, PlayState* play); // --------------- 4 --------------- #if 0 ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, - sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + /**/ ACTOR_EN_RECEPGIRL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, + /**/ sizeof(EnRecepgirl), + /**/ EnRecepgirl_Init, + /**/ EnRecepgirl_Destroy, + /**/ EnRecepgirl_Update, + /**/ EnRecepgirl_Draw, }; // static InitChainEntry sInitChain[] = { @@ -336,15 +336,15 @@ For now, we do not want to consider the data that mips2c has kindly imported for ```C #if 0 ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, - sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + /**/ ACTOR_EN_RECEPGIRL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, + /**/ sizeof(EnRecepgirl), + /**/ EnRecepgirl_Init, + /**/ EnRecepgirl_Destroy, + /**/ EnRecepgirl_Update, + /**/ EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 }; diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index 07ea8cfac..2c3f1d2e2 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -44,15 +44,15 @@ Once we have decompiled enough things to know what the data is, we can import it ```C #if 0 ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, - sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + /**/ ACTOR_EN_RECEPGIRL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, + /**/ sizeof(EnRecepgirl), + /**/ EnRecepgirl_Init, + /**/ EnRecepgirl_Destroy, + /**/ EnRecepgirl_Update, + /**/ EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 }; @@ -100,15 +100,15 @@ Next remove all the externs, and uncomment their corresponding commented data: ```C ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, - sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + /**/ ACTOR_EN_RECEPGIRL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, + /**/ sizeof(EnRecepgirl), + /**/ EnRecepgirl_Init, + /**/ EnRecepgirl_Destroy, + /**/ EnRecepgirl_Update, + /**/ EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 }; @@ -140,10 +140,10 @@ For actors which have yet to be decompiled, this is mitigated by use of the file ```c ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, + /**/ ACTOR_EN_RECEPGIRL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, }; ``` diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md index 9013ab010..619b30c06 100644 --- a/docs/tutorial/documenting.md +++ b/docs/tutorial/documenting.md @@ -49,15 +49,15 @@ void func_80C10290(EnRecepgirl* this); void func_80C102D4(EnRecepgirl* this, PlayState* play); ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, - sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + /**/ ACTOR_EN_RECEPGIRL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, + /**/ sizeof(EnRecepgirl), + /**/ EnRecepgirl_Init, + /**/ EnRecepgirl_Destroy, + /**/ EnRecepgirl_Update, + /**/ EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0, object_bg_Tex_00FCF0 }; @@ -317,10 +317,10 @@ As we discussed last time, `D_80C106B0` is an array of [segmented pointers](data ```C ActorInit En_Recepgirl_InitVars = { - ACTOR_EN_RECEPGIRL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, + /**/ ACTOR_EN_RECEPGIRL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, ``` the fourth element is the object (it is actually an enum, but the file itself has the same name as the object enum). So, we need to look at the object file. We are very lucky that a custom tool has been written for such a thing: Z64Utils. diff --git a/include/z64actor.h b/include/z64actor.h index 5d072d253..e89267690 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -23,7 +23,7 @@ struct CollisionPoly; struct EnBox; struct EnTorch2; -typedef void(*ActorFunc)(struct Actor* this, struct PlayState* play); +typedef void (*ActorFunc)(struct Actor* this, struct PlayState* play); typedef u16 (*NpcGetTextIdFunc)(struct PlayState*, struct Actor*); typedef s16 (*NpcUpdateTalkStateFunc)(struct PlayState*, struct Actor*); @@ -67,7 +67,7 @@ typedef struct ActorOverlay { /* 0x1E */ s8 numLoaded; // original name: "clients" } ActorOverlay; // size = 0x20 -typedef void(*ActorShadowFunc)(struct Actor* actor, struct Lights* mapper, struct PlayState* play); +typedef void (*ActorShadowFunc)(struct Actor* actor, struct Lights* mapper, struct PlayState* play); typedef struct { /* 0x00 */ Vec3s rot; // Current actor shape rotation @@ -196,7 +196,6 @@ typedef struct { /* 0x158 */ u8 interactFlags; } DynaPolyActor; // size = 0x15C - typedef enum Item00Type { /* 0x00 */ ITEM00_RUPEE_GREEN, /* 0x01 */ ITEM00_RUPEE_BLUE, @@ -451,7 +450,6 @@ typedef enum { /* 32 */ ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE } ActorDrawDamageEffectType; - #define DEFINE_ACTOR(_name, enumValue, _allocType, _debugName) enumValue, #define DEFINE_ACTOR_INTERNAL(_name, enumValue, _allocType, _debugName) enumValue, #define DEFINE_ACTOR_UNSET(enumValue) enumValue, @@ -651,12 +649,12 @@ typedef enum { /* 0x5B */ TATL_HINT_ID_SKULLFISH, /* 0x5C */ TATL_HINT_ID_DESBREKO, /* 0x5D */ TATL_HINT_ID_GREEN_CHUCHU, - /* 0x5E */ TATL_HINT_ID_ODOLWA_1, + /* 0x5E */ TATL_HINT_ID_ODOLWA_PHASE_ONE, // 799 or fewer frames have passed, says Odolwa is dangerous to get close to /* 0x5F */ TATL_HINT_ID_GEKKO_GIANT_SLIME, /* 0x60 */ TATL_HINT_ID_BAD_BAT, /* 0x61 */ TATL_HINT_ID_REAL_BOMBCHU, - /* 0x62 */ TATL_HINT_ID_ODOLWA_2, - /* 0x63 */ TATL_HINT_ID_ODOLWA_3, + /* 0x62 */ TATL_HINT_ID_ODOLWA_CLOSE_TO_PHASE_TWO, // 800 frames have passed, warns that Odolwa will attack after dancing + /* 0x63 */ TATL_HINT_ID_ODOLWA_PHASE_TWO, // 1000 or more frames have passed, explains that the bugs are drawn to fire /* 0x64 */ TATL_HINT_ID_MUSHROOM, /* 0xFF */ TATL_HINT_ID_NONE = 0xFF } TatlHintId; diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 403ffa546..ac1b97752 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -394,7 +394,8 @@ typedef enum { #define DMG_ENTRY(damage, effect) ((damage) | ((effect) << 4)) -// These flags are not to be used in code until we figure out how we want to format them. They are only here for reference +// Don't use combinations of these flags in code until we figure out how we want to format them. +// It's okay to use these flags if the code is only checking a single flag, though. #define DMG_DEKU_NUT (1 << 0x00) #define DMG_DEKU_STICK (1 << 0x01) #define DMG_HORSE_TRAMPLE (1 << 0x02) diff --git a/include/z64player.h b/include/z64player.h index a5f268627..fac153052 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -1151,9 +1151,9 @@ typedef struct Player { /* 0x3AC */ Vec3f unk_3AC; /* 0x3B8 */ u16 unk_3B8; /* 0x3BA */ union { - s16 doorBgCamIndex; - s16 unk_3BA; // When in a cutscene, boolean to determine if `PLAYER_STATE1_20000000` is set - }; + s16 haltActorsDuringCsAction; // If true, halt actors belonging to certain categories during a `csAction` + s16 doorBgCamIndex; // `BgCamIndex` used during a sliding door and spiral staircase cutscenes + } cv; // "Cutscene Variable": context dependent variable that has different meanings depending on what function is called /* 0x3BC */ s16 subCamId; /* 0x3BE */ char unk_3BE[2]; /* 0x3C0 */ Vec3f unk_3C0; @@ -1221,8 +1221,12 @@ typedef struct Player { /* 0xADE */ u8 unk_ADE; /* 0xADF */ s8 unk_ADF[4]; // Circular buffer used for testing for triggering a quickspin /* 0xAE3 */ s8 unk_AE3[4]; // Circular buffer used for ? - /* 0xAE7 */ s8 actionVar1; // context dependent variable that has different meanings depending on what action is currently running - /* 0xAE8 */ s16 actionVar2; // context dependent variable that has different meanings depending on what action is currently running + /* 0xAE7 */ union { + s8 actionVar1; + } av1; // "Action Variable 1": context dependent variable that has different meanings depending on what action is currently running + /* 0xAE8 */ union { + s16 actionVar2; + } av2; // "Action Variable 2": context dependent variable that has different meanings depending on what action is currently running /* 0xAEC */ f32 unk_AEC; /* 0xAF0 */ union { Vec3f unk_AF0[2]; diff --git a/spec b/spec index 310d02547..42919338c 100644 --- a/spec +++ b/spec @@ -2297,9 +2297,7 @@ beginseg name "ovl_Boss_01" compress include "build/src/overlays/actors/ovl_Boss_01/z_boss_01.o" - include "build/data/ovl_Boss_01/ovl_Boss_01.data.o" - include "build/data/ovl_Boss_01/ovl_Boss_01.bss.o" - include "build/data/ovl_Boss_01/ovl_Boss_01.reloc.o" + include "build/src/overlays/actors/ovl_Boss_01/ovl_Boss_01_reloc.o" endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d7d28dd91..3b68a0853 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1412,7 +1412,7 @@ s32 func_800B724C(PlayState* play, Actor* actor, u8 csAction) { player->csAction = csAction; player->csActor = actor; - player->unk_3BA = false; + player->cv.haltActorsDuringCsAction = false; return true; } @@ -1420,7 +1420,7 @@ s32 func_800B7298(PlayState* play, Actor* actor, u8 csAction) { Player* player = GET_PLAYER(play); if (func_800B724C(play, actor, csAction)) { - player->unk_3BA = true; + player->cv.haltActorsDuringCsAction = true; return true; } return false; diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 1fa4d4cf2..009a82f97 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -14,15 +14,15 @@ void EnAObj_Idle(EnAObj* this, PlayState* play); void EnAObj_Talk(EnAObj* this, PlayState* play); ActorInit En_A_Obj_InitVars = { - ACTOR_EN_A_OBJ, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnAObj), - (ActorFunc)EnAObj_Init, - (ActorFunc)EnAObj_Destroy, - (ActorFunc)EnAObj_Update, - (ActorFunc)EnAObj_Draw, + /**/ ACTOR_EN_A_OBJ, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnAObj), + /**/ EnAObj_Init, + /**/ EnAObj_Destroy, + /**/ EnAObj_Update, + /**/ EnAObj_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index d0dada57d..d22576ad7 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -26,15 +26,15 @@ 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), - (ActorFunc)EnItem00_Init, - (ActorFunc)EnItem00_Destroy, - (ActorFunc)EnItem00_Update, - (ActorFunc)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 44427d54c..e28fa6d6a 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -16,15 +16,15 @@ 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), - (ActorFunc)PlayerCall_Init, - (ActorFunc)PlayerCall_Destroy, - (ActorFunc)PlayerCall_Update, - (ActorFunc)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/code/z_player_lib.c b/src/code/z_player_lib.c index 43b1cd05d..3d7010c0d 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -369,13 +369,14 @@ void func_80122F28(Player* player) { s32 func_80122F9C(PlayState* play) { Player* player = GET_PLAYER(play); - return (player->stateFlags2 & PLAYER_STATE2_80000) && (player->actionVar1 == 2); + return (player->stateFlags2 & PLAYER_STATE2_80000) && (player->av1.actionVar1 == 2); } s32 func_80122FCC(PlayState* play) { Player* player = GET_PLAYER(play); - return (player->stateFlags2 & PLAYER_STATE2_80000) && ((player->actionVar1 == 1) || (player->actionVar1 == 3)); + return (player->stateFlags2 & PLAYER_STATE2_80000) && + ((player->av1.actionVar1 == 1) || (player->av1.actionVar1 == 3)); } void func_8012300C(PlayState* play, s32 arg1) { @@ -389,15 +390,15 @@ void func_8012301C(Actor* thisx, PlayState* play2) { PlayState* play = play2; Player* this = (Player*)thisx; - this->actionVar1++; + this->av1.actionVar1++; - if (this->actionVar1 == 2) { + if (this->av1.actionVar1 == 2) { s16 objectId = gPlayerFormObjectIds[GET_PLAYER_FORM]; gActorOverlayTable[ACTOR_PLAYER].initInfo->objectId = objectId; func_8012F73C(&play->objectCtx, this->actor.objectSlot, objectId); this->actor.objectSlot = Object_GetSlot(&play->objectCtx, GAMEPLAY_KEEP); - } else if (this->actionVar1 >= 3) { + } else if (this->av1.actionVar1 >= 3) { s32 objectSlot = Object_GetSlot(&play->objectCtx, gActorOverlayTable[ACTOR_PLAYER].initInfo->objectId); if (Object_IsLoaded(&play->objectCtx, objectSlot)) { @@ -3750,7 +3751,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G } } - if ((player->stateFlags1 & (PLAYER_STATE1_2 | PLAYER_STATE1_100)) && (player->actionVar2 != 0)) { + if ((player->stateFlags1 & (PLAYER_STATE1_2 | PLAYER_STATE1_100)) && (player->av2.actionVar2 != 0)) { static Vec3f D_801C0E40[PLAYER_FORM_MAX] = { { 0.0f, 0.0f, 0.0f }, // PLAYER_FORM_FIERCE_DEITY { -578.3f, -1100.9f, 0.0f }, // PLAYER_FORM_GORON @@ -3770,7 +3771,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G } gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, (u8)player->actionVar2); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, (u8)player->av2.actionVar2); gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054C90); Matrix_Pop(); 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 ba30287f5..ea2bb3850 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,15 @@ 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), - (ActorFunc)ArmsHook_Init, - (ActorFunc)ArmsHook_Destroy, - (ActorFunc)ArmsHook_Update, - (ActorFunc)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 83edc9548..0b8a8ed0b 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,15 @@ 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), - (ActorFunc)ArrowFire_Init, - (ActorFunc)ArrowFire_Destroy, - (ActorFunc)ArrowFire_Update, - (ActorFunc)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 8a908a0e3..4b3d7507a 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,15 @@ void ArrowIce_Fly(ArrowIce* this, PlayState* play); static s32 sBssPad; ActorInit Arrow_Ice_InitVars = { - ACTOR_ARROW_ICE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ArrowIce), - (ActorFunc)ArrowIce_Init, - (ActorFunc)ArrowIce_Destroy, - (ActorFunc)ArrowIce_Update, - (ActorFunc)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 902443a95..bd67099b4 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,15 @@ 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), - (ActorFunc)ArrowLight_Init, - (ActorFunc)ArrowLight_Destroy, - (ActorFunc)ArrowLight_Update, - (ActorFunc)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_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index da688a81b..a48bf5663 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -24,15 +24,15 @@ void func_80C0A458(BgAstrBombwall* this, PlayState* play); void func_80C0A4BC(BgAstrBombwall* this, PlayState* play); ActorInit Bg_Astr_Bombwall_InitVars = { - ACTOR_BG_ASTR_BOMBWALL, - ACTORCAT_BG, - FLAGS, - OBJECT_ASTR_OBJ, - sizeof(BgAstrBombwall), - (ActorFunc)BgAstrBombwall_Init, - (ActorFunc)BgAstrBombwall_Destroy, - (ActorFunc)BgAstrBombwall_Update, - (ActorFunc)BgAstrBombwall_Draw, + /**/ ACTOR_BG_ASTR_BOMBWALL, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_ASTR_OBJ, + /**/ sizeof(BgAstrBombwall), + /**/ BgAstrBombwall_Init, + /**/ BgAstrBombwall_Destroy, + /**/ BgAstrBombwall_Update, + /**/ BgAstrBombwall_Draw, }; static ColliderTrisElementInit sTrisElementsInit[2] = { diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index f1394a32e..6faedcdd0 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,15 @@ 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), - (ActorFunc)BgBotihasira_Init, - (ActorFunc)BgBotihasira_Destroy, - (ActorFunc)BgBotihasira_Update, - (ActorFunc)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 9db179c1a..cbfc59210 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), (ActorFunc)BgBreakwall_Init, - (ActorFunc)NULL, (ActorFunc)BgBreakwall_Update, (ActorFunc)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 b7540aa3f..1a7382761 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,15 @@ typedef enum { u8 sIsLoaded[32]; ActorInit Bg_Crace_Movebg_InitVars = { - ACTOR_BG_CRACE_MOVEBG, - ACTORCAT_BG, - FLAGS, - OBJECT_CRACE_OBJECT, - sizeof(BgCraceMovebg), - (ActorFunc)BgCraceMovebg_Init, - (ActorFunc)BgCraceMovebg_Destroy, - (ActorFunc)BgCraceMovebg_Update, - (ActorFunc)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 688349742..6151d55a4 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,15 @@ 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), - (ActorFunc)BgCtowerGear_Init, - (ActorFunc)BgCtowerGear_Destroy, - (ActorFunc)BgCtowerGear_Update, - (ActorFunc)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 d30f15308..47d870056 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,15 @@ 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), - (ActorFunc)BgCtowerRot_Init, - (ActorFunc)BgCtowerRot_Destroy, - (ActorFunc)BgCtowerRot_Update, - (ActorFunc)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_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index a5d01fe65..2a107ec2f 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -16,15 +16,15 @@ void BgDanpeiMovebg_Update(Actor* thisx, PlayState* play); #if 0 ActorInit Bg_Danpei_Movebg_InitVars = { - ACTOR_BG_DANPEI_MOVEBG, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(BgDanpeiMovebg), - (ActorFunc)BgDanpeiMovebg_Init, - (ActorFunc)BgDanpeiMovebg_Destroy, - (ActorFunc)BgDanpeiMovebg_Update, - (ActorFunc)NULL, + /**/ ACTOR_BG_DANPEI_MOVEBG, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(BgDanpeiMovebg), + /**/ BgDanpeiMovebg_Init, + /**/ BgDanpeiMovebg_Destroy, + /**/ BgDanpeiMovebg_Update, + /**/ NULL, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index 52c0f046f..949dbb0a0 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -30,15 +30,15 @@ AnimatedMaterial* D_80B83C70; AnimatedMaterial* D_80B83C74; ActorInit Bg_Dblue_Balance_InitVars = { - ACTOR_BG_DBLUE_BALANCE, - ACTORCAT_BG, - FLAGS, - OBJECT_DBLUE_OBJECT, - sizeof(BgDblueBalance), - (ActorFunc)BgDblueBalance_Init, - (ActorFunc)BgDblueBalance_Destroy, - (ActorFunc)BgDblueBalance_Update, - (ActorFunc)BgDblueBalance_Draw, + /**/ ACTOR_BG_DBLUE_BALANCE, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_DBLUE_OBJECT, + /**/ sizeof(BgDblueBalance), + /**/ BgDblueBalance_Init, + /**/ BgDblueBalance_Destroy, + /**/ BgDblueBalance_Update, + /**/ BgDblueBalance_Draw, }; typedef struct { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index a1d724b29..a15460cc8 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -17,15 +17,15 @@ void BgDblueElevator_Draw(Actor* thisx, PlayState* play); #if 0 ActorInit Bg_Dblue_Elevator_InitVars = { - ACTOR_BG_DBLUE_ELEVATOR, - ACTORCAT_BG, - FLAGS, - OBJECT_DBLUE_OBJECT, - sizeof(BgDblueElevator), - (ActorFunc)BgDblueElevator_Init, - (ActorFunc)BgDblueElevator_Destroy, - (ActorFunc)BgDblueElevator_Update, - (ActorFunc)BgDblueElevator_Draw, + /**/ ACTOR_BG_DBLUE_ELEVATOR, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_DBLUE_OBJECT, + /**/ sizeof(BgDblueElevator), + /**/ BgDblueElevator_Init, + /**/ BgDblueElevator_Destroy, + /**/ BgDblueElevator_Update, + /**/ BgDblueElevator_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 be3623f2d..9cb8c9b9d 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,15 @@ u8 D_80A2B870[][2] = { }; ActorInit Bg_Dblue_Movebg_InitVars = { - ACTOR_BG_DBLUE_MOVEBG, - ACTORCAT_BG, - FLAGS, - OBJECT_DBLUE_OBJECT, - sizeof(BgDblueMovebg), - (ActorFunc)BgDblueMovebg_Init, - (ActorFunc)BgDblueMovebg_Destroy, - (ActorFunc)BgDblueMovebg_Update, - (ActorFunc)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_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index 211aac6fd..74a115135 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -26,15 +26,15 @@ void func_80B84EF0(BgDblueWaterfall* this, PlayState* play); void func_80B84F20(BgDblueWaterfall* this, PlayState* play); ActorInit Bg_Dblue_Waterfall_InitVars = { - ACTOR_BG_DBLUE_WATERFALL, - ACTORCAT_PROP, - FLAGS, - OBJECT_DBLUE_OBJECT, - sizeof(BgDblueWaterfall), - (ActorFunc)BgDblueWaterfall_Init, - (ActorFunc)BgDblueWaterfall_Destroy, - (ActorFunc)BgDblueWaterfall_Update, - (ActorFunc)BgDblueWaterfall_Draw, + /**/ ACTOR_BG_DBLUE_WATERFALL, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_DBLUE_OBJECT, + /**/ sizeof(BgDblueWaterfall), + /**/ BgDblueWaterfall_Init, + /**/ BgDblueWaterfall_Destroy, + /**/ BgDblueWaterfall_Update, + /**/ BgDblueWaterfall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index b6db682d2..bbbd847a4 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,15 @@ 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), - (ActorFunc)BgDkjailIvy_Init, - (ActorFunc)BgDkjailIvy_Destroy, - (ActorFunc)BgDkjailIvy_Update, - (ActorFunc)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_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 404530342..d91f4b6aa 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -26,15 +26,15 @@ void BgDyYoseizo_UpdateEffects(BgDyYoseizo* this, PlayState* play); void BgDyYoseizo_DrawEffects(BgDyYoseizo* this, PlayState* play); ActorInit Bg_Dy_Yoseizo_InitVars = { - ACTOR_BG_DY_YOSEIZO, - ACTORCAT_PROP, - FLAGS, - OBJECT_DY_OBJ, - sizeof(BgDyYoseizo), - (ActorFunc)BgDyYoseizo_Init, - (ActorFunc)BgDyYoseizo_Destroy, - (ActorFunc)BgDyYoseizo_Update, - (ActorFunc)NULL, + /**/ ACTOR_BG_DY_YOSEIZO, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_DY_OBJ, + /**/ sizeof(BgDyYoseizo), + /**/ BgDyYoseizo_Init, + /**/ BgDyYoseizo_Destroy, + /**/ BgDyYoseizo_Update, + /**/ NULL, }; typedef enum GreatFairyAnimation { 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 db4a1105a..6beb99387 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,15 @@ 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), - (ActorFunc)BgF40Block_Init, - (ActorFunc)BgF40Block_Destroy, - (ActorFunc)BgF40Block_Update, - (ActorFunc)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 f47bf4394..736a72a9c 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,15 @@ 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), - (ActorFunc)BgF40Flift_Init, - (ActorFunc)BgF40Flift_Destroy, - (ActorFunc)BgF40Flift_Update, - (ActorFunc)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 cbeea4911..513205f5f 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,15 @@ 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), - (ActorFunc)BgF40Switch_Init, - (ActorFunc)BgF40Switch_Destroy, - (ActorFunc)BgF40Switch_Update, - (ActorFunc)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_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index 9b210c1b8..6a68e9299 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -19,16 +19,16 @@ void BgF40Swlift_Draw(Actor* thisx, PlayState* play); static s32 sSwitchFlags[4] = { 0xFF, 0xFF, 0xFF, 0xFF }; static s32 sHeights[4]; -const ActorInit Bg_F40_Swlift_InitVars = { - ACTOR_BG_F40_SWLIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_F40_OBJ, - sizeof(BgF40Swlift), - (ActorFunc)BgF40Swlift_Init, - (ActorFunc)BgF40Swlift_Destroy, - (ActorFunc)BgF40Swlift_Update, - (ActorFunc)BgF40Swlift_Draw, +ActorInit Bg_F40_Swlift_InitVars = { + /**/ ACTOR_BG_F40_SWLIFT, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_F40_OBJ, + /**/ sizeof(BgF40Swlift), + /**/ BgF40Swlift_Init, + /**/ BgF40Swlift_Destroy, + /**/ BgF40Swlift_Update, + /**/ BgF40Swlift_Draw, }; static InitChainEntry sInitChain[] = { 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 86edcbee6..292635467 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,15 @@ 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), - (ActorFunc)BgFireWall_Init, - (ActorFunc)BgFireWall_Destroy, - (ActorFunc)BgFireWall_Update, - (ActorFunc)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 ecfe2c910..d2014080d 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,15 @@ 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), - (ActorFunc)BgFuKaiten_Init, - (ActorFunc)BgFuKaiten_Destroy, - (ActorFunc)BgFuKaiten_Update, - (ActorFunc)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 3da89164d..942486729 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,15 @@ 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), - (ActorFunc)BgFuMizu_Init, - (ActorFunc)BgFuMizu_Destroy, - (ActorFunc)BgFuMizu_Update, - (ActorFunc)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 9577b832a..ab495de97 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,15 @@ 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), - (ActorFunc)BgGoronOyu_Init, - (ActorFunc)BgGoronOyu_Destroy, - (ActorFunc)BgGoronOyu_Update, - (ActorFunc)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_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index a9e70027c..bd5053f63 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -25,15 +25,15 @@ void BgHakaBombwall_SetupEndCutscene(BgHakaBombwall* this); void BgHakaBombwall_EndCutscene(BgHakaBombwall* this, PlayState* play); ActorInit Bg_Haka_Bombwall_InitVars = { - ACTOR_BG_HAKA_BOMBWALL, - ACTORCAT_BG, - FLAGS, - OBJECT_HAKA_OBJ, - sizeof(BgHakaBombwall), - (ActorFunc)BgHakaBombwall_Init, - (ActorFunc)BgHakaBombwall_Destroy, - (ActorFunc)BgHakaBombwall_Update, - (ActorFunc)BgHakaBombwall_Draw, + /**/ ACTOR_BG_HAKA_BOMBWALL, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_HAKA_OBJ, + /**/ sizeof(BgHakaBombwall), + /**/ BgHakaBombwall_Init, + /**/ BgHakaBombwall_Destroy, + /**/ BgHakaBombwall_Update, + /**/ BgHakaBombwall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c index f9ed1d0c9..8f7c3c306 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,15 @@ 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), - (ActorFunc)BgHakaCurtain_Init, - (ActorFunc)BgHakaCurtain_Destroy, - (ActorFunc)BgHakaCurtain_Update, - (ActorFunc)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 706b86b27..8a1d9ad8f 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,15 @@ 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), - (ActorFunc)BgHakaTomb_Init, - (ActorFunc)BgHakaTomb_Destroy, - (ActorFunc)BgHakaTomb_Update, - (ActorFunc)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_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index 3f043bcc2..3fe51a592 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -27,15 +27,15 @@ void func_80ABCD98(BgHakuginBombwall* this, PlayState* play); void func_80ABCE60(BgHakuginBombwall* this, PlayState* play); ActorInit Bg_Hakugin_Bombwall_InitVars = { - ACTOR_BG_HAKUGIN_BOMBWALL, - ACTORCAT_BG, - FLAGS, - OBJECT_HAKUGIN_OBJ, - sizeof(BgHakuginBombwall), - (ActorFunc)BgHakuginBombwall_Init, - (ActorFunc)BgHakuginBombwall_Destroy, - (ActorFunc)BgHakuginBombwall_Update, - (ActorFunc)BgHakuginBombwall_Draw, + /**/ ACTOR_BG_HAKUGIN_BOMBWALL, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_HAKUGIN_OBJ, + /**/ sizeof(BgHakuginBombwall), + /**/ BgHakuginBombwall_Init, + /**/ BgHakuginBombwall_Destroy, + /**/ BgHakuginBombwall_Update, + /**/ BgHakuginBombwall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 35e03c438..8c5bb0193 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -19,15 +19,15 @@ void BgHakuginElvpole_Draw(Actor* thisx, PlayState* play); void func_80ABD92C(BgHakuginElvpole* this, PlayState* play); ActorInit Bg_Hakugin_Elvpole_InitVars = { - ACTOR_BG_HAKUGIN_ELVPOLE, - ACTORCAT_BG, - FLAGS, - OBJECT_HAKUGIN_OBJ, - sizeof(BgHakuginElvpole), - (ActorFunc)BgHakuginElvpole_Init, - (ActorFunc)BgHakuginElvpole_Destroy, - (ActorFunc)BgHakuginElvpole_Update, - (ActorFunc)BgHakuginElvpole_Draw, + /**/ ACTOR_BG_HAKUGIN_ELVPOLE, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_HAKUGIN_OBJ, + /**/ sizeof(BgHakuginElvpole), + /**/ BgHakuginElvpole_Init, + /**/ BgHakuginElvpole_Destroy, + /**/ BgHakuginElvpole_Update, + /**/ BgHakuginElvpole_Draw, }; void BgHakuginElvpole_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index dc20a1fd3..bd3e2bef9 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,15 @@ BgHakuginPostColliders D_80A9DDC0; BgHakuginPostUnkStruct D_80A9E028; ActorInit Bg_Hakugin_Post_InitVars = { - ACTOR_BG_HAKUGIN_POST, - ACTORCAT_BG, - FLAGS, - OBJECT_HAKUGIN_OBJ, - sizeof(BgHakuginPost), - (ActorFunc)BgHakuginPost_Init, - (ActorFunc)BgHakuginPost_Destroy, - (ActorFunc)BgHakuginPost_Update, - (ActorFunc)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 4ecce9c3a..b1e1cfa8f 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 @@ -40,15 +40,15 @@ 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), - (ActorFunc)BgHakuginSwitch_Init, - (ActorFunc)BgHakuginSwitch_Destroy, - (ActorFunc)BgHakuginSwitch_Update, - (ActorFunc)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 50e99c1aa..40a8c3ca2 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,15 @@ 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), - (ActorFunc)BgIcefloe_Init, - (ActorFunc)BgIcefloe_Destroy, - (ActorFunc)BgIcefloe_Update, - (ActorFunc)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 df6245c68..cc966b8cc 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,15 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit Bg_Icicle_InitVars = { - ACTOR_BG_ICICLE, - ACTORCAT_PROP, - FLAGS, - OBJECT_ICICLE, - sizeof(BgIcicle), - (ActorFunc)BgIcicle_Init, - (ActorFunc)BgIcicle_Destroy, - (ActorFunc)BgIcicle_Update, - (ActorFunc)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 27375d4dd..8b0ba1217 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,15 @@ 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), - (ActorFunc)BgIkanaBlock_Init, - (ActorFunc)BgIkanaBlock_Destroy, - (ActorFunc)BgIkanaBlock_Update, - (ActorFunc)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_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index e06b788c4..747269179 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -26,15 +26,15 @@ void func_80BD5118(BgIkanaBombwall* this); void func_80BD5134(BgIkanaBombwall* this, PlayState* play); ActorInit Bg_Ikana_Bombwall_InitVars = { - ACTOR_BG_IKANA_BOMBWALL, - ACTORCAT_BG, - FLAGS, - OBJECT_IKANA_OBJ, - sizeof(BgIkanaBombwall), - (ActorFunc)BgIkanaBombwall_Init, - (ActorFunc)BgIkanaBombwall_Destroy, - (ActorFunc)BgIkanaBombwall_Update, - (ActorFunc)BgIkanaBombwall_Draw, + /**/ ACTOR_BG_IKANA_BOMBWALL, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_IKANA_OBJ, + /**/ sizeof(BgIkanaBombwall), + /**/ BgIkanaBombwall_Init, + /**/ BgIkanaBombwall_Destroy, + /**/ BgIkanaBombwall_Update, + /**/ BgIkanaBombwall_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index a0062a62b..c07278e19 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,15 @@ 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), - (ActorFunc)BgIkanaDharma_Init, - (ActorFunc)BgIkanaDharma_Destroy, - (ActorFunc)BgIkanaDharma_Update, - (ActorFunc)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 02ba3b1f4..ba362e0ba 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,15 @@ 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), - (ActorFunc)BgIkanaMirror_Init, - (ActorFunc)BgIkanaMirror_Destroy, - (ActorFunc)BgIkanaMirror_Update, - (ActorFunc)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 6a08ba101..2533c9d22 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,15 @@ 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), - (ActorFunc)BgIkanaRay_Init, - (ActorFunc)BgIkanaRay_Destroy, - (ActorFunc)BgIkanaRay_Update, - (ActorFunc)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_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index f0b2e66ff..8af51f000 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -35,15 +35,15 @@ void func_80B81DAC(BgIkanaRotaryroom* this); void func_80B81DC8(Actor* thisx, PlayState* play); ActorInit Bg_Ikana_Rotaryroom_InitVars = { - ACTOR_BG_IKANA_ROTARYROOM, - ACTORCAT_BG, - FLAGS, - OBJECT_IKANA_OBJ, - sizeof(BgIkanaRotaryroom), - (ActorFunc)BgIkanaRotaryroom_Init, - (ActorFunc)BgIkanaRotaryroom_Destroy, - (ActorFunc)BgIkanaRotaryroom_Update, - (ActorFunc)BgIkanaRotaryroom_Draw, + /**/ ACTOR_BG_IKANA_ROTARYROOM, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_IKANA_OBJ, + /**/ sizeof(BgIkanaRotaryroom), + /**/ BgIkanaRotaryroom_Init, + /**/ BgIkanaRotaryroom_Destroy, + /**/ BgIkanaRotaryroom_Update, + /**/ BgIkanaRotaryroom_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit1[2] = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index 6891956db..cec0dbf18 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,15 @@ 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), - (ActorFunc)BgIkanaShutter_Init, - (ActorFunc)BgIkanaShutter_Destroy, - (ActorFunc)BgIkanaShutter_Update, - (ActorFunc)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_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index f7c0e5710..50023193d 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -30,15 +30,15 @@ void func_80C0AD64(BgIkninSusceil* this, PlayState* play); void func_80C0AE5C(BgIkninSusceil* this, PlayState* play); ActorInit Bg_Iknin_Susceil_InitVars = { - ACTOR_BG_IKNIN_SUSCEIL, - ACTORCAT_BG, - FLAGS, - OBJECT_IKNINSIDE_OBJ, - sizeof(BgIkninSusceil), - (ActorFunc)BgIkninSusceil_Init, - (ActorFunc)BgIkninSusceil_Destroy, - (ActorFunc)BgIkninSusceil_Update, - (ActorFunc)BgIkninSusceil_Draw, + /**/ ACTOR_BG_IKNIN_SUSCEIL, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_IKNINSIDE_OBJ, + /**/ sizeof(BgIkninSusceil), + /**/ BgIkninSusceil_Init, + /**/ BgIkninSusceil_Destroy, + /**/ BgIkninSusceil_Update, + /**/ BgIkninSusceil_Draw, }; static s32 sPad = 0; diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index ecf34c2ae..ddb24e5e7 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,15 @@ 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), - (ActorFunc)BgIkninside_Init, - (ActorFunc)BgIkninside_Destroy, - (ActorFunc)BgIkninside_Update, - (ActorFunc)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 71fbb8d2f..54c77f8e0 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,15 @@ 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), - (ActorFunc)BgIknvDoukutu_Init, - (ActorFunc)BgIknvDoukutu_Destroy, - (ActorFunc)BgIknvDoukutu_Update, - (ActorFunc)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 540c393c6..b82856253 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,15 @@ 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), - (ActorFunc)BgIknvObj_Init, - (ActorFunc)BgIknvObj_Destroy, - (ActorFunc)BgIknvObj_Update, - (ActorFunc)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 0ab213d0a..736e11e36 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,15 @@ 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), - (ActorFunc)BgIngate_Init, - (ActorFunc)BgIngate_Destroy, - (ActorFunc)BgIngate_Update, - (ActorFunc)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 2eac2ed07..b70a1486e 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,15 @@ 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), - (ActorFunc)BgInibsMovebg_Init, - (ActorFunc)BgInibsMovebg_Destroy, - (ActorFunc)Actor_Noop, - (ActorFunc)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 6cc7f7684..45dc34371 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,15 @@ 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), - (ActorFunc)BgKeikokuSaku_Init, - (ActorFunc)BgKeikokuSaku_Destroy, - (ActorFunc)BgKeikokuSaku_Update, - (ActorFunc)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 ac9d089a4..34dab5fa7 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 @@ -16,16 +16,16 @@ void BgKeikokuSpr_Destroy(Actor* thisx, PlayState* play); void BgKeikokuSpr_Update(Actor* thisx, PlayState* play); void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Keikoku_Spr_InitVars = { - ACTOR_BG_KEIKOKU_SPR, - ACTORCAT_PROP, - FLAGS, - OBJECT_KEIKOKU_OBJ, - sizeof(BgKeikokuSpr), - (ActorFunc)BgKeikokuSpr_Init, - (ActorFunc)BgKeikokuSpr_Destroy, - (ActorFunc)BgKeikokuSpr_Update, - (ActorFunc)BgKeikokuSpr_Draw, +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, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index 5a8192bc4..b4a1dcedb 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -23,15 +23,15 @@ void BgKin2Bombwall_SetupEndCutscene(BgKin2Bombwall* this); void BgKin2Bombwall_EndCutscene(BgKin2Bombwall* this, PlayState* play); ActorInit Bg_Kin2_Bombwall_InitVars = { - ACTOR_BG_KIN2_BOMBWALL, - ACTORCAT_BG, - FLAGS, - OBJECT_KIN2_OBJ, - sizeof(BgKin2Bombwall), - (ActorFunc)BgKin2Bombwall_Init, - (ActorFunc)BgKin2Bombwall_Destroy, - (ActorFunc)BgKin2Bombwall_Update, - (ActorFunc)BgKin2Bombwall_Draw, + /**/ ACTOR_BG_KIN2_BOMBWALL, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_KIN2_OBJ, + /**/ sizeof(BgKin2Bombwall), + /**/ BgKin2Bombwall_Init, + /**/ BgKin2Bombwall_Destroy, + /**/ BgKin2Bombwall_Update, + /**/ BgKin2Bombwall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c index 3f68cad8d..332237dc8 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,15 @@ 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), - (ActorFunc)BgKin2Fence_Init, - (ActorFunc)BgKin2Fence_Destroy, - (ActorFunc)BgKin2Fence_Update, - (ActorFunc)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 87a946964..11dd35e9b 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,15 @@ 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), - (ActorFunc)BgKin2Picture_Init, - (ActorFunc)BgKin2Picture_Destroy, - (ActorFunc)BgKin2Picture_Update, - (ActorFunc)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 980b0fa01..55c2d66f7 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,15 @@ 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), - (ActorFunc)BgKin2Shelf_Init, - (ActorFunc)BgKin2Shelf_Destroy, - (ActorFunc)BgKin2Shelf_Update, - (ActorFunc)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 8445e855a..3514b59f6 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,15 @@ 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), - (ActorFunc)BgLadder_Init, - (ActorFunc)BgLadder_Destroy, - (ActorFunc)BgLadder_Update, - (ActorFunc)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 b74fdbd6d..8e5d4bdbf 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,15 @@ 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), - (ActorFunc)BgLastBwall_Init, - (ActorFunc)BgLastBwall_Destroy, - (ActorFunc)BgLastBwall_Update, - (ActorFunc)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 24c7ec1b3..eaf93b740 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,15 @@ 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), - (ActorFunc)BgLbfshot_Init, - (ActorFunc)BgLbfshot_Destroy, - (ActorFunc)Actor_Noop, - (ActorFunc)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 cd125e943..04e784635 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -15,15 +15,15 @@ void func_80AD6A88(BgLotus* this, PlayState* play); void func_80AD6B68(BgLotus* this, PlayState* play); ActorInit Bg_Lotus_InitVars = { - ACTOR_BG_LOTUS, - ACTORCAT_BG, - FLAGS, - OBJECT_LOTUS, - sizeof(BgLotus), - (ActorFunc)BgLotus_Init, - (ActorFunc)BgLotus_Destroy, - (ActorFunc)BgLotus_Update, - (ActorFunc)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 44d797b8e..026bf6f48 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,15 @@ 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), (ActorFunc)BgMarketStep_Init, - (ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)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 305c3084e..ef60c2de2 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,15 @@ 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), - (ActorFunc)BgMbarChair_Init, - (ActorFunc)BgMbarChair_Destroy, - (ActorFunc)BgMbarChair_Update, - (ActorFunc)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 0d308979c..0addd3520 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,15 @@ 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), - (ActorFunc)BgNumaHana_Init, - (ActorFunc)BgNumaHana_Destroy, - (ActorFunc)BgNumaHana_Update, - (ActorFunc)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 e23504231..2dc79979b 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,15 @@ typedef enum { } BGOpenShutterDoorState; ActorInit Bg_Open_Shutter_InitVars = { - ACTOR_BG_OPEN_SHUTTER, - ACTORCAT_DOOR, - FLAGS, - OBJECT_OPEN_OBJ, - sizeof(BgOpenShutter), - (ActorFunc)BgOpenShutter_Init, - (ActorFunc)BgOpenShutter_Destroy, - (ActorFunc)BgOpenShutter_Update, - (ActorFunc)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[] = { @@ -112,8 +112,8 @@ void func_80ACAD88(BgOpenShutter* this, PlayState* play) { Player* player = GET_PLAYER(play); Actor_PlaySfx(&this->slidingDoor.dyna.actor, NA_SE_EV_SLIDE_DOOR_OPEN); - Camera_ChangeDoorCam(play->cameraPtrs[CAM_ID_MAIN], &this->slidingDoor.dyna.actor, player->doorBgCamIndex, 0.0f, - 12, 15, 10); + Camera_ChangeDoorCam(play->cameraPtrs[CAM_ID_MAIN], &this->slidingDoor.dyna.actor, player->cv.doorBgCamIndex, + 0.0f, 12, 15, 10); this->unk_164 = 0; this->actionFunc = func_80ACAE5C; this->slidingDoor.dyna.actor.velocity.y = 0.0f; 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 b5eb3130a..c8d340d47 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,15 @@ 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), - (ActorFunc)BgOpenSpot_Init, - (ActorFunc)BgOpenSpot_Destroy, - (ActorFunc)BgOpenSpot_Update, - (ActorFunc)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 f7b428837..e57334605 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 @@ -26,15 +26,15 @@ 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), - (ActorFunc)BgSinkaiKabe_Init, - (ActorFunc)BgSinkaiKabe_Destroy, - (ActorFunc)BgSinkaiKabe_Update, - (ActorFunc)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 ec3961fd7..b88a2b060 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,15 @@ 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), - (ActorFunc)BgSpdweb_Init, - (ActorFunc)BgSpdweb_Destroy, - (ActorFunc)BgSpdweb_Update, - (ActorFunc)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 796f66d3f..16c6dd039 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,15 @@ 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), - (ActorFunc)BgSpoutFire_Init, - (ActorFunc)BgSpoutFire_Destroy, - (ActorFunc)BgSpoutFire_Update, - (ActorFunc)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 5302c6a90..73673f741 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -16,16 +16,16 @@ void BgTobira01_Destroy(Actor* thisx, PlayState* play); void BgTobira01_Update(Actor* thisx, PlayState* play); void BgTobira01_Draw(Actor* thisx, PlayState* play); -const ActorInit Bg_Tobira01_InitVars = { - ACTOR_BG_TOBIRA01, - ACTORCAT_PROP, - FLAGS, - OBJECT_SPOT11_OBJ, - sizeof(BgTobira01), - (ActorFunc)BgTobira01_Init, - (ActorFunc)BgTobira01_Destroy, - (ActorFunc)BgTobira01_Update, - (ActorFunc)BgTobira01_Draw, +ActorInit Bg_Tobira01_InitVars = { + /**/ ACTOR_BG_TOBIRA01, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_SPOT11_OBJ, + /**/ sizeof(BgTobira01), + /**/ BgTobira01_Init, + /**/ BgTobira01_Destroy, + /**/ BgTobira01_Update, + /**/ BgTobira01_Draw, }; void BgTobira01_Action(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 3eb8e3c8a..17ba20537 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,15 @@ 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), - (ActorFunc)BgUmajump_Init, - (ActorFunc)BgUmajump_Destroy, - (ActorFunc)BgUmajump_Update, - (ActorFunc)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_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 3ca53ff7f..6adf386d7 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -1,436 +1,3590 @@ /* * File: z_boss_01.c * Overlay: ovl_Boss_01 - * Description: Odolwa + * Description: Odolwa, his bugs, and his afterimages. + * + * In addition to handling Odolwa, this actor is also responsible for handling the bugs that Odolwa can spawn as well as + * the afterimages that appear when Odolwa jumps or does a spin attack. The bugs are effectively their own actor with + * their own Update and Draw functions and a whole dedicated section of the file specifically for them. Afterimages are + * much simpler, and their code is more interleaved with Odolwa's code. This actor also handles the falling block and + * ring of fire effects that Odolwa can summon. + * + * Odolwa's behavior can primarily be divided into two states: waiting and attacking. He has a variety of wait actions + * and attack types that he can select between, and this can make it difficult to tell when he is waiting and when he is + * attacking. Two of his wait actions look like attacks, and when selecting an attack, he can randomly choose to dance + * for a bit before attacking. Additionally, Odolwa can attack the player via more indirect means while waiting by + * summoning bugs, by dropping falling blocks on them, or by summoning a ring of fire to surround them. + * + * Outside of waiting and attacking, most of Odolwa's behavior involves either dodging attacks (e.g., by jumping, + * running around, or guarding) or reacting to attacks. He also handles all his cutscenes (his intro cutscene, the + * cutscene where he summons bugs, and his death cutscene) manually via actionFuncs. + * + * Odolwa's fight can be divided roughly into two phases, but unlike most bosses, the second phase does not happen when + * his health reaches a certain point. Rather, the second phase starts when 1000 or more frames have passed since the + * fight began. At this point, he will play the bug summoning cutscene, and more wait actions will be available for him + * to randomly select; these new wait actions are what allow him to summon a ring of fire, drop falling blocks, etc. */ #include "z_boss_01.h" #include "z64rumble.h" #include "z64shrink_window.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" +#include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" +#include "overlays/actors/ovl_En_Tanron1/z_en_tanron1.h" +#include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) #define THIS ((Boss01*)thisx) +#define ODOLWA_EFFECT_COUNT 100 + +// This actor has an array of timers in its instance, but it only ever uses the first entry. +#define TIMER_CURRENT_ACTION 0 +#define TIMER_BUG_CURRENT_ACTION 0 +#define TIMER_AFTERIMAGE_DESPAWN 0 + void Boss01_Init(Actor* thisx, PlayState* play); void Boss01_Destroy(Actor* thisx, PlayState* play); -void Boss01_Update(Actor* thisx, PlayState* play); +void Boss01_Update(Actor* thisx, PlayState* play2); void Boss01_Draw(Actor* thisx, PlayState* play); -void func_809D12B4(Boss01* this, PlayState* play); -void func_809D1B2C(Boss01* this, PlayState* play); -void func_809D1E74(Boss01* this, PlayState* play); -void func_809D20D0(Boss01* this, PlayState* play); -void func_809D25E8(Boss01* this, PlayState* play); -void func_809D26B8(Boss01* this, PlayState* play); -void func_809D27D4(Boss01* this, PlayState* play); -void func_809D2AA0(Boss01* this, PlayState* play); -void func_809D2BCC(Boss01* this, PlayState* play); -void func_809D2CDC(Boss01* this, PlayState* play); -void func_809D2E4C(Boss01* this, PlayState* play); -void func_809D30D0(Boss01* this, PlayState* play); -void func_809D345C(Boss01* this, PlayState* play); -void func_809D3530(Boss01* this, PlayState* play); -void func_809D3ADC(Boss01* this, PlayState* play); -void func_809D3CD0(Boss01* this, PlayState* play); -void func_809D4464(Boss01* this, PlayState* play); -void func_809D6314(Boss01* this, PlayState* play); -void func_809D6488(Boss01* this, PlayState* play); -void func_809D6588(Boss01* this, PlayState* play); -void func_809D65E0(Boss01* this, PlayState* play); +void Boss01_SetupIntroCutscene(Boss01* this, PlayState* play); +void Boss01_IntroCutscene(Boss01* this, PlayState* play); +void Boss01_SummonBugsCutscene(Boss01* this, PlayState* play); +void Boss01_Afterimage_SetupWaitToDespawn(Boss01* this, PlayState* play); +void Boss01_Afterimage_WaitToDespawn(Boss01* this, PlayState* play); +void Boss01_SetupWait(Boss01* this, PlayState* play, u8 waitType); +void Boss01_Wait(Boss01* this, PlayState* play); +void Boss01_Dazed(Boss01* this, PlayState* play); +void Boss01_SetupSpinAttack(Boss01* this, PlayState* play); +void Boss01_SpinAttack(Boss01* this, PlayState* play); +void Boss01_SetupDanceBeforeAttack(Boss01* this, PlayState* play); +void Boss01_DanceBeforeAttack(Boss01* this, PlayState* play); +void Boss01_SetupRun(Boss01* this, PlayState* play); +void Boss01_Run(Boss01* this, PlayState* play); +void Boss01_SetupJump(Boss01* this, PlayState* play, u8 shouldPerformFallingSlash); +void Boss01_JumpSquat(Boss01* this, PlayState* play); +void Boss01_Jump(Boss01* this, PlayState* play); +void Boss01_JumpLand(Boss01* this, PlayState* play); +void Boss01_SetupVerticalSlash(Boss01* this, PlayState* play); +void Boss01_VerticalSlash(Boss01* this, PlayState* play); +void Boss01_SetupHorizontalSlash(Boss01* this, PlayState* play); +void Boss01_HorizontalSlash(Boss01* this, PlayState* play); +void Boss01_Guard(Boss01* this, PlayState* play); +void Boss01_SetupKick(Boss01* this, PlayState* play); +void Boss01_Kick(Boss01* this, PlayState* play); +void Boss01_SetupShieldBash(Boss01* this, PlayState* play); +void Boss01_ShieldBash(Boss01* this, PlayState* play); +void Boss01_Damaged(Boss01* this, PlayState* play); +void Boss01_SetupSummonMoths(Boss01* this, PlayState* play); +void Boss01_SummonMoths(Boss01* this, PlayState* play); +void Boss01_SetupDeathCutscene(Boss01* this, PlayState* play); +void Boss01_DeathCutscene(Boss01* this, PlayState* play); +void Boss01_SetupStunned(Boss01* this, PlayState* play); +void Boss01_Stunned(Boss01* this, PlayState* play); +void Boss01_Afterimage_Draw(Actor* thisx, PlayState* play); +void Boss01_GenShadowTex(u8* tex, Boss01* this, PlayState* play); +void Boss01_DrawShadowTex(u8* tex, Boss01* this, PlayState* play); +void Boss01_Bug_SetupCrawl(Boss01* this, PlayState* play); +void Boss01_Bug_Crawl(Boss01* this, PlayState* play); +void Boss01_Bug_Damaged(Boss01* this, PlayState* play); +void Boss01_Bug_SetupDead(Boss01* this, PlayState* play); +void Boss01_Bug_Stunned(Boss01* this, PlayState* play); +void Boss01_Bug_Dead(Boss01* this, PlayState* play); +void Boss01_Bug_Update(Actor* thisx, PlayState* play); +void Boss01_Bug_Draw(Actor* thisx, PlayState* play); +void Boss01_UpdateEffects(Boss01* this, PlayState* play); +void Boss01_DrawEffects(PlayState* play); -#if 0 -// static DamageTable sDamageTable = { -static DamageTable D_809D7990 = { - /* Deku Nut */ DMG_ENTRY(0, 0x1), - /* Deku Stick */ DMG_ENTRY(1, 0xF), - /* Horse trample */ DMG_ENTRY(0, 0x0), - /* Explosives */ DMG_ENTRY(1, 0xE), - /* Zora boomerang */ DMG_ENTRY(1, 0xF), - /* Normal arrow */ DMG_ENTRY(1, 0xF), - /* UNK_DMG_0x06 */ DMG_ENTRY(0, 0x0), - /* Hookshot */ DMG_ENTRY(0, 0x0), - /* Goron punch */ DMG_ENTRY(1, 0xE), - /* Sword */ DMG_ENTRY(1, 0xE), - /* Goron pound */ DMG_ENTRY(1, 0xF), - /* Fire arrow */ DMG_ENTRY(2, 0x2), - /* Ice arrow */ DMG_ENTRY(2, 0x3), - /* Light arrow */ DMG_ENTRY(2, 0x4), - /* Goron spikes */ DMG_ENTRY(1, 0xF), - /* Deku spin */ DMG_ENTRY(1, 0xF), - /* Deku bubble */ DMG_ENTRY(0, 0x1), - /* Deku launch */ DMG_ENTRY(1, 0xE), - /* UNK_DMG_0x12 */ DMG_ENTRY(0, 0x1), - /* Zora barrier */ DMG_ENTRY(0, 0xB), - /* Normal shield */ DMG_ENTRY(0, 0x0), - /* Light ray */ DMG_ENTRY(0, 0x0), - /* Thrown object */ DMG_ENTRY(1, 0xF), - /* Zora punch */ DMG_ENTRY(1, 0xE), - /* Spin attack */ DMG_ENTRY(1, 0xD), - /* Sword beam */ DMG_ENTRY(2, 0xC), - /* Normal Roll */ DMG_ENTRY(0, 0x0), - /* UNK_DMG_0x1B */ DMG_ENTRY(0, 0x0), - /* UNK_DMG_0x1C */ DMG_ENTRY(0, 0x0), - /* Unblockable */ DMG_ENTRY(0, 0x0), - /* UNK_DMG_0x1E */ DMG_ENTRY(0, 0x0), - /* Powder Keg */ DMG_ENTRY(1, 0xE), +typedef enum { + /* 0 */ ODOLWA_EFFECT_NONE, + /* 1 */ ODOLWA_EFFECT_FALLING_BLOCK, // The blocks that fall from the ceiling and their fragments + /* 3 */ ODOLWA_EFFECT_RING_OF_FIRE = 3 // The ring of fire that surrounds the player +} OdolwaEffectType; + +typedef enum { + /* 0 */ ODOLWA_WAIT_READY, + /* 1 */ ODOLWA_WAIT_SPIN_SWORD, + /* 2 */ ODOLWA_WAIT_VERTICAL_HOP, + /* 3 */ ODOLWA_WAIT_SHAKE_DANCE, + /* 4 */ ODOLWA_WAIT_UP_AND_DOWN_DANCE, + /* 5 */ ODOLWA_WAIT_ARM_SWING_DANCE, + /* 6 */ ODOLWA_WAIT_THRUST_ATTACK, + /* 7 */ ODOLWA_WAIT_DOUBLE_SLASH, + /* 8 */ ODOLWA_WAIT_SIDE_TO_SIDE_HOP, + /* 9 */ ODOLWA_WAIT_SIDE_TO_SIDE_DANCE, + /* 10 */ ODOLWA_WAIT_SPIN_DANCE, + /* 11 */ ODOLWA_WAIT_JUMP_DANCE, + /* 12 */ ODOLWA_WAIT_MAX, + + // This doesn't correspond to an actual wait action that Odolwa can perform, but it can be passed as a parameter to + // Boss01_SetupWait to randomly select between one of Odolwa's available wait types (as well as having a random + // chance to summon moths instead), assuming that the fight is in its second phase. + /* 100 */ ODOLWA_WAIT_RANDOM = 100 +} OdolwaWaitType; + +typedef enum { + // Waits for the player to walk forward, then starts the cutscene and transitions to the next state immediately. + // This state is also used to indiciate the cutscene ended. + /* 0 */ ODOLWA_INTRO_CS_STATE_WAITING_FOR_PLAYER_OR_DONE, + + // Points the camera directly at the player, plays some of Odolwa's SFXs, and waits for 120 frames. + /* 1 */ ODOLWA_INTRO_CS_STATE_LOOK_AT_PLAYER, + + // Pans up to watch Odolwa fall from the ceiling. Transitions to the next state once he's close to the ground. + /* 2 */ ODOLWA_INTRO_CS_STATE_ODOLWA_FALLING, + + // Plays Odolwa's intro animation and shows his title card. Ends the cutscene after 140 frames. + /* 3 */ ODOLWA_INTRO_CS_STATE_ODOLWA_LANDED +} OdolwaIntroCsState; + +typedef enum { + // Starts the cutscene and transitions to the next state immediately. + /* 0 */ ODOLWA_BUG_SUMMONING_CS_STATE_STARTED, + + // This state lasts for the entire duration of the cutscene, and cutsceneState is left in this state when it ends. + /* 1 */ ODOLWA_BUG_SUMMONING_CS_STATE_PLAYING_OR_DONE +} OdolwaBugSummoningCsState; + +typedef enum { + // Starts the cutscene and transitions to the next state immediately. + /* 0 */ ODOLWA_DEATH_CS_STATE_STARTED, + + // Plays Odolwa's death animation and makes him fall face-first towards the ground. Ends after 71 frames. + /* 1 */ ODOLWA_DEATH_CS_STATE_PLAY_ANIM_AND_FALL_FORWARD, + + // Surrounds Odolwa with fire and slowly shrinks him. After 180 frames, spawns the blue warp and ends the cutscene. + /* 2 */ ODOLWA_DEATH_CS_STATE_BURST_INTO_FLAMES_AND_SHRINK, + + // Signals that the cutscene has ended. Also teleports Odolwa far above the ceiling. + /* 3 */ ODOLWA_DEATH_CS_STATE_DONE +} OdolwaDeathCsState; + +typedef enum { + /* 0 */ ODOLWA_DRAW_DMGEFF_STATE_NONE, + /* 1 */ ODOLWA_DRAW_DMGEFF_STATE_FIRE_INIT, + /* 2 */ ODOLWA_DRAW_DMGEFF_STATE_FIRE_ACTIVE, + /* 10 */ ODOLWA_DRAW_DMGEFF_STATE_FROZEN_INIT = 10, + /* 11 */ ODOLWA_DRAW_DMGEFF_STATE_FROZEN_ACTIVE, + /* 20 */ ODOLWA_DRAW_DMGEFF_STATE_LIGHT_ORB_INIT = 20, + /* 21 */ ODOLWA_DRAW_DMGEFF_STATE_LIGHT_ORB_ACTIVE, + /* 30 */ ODOLWA_DRAW_DMGEFF_STATE_BLUE_LIGHT_ORB_INIT = 30, + /* 40 */ ODOLWA_DRAW_DMGEFF_STATE_ELECTRIC_SPARKS_INIT = 40, + /* 41 */ ODOLWA_DRAW_DMGEFF_STATE_ELECTRIC_SPARKS_ACTIVE +} OdolwaDrawDmgEffState; + +typedef enum { + /* 0 */ ODOLWA_SHADOW_SIZE_MEDIUM, + /* 1 */ ODOLWA_SHADOW_SIZE_LARGE, + /* 2 */ ODOLWA_SHADOW_SIZE_EXTRA_LARGE, + /* 3 */ ODOLWA_SHADOW_SIZE_SMALL +} OdolwaShadowSize; + +typedef enum { + // There are no AT colliders enabled; the player can pass through the sword without reacting or taking any damage. + /* 0 */ ODOLWA_SWORD_STATE_INACTIVE, + + // The sword's two AT colliders are enabled; the player will be knocked back and take damage if they touch the + // sword. There is a third collider originating from Odolwa's pelvis that is also active, but it is offset very far + // out-of-bounds in this state, so the player can never touch it. + /* 1 */ ODOLWA_SWORD_STATE_ACTIVE, + + // Similar to the previous state, but the pelvis collider is now placed on the floor in front of Odolwa. + /* 2 */ ODOLWA_SWORD_STATE_HORIZONTAL_SLASH +} OdolwaSwordState; + +/** + * When falling blocks spawn, the sound effect of them falling always plays from this position, regardless of where they + * actually spawn. + */ +static Vec3f sFallingBlockSfxPos = { 0.0f, 1000.0f, 0.0f }; + +/** + * Odolwa's sword trail is a circular arc, and this variable is used to determine the angular range of this arc (and + * thus the total size of the trail). The trail consists of 10 segments in an arc, and the angle of each of those + * segments is M_PI / sSwordTrailAngularRangeDivisor; in other words, as this variable decreases, Odolwa's sword trail + * covers a larger angular range, and as it increaes, the sword trail covers a smaller angular range. + */ +static f32 sSwordTrailAngularRangeDivisor = 10.0f; + +typedef enum { + // Named based on the fact that everything with this damage effect deals zero damage. If this effect is given to an + // attack that deals non-zero damage, it will behave exactly like ODOLWA_DMGEFF_DAMAGE. + /* 0x0 */ ODOLWA_DMGEFF_IMMUNE, + + // Deals no damage, but turns Odolwa blue, stops all animations, and makes him wait in place for 40 frames. + /* 0x1 */ ODOLWA_DMGEFF_STUN, + + // Deals damage and surrounds Odolwa with fire. + /* 0x2 */ ODOLWA_DMGEFF_FIRE, + + // Behaves exactly like ODOLWA_DMGEFF_STUN, but also surrounds Odolwa with ice. + /* 0x3 */ ODOLWA_DMGEFF_FREEZE, + + // Deals damage and surrounds Odolwa with yellow light orbs. + /* 0x4 */ ODOLWA_DMGEFF_LIGHT_ORB, + + // Behaves exactly like ODOLWA_DMGEFF_STUN, but also surrounds Odolwa in electric sparks. + /* 0xB */ ODOLWA_DMGEFF_ELECTRIC_STUN = 0xB, + + // Deals damage and surrounds Odolwa with blue light orbs. + /* 0xC */ ODOLWA_DMGEFF_BLUE_LIGHT_ORB, + + // Deals damage and has no special effect. + /* 0xD */ ODOLWA_DMGEFF_DAMAGE, + + // Deals damage and checks the timer that tracks how long Odolwa should be in his damaged state. If the timer is 7 + // or more, it will reset the timer to 20 frames keep Odolwa in the damaged state for longer. If the timer is 6 or + // less, it will disable Odolwa's collision for 20 frames to ensure he can jump away without taking further damage. + /* 0xE */ ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK, + + // Deals no damage, but makes Odolwa play his dazed animation for 70 frames and be vulnerable to attacks. + /* 0xF */ ODOLWA_DMGEFF_DAZE +} OdolwaDamageEffect; + +static DamageTable sOdolwaDamageTable = { + /* Deku Nut */ DMG_ENTRY(0, ODOLWA_DMGEFF_STUN), + /* Deku Stick */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAZE), + /* Horse trample */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* Explosives */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK), + /* Zora boomerang */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAZE), + /* Normal arrow */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAZE), + /* UNK_DMG_0x06 */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* Hookshot */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* Goron punch */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK), + /* Sword */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK), + /* Goron pound */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAZE), + /* Fire arrow */ DMG_ENTRY(2, ODOLWA_DMGEFF_FIRE), + /* Ice arrow */ DMG_ENTRY(2, ODOLWA_DMGEFF_FREEZE), + /* Light arrow */ DMG_ENTRY(2, ODOLWA_DMGEFF_LIGHT_ORB), + /* Goron spikes */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAZE), + /* Deku spin */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAZE), + /* Deku bubble */ DMG_ENTRY(0, ODOLWA_DMGEFF_STUN), + /* Deku launch */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK), + /* UNK_DMG_0x12 */ DMG_ENTRY(0, ODOLWA_DMGEFF_STUN), + /* Zora barrier */ DMG_ENTRY(0, ODOLWA_DMGEFF_ELECTRIC_STUN), + /* Normal shield */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* Light ray */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* Thrown object */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAZE), + /* Zora punch */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK), + /* Spin attack */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAMAGE), + /* Sword beam */ DMG_ENTRY(2, ODOLWA_DMGEFF_BLUE_LIGHT_ORB), + /* Normal Roll */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* UNK_DMG_0x1B */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* UNK_DMG_0x1C */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* Unblockable */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* UNK_DMG_0x1E */ DMG_ENTRY(0, ODOLWA_DMGEFF_IMMUNE), + /* Powder Keg */ DMG_ENTRY(1, ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK), }; -// static DamageTable sDamageTable = { -static DamageTable D_809D79B0 = { - /* Deku Nut */ DMG_ENTRY(0, 0x1), - /* Deku Stick */ DMG_ENTRY(1, 0xF), - /* Horse trample */ DMG_ENTRY(0, 0x0), - /* Explosives */ DMG_ENTRY(2, 0xF), - /* Zora boomerang */ DMG_ENTRY(0, 0x1), - /* Normal arrow */ DMG_ENTRY(2, 0xF), - /* UNK_DMG_0x06 */ DMG_ENTRY(0, 0x0), - /* Hookshot */ DMG_ENTRY(0, 0x0), - /* Goron punch */ DMG_ENTRY(1, 0xF), - /* Sword */ DMG_ENTRY(1, 0xF), - /* Goron pound */ DMG_ENTRY(1, 0xF), - /* Fire arrow */ DMG_ENTRY(2, 0x2), - /* Ice arrow */ DMG_ENTRY(2, 0x3), - /* Light arrow */ DMG_ENTRY(2, 0x4), - /* Goron spikes */ DMG_ENTRY(1, 0xF), - /* Deku spin */ DMG_ENTRY(0, 0x1), - /* Deku bubble */ DMG_ENTRY(0, 0x1), - /* Deku launch */ DMG_ENTRY(1, 0xF), - /* UNK_DMG_0x12 */ DMG_ENTRY(0, 0x1), - /* Zora barrier */ DMG_ENTRY(0, 0x1), - /* Normal shield */ DMG_ENTRY(0, 0x0), - /* Light ray */ DMG_ENTRY(0, 0x0), - /* Thrown object */ DMG_ENTRY(1, 0xF), - /* Zora punch */ DMG_ENTRY(1, 0xE), - /* Spin attack */ DMG_ENTRY(2, 0xD), - /* Sword beam */ DMG_ENTRY(2, 0xD), - /* Normal Roll */ DMG_ENTRY(0, 0x0), - /* UNK_DMG_0x1B */ DMG_ENTRY(0, 0x0), - /* UNK_DMG_0x1C */ DMG_ENTRY(0, 0x0), - /* Unblockable */ DMG_ENTRY(0, 0x0), - /* UNK_DMG_0x1E */ DMG_ENTRY(0, 0x0), - /* Powder Keg */ DMG_ENTRY(1, 0xF), +typedef enum { + // Named based on the fact that everything with this damage effect deals zero damage. If this effect is given to an + // attack that deals non-zero damage, it will behave exactly like BUG_DMGEFF_DAMAGE. + /* 0x0 */ BUG_DMGEFF_IMMUNE, + + // Deals no damage, but turns the bug blue, stops all animations, and makes it wait in place for 40 frames. + /* 0x1 */ BUG_DMGEFF_STUN, + + // Named after the only attack that uses it. Behaves exactly like BUG_DMGEFF_DAMAGE. + /* 0x2 */ BUG_DMGEFF_FIRE_ARROW, + + // Named after the only attack that uses it. Behaves exactly like BUG_DMGEFF_DAMAGE. + /* 0x3 */ BUG_DMGEFF_ICE_ARROW, + + // Named after the only attack that uses it. Behaves exactly like BUG_DMGEFF_DAMAGE. + /* 0x4 */ BUG_DMGEFF_LIGHT_ARROW, + + // Named after the only two attacks that use it. Behaves exactly like BUG_DMGEFF_DAMAGE. + /* 0xD */ BUG_DMGEFF_SPIN_ATTACK_AND_SWORD_BEAM = 0xD, + + // Named after the only attack that uses it. Behaves exactly like BUG_DMGEFF_DAMAGE. + /* 0xE */ BUG_DMGEFF_ZORA_PUNCH, + + // Deals damage and has no special effect. + /* 0xF */ BUG_DMGEFF_DAMAGE +} BugDamageEffect; + +static DamageTable sBugDamageTable = { + /* Deku Nut */ DMG_ENTRY(0, BUG_DMGEFF_STUN), + /* Deku Stick */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), + /* Horse trample */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* Explosives */ DMG_ENTRY(2, BUG_DMGEFF_DAMAGE), + /* Zora boomerang */ DMG_ENTRY(0, BUG_DMGEFF_STUN), + /* Normal arrow */ DMG_ENTRY(2, BUG_DMGEFF_DAMAGE), + /* UNK_DMG_0x06 */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* Hookshot */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* Goron punch */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), + /* Sword */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), + /* Goron pound */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), + /* Fire arrow */ DMG_ENTRY(2, BUG_DMGEFF_FIRE_ARROW), + /* Ice arrow */ DMG_ENTRY(2, BUG_DMGEFF_ICE_ARROW), + /* Light arrow */ DMG_ENTRY(2, BUG_DMGEFF_LIGHT_ARROW), + /* Goron spikes */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), + /* Deku spin */ DMG_ENTRY(0, BUG_DMGEFF_STUN), + /* Deku bubble */ DMG_ENTRY(0, BUG_DMGEFF_STUN), + /* Deku launch */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), + /* UNK_DMG_0x12 */ DMG_ENTRY(0, BUG_DMGEFF_STUN), + /* Zora barrier */ DMG_ENTRY(0, BUG_DMGEFF_STUN), + /* Normal shield */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* Light ray */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* Thrown object */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), + /* Zora punch */ DMG_ENTRY(1, BUG_DMGEFF_ZORA_PUNCH), + /* Spin attack */ DMG_ENTRY(2, BUG_DMGEFF_SPIN_ATTACK_AND_SWORD_BEAM), + /* Sword beam */ DMG_ENTRY(2, BUG_DMGEFF_SPIN_ATTACK_AND_SWORD_BEAM), + /* Normal Roll */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* UNK_DMG_0x1B */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* UNK_DMG_0x1C */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* Unblockable */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* UNK_DMG_0x1E */ DMG_ENTRY(0, BUG_DMGEFF_IMMUNE), + /* Powder Keg */ DMG_ENTRY(1, BUG_DMGEFF_DAMAGE), }; -// static ColliderJntSphElementInit sJntSphElementsInit[3] = { -static ColliderJntSphElementInit D_809D79D0[3] = { +// The limbs referenced here are not used. The spheres are positioned manually by Boss01_PostLimbDraw. +static ColliderJntSphElementInit sSwordColliderJntSphElementsInit[3] = { { - { ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 0, { { 0, 0, 0 }, 35 }, 100 }, + { + ELEMTYPE_UNK2, + { 0xF7CFFFFF, 0x04, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 35 }, 100 }, }, { - { ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 0, { { 0, 0, 0 }, 35 }, 100 }, + { + ELEMTYPE_UNK2, + { 0xF7CFFFFF, 0x04, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 35 }, 100 }, }, { - { ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 0, { { 0, 0, 0 }, 70 }, 100 }, + { + ELEMTYPE_UNK2, + { 0xF7CFFFFF, 0x04, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 70 }, 100 }, }, }; -// static ColliderJntSphInit sJntSphInit = { -static ColliderJntSphInit D_809D7A3C = { - { COLTYPE_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, - ARRAY_COUNT(sJntSphElementsInit), D_809D79D0, // sJntSphElementsInit, +static ColliderJntSphInit sSwordColliderJntSphInit = { + { + COLTYPE_METAL, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_HARD | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_PLAYER, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + ARRAY_COUNT(sSwordColliderJntSphElementsInit), + sSwordColliderJntSphElementsInit, }; -// static ColliderJntSphElementInit sJntSphElementsInit[1] = { -static ColliderJntSphElementInit D_809D7A4C[1] = { +// The limbs referenced here are not used. The spheres are positioned manually by Boss01_PostLimbDraw. +static ColliderJntSphElementInit sShieldColliderJntSphElementsInit[1] = { { - { ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 0, { { 0, 0, 0 }, 36 }, 100 }, + { + ELEMTYPE_UNK2, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 36 }, 100 }, }, }; -// static ColliderJntSphInit sJntSphInit = { -static ColliderJntSphInit D_809D7A70 = { - { COLTYPE_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, - ARRAY_COUNT(sJntSphElementsInit), D_809D7A4C, // sJntSphElementsInit, +static ColliderJntSphInit sShieldColliderJntSphInit = { + { + COLTYPE_METAL, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_HARD | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_PLAYER, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + ARRAY_COUNT(sShieldColliderJntSphElementsInit), + sShieldColliderJntSphElementsInit, }; -// static ColliderJntSphElementInit sJntSphElementsInit[11] = { -static ColliderJntSphElementInit D_809D7A80[11] = { +// The limbs referenced here are not used. The spheres are positioned manually by Boss01_PostLimbDraw. +static ColliderJntSphElementInit sBodyColliderJntSphElementsInit[11] = { { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 0, { { 0, 0, 0 }, 20 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 20 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 30 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 30 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 25 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 25 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, - { 1, { { 0, 0, 0 }, 15 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, }; -// static ColliderJntSphInit sJntSphInit = { -static ColliderJntSphInit D_809D7C0C = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, - ARRAY_COUNT(sJntSphElementsInit), D_809D7A80, // sJntSphElementsInit, +static ColliderJntSphInit sBodyColliderJntSphInit = { + { + COLTYPE_HIT3, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_PLAYER, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + ARRAY_COUNT(sBodyColliderJntSphElementsInit), + sBodyColliderJntSphElementsInit, }; -// static ColliderJntSphElementInit sJntSphElementsInit[2] = { -static ColliderJntSphElementInit D_809D7C1C[2] = { +// The limbs referenced here are not used. The spheres are positioned manually by Boss01_PostLimbDraw. +static ColliderJntSphElementInit sKickAndShieldBashColliderJntSphElementsInit[2] = { { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_HARD, BUMP_ON, OCELEM_ON, }, - { 0, { { 0, 0, 0 }, 36 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x04, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_HARD, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 36 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_HARD, BUMP_ON, OCELEM_ON, }, - { 0, { { 0, 0, 0 }, 36 }, 100 }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x04, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_HARD, + BUMP_ON, + OCELEM_ON, + }, + { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 36 }, 100 }, }, }; -// static ColliderJntSphInit sJntSphInit = { -static ColliderJntSphInit D_809D7C64 = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, - ARRAY_COUNT(sJntSphElementsInit), D_809D7C1C, // sJntSphElementsInit, +static ColliderJntSphInit sKickAndShieldBashColliderJntSphInit = { + { + COLTYPE_HIT3, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_PLAYER, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + ARRAY_COUNT(sKickAndShieldBashColliderJntSphElementsInit), + sKickAndShieldBashColliderJntSphElementsInit, }; -// static ColliderCylinderInit sCylinderInit = { -static ColliderCylinderInit D_809D7C74 = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7FFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, +static ColliderCylinderInit sBugACColliderCylinderInit = { + { + COLTYPE_HIT3, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7FFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 15, 15, 10, { 0, 0, 0 } }, }; -// static ColliderCylinderInit sCylinderInit = { -static ColliderCylinderInit D_809D7CA0 = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7FFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, +static ColliderCylinderInit sBugATColliderCylinderInit = { + { + COLTYPE_HIT3, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK3, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7FFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 8, 15, 10, { 0, 0, 0 } }, }; ActorInit Boss_01_InitVars = { - ACTOR_BOSS_01, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS01, - sizeof(Boss01), - (ActorFunc)Boss01_Init, - (ActorFunc)Boss01_Destroy, - (ActorFunc)Boss01_Update, - (ActorFunc)Boss01_Draw, + /**/ ACTOR_BOSS_01, + /**/ ACTORCAT_BOSS, + /**/ FLAGS, + /**/ OBJECT_BOSS01, + /**/ sizeof(Boss01), + /**/ Boss01_Init, + /**/ Boss01_Destroy, + /**/ Boss01_Update, + /**/ Boss01_Draw, }; -#endif - -extern DamageTable D_809D7990; -extern DamageTable D_809D79B0; -extern ColliderJntSphElementInit D_809D79D0[3]; -extern ColliderJntSphInit D_809D7A3C; -extern ColliderJntSphElementInit D_809D7A4C[1]; -extern ColliderJntSphInit D_809D7A70; -extern ColliderJntSphElementInit D_809D7A80[11]; -extern ColliderJntSphInit D_809D7C0C; -extern ColliderJntSphElementInit D_809D7C1C[2]; -extern ColliderJntSphInit D_809D7C64; -extern ColliderCylinderInit D_809D7C74; -extern ColliderCylinderInit D_809D7CA0; - -extern UNK_TYPE D_06000C44; -extern UNK_TYPE D_06001884; -extern UNK_TYPE D_0600C338; -extern UNK_TYPE D_0600C5E0; -extern UNK_TYPE D_0600C7A8; -extern UNK_TYPE D_0600E3E8; -extern UNK_TYPE D_0600FDEC; -extern UNK_TYPE D_0600FF94; -extern UNK_TYPE D_06010980; -extern UNK_TYPE D_060124CC; -extern UNK_TYPE D_06012B70; -extern UNK_TYPE D_06012D10; -extern UNK_TYPE D_06012EBC; -extern UNK_TYPE D_06013480; -extern UNK_TYPE D_0601407C; -extern UNK_TYPE D_06014F14; -extern UNK_TYPE D_06015A30; -extern UNK_TYPE D_06016168; -extern UNK_TYPE D_060164CC; -extern UNK_TYPE D_0601F6A4; -extern UNK_TYPE D_060204AC; -extern UNK_TYPE D_060213A8; -extern UNK_TYPE D_06022550; - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D0530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D0550.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D0678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D082C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D089C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D092C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D0AA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/Boss01_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/Boss01_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D119C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D1258.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D12B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D1AB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D1B2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D1E5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D1E74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D1EA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D20D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2588.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D25E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2664.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D26B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2780.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D27D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2858.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2914.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2A44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2AA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2BCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2CDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2DE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D2E4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3074.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D30D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D32B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3374.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3400.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D345C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D34D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D35A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D365C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D370C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3A7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3ADC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3C10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D3CD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D441C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D4464.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D44C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D4668.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/Boss01_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D519C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D5584.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D55CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/Boss01_Draw.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D5B0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D5BC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D5FB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D606C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D62D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6314.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6424.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6488.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D64E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6540.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6588.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D65E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D670C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D694C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6B08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6BB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6C98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D6E7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_01/func_809D73D4.s") +static Color_RGBA8 sDustPrimColor = { 60, 50, 20, 255 }; + +static Color_RGBA8 sDustEnvColor = { 40, 30, 30, 255 }; + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ Vec3f velocity; + /* 0x18 */ f32 gravity; + /* 0x1C */ s16 rotX; + /* 0x1E */ s16 rotY; + /* 0x20 */ UNK_TYPE1 unk_20[0x8]; + /* 0x28 */ u8 type; + /* 0x2A */ s16 timer; + /* 0x2C */ s16 isFallingBlockFragment; + /* 0x2E */ s16 angularVelocityX; + /* 0x30 */ s16 angularVelocityY; + /* 0x34 */ f32 scale; + /* 0x38 */ f32 alpha; +} OdolwaEffect; // size = 0x3C + +/** + * Keeps track of how many bugs are currently spawned and alive. When there are four or fewer bugs alive, Odolwa can + * summon more bugs or falling blocks. + */ +s16 sOdolwaBugCount; + +/** + * Pointer to the main Odolwa instance so that bugs and effects can check and manipulate his state. + */ +Boss01* sOdolwa; + +/** + * Pointer to the swarm of moths that Odolwa can summon. + */ +EnTanron1* sMothSwarm; + +/** + * Odolwa draws his sword trail manually by manipulating these variables during his horizontal and vertical slashes. + * Note that the position of the sword is offset from Odolwa's position. + */ +f32 sOdolwaSwordTrailPosX; +f32 sOdolwaSwordTrailPosY; +f32 sOdolwaSwordTrailPosZ; +f32 sOdolwaSwordTrailRotX; +f32 sOdolwaSwordTrailRotY; +f32 sOdolwaSwordTrailRotZ; +f32 sOdolwaSwordTrailAlpha; + +/** + * If the intro cutscene was skipped (because it was already watched), this timer will be used to determine when to + * start playing the boss theme. + */ +u8 sOdolwaMusicStartTimer; + +/** + * When Odolwa is damaged or dazed, the sound effect will play from this position. It is set to his projectedPos. + */ +Vec3f sOdolwaDamageSfxPos; + +s32 sOdolwaRandSeed1; +s32 sOdolwaRandSeed2; +s32 sOdolwaRandSeed3; + +/** + * Stores all of Odolwa's effects. Note that the first entry in this array is always reserved for the ring of fire, so + * falling blocks can only be placed from the second entry onwards. + */ +OdolwaEffect sOdolwaEffects[ODOLWA_EFFECT_COUNT]; + +void Boss01_InitRand(s32 seedInit1, s32 seedInit2, s32 seedInit3) { + sOdolwaRandSeed1 = seedInit1; + sOdolwaRandSeed2 = seedInit2; + sOdolwaRandSeed3 = seedInit3; +} + +f32 Boss01_RandZeroOne(void) { + // Wichmann-Hill algorithm + f32 randFloat; + + sOdolwaRandSeed1 = (sOdolwaRandSeed1 * 171) % 30269; + sOdolwaRandSeed2 = (sOdolwaRandSeed2 * 172) % 30307; + sOdolwaRandSeed3 = (sOdolwaRandSeed3 * 170) % 30323; + + randFloat = (sOdolwaRandSeed1 / 30269.0f) + (sOdolwaRandSeed2 / 30307.0f) + (sOdolwaRandSeed3 / 30323.0f); + + while (randFloat >= 1.0f) { + randFloat -= 1.0f; + } + + return fabsf(randFloat); +} + +/** + * Spawns a falling block or a fragment of a block that has hit the ground at the specified position. + */ +void Boss01_SpawnEffectFallingBlock(OdolwaEffect* effect, Vec3f* pos, s16 isFragment) { + s16 i; + + for (i = 1; i < ODOLWA_EFFECT_COUNT; i++, effect++) { + if (effect->type == ODOLWA_EFFECT_NONE) { + effect->type = ODOLWA_EFFECT_FALLING_BLOCK; + effect->pos = *pos; + effect->timer = 0; + effect->rotX = Rand_ZeroFloat(0x10000); + effect->rotY = Rand_ZeroFloat(0x10000); + effect->isFallingBlockFragment = isFragment; + effect->gravity = -1.0f; + + if (!isFragment) { + effect->angularVelocityY = Rand_CenteredFloat(0x320); + effect->angularVelocityX = Rand_CenteredFloat(0x320); + effect->scale = 8.0f * 0.001f; + effect->velocity = gZeroVec3f; + } else { + effect->angularVelocityY = Rand_CenteredFloat(0x1F40); + effect->angularVelocityX = Rand_CenteredFloat(0x1F40); + effect->scale = Rand_CenteredFloat(1.6f * 0.001f) + (3.2f * 0.001f); + effect->velocity.x = Rand_CenteredFloat(13.0f); + effect->velocity.y = Rand_ZeroFloat(4.0f) + 7.0f; + effect->velocity.z = Rand_CenteredFloat(13.0f); + } + + break; + } + } +} + +/** + * Spawns the ring of fire at the specified position. + */ +void Boss01_SpawnEffectRingOfFire(OdolwaEffect* effect, Vec3f* pos) { + if (effect->type == ODOLWA_EFFECT_NONE) { + effect->type = ODOLWA_EFFECT_RING_OF_FIRE; + effect->pos = *pos; + effect->timer = 0; + effect->velocity = gZeroVec3f; + effect->gravity = 0.0f; + effect->scale = 0.0f; + effect->alpha = 230.0f; + } +} + +/** + * Manually sets the position of a sphere collider to a specific position. + */ +void Boss01_SetColliderSphere(s32 index, ColliderJntSph* collider, Vec3f* sphereCenter) { + collider->elements[index].dim.worldSphere.center.x = sphereCenter->x; + collider->elements[index].dim.worldSphere.center.y = sphereCenter->y; + collider->elements[index].dim.worldSphere.center.z = sphereCenter->z; + collider->elements[index].dim.worldSphere.radius = + collider->elements[index].dim.modelSphere.radius * collider->elements[index].dim.scale; +} + +/** + * For the most part, this function is responsible for selecting which attack Odolwa will do after he's done waiting. + * Which attack he chooses depends on Odolwa's health, his distance to the player, and random chance. However, this + * function can also make Odolwa do a specific dance before attacking; if the mustAttack parameter is false, then Odolwa + * has a 20% chance of choosing to dance instead of attacking. This function will also make Odolwa go back to waiting if + * the player is too far off the ground (e.g., by jumping out of the Deku Flower in the center of the arena). + */ +void Boss01_SelectAttack(Boss01* this, PlayState* play, u8 mustAttack) { + Player* player = GET_PLAYER(play); + + if (player->actor.world.pos.y > 200.0f) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } else if ((Rand_ZeroOne() < 0.2f) && !mustAttack) { + // When Odolwa is done dancing, this function calls Boss01_SelectAttack with mustAttack set to true, so he will + // be guaranteed to choose an attack later, so long as the player isn't too far off the ground. + Boss01_SetupDanceBeforeAttack(this, play); + } else if (this->actor.xzDistToPlayer <= 250.0f) { + if (this->actor.xzDistToPlayer <= 150.0f) { + if (Rand_ZeroOne() < 0.5f) { + Boss01_SetupKick(this, play); + } else { + Boss01_SetupShieldBash(this, play); + } + } else { + Boss01_SetupHorizontalSlash(this, play); + } + } else if (((s8)this->actor.colChkInfo.health < 8) && (Rand_ZeroOne() < 0.75f)) { + Boss01_SetupSpinAttack(this, play); + } else { + Boss01_SetupVerticalSlash(this, play); + } +} + +/** + * Spawns dust at both of Odolwa's feet if *any* of the following conditions are true: + * - Odolwa's speed is greater than 1.0f + * - Odolwa's additional velocity (in either the X or Z direction) is greater than 1.0f + * - this->frameCounter & dustSpawnFrameMask is equal to 0 + * - dustSpawnFrameMask is 0 + */ +void Boss01_SpawnDustAtFeet(Boss01* this, PlayState* play, u8 dustSpawnFrameMask) { + u8 i; + Vec3f pos; + Vec3f velocity; + Vec3f accel; + + if (((this->frameCounter & dustSpawnFrameMask) == 0) && + ((this->additionalVelocityX > 1.0f) || (this->additionalVelocityZ > 1.0f) || (dustSpawnFrameMask == 0) || + (this->actor.speed > 1.0f))) { + for (i = 0; i < ARRAY_COUNT(this->feetPos); i++) { + velocity.x = Rand_CenteredFloat(5.0f); + velocity.y = Rand_ZeroFloat(2.0f) + 1.0f; + velocity.z = Rand_CenteredFloat(5.0f); + accel.y = -0.1f; + accel.x = accel.z = 0.0f; + pos.x = this->feetPos[i].x + Rand_CenteredFloat(20.0f); + pos.y = Rand_ZeroFloat(10.0f) + 3.0f; + pos.z = this->feetPos[i].z + Rand_CenteredFloat(20.0f); + func_800B0EB0(play, &pos, &velocity, &accel, &sDustPrimColor, &sDustEnvColor, + Rand_ZeroFloat(150.0f) + 350.0f, 10, Rand_ZeroFloat(5.0f) + 14.0f); + } + } +} + +void Boss01_Init(Actor* thisx, PlayState* play) { + Boss01* this = THIS; + s32 pad; + s16 i; + + Actor_SetScale(&this->actor, 0.015f); + if (ODOLWA_GET_TYPE(&this->actor) == ODOLWA_TYPE_BUG) { + SkelAnime_InitFlex(play, &this->skelAnime, &gOdolwaBugSkel, &gOdolwaBugCrawlAnim, this->jointTable, + this->morphTable, ODOLWA_BUG_LIMB_MAX); + this->actor.update = Boss01_Bug_Update; + this->actor.draw = Boss01_Bug_Draw; + this->bugDrawDmgEffType = ACTOR_DRAW_DMGEFF_BLUE_FIRE; + Boss01_Bug_SetupCrawl(this, play); + this->actor.gravity = -2.0f; + Collider_InitAndSetCylinder(play, &this->bugACCollider, &this->actor, &sBugACColliderCylinderInit); + Collider_InitAndSetCylinder(play, &this->bugATCollider, &this->actor, &sBugATColliderCylinderInit); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 12.0f); + Actor_SetScale(&this->actor, 0.025f); + this->actor.colChkInfo.health = 2; + sOdolwaBugCount++; + Actor_PlaySfx(&this->actor, NA_SE_EV_ROCK_FALL); + this->actor.colChkInfo.damageTable = &sBugDamageTable; + sOdolwa->actor.hintId = TATL_HINT_ID_ODOLWA_PHASE_TWO; + } else if (ODOLWA_GET_TYPE(&this->actor) == ODOLWA_TYPE_AFTERIMAGE) { + SkelAnime_InitFlex(play, &this->skelAnime, &gOdolwaSkel, &gOdolwaReadyAnim, this->jointTable, this->morphTable, + ODOLWA_LIMB_MAX); + Boss01_Afterimage_SetupWaitToDespawn(this, play); + this->timers[TIMER_AFTERIMAGE_DESPAWN] = ODOLWA_GET_AFTERIMAGE_DESPAWN_TIMER(&this->actor); + this->actor.world.rot.z = 0; + this->actor.draw = Boss01_Afterimage_Draw; + this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; + } else { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_WOODFALL_TEMPLE)) { + Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, 0.0f, 0.0f, 0, 0, 0, + ENDOORWARP1_FF_1); + Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 0.0f, 0.0f, 250.0f, 0, 0, 0, BHEART_PARAM_NORMAL); + Actor_Kill(&this->actor); + return; + } + + play->envCtx.lightSettingOverride = 0; + play->envCtx.lightBlendOverride = LIGHT_BLEND_OVERRIDE_FULL_CONTROL; + play->envCtx.lightBlend = 0.0f; + sOdolwa = this; + sOdolwaBugCount = 0; + play->specialEffects = sOdolwaEffects; + + for (i = 0; i < ODOLWA_EFFECT_COUNT; i++) { + sOdolwaEffects[i].type = ODOLWA_EFFECT_NONE; + } + + this->actor.hintId = TATL_HINT_ID_ODOLWA_PHASE_ONE; + this->actor.targetMode = TARGET_MODE_5; + this->actor.colChkInfo.mass = MASS_HEAVY; + this->actor.colChkInfo.damageTable = &sOdolwaDamageTable; + this->actor.colChkInfo.health = 20; + + ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f); + Collider_InitAndSetJntSph(play, &this->swordCollider, &this->actor, &sSwordColliderJntSphInit, + this->swordColliderElements); + Collider_InitAndSetJntSph(play, &this->shieldCollider, &this->actor, &sShieldColliderJntSphInit, + this->shieldColliderElements); + Collider_InitAndSetJntSph(play, &this->bodyCollider, &this->actor, &sBodyColliderJntSphInit, + this->bodyColliderElements); + Collider_InitAndSetJntSph(play, &this->kickAndShieldBashCollider, &this->actor, + &sKickAndShieldBashColliderJntSphInit, this->kickAndShieldBashColliderElements); + SkelAnime_InitFlex(play, &this->skelAnime, &gOdolwaSkel, &gOdolwaReadyAnim, this->jointTable, this->morphTable, + ODOLWA_LIMB_MAX); + + if ((KREG(64) != 0) || CHECK_EVENTINF(EVENTINF_54)) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_READY); + this->actor.gravity = -2.5f; + sOdolwaMusicStartTimer = KREG(15) + 20; + } else { + Boss01_SetupIntroCutscene(this, play); + } + + sMothSwarm = (EnTanron1*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_TANRON1, 0.0f, 437.0f, + -750.0f, 0, 0, 0, 0x100); + } + + this->animMorphFrames1 = -2.0f; + this->animMorphFrames2 = -4.0f; +} + +void Boss01_Destroy(Actor* thisx, PlayState* play) { +} + +/** + * Checks every explosive actor to see if Odolwa is close enough to any of them. If he is, then he'll jump. + */ +void Boss01_JumpAwayFromExplosive(Boss01* this, PlayState* play) { + Actor* explosive = play->actorCtx.actorLists[ACTORCAT_EXPLOSIVES].first; + + while (explosive != NULL) { + if (sqrtf(SQ(explosive->world.pos.x - this->actor.world.pos.x) + + SQ(explosive->world.pos.y - this->actor.world.pos.y) + + SQ(explosive->world.pos.z - this->actor.world.pos.z)) < 150.0f) { + Boss01_SetupJump(this, play, false); + } + + explosive = explosive->next; + } +} + +/** + * Note that this function will move Odolwa to (0, 2400, 0), regardless of where he was originally spawned. This is so + * he can fall from the ceiling in his intro cutscene, and this is also why he's not visible until the cutscene starts. + */ +void Boss01_SetupIntroCutscene(Boss01* this, PlayState* play) { + this->actionFunc = Boss01_IntroCutscene; + this->actor.world.pos.x = 0.0f; + this->actor.world.pos.z = 0.0f; + this->actor.gravity = 0.0f; + this->actor.world.pos.y = 2400.0f; + Animation_MorphToLoop(&this->skelAnime, &gOdolwaCrouchAnim, 0.0f); +} + +/** + * Handles the entirety of Odolwa's intro cutscene, including manipulating the camera, starting the boss theme, showing + * Odolwa's title card, etc. It also handles waiting for the player to move forward from the door before actually + * starting the cutscene. + */ +void Boss01_IntroCutscene(Boss01* this, PlayState* play) { + Player* player = GET_PLAYER(play); + + this->cutsceneTimer++; + SkelAnime_Update(&this->skelAnime); + + switch (this->cutsceneState) { + case ODOLWA_INTRO_CS_STATE_WAITING_FOR_PLAYER_OR_DONE: + if ((CutsceneManager_GetCurrentCsId() != -1) || !(player->actor.world.pos.z < 590.0f)) { + break; + } + + Cutscene_StartManual(play, &play->csCtx); + func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT); + this->subCamId = Play_CreateSubCamera(play); + Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT); + Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE); + this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; + this->cutsceneTimer = 0; + this->cutsceneState = ODOLWA_INTRO_CS_STATE_LOOK_AT_PLAYER; + this->subCamUp.x = 0.0f; + this->subCamUp.y = 1.0f; + this->subCamUp.z = 0.0f; + // fallthrough + case ODOLWA_INTRO_CS_STATE_LOOK_AT_PLAYER: + player->actor.world.rot.y = -0x8000; + player->actor.shape.rot.y = -0x8000; + player->actor.world.pos.x = -9.0f; + player->actor.world.pos.z = 587.0f; + + this->subCamEye.x = -9.0f; + this->subCamEye.y = (Player_GetHeight(player) + player->actor.world.pos.y) - 24.0f; + this->subCamEye.z = (player->actor.world.pos.z - 200.0f) + 110.0f; + + this->subCamAt.x = player->actor.world.pos.x; + this->subCamAt.y = (Player_GetHeight(player) + player->actor.world.pos.y) - 14.0f; + this->subCamAt.z = player->actor.world.pos.z; + + if (player->transformation == PLAYER_FORM_FIERCE_DEITY) { + this->subCamEye.y -= 30.0f + BREG(16); + this->subCamAt.y -= 30.0f + BREG(17); + } + + if (this->cutsceneTimer >= 20) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_RHYTHM_OLD - SFX_FLAG); + } + + if (this->cutsceneTimer == 40) { + func_800B7298(play, &this->actor, PLAYER_CSACTION_21); + } + + if (this->cutsceneTimer == 100) { + func_800B7298(play, &this->actor, PLAYER_CSACTION_4); + } + + if (this->cutsceneTimer >= 90) { + Audio_PlaySfx(NA_SE_EN_MIBOSS_FALL_OLD_OLD - SFX_FLAG); + } + + if (this->cutsceneTimer == 120) { + this->actor.world.pos.y = 1500.0f; + this->actor.gravity = -2.5f; + this->cutsceneState = ODOLWA_INTRO_CS_STATE_ODOLWA_FALLING; + this->cutsceneTimer = 0; + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaJumpAnim, 0.0f); + this->subCamEye.x = this->actor.world.pos.x; + this->subCamAt.x = this->actor.world.pos.x; + this->subCamAt.y = 80.0f; + this->subCamEye.y = 30.0f; + this->subCamEye.z = (this->actor.world.pos.z + 200.0f + 50.0f) - 150.0f; + this->subCamAt.z = this->actor.world.pos.z; + this->subCamUp.x = 2.0f; + } + break; + + case ODOLWA_INTRO_CS_STATE_ODOLWA_FALLING: + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_RHYTHM_OLD - SFX_FLAG); + Math_ApproachZeroF(&this->subCamUp.x, 0.1f, 0.1f); + Audio_PlaySfx(NA_SE_EN_MIBOSS_FALL_OLD_OLD - SFX_FLAG); + this->afterimageSpawnFrameMask = 2; + Math_ApproachF(&this->subCamAt.y, this->actor.world.pos.y + 80.0f, 0.25f, 30.0f); + if (this->actor.world.pos.y < 40.0f) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaCrouchAnim, -2.0f); + this->cutsceneState = ODOLWA_INTRO_CS_STATE_ODOLWA_LANDED; + this->cutsceneTimer = 0; + } + break; + + case ODOLWA_INTRO_CS_STATE_ODOLWA_LANDED: + if (this->cutsceneTimer < 51) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_RHYTHM_OLD - SFX_FLAG); + } + + if ((this->cutsceneTimer == 1) || (this->cutsceneTimer == 3)) { + u8 i; + + for (i = 0; i < 10; i++) { + Boss01_SpawnDustAtFeet(this, play, 0); + } + + Audio_PlaySfx(NA_SE_EN_MIBOSS_GND1_OLD); + Rumble_Override(0.0f, 200, 20, 20); + this->screenShakeMagnitude = 10.0f; + } + + if (this->cutsceneTimer == 5) { + Animation_MorphToLoop(&this->skelAnime, &gOdolwaIntroSlashAnim, -20.0f); + } + + if ((this->cutsceneTimer >= 6) && + (Animation_OnFrame(&this->skelAnime, 30.0f) || Animation_OnFrame(&this->skelAnime, 54.0f))) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_SWORD_OLD); + } + + if (this->cutsceneTimer < 30) { + Math_ApproachF(&this->subCamAt.y, this->actor.world.pos.y + 80.0f, 0.25f, 1000.0f); + } else { + Math_ApproachF(&this->subCamEye.x, this->actor.world.pos.x + 70.0f, 0.05f, + this->subCamVelocity * 70.0f); + Math_ApproachF(&this->subCamEye.y, 200.0f, 0.05f, this->subCamVelocity * 170.0f); + Math_ApproachF(&this->subCamEye.z, (this->actor.world.pos.z + 200.0f + 50.0f) - 30.0f, 0.05f, + this->subCamVelocity * 120.0f); + Math_ApproachF(&this->subCamAt.y, this->actor.world.pos.y + 80.0f + 20.0f, 0.05f, + this->subCamVelocity * 20.0f); + Math_ApproachF(&this->subCamVelocity, 1.0f, 1.0f, 0.001f); + } + + if (this->cutsceneTimer == 20) { + SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, NA_BGM_BOSS | SEQ_FLAG_ASYNC); + } + + if (this->cutsceneTimer == 50) { + TitleCard_InitBossName(&play->state, &play->actorCtx.titleCtxt, + Lib_SegmentedToVirtual(&gOdolwaTitleCardTex), 160, 180, 128, 40); + } + + if (this->cutsceneTimer == 140) { + Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); + + this->cutsceneState = ODOLWA_INTRO_CS_STATE_WAITING_FOR_PLAYER_OR_DONE; + this->phaseFrameCounter = 0; + Boss01_SetupWait(this, play, ODOLWA_WAIT_READY); + mainCam->eye = this->subCamEye; + mainCam->eyeNext = this->subCamEye; + mainCam->at = this->subCamAt; + func_80169AFC(play, this->subCamId, 0); + this->subCamId = SUB_CAM_ID_DONE; + Cutscene_StopManual(play, &play->csCtx); + func_800B7298(play, &this->actor, PLAYER_CSACTION_END); + this->actor.flags |= ACTOR_FLAG_TARGETABLE; + SET_EVENTINF(EVENTINF_54); + } + break; + + default: + break; + } + + if (this->subCamId != SUB_CAM_ID_DONE) { + Vec3f at; + + ShrinkWindow_Letterbox_SetSizeTarget(27); + this->screenShakeOffsetY = Math_CosS(play->gameplayFrames * 0x8000) * this->screenShakeMagnitude; + Math_ApproachZeroF(&this->screenShakeMagnitude, 1.0f, 0.75f); + at = this->subCamAt; + at.y += this->screenShakeOffsetY; + Play_SetCameraAtEyeUp(play, this->subCamId, &at, &this->subCamEye, &this->subCamUp); + } +} + +void Boss01_SetupSummonBugsCutscene(Boss01* this, PlayState* play) { + this->actionFunc = Boss01_SummonBugsCutscene; + Animation_MorphToLoop(&this->skelAnime, &gOdolwaSideToSideDanceAnim, -10.0f); + this->cutsceneState = ODOLWA_BUG_SUMMONING_CS_STATE_STARTED; + this->cutsceneTimer = 0; + this->hasPlayedSummonBugCs++; + this->disableCollisionTimer = 30; + this->actor.speed = 0.0f; + this->additionalVelocityZ = 0.0f; + this->additionalVelocityX = 0.0f; +} + +/** + * Handles everything involving the bug summoning cutscene, including manipulating the camera, spawning the bugs, etc. + */ +void Boss01_SummonBugsCutscene(Boss01* this, PlayState* play) { + Player* player = GET_PLAYER(play); + Vec3f offset; + Vec3f pos; + + this->cutsceneTimer++; + this->disableCollisionTimer = 30; + SkelAnime_Update(&this->skelAnime); + + switch (this->cutsceneState) { + case ODOLWA_BUG_SUMMONING_CS_STATE_STARTED: + if (CutsceneManager_GetCurrentCsId() != -1) { + break; + } + + Cutscene_StartManual(play, &play->csCtx); + func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT); + this->subCamId = Play_CreateSubCamera(play); + Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT); + Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE); + this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; + this->cutsceneState = ODOLWA_BUG_SUMMONING_CS_STATE_PLAYING_OR_DONE; + this->actor.shape.rot.y = 0; + this->actor.world.pos.z = 0.0f; + this->actor.world.pos.x = 0.0f; + this->subCamVelocity = 0.0f; + this->subCamEyeNext.y = 100.0f; + // fallthrough + case ODOLWA_BUG_SUMMONING_CS_STATE_PLAYING_OR_DONE: + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_VOICE1_OLD - SFX_FLAG); + Matrix_RotateYS(this->actor.shape.rot.y, MTXMODE_NEW); + Matrix_MultVecZ(250.0f, &offset); + + this->subCamEye.x = this->actor.world.pos.x + offset.x; + this->subCamEye.y = this->actor.world.pos.y + offset.y + 40.0f; + this->subCamEye.z = this->actor.world.pos.z + offset.z; + + this->subCamAt.x = this->actor.world.pos.x; + this->subCamAt.y = this->actor.world.pos.y + this->subCamEyeNext.y; + this->subCamAt.z = this->actor.world.pos.z; + + if (this->cutsceneTimer > 40) { + Math_ApproachF(&this->subCamEyeNext.y, 800.0f, 0.1f, this->subCamVelocity); + Math_ApproachF(&this->subCamVelocity, 100.0f, 1.0f, 1.0f); + if ((this->cutsceneTimer > 80) && ((this->cutsceneTimer % 16) == 0)) { + Matrix_MultVecZ(100.0f, &offset); + pos.x = Rand_CenteredFloat(200.0f) + (this->actor.world.pos.x + offset.x); + pos.z = Rand_CenteredFloat(200.0f) + (this->actor.world.pos.z + offset.z); + Audio_PlaySfx(NA_SE_PL_DEKUNUTS_DROP_BOMB); + Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_01, pos.x, 1200.0f, pos.z, 0, Rand_ZeroFloat(0x10000), + 0, ODOLWA_TYPE_BUG); + } + } + + if (this->cutsceneTimer >= 170) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_READY); + func_80169AFC(play, this->subCamId, 0); + this->subCamId = SUB_CAM_ID_DONE; + Cutscene_StopManual(play, &play->csCtx); + func_800B7298(play, &this->actor, PLAYER_CSACTION_END); + this->actor.flags |= ACTOR_FLAG_TARGETABLE; + player->actor.world.rot.y = player->actor.shape.rot.y = -0x8000; + player->actor.world.pos.x = 0.0f; + player->actor.world.pos.z = -600.0f; + } + break; + } + + if (this->subCamId != SUB_CAM_ID_DONE) { + ShrinkWindow_Letterbox_SetSizeTarget(27); + Play_SetCameraAtEye(play, this->subCamId, &this->subCamAt, &this->subCamEye); + } +} + +void Boss01_Afterimage_SetupWaitToDespawn(Boss01* this, PlayState* play) { + this->actionFunc = Boss01_Afterimage_WaitToDespawn; +} + +/** + * Waits until the despawn timer reaches 0, then kills the actor. + */ +void Boss01_Afterimage_WaitToDespawn(Boss01* this, PlayState* play) { + if (this->timers[TIMER_AFTERIMAGE_DESPAWN] == 0) { + Actor_Kill(&this->actor); + } +} + +static AnimationHeader* sWaitAnimations[ODOLWA_WAIT_MAX] = { + &gOdolwaReadyAnim, // ODOLWA_WAIT_READY, + &gOdolwaSpinSwordAnim, // ODOLWA_WAIT_SPIN_SWORD, + &gOdolwaVerticalHopAnim, // ODOLWA_WAIT_VERTICAL_HOP, + &gOdolwaHipShakeDanceAnim, // ODOLWA_WAIT_SHAKE_DANCE, + &gOdolwaUpAndDownDanceAnim, // ODOLWA_WAIT_UP_AND_DOWN_DANCE, + &gOdolwaArmSwingDanceAnim, // ODOLWA_WAIT_ARM_SWING_DANCE, + &gOdolwaThurstAttackAnim, // ODOLWA_WAIT_THRUST_ATTACK, + &gOdolwaDoubleSlashAnim, // ODOLWA_WAIT_DOUBLE_SLASH, + &gOdolwaSideToSideHopAnim, // ODOLWA_WAIT_SIDE_TO_SIDE_HOP, + &gOdolwaSideToSideDanceAnim, // ODOLWA_WAIT_SIDE_TO_SIDE_DANCE, + &gOdolwaSpinDanceAnim, // ODOLWA_WAIT_SPIN_DANCE + &gOdolwaJumpDanceAnim, // ODOLWA_WAIT_JUMP_DANCE +}; + +/** + * Prepares Odolwa to enter his "wait" state, i.e., his primary state where he waits for a bit of time before attacking. + * If the fight has been going for 1000 or more frames, this function is also responsible for starting the bug summoning + * cutscene. Callers of this function can choose which type of wait action he will do using the waitType parameter, + * though this parameter is ignored if the fight is still in its first phase (i.e, when the fight has been going on for + * 999 or fewer frames); Odolwa will always perform the "ready" wait action in the first phase. + * + * If ODOLWA_WAIT_RANDOM is passed for the waitType, then Odolwa has a 30% chance of summoning moths instead of doing a + * standard wait action. Otherwise, he will randomly choose his own wait type. + */ +void Boss01_SetupWait(Boss01* this, PlayState* play, u8 waitType) { + if (this->phaseFrameCounter > 1000) { + if (!this->hasPlayedSummonBugCs) { + Boss01_SetupSummonBugsCutscene(this, play); + return; + } + + if (waitType == ODOLWA_WAIT_RANDOM) { + if (Rand_ZeroOne() < 0.3f) { + Boss01_SetupSummonMoths(this, play); + return; + } + + this->waitType = Rand_ZeroFloat(ODOLWA_WAIT_MAX - 0.001f); + } else { + this->waitType = waitType; + } + } else { + this->waitType = ODOLWA_WAIT_READY; + } + + Animation_MorphToLoop(&this->skelAnime, sWaitAnimations[this->waitType], 2.0f * this->animMorphFrames2); + this->animEndFrame = Animation_GetLastFrame(sWaitAnimations[this->waitType]); + this->actionFunc = Boss01_Wait; + this->timers[TIMER_CURRENT_ACTION] = 80; + this->jumpIfPlayerIsClose = Rand_ZeroFloat(1.999f); + this->waitTimer = 0; +} + +/** + * This function will make Odolwa perform one of 12 different "wait actions," after which he will either select an + * attack, jump, or start running. Because of the variety of actions this function handles, it has a large number of + * responsibilities, including summoning the ring of fire and spawning more bugs and falling blocks. + */ +void Boss01_Wait(Boss01* this, PlayState* play) { + s16 i; + Player* player = GET_PLAYER(play); + + this->lookAtPlayer = true; + + if ((this->waitType == ODOLWA_WAIT_SPIN_SWORD) || (this->waitType == ODOLWA_WAIT_VERTICAL_HOP) || + (this->waitType == ODOLWA_WAIT_ARM_SWING_DANCE) || (this->waitType == ODOLWA_WAIT_THRUST_ATTACK)) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_VOICE1_OLD - SFX_FLAG); + } else { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_VOICE2_OLD - SFX_FLAG); + } + + if ((this->waitType == ODOLWA_WAIT_READY) || (this->waitType == ODOLWA_WAIT_SPIN_SWORD) || + (this->waitType == ODOLWA_WAIT_VERTICAL_HOP) || (this->waitType == ODOLWA_WAIT_SHAKE_DANCE)) { + this->canGuardOrEvade = true; + this->swordAndShieldCollisionEnabled = true; + } + + if (((this->waitType == ODOLWA_WAIT_VERTICAL_HOP) || (this->waitType == ODOLWA_WAIT_SIDE_TO_SIDE_HOP) || + (this->waitType == ODOLWA_WAIT_SIDE_TO_SIDE_DANCE)) && + Animation_OnFrame(&this->skelAnime, 6.0f)) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_GND1_OLD); + for (i = 0; i < 3; i++) { + Boss01_SpawnDustAtFeet(this, play, 0); + } + } + + if (this->waitType == ODOLWA_WAIT_SIDE_TO_SIDE_DANCE) { + this->animMorphFrames2 = 0.0f; + this->animMorphFrames1 = 0.0f; + } + + this->swordState = ODOLWA_SWORD_STATE_ACTIVE; + this->waitTimer++; + + // This will play "slash" sound effects at appropriate points in the thrust attack or double slash action. + if (this->waitType == ODOLWA_WAIT_THRUST_ATTACK) { + if (this->waitTimer == 7) { + Actor_PlaySfx(&this->actor, NA_SE_EN_ANSATSUSYA_ENTRY); + } + } else if ((this->waitType == ODOLWA_WAIT_DOUBLE_SLASH) && (((this->waitTimer == 12)) || (this->waitTimer == 20))) { + Actor_PlaySfx(&this->actor, NA_SE_EN_ANSATSUSYA_ENTRY); + } + + SkelAnime_Update(&this->skelAnime); + Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0xA, 0x800); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.5f); + + // Whether or not Odolwa should jump if the player gets close was randomly decided earlier in Boss01_SetupWait, and + // if it was decided that he *should* jump, this can interrupt any wait action. + if ((this->actor.xzDistToPlayer <= 150.0f) && this->jumpIfPlayerIsClose) { + Boss01_SetupJump(this, play, false); + this->canGuardOrEvade = false; + } + + // The thrust attack and double slash wait types select Odolwa's next action after their animations end rather than + // waiting until the full 80 frames like every other wait type. The timer for the current action is not set to 0 + // here, though, which may cause some unintended behavior in Boss01_HorizontalSlash. + if (((this->timers[TIMER_CURRENT_ACTION] == 0) && (this->waitType != ODOLWA_WAIT_THRUST_ATTACK) && + (this->waitType != ODOLWA_WAIT_DOUBLE_SLASH)) || + (Animation_OnFrame(&this->skelAnime, this->animEndFrame) && + ((this->waitType == ODOLWA_WAIT_THRUST_ATTACK) || (this->waitType == ODOLWA_WAIT_DOUBLE_SLASH)))) { + if (this->actor.xzDistToPlayer <= 450.0f) { + Boss01_SelectAttack(this, play, false); + } else if (Rand_ZeroOne() < 0.5f) { + Boss01_SetupJump(this, play, true); + } else { + Boss01_SetupRun(this, play); + } + } + + Boss01_SpawnDustAtFeet(this, play, 1); + this->animMorphFrames1 = -2.0f; + this->animMorphFrames2 = -4.0f; + + if (((this->waitType == ODOLWA_WAIT_SHAKE_DANCE) || (this->waitType == ODOLWA_WAIT_UP_AND_DOWN_DANCE) || + (this->waitType == ODOLWA_WAIT_DOUBLE_SLASH) || (this->waitType == ODOLWA_WAIT_SIDE_TO_SIDE_HOP)) && + (this->waitTimer == 30)) { + Boss01_SpawnEffectRingOfFire((OdolwaEffect*)play->specialEffects, &player->actor.world.pos); + this->timers[TIMER_CURRENT_ACTION] = 120; + } + + if (((this->timers[TIMER_CURRENT_ACTION] % 16) == 0) && (this->waitType != ODOLWA_WAIT_READY) && + (sOdolwaBugCount < 5)) { + Vec3f pos; + Player* player2 = GET_PLAYER(play); + s32 pad; + + if (Rand_ZeroOne() < 0.2f) { + pos = player2->actor.world.pos; + } else { + pos.x = Rand_CenteredFloat(1200.0f); + pos.z = Rand_CenteredFloat(1200.0f); + } + + pos.y = 1200.0f; + + switch (this->waitType) { + case ODOLWA_WAIT_SPIN_SWORD: + case ODOLWA_WAIT_VERTICAL_HOP: + case ODOLWA_WAIT_ARM_SWING_DANCE: + case ODOLWA_WAIT_THRUST_ATTACK: + Actor_Spawn(&play->actorCtx, play, ACTOR_BOSS_01, pos.x, pos.y, pos.z, 0, Rand_ZeroFloat(0x10000), 0, + ODOLWA_TYPE_BUG); + break; + + case ODOLWA_WAIT_SIDE_TO_SIDE_DANCE: + case ODOLWA_WAIT_SPIN_DANCE: + case ODOLWA_WAIT_JUMP_DANCE: + Audio_PlaySfx_AtPos(&sFallingBlockSfxPos, NA_SE_EV_ROCK_FALL); + Boss01_SpawnEffectFallingBlock((OdolwaEffect*)play->specialEffects, &pos, false); + break; + + default: + break; + } + } +} + +void Boss01_SetupDazed(Boss01* this, PlayState* play) { + Animation_MorphToLoop(&this->skelAnime, &gOdolwaStunAnim, this->animMorphFrames2); + if (this->actionFunc != Boss01_Dazed) { + this->timers[TIMER_CURRENT_ACTION] = 70; + this->actionFunc = Boss01_Dazed; + } + + this->canGuardOrEvade = false; +} + +/** + * Plays the dazed animation for 70 frames, leaving Odolwa vulnerable to attacks. This state is often referred to as + * Odolwa being "stunned," though it was deliberately named something different here to avoid confusion with the state + * where Odolwa turns blue and stops all his animations (e.g., when he is hit with a Deku Nut). The latter state is + * consistently named "stunned" across all enemies in the codebase, so this function was given a different name to + * signify it does something else. + */ +void Boss01_Dazed(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_WEAKENED - SFX_FLAG); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.5f); + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } + + this->canGuardOrEvade = false; + Boss01_SpawnDustAtFeet(this, play, 1); +} + +void Boss01_SetupSpinAttack(Boss01* this, PlayState* play) { + Animation_MorphToLoop(&this->skelAnime, &gOdolwaSpinAttackAnim, this->animMorphFrames2); + this->timers[TIMER_CURRENT_ACTION] = 120; + this->actionFunc = Boss01_SpinAttack; + this->canGuardOrEvade = false; +} + +/** + * Rapidly spin around and approach the player for 120 frames, spawning a new afterimage every frame. + * Transitions back to waiting once the attack completes. + */ +void Boss01_SpinAttack(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Math_ApproachF(&this->actor.speed, 7.0f, 1.0f, 1.5f); + Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 4, 0x1000); + + if (Animation_OnFrame(&this->skelAnime, 5.0f)) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_SWORD_OLD); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_ROLLING_OLD); + } + + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } + + this->canGuardOrEvade = false; + this->swordState = ODOLWA_SWORD_STATE_ACTIVE; + this->swordAndShieldCollisionEnabled = true; + Boss01_SpawnDustAtFeet(this, play, 1); + this->afterimageSpawnFrameMask = 1; +} + +void Boss01_SetupDanceBeforeAttack(Boss01* this, PlayState* play) { + Animation_MorphToLoop(&this->skelAnime, &gOdolwaJumpDanceAnim, this->animMorphFrames2); + this->timers[TIMER_CURRENT_ACTION] = 40; + this->actionFunc = Boss01_DanceBeforeAttack; + this->canGuardOrEvade = false; +} + +/** + * Dance for 40 frames, then select an attack. Odolwa can only end up in this state if he randomly chose to dance + * instead of attack the last time Boss01_SelectAttack was called. This function calls Boss01_SelectAttack with the + * mustAttack parameter set to true, ensuring that he will not dance again immediately after this. + */ +void Boss01_DanceBeforeAttack(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.5f); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_VOICE2_OLD - SFX_FLAG); + + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + Boss01_SelectAttack(this, play, true); + } + + this->canGuardOrEvade = false; + this->swordAndShieldCollisionEnabled = true; + Boss01_SpawnDustAtFeet(this, play, 1); +} + +void Boss01_SetupRun(Boss01* this, PlayState* play) { + Animation_MorphToLoop(&this->skelAnime, &gOdolwaRunAnim, this->animMorphFrames2); + this->actionFunc = Boss01_Run; + this->timers[TIMER_CURRENT_ACTION] = Rand_ZeroFloat(100.0f) + 50.0f; + this->runTargetPosAngularVelocityY = 0.07f; + + if (Rand_ZeroOne() < 0.5f) { + this->runTargetPosAngularVelocityY *= -1.0f; + } + + this->actor.gravity = -3.0f; +} + +/** + * Run in a circle for 50-150 frames by chasing a rotating target around the room, then go back to waiting. + */ +void Boss01_Run(Boss01* this, PlayState* play) { + Vec3f targetPos; + f32 diffX; + f32 diffZ; + + this->lookAtPlayer = true; + SkelAnime_Update(&this->skelAnime); + + if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && + (Animation_OnFrame(&this->skelAnime, 6.0f) || Animation_OnFrame(&this->skelAnime, 16.0f))) { + this->actor.velocity.y = 10.0f; + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_GND1_OLD); + } + + this->runTargetPosRotY += this->runTargetPosAngularVelocityY; + Matrix_RotateYF(this->runTargetPosRotY, MTXMODE_NEW); + Matrix_MultVecZ(450.0f, &targetPos); + diffX = targetPos.x - this->actor.world.pos.x; + diffZ = targetPos.z - this->actor.world.pos.z; + Math_ApproachS(&this->actor.world.rot.y, Math_Atan2S_XY(diffZ, diffX), 0xA, 0x1000); + Math_ApproachF(&this->actor.speed, 12.0f, 1.0f, 3.0f); + + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } + + Boss01_SpawnDustAtFeet(this, play, 3); + this->swordState = ODOLWA_SWORD_STATE_ACTIVE; + this->swordAndShieldCollisionEnabled = true; +} + +/** + * This starts the process making Odolwa jump, though the actual jump is divided into three different action functions. + * The shouldPerformFallingSlash parameter controls whether Odolwa should try to perform a falling slash during the + * middle part of the jump or if he should just jump normally. + */ +void Boss01_SetupJump(Boss01* this, PlayState* play, u8 shouldPerformFallingSlash) { + this->shouldPerformFallingSlash = shouldPerformFallingSlash; + Animation_MorphToLoop(&this->skelAnime, &gOdolwaCrouchAnim, this->animMorphFrames2); + this->actionFunc = Boss01_JumpSquat; + this->timers[TIMER_CURRENT_ACTION] = 5; +} + +/** + * Plays the crouch animation for 5 frames, then jumps off. + */ +void Boss01_JumpSquat(Boss01* this, PlayState* play) { + s32 pad[2]; + u8 i; + Vec3f additionalVelocity; + f32 magnitude; + + SkelAnime_Update(&this->skelAnime); + + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + this->actionFunc = Boss01_Jump; + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaJumpAnim, this->animMorphFrames1); + this->actor.velocity.y = 35.0f; + this->actor.gravity = -2.5f; + Matrix_RotateYS(this->actor.world.rot.y, MTXMODE_NEW); + + if (!this->shouldPerformFallingSlash) { + magnitude = Rand_ZeroFloat(10.0f) + 10.0f; + } else { + magnitude = 12.0f; + } + + Matrix_MultVecZ(magnitude, &additionalVelocity); + this->additionalVelocityX = additionalVelocity.x; + this->additionalVelocityZ = additionalVelocity.z; + + for (i = 0; i < 5; i++) { + Boss01_SpawnDustAtFeet(this, play, 0); + } + + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_JUMP1); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_JUMP2 - SFX_FLAG); + this->disableCollisionTimer = 5; + } + + this->swordAndShieldCollisionEnabled = true; +} + +/** + * As Odolwa moves through the air, this function will spawn an afterimage every other frame and rotate him to face the + * player. If Odolwa should perform a falling slash, and if he's falling fast enough, then this function will stop + * rotating him and transition him to the slash animation. Lastly, this function will transition Odolwa to his "landing" + * action once he gets close enough to the ground. + */ +void Boss01_Jump(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_JUMP2 - SFX_FLAG); + + if (!this->shouldPerformFallingSlash) { + Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 5, 0x1000); + } else if ((this->actor.velocity.y < -5.0f) && (this->prevJumpVelocityY >= -5.0f)) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaFallingSlashAnim, this->animMorphFrames1); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_SWORD_OLD); + } + + if (this->actor.world.pos.y < 40.0f) { + this->actionFunc = Boss01_JumpLand; + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaCrouchAnim, this->animMorphFrames1); + this->timers[TIMER_CURRENT_ACTION] = 5; + this->landedFromJump = false; + } + + this->swordState = ODOLWA_SWORD_STATE_ACTIVE; + this->swordAndShieldCollisionEnabled = true; + this->afterimageSpawnFrameMask = 2; + this->prevJumpVelocityY = this->actor.velocity.y; +} + +/** + * Plays the crouch animation for five frames, then transitions either to selecting an attack or waiting based on + * Odolwa's distance to the player. + */ +void Boss01_JumpLand(Boss01* this, PlayState* play) { + u8 i; + + SkelAnime_Update(&this->skelAnime); + + if (!this->landedFromJump) { + if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { + this->landedFromJump = true; + for (i = 0; i < 5; i++) { + Boss01_SpawnDustAtFeet(this, play, 0); + } + + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_GND1_OLD); + } + } + + if (!this->shouldPerformFallingSlash) { + Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 4, 0x2800); + } + + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + if (this->actor.xzDistToPlayer <= 450.0f) { + Boss01_SelectAttack(this, play, false); + } else { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } + } + + this->swordState = ODOLWA_SWORD_STATE_ACTIVE; + this->swordAndShieldCollisionEnabled = true; +} + +void Boss01_SetupVerticalSlash(Boss01* this, PlayState* play) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaVerticalSlashAnim, this->animMorphFrames2); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaVerticalSlashAnim); + this->actionFunc = Boss01_VerticalSlash; + this->timers[TIMER_CURRENT_ACTION] = 20; +} + +/** + * Charges forward and performs a vertical slash. Transitions back to waiting once the attack completes. + */ +void Boss01_VerticalSlash(Boss01* this, PlayState* play) { + Vec3f additionalVelocity; + + SkelAnime_Update(&this->skelAnime); + + if ((this->skelAnime.curFrame >= 10.0f) && (this->skelAnime.curFrame <= 15.0f)) { + this->isPerformingVerticalSlash = true; + } + + if ((this->timers[TIMER_CURRENT_ACTION] >= 7) && (this->timers[TIMER_CURRENT_ACTION] < 13)) { + Matrix_RotateYF(BINANG_TO_RAD_ALT(this->actor.world.rot.y), MTXMODE_NEW); + Matrix_MultVecZ(20.0f, &additionalVelocity); + this->additionalVelocityX = additionalVelocity.x; + this->additionalVelocityZ = additionalVelocity.z; + Boss01_SpawnDustAtFeet(this, play, 0); + } + + sOdolwaSwordTrailPosX = 0.0f; + sOdolwaSwordTrailPosY = 90.0f; + sOdolwaSwordTrailPosZ = -70.0f; + sOdolwaSwordTrailRotX = 0.4712388f; + sOdolwaSwordTrailRotY = M_PI; + sOdolwaSwordTrailRotZ = 1.7278761f; + + if (Animation_OnFrame(&this->skelAnime, 12.0f)) { + sOdolwaSwordTrailAlpha = 255.0f; + sSwordTrailAngularRangeDivisor = 100.0f; + } + + if (Animation_OnFrame(&this->skelAnime, 13.0f)) { + sSwordTrailAngularRangeDivisor = 20.0f; + } + + if (Animation_OnFrame(&this->skelAnime, 14.0f)) { + sSwordTrailAngularRangeDivisor = 7.0f; + } + + if (Animation_OnFrame(&this->skelAnime, 7.0f)) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_DASH_OLD); + } + + if (Animation_OnFrame(&this->skelAnime, 10.0f)) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_SWORD_OLD); + } + + if (Animation_OnFrame(&this->skelAnime, this->animEndFrame)) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + this->additionalVelocityZ = 0.0f; + this->additionalVelocityX = 0.0f; + } + + this->swordState = ODOLWA_SWORD_STATE_ACTIVE; + this->swordAndShieldCollisionEnabled = true; +} + +void Boss01_SetupHorizontalSlash(Boss01* this, PlayState* play) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaHorizontalSlashAnim, this->animMorphFrames2); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaHorizontalSlashAnim); + this->actionFunc = Boss01_HorizontalSlash; +} + +/** + * Stands in place and performs a horizontal slash. Transitions back to waiting once the attack completes. + */ +void Boss01_HorizontalSlash(Boss01* this, PlayState* play) { + Vec3f additionalVelocity; + + SkelAnime_Update(&this->skelAnime); + + if ((this->skelAnime.curFrame >= 10.0f) && (this->skelAnime.curFrame <= 15.0f)) { + this->swordState = ODOLWA_SWORD_STATE_HORIZONTAL_SLASH; + } + + // This code is written very strangely and might never have been intended to run. The timer values checked here seem + // copied from Boss01_VerticalSlash, and they make sense there to control when Odolwa should dash forward. Unlike + // Boss01_VerticalSlash, however, this function uses Matrix_MultZero to initialize additionalVelocity; in other + // words, the additional velocity in all directions will be zero, and Odolwa will stay in place. + // + // Additionally, Boss01_SetupHorizontalSlash doesn't initialize this->timers[TIMER_CURRENT_ACTION] to anything, so + // most of the time, the timer will just be zero, and this code will never run in the first place. However, if + // Odolwa did a double slash or thrust attack wait action in Boss01_Wait, it is possible to enter this function with + // a non-zero current action timer, potentially allowing this code to run. The only consequence of this is that + // Odolwa will sometimes spawn dust at his feet during a horizontal slash when he was probably never supposed to. + if ((this->timers[TIMER_CURRENT_ACTION] >= 7) && (this->timers[TIMER_CURRENT_ACTION] < 13)) { + Matrix_RotateYF(BINANG_TO_RAD_ALT(this->actor.world.rot.y), MTXMODE_NEW); + Matrix_MultZero(&additionalVelocity); + this->additionalVelocityX = additionalVelocity.x; + this->additionalVelocityZ = additionalVelocity.z; + Boss01_SpawnDustAtFeet(this, play, 0); + } + + sOdolwaSwordTrailPosX = 0.0f; + sOdolwaSwordTrailPosY = 140.0f; + sOdolwaSwordTrailPosZ = 0.0f; + sOdolwaSwordTrailRotX = 0.4712388f; + sOdolwaSwordTrailRotY = 0.0f; + sOdolwaSwordTrailRotZ = 0.0f; + + if (Animation_OnFrame(&this->skelAnime, 12.0f)) { + sOdolwaSwordTrailAlpha = 255.0f; + sSwordTrailAngularRangeDivisor = 100.0f; + } + + if (Animation_OnFrame(&this->skelAnime, 13.0f)) { + sSwordTrailAngularRangeDivisor = 20.0f; + } + + if (Animation_OnFrame(&this->skelAnime, 14.0f)) { + sSwordTrailAngularRangeDivisor = 7.0f; + } + + if (Animation_OnFrame(&this->skelAnime, 10.0f)) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_SWORD_OLD); + } + + if (Animation_OnFrame(&this->skelAnime, this->animEndFrame)) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + this->additionalVelocityZ = 0.0f; + this->additionalVelocityX = 0.0f; + } + + this->swordAndShieldCollisionEnabled = true; +} + +/** + * Prepares Odolwa to guard using either his shield or sword depending on the supplied parameter. The difference is + * entirely aesthetic, with him behaving in the exact same way regardless of which type of guard is chosen. + */ +void Boss01_SetupGuard(Boss01* this, PlayState* play, u8 guardUsingSword) { + if (this->actionFunc != Boss01_Guard) { + if (!guardUsingSword) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaShieldGuardAnim, this->animMorphFrames1); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaShieldGuardAnim); + } else { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaSwordGuardAnim, this->animMorphFrames1); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaSwordGuardAnim); + } + + this->actionFunc = Boss01_Guard; + } + + this->timers[TIMER_CURRENT_ACTION] = 5; +} + +/** + * Plays a guard animation (either blocking with his shield or his sword) for five frames, then transitions back to + * waiting. + */ +void Boss01_Guard(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 2, 0x500); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + if (this->timers[TIMER_CURRENT_ACTION] != 0) { + this->swordAndShieldCollisionEnabled = true; + } else { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } + + this->canGuardOrEvade = true; +} + +void Boss01_SetupKick(Boss01* this, PlayState* play) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaKickAnim, this->animMorphFrames2); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaKickAnim); + this->actionFunc = Boss01_Kick; +} + +/** + * Plays the kick animation to completion, then transitions back to waiting. + */ +void Boss01_Kick(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + if (Animation_OnFrame(&this->skelAnime, this->animEndFrame)) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } + + this->kickAndShieldBashCollisionEnabled = true; +} + +void Boss01_SetupShieldBash(Boss01* this, PlayState* play) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaShieldBashAnim, this->animMorphFrames2); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaShieldBashAnim); + this->actionFunc = Boss01_ShieldBash; +} + +/** + * Plays the shield bash animation to completion, then transitions back to waiting. + */ +void Boss01_ShieldBash(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + if (Animation_OnFrame(&this->skelAnime, this->animEndFrame)) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } + + this->kickAndShieldBashCollisionEnabled = true; +} + +/** + * If Odolwa is not currently in the "damaged" state (where he's crouched on one knee and breathing heavily), this + * function will transition him to that state and start a 20 frame timer; when this timer reaches 0, he will recover and + * jump away. However, if he is already in the "damaged" state, and if the player attacked him with an attack that has + * the ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK damage effect, then one of two things will happen: + * - If the attack hit while his current action timer is 7 or more, the timer will be set to 20 again; this will keep + * Odolwa in the "damaged" state for longer and allow the player to attack him more. + * - If the attack hit while his current action timer is 6 or less, Odolwa will disable all of his collision for 20 + * frames to ensure that the player cannot hit him with subsequent attacks. + */ +void Boss01_SetupDamaged(Boss01* this, PlayState* play, u8 damageEffect) { + if (this->actionFunc != Boss01_Damaged) { + this->timers[TIMER_CURRENT_ACTION] = 20; + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaDamagedStartAnim, 0.0f); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaDamagedStartAnim); + this->actionFunc = Boss01_Damaged; + } else if (damageEffect == ODOLWA_DMGEFF_DAMAGE_TIMER_CHECK) { + if (this->timers[TIMER_CURRENT_ACTION] > 5) { + this->disableCollisionTimer = 20; + } else { + this->timers[TIMER_CURRENT_ACTION] = 20; + } + } +} + +/** + * Plays Odolwa's damaged animation until the current action timer reaches 0, then makes him jump away. If the player + * attacks Odolwa while he's "downed" in this state, the current action timer can be manipulated in Boss01_SetupDamaged, + * so it's possible for Odolwa to stay in this state for a long time with well-timed attacks. + */ +void Boss01_Damaged(Boss01* this, PlayState* play) { + SkelAnime_Update(&this->skelAnime); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + + if (Animation_OnFrame(&this->skelAnime, this->animEndFrame)) { + Animation_MorphToLoop(&this->skelAnime, &gOdolwaDamagedLoopAnim, this->animMorphFrames2); + this->animEndFrame = 1000.0f; + } + + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + Boss01_SetupJump(this, play, false); + } + + Boss01_SpawnDustAtFeet(this, play, 1); +} + +void Boss01_UpdateDamage(Boss01* this, PlayState* play) { + Player* player = GET_PLAYER(play); + u8 damage; + s32 i; + + if (this->shieldCollider.elements[ODOLWA_SHIELD_COLLIDER_SHIELD].info.bumperFlags & BUMP_HIT) { + this->bodyInvincibilityTimer = 5; + if (this->damageTimer == 0) { + ColliderInfo* acHitInfo = this->shieldCollider.elements[ODOLWA_SHIELD_COLLIDER_SHIELD].info.acHitInfo; + + if (acHitInfo->toucher.dmgFlags == DMG_SWORD_BEAM) { + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.focus.pos.x, this->actor.focus.pos.y, + this->actor.focus.pos.z, 0, 0, 3, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_BOUND); + this->damageTimer = 5; + } + } + } else if (this->damageTimer == 0) { + for (i = 0; i < ODOLWA_SWORD_COLLIDER_MAX; i++) { + if (this->swordCollider.elements[i].info.toucherFlags & TOUCH_HIT) { + this->swordCollider.elements[i].info.toucherFlags &= ~TOUCH_HIT; + player->pushedYaw = this->actor.yawTowardsPlayer; + player->pushedSpeed = 15.0f; + } + } + + for (i = 0; i < ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_MAX; i++) { + if (this->kickAndShieldBashCollider.elements[i].info.toucherFlags & TOUCH_HIT) { + this->kickAndShieldBashCollider.elements[i].info.toucherFlags &= ~TOUCH_HIT; + player->pushedYaw = this->actor.yawTowardsPlayer; + player->pushedSpeed = 20.0f; + } + } + + for (i = 0; i < ODOLWA_COLLIDER_BODYPART_MAX; i++) { + if (this->bodyCollider.elements[i].info.bumperFlags & BUMP_HIT) { + this->bodyCollider.elements[i].info.bumperFlags &= ~BUMP_HIT; + + switch (this->actor.colChkInfo.damageEffect) { + case ODOLWA_DMGEFF_FREEZE: + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_FROZEN_INIT; + goto stunned; + + case ODOLWA_DMGEFF_FIRE: + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_FIRE_INIT; + break; + + case ODOLWA_DMGEFF_LIGHT_ORB: + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_LIGHT_ORB_INIT; + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.focus.pos.x, + this->actor.focus.pos.y, this->actor.focus.pos.z, 0, 0, 0, + CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + break; + + case ODOLWA_DMGEFF_ELECTRIC_STUN: + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_ELECTRIC_SPARKS_INIT; + goto stunned; + + case ODOLWA_DMGEFF_BLUE_LIGHT_ORB: + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_BLUE_LIGHT_ORB_INIT; + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.focus.pos.x, + this->actor.focus.pos.y, this->actor.focus.pos.z, 0, 0, 3, + CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + break; + + case ODOLWA_DMGEFF_STUN: + stunned: + Boss01_SetupStunned(this, play); + this->damageTimer = 15; + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); + this->canGuardOrEvade = false; + return; + + default: + break; + } + + damage = this->actor.colChkInfo.damage; + sMothSwarm->unk_148 = 0; + + if (this->actor.colChkInfo.damageEffect == ODOLWA_DMGEFF_STUN) { + //! @bug: unreachable code. If Odolwa's damage effect is ODOLWA_DMGEFF_STUN, we early-return out of + //! the function in the above switch statement. + Boss01_SetupStunned(this, play); + this->damageTimer = 15; + } else if (this->actor.colChkInfo.damageEffect == ODOLWA_DMGEFF_DAZE) { + Boss01_SetupDazed(this, play); + Audio_PlaySfx_AtPos(&sOdolwaDamageSfxPos, NA_SE_EN_MIBOSS_DAMAGE_OLD); + this->damageTimer = 15; + } else { + this->damageFlashTimer = 15; + this->damageTimer = 5; + this->actor.colChkInfo.health -= damage; + if ((s8)this->actor.colChkInfo.health <= 0) { + Boss01_SetupDeathCutscene(this, play); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_DEAD_OLD); + Enemy_StartFinishingBlow(play, &this->actor); + } else { + Boss01_SetupDamaged(this, play, this->actor.colChkInfo.damageEffect); + Audio_PlaySfx_AtPos(&sOdolwaDamageSfxPos, NA_SE_EN_MIBOSS_DAMAGE_OLD); + } + } + + this->canGuardOrEvade = false; + break; + } + } + } +} + +void Boss01_SetupSummonMoths(Boss01* this, PlayState* play) { + Animation_MorphToLoop(&this->skelAnime, &gOdolwaMothSummonDanceAnim, -5.0f); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaMothSummonDanceAnim); + this->actionFunc = Boss01_SummonMoths; + this->summonMothsTimer = 0; +} + +/** + * Plays a specific dancing animation and summons moths after 30 frames. After 131 frames pass, Odolwa will transition + * back to waiting; notably, this function always transitions him to a specific wait rather than choosing a random wait + * action like every other non-cutscene function. + */ +void Boss01_SummonMoths(Boss01* this, PlayState* play) { + this->summonMothsTimer++; + SkelAnime_Update(&this->skelAnime); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_VOICE3_OLD - SFX_FLAG); + + if (Animation_OnFrame(&this->skelAnime, this->animEndFrame)) { + this->skelAnime.curFrame = this->animEndFrame - 20.0f; + } + + if (this->summonMothsTimer >= 30) { + sMothSwarm->actor.world.pos.x = this->bodyPartsPos[ODOLWA_BODYPART_HEAD].x; + sMothSwarm->actor.world.pos.y = this->bodyPartsPos[ODOLWA_BODYPART_HEAD].y; + sMothSwarm->actor.world.pos.z = this->bodyPartsPos[ODOLWA_BODYPART_HEAD].z; + sMothSwarm->actor.world.rot.y = this->actor.world.rot.y; + + if (this->summonMothsTimer == 30) { + sMothSwarm->unk_148 = 100; + Actor_PlaySfx(&this->actor, NA_SE_SY_TRANSFORM_MASK_FLASH); + } + } + + Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 5, 0x500); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + if (this->summonMothsTimer >= 131) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_SPIN_DANCE); + } +} + +void Boss01_SetupDeathCutscene(Boss01* this, PlayState* play) { + Animation_MorphToPlayOnce(&this->skelAnime, &gOdolwaDeathAnim, this->animMorphFrames1); + this->animEndFrame = Animation_GetLastFrame(&gOdolwaDeathAnim); + this->actionFunc = Boss01_DeathCutscene; + Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_DAMAGE); + this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; + this->disableCollisionTimer = 1000; + this->cutsceneTimer = 0; + this->cutsceneState = ODOLWA_DEATH_CS_STATE_STARTED; + SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1); + sMothSwarm->unk_144 = 250; + func_800BC154(play, &play->actorCtx, &sMothSwarm->actor, ACTORCAT_BOSS); +} + +/** + * Handles the entirety of Odolwa's death cutscene, including manipulating the camera, starting the "boss defeated" + * theme, spawning the Heart Container and blue warp, surrounding Odolwa with flames, etc. Notably, the main Odolwa + * instance is *not* killed in this function, and it stays in this state forever. Instead, Odolwa is teleported far + * above the ceiling so the player cannot see or interact with him. + */ +void Boss01_DeathCutscene(Boss01* this, PlayState* play) { + Vec3f subCamOffset; + f32 diffX; + f32 diffZ; + Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); + + this->disableCollisionTimer = 1000; + this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; + SkelAnime_Update(&this->skelAnime); + this->cutsceneTimer++; + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + + switch (this->cutsceneState) { + case ODOLWA_DEATH_CS_STATE_STARTED: + if (CutsceneManager_GetCurrentCsId() != -1) { + break; + } + + Cutscene_StartManual(play, &play->csCtx); + func_800B7298(play, &this->actor, PLAYER_CSACTION_1); + this->subCamId = Play_CreateSubCamera(play); + Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT); + Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE); + this->cutsceneTimer = 0; + this->cutsceneState = ODOLWA_DEATH_CS_STATE_PLAY_ANIM_AND_FALL_FORWARD; + this->subCamEye.x = mainCam->eye.x; + this->subCamEye.y = mainCam->eye.y; + this->subCamEye.z = mainCam->eye.z; + this->subCamAt.x = mainCam->at.x; + this->subCamAt.y = mainCam->at.y; + this->subCamAt.z = mainCam->at.z; + diffX = this->subCamEye.x - this->actor.world.pos.x; + diffZ = this->subCamEye.z - this->actor.world.pos.z; + this->deathCsInitialSubCamRot = Math_Atan2F_XY(diffZ, diffX); + this->deathCsSubCamRot = -0.5f; + // fallthrough + case ODOLWA_DEATH_CS_STATE_PLAY_ANIM_AND_FALL_FORWARD: + if (this->cutsceneTimer < 15) { + Math_ApproachF(&this->actor.world.pos.x, 0.0f, 0.1f, 5.0f); + Math_ApproachF(&this->actor.world.pos.z, 0.0f, 0.1f, 5.0f); + } + + if (this->cutsceneTimer == 70) { + SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, NA_BGM_CLEAR_BOSS | SEQ_FLAG_ASYNC); + } + + if (this->cutsceneTimer == 71) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIBOSS_GND2_OLD); + this->cutsceneState = ODOLWA_DEATH_CS_STATE_BURST_INTO_FLAMES_AND_SHRINK; + this->cutsceneTimer = 0; + } + // fallthrough + case ODOLWA_DEATH_CS_STATE_BURST_INTO_FLAMES_AND_SHRINK: + Math_ApproachF(&this->deathCsSubCamRot, 1.3f, 0.1f, 0.008f); + subCamOffset.x = 0.0f; + subCamOffset.y = 30.0f; + subCamOffset.z = 300.0f; + Matrix_RotateYF(this->deathCsInitialSubCamRot + this->deathCsSubCamRot, MTXMODE_NEW); + Matrix_MultVec3f(&subCamOffset, &this->subCamEyeNext); + this->subCamEyeNext.x += this->pelvisPos.x; + this->subCamEyeNext.y += this->pelvisPos.y; + this->subCamEyeNext.z += this->pelvisPos.z; + Math_ApproachF(&this->subCamEye.x, this->subCamEyeNext.x, 0.1f, 40.0f); + Math_ApproachF(&this->subCamEye.y, this->subCamEyeNext.y, 0.1f, 40.0f); + Math_ApproachF(&this->subCamEye.z, this->subCamEyeNext.z, 0.1f, 40.0f); + Math_ApproachF(&this->subCamAt.x, this->pelvisPos.x, 0.1f, 70.0f); + Math_ApproachF(&this->subCamAt.y, this->pelvisPos.y + 50.0f, 0.1f, 70.0f); + Math_ApproachF(&this->subCamAt.z, this->pelvisPos.z, 0.1f, 70.0f); + + if (this->cutsceneTimer >= 71) { + s16 i; + s16 fireCount; + Vec3f fireAccel; + Vec3f firePos; + s16 bodyPartIndex; + + fireAccel = gZeroVec3f; + fireAccel.y = 0.03f; + + if (this->cutsceneTimer > 80) { + Math_ApproachZeroF(&this->actor.scale.y, 0.1f, this->deathShrinkSpeed * 0.00075f); + Math_ApproachF(&this->deathShrinkSpeed, 1.0f, 1.0f, 0.01f); + } + + if (this->cutsceneTimer > 120) { + fireCount = 1; + } else { + fireCount = 2; + } + + for (i = 0; i < fireCount; i++) { + bodyPartIndex = Rand_ZeroFloat(14.9f); + firePos.x = this->bodyPartsPos[bodyPartIndex].x + Rand_CenteredFloat(40.0f); + firePos.y = this->bodyPartsPos[bodyPartIndex].y - 10.0f; + firePos.z = this->bodyPartsPos[bodyPartIndex].z + Rand_CenteredFloat(40.0f); + EffectSsKFire_Spawn(play, &firePos, &gZeroVec3f, &fireAccel, Rand_ZeroFloat(30.0f) + 30.0f, 0); + } + + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_EXTINCT_LEV - SFX_FLAG); + } + + if (this->cutsceneTimer == 71) { + Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, this->actor.focus.pos.x, this->actor.focus.pos.y, + this->actor.focus.pos.z, 0, 0, 0, BHEART_PARAM_NORMAL); + } + + if (this->cutsceneTimer == 180) { + static f32 sBlueWarpSpawnsX[] = { 0.0f, 350.0f, -350.0f, 350.0f, -350.0f }; + static f32 sBlueWarpSpawnsZ[] = { 0.0f, 350.0f, 350.0f, -350.0f, -350.0f }; + Player* player = GET_PLAYER(play); + f32 warpX; + f32 warpZ; + s32 i; + + for (i = 0; i < ARRAY_COUNT(sBlueWarpSpawnsX); i++) { + warpX = sBlueWarpSpawnsX[i]; + warpZ = sBlueWarpSpawnsZ[i]; + + if (((fabsf(warpX - this->actor.focus.pos.x) < 220.0f) && + (fabsf(warpZ - this->actor.focus.pos.z) < 220.0f)) || + ((fabsf(warpX - player->actor.world.pos.x) < 220.0f) && + (fabsf(warpZ - player->actor.world.pos.z) < 220.0f))) { + } else { + break; + } + } + + Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, warpX, 0.0f, warpZ, 0, 0, 0, + ENDOORWARP1_FF_1); + this->cutsceneState = ODOLWA_DEATH_CS_STATE_DONE; + mainCam->eye = this->subCamEye; + mainCam->eyeNext = this->subCamEye; + mainCam->at = this->subCamAt; + func_80169AFC(play, this->subCamId, 0); + this->subCamId = SUB_CAM_ID_DONE; + Cutscene_StopManual(play, &play->csCtx); + func_800B7298(play, &this->actor, PLAYER_CSACTION_END); + this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; + } + break; + + case ODOLWA_DEATH_CS_STATE_DONE: + this->actor.world.pos.y = 5000.0f; + break; + } + + if (this->subCamId != SUB_CAM_ID_DONE) { + Vec3f at; + + // It seems like this code was copied from Boss01_IntroCutscene, since this function doesn't set + // screenShakeMagnitude to anything, and thus it is always 0.0f; all of the code involving screen + // shake here could be removed, since it is effectively useless. + this->screenShakeOffsetY = Math_CosS(play->gameplayFrames * 0x8000) * this->screenShakeMagnitude; + Math_ApproachZeroF(&this->screenShakeMagnitude, 1.0f, 0.75f); + at = this->subCamAt; + at.y += this->screenShakeOffsetY; + Play_SetCameraAtEye(play, this->subCamId, &at, &this->subCamEye); + } +} + +void Boss01_SetupStunned(Boss01* this, PlayState* play) { + this->actionFunc = Boss01_Stunned; + this->timers[TIMER_CURRENT_ACTION] = 40; + Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 40); +} + +/** + * Turns Odolwa blue, disables all animations, and makes him wait in place for 40 frames, after which he will transition + * to waiting. This is not to be confused with his "dazed" state, which is commonly referred to as Odolwa "being + * stunned"; this form of stun, where the enemy turns blue and stops their animations, is very common among regular + * enemies, but it's very rare to see on a boss, so the term "stunned" was used here for consistency with other enemies. + */ +void Boss01_Stunned(Boss01* this, PlayState* play) { + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + if (this->timers[TIMER_CURRENT_ACTION] == 0) { + Boss01_SetupWait(this, play, ODOLWA_WAIT_RANDOM); + } +} + +/** + * Spawns two ice shards on all of Odolwa's body parts that fly off in random directions. + */ +void Boss01_Thaw(Boss01* this, PlayState* play) { + static Color_RGBA8 sIcePrimColor = { 170, 255, 255, 255 }; + static Color_RGBA8 sIceEnvColor = { 200, 200, 255, 255 }; + static Vec3f sIceAccel = { 0.0f, -1.0f, 0.0f }; + Vec3f pos; + Vec3f velocity; + s32 i; + + SoundSource_PlaySfxAtFixedWorldPos(play, this->bodyPartsPos, 30, NA_SE_EV_ICE_BROKEN); + + for (i = 0; i < ODOLWA_BODYPART_MAX * 2; i++) { + velocity.x = Rand_CenteredFloat(7.0f); + velocity.z = Rand_CenteredFloat(7.0f); + velocity.y = Rand_ZeroFloat(6.0f) + 4.0f; + + pos.x = this->bodyPartsPos[i / 2].x + velocity.x; + pos.y = this->bodyPartsPos[i / 2].y + velocity.y; + pos.z = this->bodyPartsPos[i / 2].z + velocity.z; + + EffectSsEnIce_Spawn(play, &pos, Rand_ZeroFloat(1.0f) + 1.5f, &velocity, &sIceAccel, &sIcePrimColor, + &sIceEnvColor, 30); + } +} + +/** + * Returns true if Odolwa's model is rotated such that he is looking at the player *and* if the player's model is + * rotated such that they are looking at Odolwa. + */ +s32 Boss01_ArePlayerAndOdolwaFacing(Boss01* this, PlayState* play) { + Player* player = GET_PLAYER(play); + + if ((ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.shape.rot.y)) < 0x3000) && + (ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, BINANG_ROT180(player->actor.shape.rot.y))) < 0x3000)) { + return true; + } + + return false; +} + +void Boss01_Update(Actor* thisx, PlayState* play2) { + Boss01* this = THIS; + PlayState* play = play2; + s32 i; + Player* player = GET_PLAYER(play); + f32 diffX; + f32 diffY; + f32 diffZ; + s16 targetHeadRotY; + s16 targetHeadRotX; + s32 pad; + + if (ODOLWA_GET_TYPE(&this->actor) == ODOLWA_TYPE_AFTERIMAGE) { + if (KREG(63) == 0) { + DECR(this->timers[TIMER_AFTERIMAGE_DESPAWN]); + this->actionFunc(this, play); + } + return; + } + + Math_Vec3f_Copy(&sOdolwaDamageSfxPos, &this->actor.projectedPos); + + play->envCtx.lightSetting = 0; + play->envCtx.prevLightSetting = 1; + Math_ApproachZeroF(&play->envCtx.lightBlend, 1.0f, 0.03f); + + this->frameCounter++; + + if (KREG(63) == 0) { + this->phaseFrameCounter++; + if (this->phaseFrameCounter == 800) { + sOdolwa->actor.hintId = TATL_HINT_ID_ODOLWA_CLOSE_TO_PHASE_TWO; + } + + this->canGuardOrEvade = false; + this->swordAndShieldCollisionEnabled = false; + this->isPerformingVerticalSlash = false; + this->afterimageSpawnFrameMask = 0; + this->kickAndShieldBashCollisionEnabled = false; + this->swordState = ODOLWA_SWORD_STATE_INACTIVE; + + for (i = 0; i < ARRAY_COUNT(this->timers); i++) { + DECR(this->timers[i]); + } + + DECR(this->damageTimer); + DECR(this->damageFlashTimer); + + this->actor.flags |= ACTOR_FLAG_TARGETABLE; + this->actionFunc(this, play); + Actor_MoveWithGravity(&this->actor); + this->actor.world.pos.x += this->additionalVelocityX; + this->actor.world.pos.z += this->additionalVelocityZ; + } + + Actor_UpdateBgCheckInfo(play, &this->actor, 50.0f, 150.0f, 100.0f, UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4); + if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { + Math_ApproachZeroF(&this->additionalVelocityX, 1.0f, 1.0f); + Math_ApproachZeroF(&this->additionalVelocityZ, 1.0f, 1.0f); + } + + this->actor.shape.rot = this->actor.world.rot; + + if (this->disableCollisionTimer == 0) { + Boss01_UpdateDamage(this, play); + + if (this->bodyInvincibilityTimer == 0) { + CollisionCheck_SetAC(play, &play->colChkCtx, &this->bodyCollider.base); + } else { + this->bodyInvincibilityTimer--; + for (i = 0; i < ODOLWA_COLLIDER_BODYPART_MAX; i++) { + this->bodyCollider.elements[i].info.bumperFlags &= ~BUMP_HIT; + } + } + + if (this->swordAndShieldCollisionEnabled) { + CollisionCheck_SetAC(play, &play->colChkCtx, &this->shieldCollider.base); + CollisionCheck_SetOC(play, &play->colChkCtx, &this->shieldCollider.base); + CollisionCheck_SetAC(play, &play->colChkCtx, &this->swordCollider.base); + } + + if (this->swordState != ODOLWA_SWORD_STATE_INACTIVE) { + CollisionCheck_SetAT(play, &play->colChkCtx, &this->swordCollider.base); + } + + if (this->kickAndShieldBashCollisionEnabled) { + CollisionCheck_SetAT(play, &play->colChkCtx, &this->kickAndShieldBashCollider.base); + } + } else { + this->disableCollisionTimer--; + for (i = 0; i < ODOLWA_COLLIDER_BODYPART_MAX; i++) { + this->bodyCollider.elements[i].info.bumperFlags &= ~BUMP_HIT; + } + } + + CollisionCheck_SetOC(play, &play->colChkCtx, &this->bodyCollider.base); + + // If Odolwa and the player are *not* facing each other, Odolwa will *not* block or jump away from the player's + // attacks, even if canGuardOrEvade is set to true. This allows the player to hit Odolwa even during states where he + // normally evades attacks, so long as the player is far enough to the side or behind him. + if (this->canGuardOrEvade && + ((player->unk_D57 != 0) || ((player->unk_ADC != 0) && (this->actor.xzDistToPlayer <= 120.0f))) && + Boss01_ArePlayerAndOdolwaFacing(this, play)) { + if ((Rand_ZeroOne() < 0.25f) && (this->actionFunc != Boss01_Guard)) { + Boss01_SetupJump(this, play, false); + this->disableCollisionTimer = 10; + } else if ((player->unk_ADC != 0) && (this->actor.xzDistToPlayer <= 120.0f)) { + Boss01_SetupGuard(this, play, true); + } else { + Boss01_SetupGuard(this, play, false); + } + } + + if (this->canGuardOrEvade) { + Boss01_JumpAwayFromExplosive(this, play); + } + + if (((this->frameCounter & (this->afterimageSpawnFrameMask - 1)) == 0) && (this->afterimageSpawnFrameMask != 0)) { + s16 afterimageTimer = (this->actionFunc == Boss01_SpinAttack) ? 4 : 10; + s32 pad; + Boss01* child = + (Boss01*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_01, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, this->actor.world.rot.x, + this->actor.world.rot.y, afterimageTimer, ODOLWA_TYPE_AFTERIMAGE); + + if (child != NULL) { + for (i = 0; i < ODOLWA_LIMB_MAX; i++) { + child->skelAnime.jointTable[i] = this->skelAnime.jointTable[i]; + } + } + } + + Boss01_UpdateEffects(this, play); + + if (sOdolwaMusicStartTimer != 0) { + sOdolwaMusicStartTimer--; + if (sOdolwaMusicStartTimer == 0) { + SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, NA_BGM_BOSS | SEQ_FLAG_ASYNC); + } + } + + if (this->lookAtPlayer) { + targetHeadRotY = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; + if ((targetHeadRotY > 0x3800) || (targetHeadRotY < -0x3800)) { + targetHeadRotY = 0; + } + + diffX = player->actor.world.pos.x - this->actor.focus.pos.x; + diffY = KREG(36) + ((player->actor.world.pos.y + 25.0f) - this->actor.focus.pos.y); + diffZ = player->actor.world.pos.z - this->actor.focus.pos.z; + targetHeadRotX = Math_Atan2S(diffY, sqrtf(SQ(diffX) + SQ(diffZ))); + + // This line of code ensures that *not* following the player is the default behavior; if you want Odolwa's head + // to track the player, you'll need to set this variable to true for every single frame you want this behavior. + this->lookAtPlayer = false; + } else { + targetHeadRotX = 0; + targetHeadRotY = 0; + } + + Math_ApproachS(&this->headRotY, targetHeadRotY, 3, 0x2000); + Math_ApproachS(&this->headRotX, targetHeadRotX, 3, 0x2000); + + DECR(this->drawDmgEffTimer); + + switch (this->drawDmgEffState) { + case ODOLWA_DRAW_DMGEFF_STATE_NONE: + this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; + this->drawDmgEffTimer = 0; + this->drawDmgEffAlpha = 0.0f; + break; + + case ODOLWA_DRAW_DMGEFF_STATE_FIRE_INIT: + this->drawDmgEffAlpha = 1.0f; + this->drawDmgEffScale = 0.0f; + this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; + this->drawDmgEffTimer = 40; + this->drawDmgEffState++; + Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 120, COLORFILTER_BUFFLAG_OPA, 60); + // fallthrough + case ODOLWA_DRAW_DMGEFF_STATE_FIRE_ACTIVE: + if (this->drawDmgEffTimer == 0) { + Math_ApproachZeroF(&this->drawDmgEffAlpha, 1.0f, 0.02f); + if (this->drawDmgEffAlpha == 0.0f) { + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_NONE; + } + } else { + Math_ApproachF(&this->drawDmgEffScale, 1.0f, 0.1f, 0.5f); + } + break; + + case ODOLWA_DRAW_DMGEFF_STATE_FROZEN_INIT: + this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_SFX; + this->drawDmgEffTimer = 40; + this->drawDmgEffState++; + this->drawDmgEffAlpha = 1.0f; + this->drawDmgEffScale = 0.0f; + this->drawDmgEffFrozenSteamScale = 1.0f; + // fallthrough + case ODOLWA_DRAW_DMGEFF_STATE_FROZEN_ACTIVE: + if (this->drawDmgEffTimer == 0) { + Boss01_Thaw(this, play); + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_NONE; + break; + } + + if (this->drawDmgEffTimer == 50) { + this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; + } + + Math_ApproachF(&this->drawDmgEffScale, 1.0f, 1.0f, 0.08f); + Math_ApproachF(&this->drawDmgEffFrozenSteamScale, 1.0f, 0.05f, 0.05f); + break; + + case ODOLWA_DRAW_DMGEFF_STATE_LIGHT_ORB_INIT: + this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; + this->drawDmgEffTimer = 40; + this->drawDmgEffScale = 1.0f; + goto lightOrbInitCommon; + + case ODOLWA_DRAW_DMGEFF_STATE_BLUE_LIGHT_ORB_INIT: + this->drawDmgEffType = ACTOR_DRAW_DMGEFF_BLUE_LIGHT_ORBS; + this->drawDmgEffTimer = 40; + this->drawDmgEffScale = 3.0f; + lightOrbInitCommon: + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_LIGHT_ORB_ACTIVE; + this->drawDmgEffAlpha = 1.0f; + // fallthrough + case ODOLWA_DRAW_DMGEFF_STATE_LIGHT_ORB_ACTIVE: + if (this->drawDmgEffTimer == 0) { + Math_ApproachZeroF(&this->drawDmgEffScale, 1.0f, 0.03f); + if (this->drawDmgEffScale == 0.0f) { + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_NONE; + this->drawDmgEffAlpha = 0.0f; + } + } else { + Math_ApproachF(&this->drawDmgEffScale, 1.5f, 0.5f, 0.5f); + } + break; + + case ODOLWA_DRAW_DMGEFF_STATE_ELECTRIC_SPARKS_INIT: + this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_SMALL; + this->drawDmgEffTimer = 50; + this->drawDmgEffAlpha = 1.0f; + this->drawDmgEffScale = (KREG(18) * 0.1f) + 1.0f; + this->drawDmgEffState++; + // fallthrough + case ODOLWA_DRAW_DMGEFF_STATE_ELECTRIC_SPARKS_ACTIVE: + if (this->drawDmgEffTimer == 0) { + Math_ApproachZeroF(&this->drawDmgEffScale, 1.0f, 0.05f); + if (this->drawDmgEffScale == 0.0f) { + this->drawDmgEffState = ODOLWA_DRAW_DMGEFF_STATE_NONE; + this->drawDmgEffAlpha = 0.0f; + } + } + break; + + default: + break; + } +} + +/** + * Draws the sword trail that follows Odolwa's sword during horizontal and vertical slashes. + */ +void Boss01_DrawSwordTrail(Boss01* this, PlayState* play) { + static u8 sSwordTrailOuterVertexIndices[] = { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20 }; + static u8 sSwordTrailInnerVertexIndices[] = { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21 }; + Vtx* vtx; + u32 i; + + OPEN_DISPS(play->state.gfxCtx); + + vtx = Lib_SegmentedToVirtual(&gOdolwaSwordTrailVtx); + + for (i = 0; i < ARRAY_COUNT(sSwordTrailOuterVertexIndices); i++) { + vtx[sSwordTrailOuterVertexIndices[i]].v.ob[0] = cosf((i * M_PI) / sSwordTrailAngularRangeDivisor) * 200.0f; + vtx[sSwordTrailOuterVertexIndices[i]].v.ob[1] = 0; + vtx[sSwordTrailOuterVertexIndices[i]].v.ob[2] = sinf((i * M_PI) / sSwordTrailAngularRangeDivisor) * 200.0f; + + vtx[sSwordTrailInnerVertexIndices[i]].v.ob[0] = cosf((i * M_PI) / sSwordTrailAngularRangeDivisor) * 100.0f; + vtx[sSwordTrailInnerVertexIndices[i]].v.ob[1] = 0; + vtx[sSwordTrailInnerVertexIndices[i]].v.ob[2] = sinf((i * M_PI) / sSwordTrailAngularRangeDivisor) * 100.0f; + } + + gSPSegment( + POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 0, 0, 32, 32, 1, play->gameplayFrames * 18, 0, 32, 32)); + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)sOdolwaSwordTrailAlpha); + + Matrix_Translate(this->actor.world.pos.x + sOdolwaSwordTrailPosX, this->actor.world.pos.y + sOdolwaSwordTrailPosY, + this->actor.world.pos.z + sOdolwaSwordTrailPosZ, MTXMODE_NEW); + Matrix_RotateYF(BINANG_TO_RAD(this->actor.shape.rot.y), MTXMODE_APPLY); + Matrix_RotateXFApply(sOdolwaSwordTrailRotX); + Matrix_RotateZF(sOdolwaSwordTrailRotZ, MTXMODE_APPLY); + Matrix_RotateYF(sOdolwaSwordTrailRotY, MTXMODE_APPLY); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gOdolwaSwordTrailDL); + + CLOSE_DISPS(play->state.gfxCtx); +} + +s32 Boss01_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + Boss01* this = THIS; + + if (limbIndex == ODOLWA_LIMB_HEAD) { + // The rot variable here is in model space, whereas the headRot variables are in world space. + // Odolwa's head is lying on its side in model space, which is why this assignment looks weird. + rot->x += this->headRotY; + rot->y += this->headRotX; + } + + return false; +} + +static s8 sLimbToColliderBodyParts[] = { + BODYPART_NONE, // ODOLWA_LIMB_NONE + BODYPART_NONE, // ODOLWA_LIMB_ROOT + ODOLWA_COLLIDER_BODYPART_PELVIS, // ODOLWA_LIMB_PELVIS + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LEG_ROOT + ODOLWA_COLLIDER_BODYPART_RIGHT_THIGH, // ODOLWA_LIMB_RIGHT_THIGH + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LOWER_LEG_ROOT + ODOLWA_COLLIDER_BODYPART_RIGHT_SHIN, // ODOLWA_LIMB_RIGHT_SHIN + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_FOOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LEG_ROOT + ODOLWA_COLLIDER_BODYPART_LEFT_THIGH, // ODOLWA_LIMB_LEFT_THIGH + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LOWER_LEG_ROOT + ODOLWA_COLLIDER_BODYPART_LEFT_SHIN, // ODOLWA_LIMB_LEFT_SHIN + BODYPART_NONE, // ODOLWA_LIMB_LEFT_FOOT + BODYPART_NONE, // ODOLWA_LIMB_UPPER_BODY_ROOT + BODYPART_NONE, // ODOLWA_LIMB_UPPER_BODY_WRAPPER + ODOLWA_COLLIDER_BODYPART_TORSO, // ODOLWA_LIMB_TORSO + BODYPART_NONE, // ODOLWA_LIMB_LEFT_ARM_ROOT + ODOLWA_COLLIDER_BODYPART_LEFT_UPPER_ARM, // ODOLWA_LIMB_LEFT_UPPER_ARM + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LOWER_ARM_ROOT + ODOLWA_COLLIDER_BODYPART_LEFT_FOREARM, // ODOLWA_LIMB_LEFT_FOREARM + BODYPART_NONE, // ODOLWA_LIMB_LEFT_BANGLE + BODYPART_NONE, // ODOLWA_LIMB_LEFT_HAND_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_HAND + BODYPART_NONE, // ODOLWA_LIMB_SHIELD + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_ARM_ROOT + ODOLWA_COLLIDER_BODYPART_RIGHT_UPPER_ARM, // ODOLWA_LIMB_RIGHT_UPPER_ARM + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LOWER_ARM_ROOT + ODOLWA_COLLIDER_BODYPART_RIGHT_FOREARM, // ODOLWA_LIMB_RIGHT_FOREARM + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_BANGLE + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_HAND_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_HAND + BODYPART_NONE, // ODOLWA_LIMB_SWORD + ODOLWA_COLLIDER_BODYPART_HEAD, // ODOLWA_LIMB_HEAD + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_EARRING_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_EARRING + BODYPART_NONE, // ODOLWA_LIMB_LEFT_EARRING_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_EARRING + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_BASE + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LOWER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_MIDDLE + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_TIP + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_BASE + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LOWER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_MIDDLE + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_TIP + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_BASE + BODYPART_NONE, // ODOLWA_LIMB_CENTER_LOWER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_MIDDLE + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_TIP + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa +}; + +static Vec3f sLimbColliderOffsets[ODOLWA_COLLIDER_BODYPART_MAX] = { + { 1300.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_HEAD + { 1000.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_TORSO + { 0.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_PELVIS + { 1000.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_LEFT_UPPER_ARM + { 1000.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_LEFT_FOREARM + { 1000.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_RIGHT_UPPER_ARM + { 1000.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_RIGHT_FOREARM + { 1500.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_LEFT_THIGH + { 1500.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_LEFT_SHIN + { 1500.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_RIGHT_THIGH + { 1500.0f, 0.0f, 0.0f }, // ODOLWA_COLLIDER_BODYPART_RIGHT_SHIN +}; + +static Vec3f sShieldColliderOffset = { 0.0f, 500.0f, 0.0f }; + +static Vec3f sSwordBaseColliderOffset = { 500.0f, -2500.0f, 0.0f }; + +static Vec3f sSwordTipColliderOffset = { 1500.0f, -7000.0f, 0.0f }; + +/** + * When Odolwa performs a horizontal slash, his sword is very likely to be too high to hit the player. In order to make + * the attack effective, there is an additional collider projected from Odolwa's pelvis that sweeps across the floor + * during his horizontal slash. This variable controls the offset of this collider from his pelvis limb. + */ +static Vec3f sHorizontalSlashPelvisColliderOffset = { 5000.0f, 0.0f, 9000.0f }; + +static s8 sLimbToBodyParts[] = { + BODYPART_NONE, // ODOLWA_LIMB_NONE + BODYPART_NONE, // ODOLWA_LIMB_ROOT + ODOLWA_BODYPART_PELVIS, // ODOLWA_LIMB_PELVIS + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LEG_ROOT + ODOLWA_BODYPART_RIGHT_THIGH, // ODOLWA_LIMB_RIGHT_THIGH + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LOWER_LEG_ROOT + ODOLWA_BODYPART_RIGHT_SHIN, // ODOLWA_LIMB_RIGHT_SHIN + ODOLWA_BODYPART_RIGHT_FOOT, // ODOLWA_LIMB_RIGHT_FOOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LEG_ROOT + ODOLWA_BODYPART_LEFT_THIGH, // ODOLWA_LIMB_LEFT_THIGH + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LOWER_LEG_ROOT + ODOLWA_BODYPART_LEFT_SHIN, // ODOLWA_LIMB_LEFT_SHIN + ODOLWA_BODYPART_LEFT_FOOT, // ODOLWA_LIMB_LEFT_FOOT + BODYPART_NONE, // ODOLWA_LIMB_UPPER_BODY_ROOT + BODYPART_NONE, // ODOLWA_LIMB_UPPER_BODY_WRAPPER + ODOLWA_BODYPART_TORSO, // ODOLWA_LIMB_TORSO + BODYPART_NONE, // ODOLWA_LIMB_LEFT_ARM_ROOT + ODOLWA_BODYPART_LEFT_UPPER_ARM, // ODOLWA_LIMB_LEFT_UPPER_ARM + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LOWER_ARM_ROOT + ODOLWA_BODYPART_LEFT_FOREARM, // ODOLWA_LIMB_LEFT_FOREARM + BODYPART_NONE, // ODOLWA_LIMB_LEFT_BANGLE + BODYPART_NONE, // ODOLWA_LIMB_LEFT_HAND_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_HAND + ODOLWA_BODYPART_SHIELD, // ODOLWA_LIMB_SHIELD + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_ARM_ROOT + ODOLWA_BODYPART_RIGHT_UPPER_ARM, // ODOLWA_LIMB_RIGHT_UPPER_ARM + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LOWER_ARM_ROOT + ODOLWA_BODYPART_RIGHT_FOREARM, // ODOLWA_LIMB_RIGHT_FOREARM + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_BANGLE + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_HAND_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_HAND + ODOLWA_BODYPART_SWORD, // ODOLWA_LIMB_SWORD + ODOLWA_BODYPART_HEAD, // ODOLWA_LIMB_HEAD + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_EARRING_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_EARRING + BODYPART_NONE, // ODOLWA_LIMB_LEFT_EARRING_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_EARRING + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_BASE + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_LOWER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_MIDDLE + BODYPART_NONE, // ODOLWA_LIMB_RIGHT_PLUME_TIP + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_BASE + BODYPART_NONE, // ODOLWA_LIMB_LEFT_LOWER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_MIDDLE + BODYPART_NONE, // ODOLWA_LIMB_LEFT_PLUME_TIP + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_BASE + BODYPART_NONE, // ODOLWA_LIMB_CENTER_LOWER_PLUME_ROOT + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_MIDDLE + BODYPART_NONE, // ODOLWA_LIMB_CENTER_PLUME_TIP + BODYPART_NONE, // Doesn't correspond to a real limb on Odolwa +}; + +void Boss01_PostLimbDraw(PlayState* play2, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { + Boss01* this = THIS; + PlayState* play = play2; + s8 index; + Vec3f pos; + + if (limbIndex == ODOLWA_LIMB_HEAD) { + Matrix_MultZero(&this->actor.focus.pos); + } + + index = sLimbToBodyParts[limbIndex]; + if (index > BODYPART_NONE) { + Matrix_MultZero(&this->bodyPartsPos[index]); + } + + index = sLimbToColliderBodyParts[limbIndex]; + if (index > BODYPART_NONE) { + Matrix_MultVec3f(&sLimbColliderOffsets[index], &pos); + Boss01_SetColliderSphere(index, &this->bodyCollider, &pos); + } + + if (limbIndex == ODOLWA_LIMB_PELVIS) { + Matrix_MultZero(&this->pelvisPos); + if (this->swordState == ODOLWA_SWORD_STATE_HORIZONTAL_SLASH) { + Matrix_MultVec3f(&sHorizontalSlashPelvisColliderOffset, &pos); + Boss01_SetColliderSphere(ODOLWA_SWORD_COLLIDER_PELVIS, &this->swordCollider, &pos); + } + } + + if (limbIndex == ODOLWA_LIMB_SWORD) { + Matrix_MultVec3f(&sSwordBaseColliderOffset, &pos); + Boss01_SetColliderSphere(ODOLWA_SWORD_COLLIDER_SWORD_BASE, &this->swordCollider, &pos); + Matrix_MultVec3f(&sSwordTipColliderOffset, &pos); + Boss01_SetColliderSphere(ODOLWA_SWORD_COLLIDER_SWORD_TIP, &this->swordCollider, &pos); + } + + if (limbIndex == ODOLWA_LIMB_SHIELD) { + Matrix_MultVec3f(&sShieldColliderOffset, &pos); + Boss01_SetColliderSphere(ODOLWA_SHIELD_COLLIDER_SHIELD, &this->shieldCollider, &pos); + Boss01_SetColliderSphere(ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_SHIELD, &this->kickAndShieldBashCollider, &pos); + } + + if (limbIndex == ODOLWA_LIMB_RIGHT_FOOT) { + Matrix_MultZero(&this->feetPos[0]); + } + + if (limbIndex == ODOLWA_LIMB_LEFT_FOOT) { + Matrix_MultZero(&this->feetPos[1]); + Matrix_MultZero(&pos); + Boss01_SetColliderSphere(ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_LEFT_FOOT, &this->kickAndShieldBashCollider, + &pos); + } + + if (limbIndex == ODOLWA_LIMB_HEAD) { + OPEN_DISPS(play->state.gfxCtx); + + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 0, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); + + Matrix_Push(); + Matrix_Translate(1470.0f, 400.0f, 450.0f, MTXMODE_APPLY); + Matrix_Scale(0.35f, 0.35f, 0.35f, MTXMODE_APPLY); + Matrix_ReplaceRotation(&play->billboardMtxF); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gOdolwaEyeDL); + Matrix_Pop(); + + Matrix_Push(); + Matrix_Translate(1470.0f, -360.0f, 450.0f, MTXMODE_APPLY); + Matrix_Scale(0.35f, 0.35f, 0.35f, MTXMODE_APPLY); + Matrix_ReplaceRotation(&play->billboardMtxF); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gOdolwaEyeDL); + Matrix_Pop(); + + CLOSE_DISPS(play->state.gfxCtx); + } +} + +void Boss01_Draw(Actor* thisx, PlayState* play) { + static Vec3f sDefaultPelvisColliderOffset = { 10000.0f, 10000.0f, 10000.0f }; + Boss01* this = THIS; + s32 pad; + u8* tex = GRAPH_ALLOC(play->state.gfxCtx, ODOLWA_SHADOW_TEX_SIZE); + + OPEN_DISPS(play->state.gfxCtx); + + // When Odolwa is performing a horizontal slash, an additional collider offset from his pelvis will sweep across the + // floor and damage the player. However, this collider should not be present all the time, so it is offset very far + // out-of-bounds here. If Odolwa is performing a horizontal slash, then Boss01_PostLimbDraw (which is called later + // in this function) will offset it properly for this frame. + Boss01_SetColliderSphere(ODOLWA_SWORD_COLLIDER_PELVIS, &this->swordCollider, &sDefaultPelvisColliderOffset); + + Gfx_SetupDL25_Opa(play->state.gfxCtx); + Gfx_SetupDL25_Xlu(play->state.gfxCtx); + + if (this->damageFlashTimer & 1) { + POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 255, 0, 0, 255, 900, 1099); + } + + SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + Boss01_OverrideLimbDraw, Boss01_PostLimbDraw, &this->actor); + + POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP); + + Boss01_GenShadowTex(tex, this, play); + Boss01_DrawShadowTex(tex, this, play); + + if (sOdolwaSwordTrailAlpha > 0.0f) { + Boss01_DrawSwordTrail(this, play); + Math_ApproachZeroF(&sOdolwaSwordTrailAlpha, 1.0f, 50.0f); + } + + Actor_DrawDamageEffects(play, &this->actor, this->bodyPartsPos, ODOLWA_BODYPART_MAX, this->drawDmgEffScale, + this->drawDmgEffFrozenSteamScale, this->drawDmgEffAlpha, this->drawDmgEffType); + + Boss01_DrawEffects(play); + + CLOSE_DISPS(play->state.gfxCtx); +} + +void Boss01_Afterimage_Draw(Actor* thisx, PlayState* play) { + Boss01* this = THIS; + s32 pad; + Boss01* parent = (Boss01*)this->actor.parent; + + OPEN_DISPS(play->state.gfxCtx); + + Gfx_SetupDL25_Opa(play->state.gfxCtx); + Gfx_SetupDL25_Xlu(play->state.gfxCtx); + POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 50, 0, 40, 255, 900, 1099); + SkelAnime_DrawFlexOpa(play, parent->skelAnime.skeleton, this->skelAnime.jointTable, parent->skelAnime.dListCount, + NULL, NULL, &this->actor); + POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP); + + CLOSE_DISPS(play->state.gfxCtx); +} + +/** + * These four arrays encode circular shadow maps of various sizes. For an array of length N, the shadow map is N rows + * tall, and each entry in the array describes the start and end point of the shadow within a given row (the exact + * values of the start and end points are determined by the loops within Boss01_FillShadowTex). To illustrate using the + * sShadowSmallMap as an example: + * -3 -2 -1 0 1 + * ------------- + * 0 0 1 0 0 + * 0 1 1 1 0 + * 1 1 1 1 1 + * 1 1 1 1 1 + * 0 1 1 1 0 + * 0 0 1 0 0 + */ +static s32 sShadowSmallMap[] = { + 1, 2, 3, 3, 2, 1, +}; + +static s32 sShadowMediumMap[] = { + 2, 3, 4, 4, 4, 3, 2, +}; + +static s32 sShadowLargeMap[] = { + 2, 3, 4, 4, 4, 4, 3, 2, +}; + +static s32 sShadowExtraLargeMap[] = { + 2, 4, 5, 5, 6, 6, 6, 6, 5, 5, 4, 2, +}; + +static s32 sParentShadowBodyParts[ODOLWA_BODYPART_MAX] = { + ODOLWA_BODYPART_TORSO, // ODOLWA_BODYPART_HEAD + BODYPART_NONE, // ODOLWA_BODYPART_TORSO + ODOLWA_BODYPART_TORSO, // ODOLWA_BODYPART_PELVIS + ODOLWA_BODYPART_TORSO, // ODOLWA_BODYPART_LEFT_UPPER_ARM + ODOLWA_BODYPART_LEFT_UPPER_ARM, // ODOLWA_BODYPART_LEFT_FOREARM + ODOLWA_BODYPART_LEFT_FOREARM, // ODOLWA_BODYPART_SHIELD + ODOLWA_BODYPART_TORSO, // ODOLWA_BODYPART_RIGHT_UPPER_ARM + ODOLWA_BODYPART_RIGHT_UPPER_ARM, // ODOLWA_BODYPART_RIGHT_FOREARM + ODOLWA_BODYPART_RIGHT_FOREARM, // ODOLWA_BODYPART_SWORD + ODOLWA_BODYPART_PELVIS, // ODOLWA_BODYPART_RIGHT_THIGH + ODOLWA_BODYPART_RIGHT_THIGH, // ODOLWA_BODYPART_RIGHT_SHIN + ODOLWA_BODYPART_RIGHT_SHIN, // ODOLWA_BODYPART_RIGHT_FOOT + ODOLWA_BODYPART_PELVIS, // ODOLWA_BODYPART_LEFT_THIGH + ODOLWA_BODYPART_LEFT_THIGH, // ODOLWA_BODYPART_LEFT_SHIN + ODOLWA_BODYPART_LEFT_SHIN, // ODOLWA_BODYPART_LEFT_FOOT +}; + +static u8 sShadowSizes[ODOLWA_BODYPART_MAX] = { + ODOLWA_SHADOW_SIZE_SMALL, // ODOLWA_BODYPART_HEAD + ODOLWA_SHADOW_SIZE_EXTRA_LARGE, // ODOLWA_BODYPART_TORSO + ODOLWA_SHADOW_SIZE_EXTRA_LARGE, // ODOLWA_BODYPART_PELVIS + ODOLWA_SHADOW_SIZE_LARGE, // ODOLWA_BODYPART_LEFT_UPPER_ARM + ODOLWA_SHADOW_SIZE_SMALL, // ODOLWA_BODYPART_LEFT_FOREARM + ODOLWA_SHADOW_SIZE_EXTRA_LARGE, // ODOLWA_BODYPART_SHIELD + ODOLWA_SHADOW_SIZE_LARGE, // ODOLWA_BODYPART_RIGHT_UPPER_ARM + ODOLWA_SHADOW_SIZE_SMALL, // ODOLWA_BODYPART_RIGHT_FOREARM + ODOLWA_SHADOW_SIZE_SMALL, // ODOLWA_BODYPART_SWORD + ODOLWA_SHADOW_SIZE_LARGE, // ODOLWA_BODYPART_RIGHT_THIGH + ODOLWA_SHADOW_SIZE_MEDIUM, // ODOLWA_BODYPART_RIGHT_SHIN + ODOLWA_SHADOW_SIZE_SMALL, // ODOLWA_BODYPART_RIGHT_FOOT + ODOLWA_SHADOW_SIZE_LARGE, // ODOLWA_BODYPART_LEFT_THIGH + ODOLWA_SHADOW_SIZE_MEDIUM, // ODOLWA_BODYPART_LEFT_SHIN + ODOLWA_SHADOW_SIZE_SMALL, // ODOLWA_BODYPART_LEFT_FOOT +}; + +void Boss01_FillShadowTex(Boss01* this, u8* tex, f32 weight) { + s32 index; + s32 i; + s32 baseX; + s32 baseY; + s32 x; + s32 y = 0; + s32 addY; + Vec3f lerp; + Vec3f pos; + Vec3f startVec; + + for (i = 0; i < ODOLWA_BODYPART_MAX; i++) { + if ((weight == 0.0f) || (y = sParentShadowBodyParts[i]) > BODYPART_NONE) { + if (weight > 0.0f) { + VEC3F_LERPIMPDST(&lerp, &this->bodyPartsPos[i], &this->bodyPartsPos[y], weight); + + pos.x = lerp.x - this->actor.world.pos.x; + pos.y = lerp.y - this->actor.world.pos.y + 76.0f + 30.0f + 30.0f + 100.0f; + pos.z = lerp.z - this->actor.world.pos.z; + } else { + pos.x = this->bodyPartsPos[i].x - this->actor.world.pos.x; + pos.y = this->bodyPartsPos[i].y - this->actor.world.pos.y + 76.0f + 30.0f + 30.0f + 100.0f; + pos.z = this->bodyPartsPos[i].z - this->actor.world.pos.z; + } + + Matrix_MultVec3f(&pos, &startVec); + + startVec.x *= 0.2f; + startVec.y *= 0.2f; + + baseX = (u16)(s32)(startVec.x + 32.0f); + baseY = (u16)((s32)startVec.y * 64); + + if (sShadowSizes[i] == ODOLWA_SHADOW_SIZE_EXTRA_LARGE) { + for (y = 0, addY = -0x180; y < ARRAY_COUNT(sShadowExtraLargeMap); y++, addY += 0x40) { + for (x = -sShadowExtraLargeMap[y]; x < sShadowExtraLargeMap[y]; x++) { + index = baseX + x + baseY + addY; + if ((index >= 0) && (index < ODOLWA_SHADOW_TEX_SIZE)) { + tex[index] = 255; + } + } + } + } else if (sShadowSizes[i] == ODOLWA_SHADOW_SIZE_LARGE) { + for (y = 0, addY = -0x100; y < ARRAY_COUNT(sShadowLargeMap); y++, addY += 0x40) { + for (x = -sShadowLargeMap[y]; x < sShadowLargeMap[y]; x++) { + index = baseX + x + baseY + addY; + if ((index >= 0) && (index < ODOLWA_SHADOW_TEX_SIZE)) { + tex[index] = 255; + } + } + } + } else if (sShadowSizes[i] == ODOLWA_SHADOW_SIZE_MEDIUM) { + for (y = 0, addY = -0xC0; y < ARRAY_COUNT(sShadowMediumMap); y++, addY += 0x40) { + for (x = -sShadowMediumMap[y]; x < sShadowMediumMap[y] - 1; x++) { + index = baseX + x + baseY + addY; + if ((index >= 0) && (index < ODOLWA_SHADOW_TEX_SIZE)) { + tex[index] = 255; + } + } + } + } else { + for (y = 0, addY = -0x80; y < ARRAY_COUNT(sShadowSmallMap); y++, addY += 0x40) { + for (x = -sShadowSmallMap[y]; x < sShadowSmallMap[y] - 1; x++) { + index = baseX + x + baseY + addY; + if ((index >= 0) && (index < ODOLWA_SHADOW_TEX_SIZE)) { + tex[index] = 255; + } + } + } + } + } + } +} + +void Boss01_GenShadowTex(u8* tex, Boss01* this, PlayState* play) { + s32* iter = (s32*)tex; + s16 i; + + for (i = 0; i < (s32)(ODOLWA_SHADOW_TEX_SIZE / sizeof(s32)); i++, iter++) { + *iter = 0; + } + + Matrix_RotateXFNew(1.0f); + + for (i = 0; i <= 5; i++) { + Boss01_FillShadowTex(this, tex, i / 5.0f); + } +} + +/** + * Draws Odolwa's dynamic shadow underneath him. + */ +void Boss01_DrawShadowTex(u8* tex, Boss01* this, PlayState* play) { + s32 pad[2]; + f32 alpha; + GraphicsContext* gfxCtx = play->state.gfxCtx; + + OPEN_DISPS(gfxCtx); + + Gfx_SetupDL25_Opa(play->state.gfxCtx); + + alpha = (400.0f - this->actor.world.pos.y) * (1.0f / 400.0f); + alpha = CLAMP_MIN(alpha, 0.0f); + alpha = CLAMP_MAX(alpha, 1.0f); + + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, (s8)(alpha * 80.0f)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); + Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z - 20.0f, MTXMODE_NEW); + Matrix_Scale(1.65f, 1.0f, 1.65f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gOdolwaShadowMaterialDL); + gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, ODOLWA_SHADOW_TEX_WIDTH, + ODOLWA_SHADOW_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, + G_TX_NOLOD, G_TX_NOLOD); + gSPDisplayList(POLY_OPA_DISP++, gOdolwaShadowModelDL); + + CLOSE_DISPS(gfxCtx); +} + +void Boss01_Bug_SetupCrawl(Boss01* this, PlayState* play) { + this->actionFunc = Boss01_Bug_Crawl; + Animation_MorphToLoop(&this->skelAnime, &gOdolwaBugCrawlAnim, -5.0f); +} + +/** + * If an explosive is present, the bug will crawl quickly towards it. Otherwise, it will crawl slowly towards the player + * and chase them around. + */ +void Boss01_Bug_Crawl(Boss01* this, PlayState* play) { + s32 pad; + Player* player = GET_PLAYER(play); + f32 targetSpeed = 3.0f; + Actor* targetActor = &player->actor; + Actor* explosive = play->actorCtx.actorLists[ACTORCAT_EXPLOSIVES].first; + s16 maxStep = 0x3E8; + + if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { + this->skelAnime.playSpeed = 1.0f; + + while (explosive != NULL) { + if (explosive->params == 1) { + explosive = explosive->next; + } else { + targetSpeed = 5.0f; + targetActor = explosive; + maxStep = 0x7D0; + this->skelAnime.playSpeed = 1.5f; + break; + } + } + + SkelAnime_Update(&this->skelAnime); + Actor_PlaySfx(&this->actor, NA_SE_EN_MB_INSECT_WALK - SFX_FLAG); + Math_ApproachF(&this->actor.speed, targetSpeed, 1.0f, 1.0f); + Math_ApproachS(&this->actor.world.rot.y, + Math_Atan2S(targetActor->world.pos.x - this->actor.world.pos.x, + targetActor->world.pos.z - this->actor.world.pos.z), + 5, maxStep); + } +} + +void Boss01_Bug_SetupDamaged(Boss01* this, PlayState* play) { + if ((s8)this->actor.colChkInfo.health > 0) { + this->actionFunc = Boss01_Bug_Damaged; + this->timers[TIMER_BUG_CURRENT_ACTION] = 30; + } else { + this->timers[TIMER_BUG_CURRENT_ACTION] = 15; + Enemy_StartFinishingBlow(play, &this->actor); + Boss01_Bug_SetupDead(this, play); + } +} + +/** + * Stops the bug's animations and makes it wait in place for 30 frames, then it starts crawling again. + */ +void Boss01_Bug_Damaged(Boss01* this, PlayState* play) { + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + if (this->timers[TIMER_BUG_CURRENT_ACTION] == 0) { + Boss01_Bug_SetupCrawl(this, play); + } +} + +void Boss01_Bug_SetupDead(Boss01* this, PlayState* play) { + this->actionFunc = Boss01_Bug_Dead; + this->additionalVelocityZ = 0.0f; + this->additionalVelocityX = 0.0f; + this->bugDrawDmgEffAlpha = 1.0f; + this->actor.speed = -15.0f; + this->actor.velocity.y = 12.0f; + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; +} + +void Boss01_Bug_SetupStunned(Boss01* this, PlayState* play) { + this->actionFunc = Boss01_Bug_Stunned; + this->timers[TIMER_BUG_CURRENT_ACTION] = 40; + Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 40); +} + +/** + * Turns the bug blue, stops its animations, and makes it wait in place for 40 frames, then it starts crawling again. + */ +void Boss01_Bug_Stunned(Boss01* this, PlayState* play) { + Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); + if (this->timers[TIMER_BUG_CURRENT_ACTION] == 0) { + Boss01_Bug_SetupCrawl(this, play); + } +} + +/** + * Flings the bug backwards, spinning randomly, until it hits the ground. After it lands, it shrinks and spawns a single + * blue flame. The bug will die and drop an item once the flame fades enough. + */ +void Boss01_Bug_Dead(Boss01* this, PlayState* play) { + if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_EXTINCT_LEV - SFX_FLAG); + Math_ApproachZeroF(&this->actor.speed, 1.0f, 2.0f); + Math_ApproachZeroF(&this->actor.scale.y, 1.0f, 0.00075f); + Math_ApproachF(&this->bugDrawDmgEffScale, 1.0f, 0.5f, 0.15f); + + if (this->actor.scale.y < 0.001f) { + Math_ApproachZeroF(&this->bugDrawDmgEffAlpha, 1.0f, 0.05f); + if (this->bugDrawDmgEffAlpha < 0.01f) { + Actor_Kill(&this->actor); + Item_DropCollectibleRandom(play, NULL, &this->actor.world.pos, 0x60); + sOdolwaBugCount--; + } + } + + Math_ApproachS(&this->actor.shape.rot.x, 0, 1, 0x800); + } else { + this->actor.shape.rot.x -= 0x2000; + this->actor.shape.rot.z += 0x1000; + } +} + +void Boss01_Bug_UpdateDamage(Boss01* this, PlayState* play) { + Vec3f additionalVelocity; + s32 pad[2]; + u8 damage; + ColliderInfo* acHitInfo; + OdolwaEffect* effect = play->specialEffects; + + if (this->bugACCollider.base.acFlags & AC_HIT) { + this->bugACCollider.base.acFlags &= ~AC_HIT; + acHitInfo = this->bugACCollider.info.acHitInfo; + + if (this->damageTimer == 0) { + Matrix_RotateYS(this->actor.yawTowardsPlayer, MTXMODE_NEW); + if (acHitInfo->toucher.dmgFlags & 0x300000) { + this->damageTimer = 10; + Matrix_MultVecZ(-10.0f, &additionalVelocity); + this->additionalVelocityX = additionalVelocity.x; + this->additionalVelocityZ = additionalVelocity.z; + } else { + this->damageTimer = 15; + this->damageFlashTimer = 15; + Matrix_MultVecZ(-20.0f, &additionalVelocity); + this->additionalVelocityX = additionalVelocity.x; + this->additionalVelocityZ = additionalVelocity.z; + if (this->actor.colChkInfo.damageEffect == BUG_DMGEFF_STUN) { + Boss01_Bug_SetupStunned(this, play); + Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE); + } else { + damage = this->actor.colChkInfo.damage; + this->actor.colChkInfo.health -= damage; + Boss01_Bug_SetupDamaged(this, play); + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA2_DAMAGE); + } + } + } + } + + // If Odolwa dies, instantly kill any bugs in the room too. Setting their y-velocity to 0 will skip the part of + // their death where they fly backwards; they will immediately shrink and burst into a single blue flame. + if ((sOdolwa != NULL) && (sOdolwa->actionFunc == Boss01_DeathCutscene)) { + Boss01_Bug_SetupDead(this, play); + this->actor.velocity.y = 0.0f; + this->actor.speed = 0.0f; + } + + if ((effect->type == ODOLWA_EFFECT_RING_OF_FIRE) && (effect->timer < 150)) { + f32 distXZ = sqrtf(SQ(effect->pos.x - this->actor.world.pos.x) + SQ(effect->pos.z - this->actor.world.pos.z)); + + // If the bugs touch the ring of fire, it will instantly kill them. Like before, setting the y-velocity to zero + // here will immediately make the bug shrink and burst into a single red flame. + if ((distXZ < (KREG(49) + 210.0f)) && (distXZ > (KREG(49) + 190.0f))) { + Actor_PlaySfx(&this->actor, NA_SE_EN_MIZUBABA2_DAMAGE); + Boss01_Bug_SetupDead(this, play); + this->damageFlashTimer = 15; + this->bugDrawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; + this->actor.speed = 0.0f; + this->actor.velocity.y = 5.0f; + } + } +} + +void Boss01_Bug_Update(Actor* thisx, PlayState* play) { + Boss01* this = THIS; + s32 pad; + s32 i; + + this->frameCounter++; + + for (i = 0; i < ARRAY_COUNT(this->timers); i++) { + DECR(this->timers[i]); + } + + DECR(this->damageTimer); + DECR(this->damageFlashTimer); + + this->actionFunc(this, play); + + Actor_MoveWithGravity(&this->actor); + this->actor.world.pos.x += this->additionalVelocityX; + this->actor.world.pos.z += this->additionalVelocityZ; + Actor_SetFocus(&this->actor, 10.0f); + Actor_UpdateBgCheckInfo(play, &this->actor, 50.0f, 21.0f, 100.0f, UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4); + if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { + Math_ApproachZeroF(&this->additionalVelocityX, 1.0f, 1.0f); + Math_ApproachZeroF(&this->additionalVelocityZ, 1.0f, 1.0f); + } + + if (this->actionFunc != Boss01_Bug_Dead) { + Boss01_Bug_UpdateDamage(this, play); + Collider_UpdateCylinder(&this->actor, &this->bugACCollider); + CollisionCheck_SetAC(play, &play->colChkCtx, &this->bugACCollider.base); + Collider_UpdateCylinder(&this->actor, &this->bugATCollider); + CollisionCheck_SetAT(play, &play->colChkCtx, &this->bugATCollider.base); + this->actor.shape.rot = this->actor.world.rot; + } +} + +s32 Boss01_Bug_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + if ((limbIndex == ODOLWA_BUG_LIMB_BODY) && (sOdolwa->actionFunc == Boss01_SummonBugsCutscene)) { + *dList = gOdolwaBugDarkBodyDL; + } + + if (limbIndex == ODOLWA_BUG_LIMB_FRONT_RIGHT_UPPER_LEG) { + OPEN_DISPS(play->state.gfxCtx); + + if (sOdolwa->actionFunc == Boss01_SummonBugsCutscene) { + gSPDisplayList(POLY_OPA_DISP++, gOdolwaBugBrightLegMaterialDL); + } else { + gSPDisplayList(POLY_OPA_DISP++, gOdolwaBugDullLegMaterialDL); + } + + CLOSE_DISPS(play->state.gfxCtx); + } + + return false; +} + +void Boss01_Bug_Draw(Actor* thisx, PlayState* play) { + Boss01* this = THIS; + s32 pad; + + OPEN_DISPS(play->state.gfxCtx); + + Gfx_SetupDL25_Opa(play->state.gfxCtx); + + if (this->damageFlashTimer & 1) { + POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 255, 0, 0, 255, 900, 1099); + } + + SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + Boss01_Bug_OverrideLimbDraw, NULL, &this->actor); + + POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP); + + Actor_DrawDamageEffects(play, &this->actor, &this->actor.world.pos, 1, this->bugDrawDmgEffScale, 0.0f, + this->bugDrawDmgEffAlpha, this->bugDrawDmgEffType); + + CLOSE_DISPS(play->state.gfxCtx); +} + +/** + * Spawns five dust clouds randomly around the block's current position. + */ +void Boss01_SpawnDustForFallingBlock(PlayState* play, Vec3f* blockPos, f32 scale) { + s16 i; + Vec3f velocity; + Vec3f accel; + Vec3f pos; + + for (i = 0; i < 5; i++) { + velocity.x = Rand_CenteredFloat(5.0f); + velocity.y = Rand_ZeroFloat(2.0f) + 1.0f; + velocity.z = Rand_CenteredFloat(5.0f); + accel.x = accel.z = 0.0f; + accel.y = -0.1f; + pos.x = (Rand_CenteredFloat(70.0f) * scale) + blockPos->x; + pos.y = (Rand_ZeroFloat(10.0f) * scale) + blockPos->y; + pos.z = (Rand_CenteredFloat(70.0f) * scale) + blockPos->z; + func_800B0EB0(play, &pos, &velocity, &accel, &sDustPrimColor, &sDustEnvColor, + (Rand_ZeroFloat(150.0f) + 350.0f) * scale, 10, Rand_ZeroFloat(5.0f) + 14.0f); + } +} + +/** + * Responsible for updating the falling blocks and the ring of fire, including spawning block fragments when a block + * hits the floor and damaging the player. + */ +void Boss01_UpdateEffects(Boss01* this, PlayState* play) { + OdolwaEffect* effect = (OdolwaEffect*)play->specialEffects; + Player* player = GET_PLAYER(play); + s16 i; + s16 j; + s16 temp; + f32 diffX; + f32 diffZ; + f32 temp2; + s32 type; + + for (i = 0; i < ODOLWA_EFFECT_COUNT; i++, effect++) { + if (effect->type != ODOLWA_EFFECT_NONE) { + effect->timer++; + type = effect->type; + if (type == ODOLWA_EFFECT_RING_OF_FIRE) { + if (effect->timer < 150) { + Math_ApproachF(&play->envCtx.lightBlend, (Math_SinS(effect->timer * 0x1000) * 0.1f) + 0.9f, 1.0f, + 0.2f); + sMothSwarm->unk_144 = 250; + + // If Odolwa dies, this will make the ring of fire start fading away immediately. + if ((sOdolwa != NULL) && (sOdolwa->actionFunc == Boss01_DeathCutscene)) { + effect->timer = 150; + } + + Audio_PlaySfx(NA_SE_EV_FIRE_PLATE - SFX_FLAG); + Math_ApproachF(&effect->scale, 1.0f, 0.1f, 0.3f); + + // The ring of fire has no collision, so this code is responsible for checking to see if the player + // is touching it. If they are, then it will set them on fire and damage them manually. + if (!(player->stateFlags3 & PLAYER_STATE3_1000) && (player->actor.world.pos.y < 70.0f)) { + diffX = effect->pos.x - player->actor.world.pos.x; + diffZ = effect->pos.z - player->actor.world.pos.z; + temp2 = sqrtf(SQ(diffX) + SQ(diffZ)); + + if (player->invincibilityTimer == 0) { + if ((temp2 < (KREG(49) + 210.0f)) && ((KREG(49) + 190.0f) < temp2)) { + for (j = 0; j < PLAYER_BODYPART_MAX; j++) { + player->flameTimers[j] = Rand_S16Offset(0, 200); + } + + player->isBurning = true; + temp = Math_Atan2S_XY(diffZ, diffX); + if ((KREG(49) + 100.0f) < temp2) { + temp += 0x8000; + } + + func_800B8D50(play, &this->actor, 10.0f, temp, 0.0f, 8); + } + } + } + } else { + Math_ApproachZeroF(&effect->alpha, 1.0f, 10.0f); + if (effect->alpha < 0.1f) { + effect->type = ODOLWA_EFFECT_NONE; + } + } + } else { + effect->pos.x += effect->velocity.x; + effect->pos.y += effect->velocity.y; + effect->pos.z += effect->velocity.z; + effect->velocity.y += effect->gravity; + + if (type == ODOLWA_EFFECT_FALLING_BLOCK) { + effect->rotY += effect->angularVelocityY; + effect->rotX += effect->angularVelocityX; + + if (!effect->isFallingBlockFragment) { + // Falling blocks have no collision, so this code is responsible for checking to see if the + // player is touching one. If they are, then it will damage them manually. + diffX = player->actor.world.pos.x - effect->pos.x; + temp2 = (player->actor.world.pos.y + 20.0f) - effect->pos.y; + diffZ = player->actor.world.pos.z - effect->pos.z; + + if ((SQ(diffX) + SQ(diffZ) + SQ(temp2)) < SQ(50.0f)) { + func_800B8D50(play, NULL, 0.0f, Rand_ZeroFloat(65526.0f), 0.0f, 8); + } + + if (effect->pos.y < 10.0f) { + effect->pos.y = 10.0f; + temp = (Rand_ZeroFloat(2.0f) + 4.0f); + for (j = 0; j < temp; j++) { + Boss01_SpawnEffectFallingBlock((OdolwaEffect*)play->specialEffects, &effect->pos, true); + } + + effect->type = ODOLWA_EFFECT_NONE; + SoundSource_PlaySfxAtFixedWorldPos(play, &effect->pos, 40, NA_SE_EV_WALL_BROKEN); + Boss01_SpawnDustForFallingBlock(play, &effect->pos, 1.0f); + CollisionCheck_SpawnShieldParticles(play, &effect->pos); + Actor_RequestQuakeAndRumble(&this->actor, play, 3, 10); + } + } else if ((effect->pos.y < 10.0f) && (effect->velocity.y < 0.0f)) { + effect->pos.y = 10.0f; + effect->type = ODOLWA_EFFECT_NONE; + Boss01_SpawnDustForFallingBlock(play, &effect->pos, 0.5f); + } + } + } + } + } +} + +/** + * Draws the falling blocks, the circle shadows that appear under the blocks as they fall, and the ring of fire. + */ +void Boss01_DrawEffects(PlayState* play) { + s32 pad; + s16 i; + f32 alpha; + OdolwaEffect* effect = play->specialEffects; + + OPEN_DISPS(play->state.gfxCtx); + + Gfx_SetupDL25_Opa(play->state.gfxCtx); + Gfx_SetupDL25_Xlu(play->state.gfxCtx); + + for (i = 1; i < ODOLWA_EFFECT_COUNT; i++, effect++) { + if (effect->type == ODOLWA_EFFECT_FALLING_BLOCK) { + Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); + Matrix_RotateYS(effect->rotY, MTXMODE_APPLY); + Matrix_RotateXS(effect->rotX, MTXMODE_APPLY); + Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gOdolwaFallingBlockDL); + } + } + + effect = play->specialEffects; + Gfx_SetupDL44_Xlu(play->state.gfxCtx); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 100); + + for (i = 1; i < ODOLWA_EFFECT_COUNT; i++, effect++) { + if (effect->type == ODOLWA_EFFECT_FALLING_BLOCK) { + Matrix_Translate(effect->pos.x, 0.0f, effect->pos.z, MTXMODE_NEW); + Matrix_Scale(effect->scale * 50.0f, 1.0f, effect->scale * 50.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_K0(gCircleShadowDL)); + } + } + + Gfx_SetupDL25_Xlu(play->state.gfxCtx); + effect = play->specialEffects; + Boss01_InitRand(1, 0x71A5, 0x263A); + + if (effect->type == ODOLWA_EFFECT_RING_OF_FIRE) { + gDPSetEnvColor(POLY_XLU_DISP++, 255, 10, 0, 0); + Matrix_Translate(effect->pos.x, 0.0f, effect->pos.z, MTXMODE_NEW); + + for (i = 0; i < 32; i++) { + Matrix_Push(); + alpha = effect->alpha - (Boss01_RandZeroOne() * 50.0f); + if (alpha < 0.0f) { + alpha = 0.0f; + } + + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, (u8)alpha); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, 0, 0, 32, 64, 1, 0, + ((effect->timer + (i * 10)) * -20) & 0x1FF, 32, 128)); + + Matrix_RotateYF(i * (M_PI / 16.0f), MTXMODE_APPLY); + Matrix_Translate(0.0f, 0.0f, KREG(49) + 200.0f, MTXMODE_APPLY); + Matrix_ReplaceRotation(&play->billboardMtxF); + if (Boss01_RandZeroOne() < 0.5f) { + Matrix_RotateYF(M_PI, MTXMODE_APPLY); + } + + Matrix_Scale(KREG(48) * 0.0001f + 0.018f, + ((0.007f + KREG(54) * 0.0001f) + (Boss01_RandZeroOne() * 30.0f * 0.0001f)) * effect->scale, + 1.0f, MTXMODE_APPLY); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); + Matrix_Pop(); + } + } + + CLOSE_DISPS(play->state.gfxCtx); +} diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.h b/src/overlays/actors/ovl_Boss_01/z_boss_01.h index 37c8d4b00..358775179 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.h +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.h @@ -2,16 +2,153 @@ #define Z_BOSS_01_H #include "global.h" +#include "assets/objects/object_boss01/object_boss01.h" struct Boss01; +#define ODOLWA_GET_TYPE(thisx) ((thisx)->params) +#define ODOLWA_GET_AFTERIMAGE_DESPAWN_TIMER(thisx) ((thisx)->world.rot.z) + +#define ODOLWA_SHADOW_TEX_WIDTH 64 +#define ODOLWA_SHADOW_TEX_HEIGHT 64 +#define ODOLWA_SHADOW_TEX_SIZE ((s32)sizeof(u8[ODOLWA_SHADOW_TEX_HEIGHT][ODOLWA_SHADOW_TEX_WIDTH])) + typedef void (*Boss01ActionFunc)(struct Boss01*, PlayState*); +typedef enum OdolwaType { + /* 0 */ ODOLWA_TYPE_ODOLWA, + /* 10 */ ODOLWA_TYPE_BUG = 10, + /* 35 */ ODOLWA_TYPE_AFTERIMAGE = 35 +} OdolwaType; + +typedef enum OdolwaBodyPart { + /* 0 */ ODOLWA_BODYPART_HEAD, + /* 1 */ ODOLWA_BODYPART_TORSO, + /* 2 */ ODOLWA_BODYPART_PELVIS, + /* 3 */ ODOLWA_BODYPART_LEFT_UPPER_ARM, + /* 4 */ ODOLWA_BODYPART_LEFT_FOREARM, + /* 5 */ ODOLWA_BODYPART_SHIELD, + /* 6 */ ODOLWA_BODYPART_RIGHT_UPPER_ARM, + /* 7 */ ODOLWA_BODYPART_RIGHT_FOREARM, + /* 8 */ ODOLWA_BODYPART_SWORD, + /* 9 */ ODOLWA_BODYPART_RIGHT_THIGH, + /* 10 */ ODOLWA_BODYPART_RIGHT_SHIN, + /* 11 */ ODOLWA_BODYPART_RIGHT_FOOT, + /* 12 */ ODOLWA_BODYPART_LEFT_THIGH, + /* 13 */ ODOLWA_BODYPART_LEFT_SHIN, + /* 14 */ ODOLWA_BODYPART_LEFT_FOOT, + /* 15 */ ODOLWA_BODYPART_MAX +} OdolwaBodyPart; + +typedef enum OdolwaColliderBodyPart { + /* 0 */ ODOLWA_COLLIDER_BODYPART_HEAD, + /* 1 */ ODOLWA_COLLIDER_BODYPART_TORSO, + /* 2 */ ODOLWA_COLLIDER_BODYPART_PELVIS, + /* 3 */ ODOLWA_COLLIDER_BODYPART_LEFT_UPPER_ARM, + /* 4 */ ODOLWA_COLLIDER_BODYPART_LEFT_FOREARM, + /* 5 */ ODOLWA_COLLIDER_BODYPART_RIGHT_UPPER_ARM, + /* 6 */ ODOLWA_COLLIDER_BODYPART_RIGHT_FOREARM, + /* 7 */ ODOLWA_COLLIDER_BODYPART_LEFT_THIGH, + /* 8 */ ODOLWA_COLLIDER_BODYPART_LEFT_SHIN, + /* 9 */ ODOLWA_COLLIDER_BODYPART_RIGHT_THIGH, + /* 10 */ ODOLWA_COLLIDER_BODYPART_RIGHT_SHIN, + /* 11 */ ODOLWA_COLLIDER_BODYPART_MAX +} OdolwaColliderBodyPart; + +typedef enum OdolwaSwordCollider { + /* 0 */ ODOLWA_SWORD_COLLIDER_SWORD_BASE, + /* 1 */ ODOLWA_SWORD_COLLIDER_SWORD_TIP, + /* 2 */ ODOLWA_SWORD_COLLIDER_PELVIS, + /* 3 */ ODOLWA_SWORD_COLLIDER_MAX +} OdolwaSwordCollider; + +typedef enum OdolwaShieldCollider { + /* 0 */ ODOLWA_SHIELD_COLLIDER_SHIELD, + /* 1 */ ODOLWA_SHIELD_COLLIDER_MAX +} OdolwaShieldCollider; + +typedef enum OdolwaKickAndShieldBashCollider { + /* 0 */ ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_SHIELD, + /* 1 */ ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_LEFT_FOOT, + /* 2 */ ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_MAX +} OdolwaKickAndShieldBashCollider; + typedef struct Boss01 { /* 0x000 */ Actor actor; - /* 0x144 */ char unk_144[0x320]; + /* 0x144 */ s16 frameCounter; + /* 0x148 */ s32 phaseFrameCounter; + /* 0x14C */ union { + u8 jumpIfPlayerIsClose; + u8 shouldPerformFallingSlash; + u8 bugDrawDmgEffType; + }; + /* 0x14E */ s16 timers[3]; + /* 0x154 */ f32 animMorphFrames1; + /* 0x158 */ f32 animMorphFrames2; + /* 0x15C */ s16 damageTimer; + /* 0x15E */ s16 damageFlashTimer; + /* 0x160 */ u8 isPerformingVerticalSlash; // set, but never checked + /* 0x160 */ u8 landedFromJump; + /* 0x162 */ u8 waitType; + /* 0x163 */ u8 lookAtPlayer; + /* 0x164 */ SkelAnime skelAnime; + /* 0x1A8 */ f32 animEndFrame; + /* 0x1AC */ f32 prevJumpVelocityY; + /* 0x1B0 */ f32 runTargetPosAngularVelocityY; + /* 0x1B4 */ f32 runTargetPosRotY; + /* 0x1B8 */ u8 swordState; + /* 0x1B9 */ u8 kickAndShieldBashCollisionEnabled; + /* 0x1BA */ u8 swordAndShieldCollisionEnabled; + /* 0x1BB */ u8 canGuardOrEvade; + /* 0x1BC */ u8 bodyInvincibilityTimer; + /* 0x1BE */ s16 disableCollisionTimer; + /* 0x1C0 */ u8 afterimageSpawnFrameMask; // used as a bitmask with frameCounter to control how often to spawn afterimages + /* 0x1C1 */ u8 hasPlayedSummonBugCs; + /* 0x1C4 */ f32 additionalVelocityX; + /* 0x1C8 */ f32 additionalVelocityZ; + /* 0x1CC */ s16 headRotY; + /* 0x1CE */ s16 headRotX; + /* 0x1D0 */ Vec3s jointTable[ODOLWA_LIMB_MAX]; + /* 0x308 */ Vec3s morphTable[ODOLWA_LIMB_MAX]; + /* 0x440 */ Vec3f feetPos[2]; + /* 0x458 */ Vec3f pelvisPos; /* 0x464 */ Boss01ActionFunc actionFunc; - /* 0x468 */ char unk_468[0x674]; + /* 0x468 */ ColliderJntSph swordCollider; + /* 0x488 */ ColliderJntSphElement swordColliderElements[ODOLWA_SWORD_COLLIDER_MAX]; + /* 0x548 */ ColliderJntSph shieldCollider; + /* 0x568 */ ColliderJntSphElement shieldColliderElements[ODOLWA_SHIELD_COLLIDER_MAX]; + /* 0x5A8 */ ColliderJntSph bodyCollider; + /* 0x5C8 */ ColliderJntSphElement bodyColliderElements[ODOLWA_COLLIDER_BODYPART_MAX]; + /* 0x888 */ ColliderJntSph kickAndShieldBashCollider; + /* 0x8A8 */ ColliderJntSphElement kickAndShieldBashColliderElements[ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_MAX]; + /* 0x928 */ Vec3f bodyPartsPos[ODOLWA_BODYPART_MAX]; + /* 0x9DC */ union { + u32 cutsceneTimer; + u32 waitTimer; + u32 summonMothsTimer; + }; + /* 0x9E0 */ s16 cutsceneState; + /* 0x9E2 */ s16 subCamId; + /* 0x9E4 */ Vec3f subCamEye; + /* 0x9F0 */ Vec3f subCamAt; + /* 0x9FC */ Vec3f subCamUp; + /* 0xA08 */ Vec3f subCamEyeNext; + /* 0xA14 */ f32 deathCsInitialSubCamRot; + /* 0xA18 */ f32 deathCsSubCamRot; + /* 0xA1C */ f32 subCamVelocity; + /* 0xA20 */ f32 deathShrinkSpeed; + /* 0xA24 */ f32 screenShakeOffsetY; + /* 0xA28 */ f32 screenShakeMagnitude; + /* 0xA2C */ ColliderCylinder bugACCollider; + /* 0xA78 */ ColliderCylinder bugATCollider; + /* 0xAC4 */ f32 bugDrawDmgEffScale; + /* 0xAC8 */ f32 bugDrawDmgEffAlpha; + /* 0xACC */ f32 drawDmgEffScale; + /* 0xAD0 */ f32 drawDmgEffFrozenSteamScale; + /* 0xAD4 */ f32 drawDmgEffAlpha; + /* 0xAD8 */ u8 drawDmgEffType; + /* 0xAD9 */ u8 drawDmgEffState; + /* 0xADA */ s16 drawDmgEffTimer; } Boss01; // size = 0xADC #endif // Z_BOSS_01_H 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 d5f85443e..e202a08cb 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -69,9 +69,9 @@ u8 sIsInGiantMode; Boss02* sRedTwinmold; Boss02* sBlueTwinmold; Boss02* sTwinmoldStatic; -u8 sMusicStartTimer; +u8 sTwinmoldMusicStartTimer; DoorWarp1* sBlueWarp; -TwinmoldEffect sEffects[TWINMOLD_EFFECT_COUNT]; +TwinmoldEffect sTwinmoldEffects[TWINMOLD_EFFECT_COUNT]; static DamageTable sBlueTwinmoldDamageTable = { /* Deku Nut */ DMG_ENTRY(0, 0x0), @@ -144,15 +144,15 @@ static DamageTable sRedTwinmoldDamageTable = { }; ActorInit Boss_02_InitVars = { - ACTOR_BOSS_02, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS02, - sizeof(Boss02), - (ActorFunc)Boss02_Init, - (ActorFunc)Boss02_Destroy, - (ActorFunc)Boss02_Twinmold_Update, - (ActorFunc)Boss02_Twinmold_Draw, + /**/ ACTOR_BOSS_02, + /**/ ACTORCAT_BOSS, + /**/ FLAGS, + /**/ OBJECT_BOSS02, + /**/ sizeof(Boss02), + /**/ Boss02_Init, + /**/ Boss02_Destroy, + /**/ Boss02_Twinmold_Update, + /**/ Boss02_Twinmold_Draw, }; /** @@ -588,7 +588,7 @@ void Boss02_Init(Actor* thisx, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_STONE_TOWER_TEMPLE) && (TWINMOLD_GET_TYPE(&this->actor) == TWINMOLD_TYPE_RED)) { sBlueWarp = (DoorWarp1*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, 60.0f, - 0.0f, 0, 0, 0, 1); + 0.0f, 0, 0, 0, ENDOORWARP1_FF_1); Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, 0.0f, 30.0f, -150.0f, 0, 1, 0, BHEART_PARAM_NORMAL); } @@ -597,14 +597,14 @@ void Boss02_Init(Actor* thisx, PlayState* play) { this->subCamUp.y = 1.0f; if (TWINMOLD_GET_TYPE(&this->actor) == TWINMOLD_TYPE_STATIC) { sTwinmoldStatic = this; - play->specialEffects = (void*)sEffects; + play->specialEffects = (void*)sTwinmoldEffects; this->actor.update = Boss02_Static_Update; this->actor.draw = Boss02_Static_Draw; this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; this->playerScale = 0.01f; if ((KREG(64) != 0) || CHECK_EVENTINF(EVENTINF_55) || (sBlueWarp != NULL)) { this->unk_1D20 = 0; - sMusicStartTimer = KREG(15) + 20; + sTwinmoldMusicStartTimer = KREG(15) + 20; } else { this->unk_1D20 = 1; } @@ -1346,9 +1346,9 @@ void Boss02_Static_Update(Actor* thisx, PlayState* play) { } if (sBlueWarp == NULL) { - if (sMusicStartTimer != 0) { - sMusicStartTimer--; - if (sMusicStartTimer == 0) { + if (sTwinmoldMusicStartTimer != 0) { + sTwinmoldMusicStartTimer--; + if (sTwinmoldMusicStartTimer == 0) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, NA_BGM_BOSS | SEQ_FLAG_ASYNC); } } @@ -2173,7 +2173,7 @@ void func_809DEAC4(Boss02* this, PlayState* play) { if (this->unk_1D1C == 45) { func_800B7298(play, &this->actor, PLAYER_CSACTION_21); - sMusicStartTimer = KREG(91) + 43; + sTwinmoldMusicStartTimer = KREG(91) + 43; } if (this->unk_1D1C == 85) { @@ -2304,7 +2304,7 @@ void func_809DEAC4(Boss02* this, PlayState* play) { phi_f0 = 3155.0f; } sBlueWarp = (DoorWarp1*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, - 0.0f, phi_f0, 0.0f, 0, 0, 0, 1); + 0.0f, phi_f0, 0.0f, 0, 0, 0, ENDOORWARP1_FF_1); if (!sIsInGiantMode) { sBlueWarp->unk_203 = 0; 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 202e836a5..f96626785 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -231,30 +231,30 @@ void Boss03_UpdateSphereElement(s32 index, ColliderJntSph* collider, Vec3f* sphe /* Start of RNG section */ -static s32 sRandSeed0; -static s32 sRandSeed1; -static s32 sRandSeed2; +s32 sGyorgRandSeed1; +s32 sGyorgRandSeed2; +s32 sGyorgRandSeed3; -void Boss03_SeedRand(s32 seed0, s32 seed1, s32 seed2) { - sRandSeed0 = seed0; - sRandSeed1 = seed1; - sRandSeed2 = seed2; +void Boss03_InitRand(s32 seedInit1, s32 seedInit2, s32 seedInit3) { + sGyorgRandSeed1 = seedInit1; + sGyorgRandSeed2 = seedInit2; + sGyorgRandSeed3 = seedInit3; } f32 Boss03_RandZeroOne(void) { - f32 rand; - // Wichmann-Hill algorithm - sRandSeed0 = (sRandSeed0 * 171) % 30269; - sRandSeed1 = (sRandSeed1 * 172) % 30307; - sRandSeed2 = (sRandSeed2 * 170) % 30323; + f32 randFloat; - rand = (sRandSeed0 / 30269.0f) + (sRandSeed1 / 30307.0f) + (sRandSeed2 / 30323.0f); - while (rand >= 1.0f) { - rand -= 1.0f; + sGyorgRandSeed1 = (sGyorgRandSeed1 * 171) % 30269; + sGyorgRandSeed2 = (sGyorgRandSeed2 * 172) % 30307; + sGyorgRandSeed3 = (sGyorgRandSeed3 * 170) % 30323; + + randFloat = (sGyorgRandSeed1 / 30269.0f) + (sGyorgRandSeed2 / 30307.0f) + (sGyorgRandSeed3 / 30323.0f); + while (randFloat >= 1.0f) { + randFloat -= 1.0f; } - return fabsf(rand); + return fabsf(randFloat); } /* End of RNG section */ @@ -276,15 +276,15 @@ 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), - (ActorFunc)Boss03_Init, - (ActorFunc)Boss03_Destroy, - (ActorFunc)Boss03_Update, - (ActorFunc)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 @@ -483,7 +483,7 @@ void Boss03_Init(Actor* thisx, PlayState* play2) { this->actor.world.pos = sGyorgInitialPos; // Since Boss03_RandZeroOne is only used on this Init function, the resulting values end up being deterministic - Boss03_SeedRand(1, 29093, 9786); + Boss03_InitRand(1, 29093, 9786); for (i = 0; i < 5; i++) { f32 rand; @@ -685,7 +685,7 @@ void Boss03_ChasePlayer(Boss03* this, PlayState* play) { (player->actor.shape.feetPos[0].y >= WATER_HEIGHT + 8.0f)) || (this->workTimer[WORK_TIMER_CURRENT_ACTION] == 0)) { if (&this->actor == player->actor.parent) { - player->actionVar2 = 101; + player->av2.actionVar2 = 101; player->actor.parent = NULL; player->csAction = PLAYER_CSACTION_NONE; } @@ -781,7 +781,7 @@ void Boss03_CatchPlayer(Boss03* this, PlayState* play) { (player->actor.shape.feetPos[FOOT_LEFT].y >= WATER_HEIGHT + 8.0f)) || (this->workTimer[WORK_TIMER_CURRENT_ACTION] == 0)) { if (&this->actor == player->actor.parent) { - player->actionVar2 = 101; + player->av2.actionVar2 = 101; player->actor.parent = NULL; player->csAction = PLAYER_CSACTION_NONE; Play_DisableMotionBlur(); @@ -909,7 +909,7 @@ void Boss03_ChewPlayer(Boss03* this, PlayState* play) { // Stop chewing when the timer runs out if (this->workTimer[WORK_TIMER_CURRENT_ACTION] == 0) { if (&this->actor == player->actor.parent) { - player->actionVar2 = 101; + player->av2.actionVar2 = 101; player->actor.parent = NULL; player->csAction = PLAYER_CSACTION_NONE; Play_DisableMotionBlur(); @@ -1751,7 +1751,7 @@ void Boss03_SetupStunned(Boss03* this, PlayState* play) { } if (&this->actor == player->actor.parent) { - player->actionVar2 = 101; + player->av2.actionVar2 = 101; player->actor.parent = NULL; player->csAction = PLAYER_CSACTION_NONE; Play_DisableMotionBlur(); @@ -1903,7 +1903,7 @@ void Boss03_UpdateCollision(Boss03* this, PlayState* play) { Boss03_PlayUnderwaterSfx(&this->actor.projectedPos, NA_SE_EN_KONB_DAMAGE_OLD); if (&this->actor == player->actor.parent) { - player->actionVar2 = 101; + player->av2.actionVar2 = 101; player->actor.parent = NULL; player->csAction = PLAYER_CSACTION_NONE; Play_DisableMotionBlur(); 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 73a0271ed..62250d6a4 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -64,15 +64,15 @@ static DamageTable sDamageTable = { }; ActorInit Boss_04_InitVars = { - ACTOR_BOSS_04, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS04, - sizeof(Boss04), - (ActorFunc)Boss04_Init, - (ActorFunc)Boss04_Destroy, - (ActorFunc)Boss04_Update, - (ActorFunc)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_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index 535a3a8f5..56d26129a 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -148,15 +148,15 @@ static DamageTable D_809F1C20 = { }; ActorInit Boss_05_InitVars = { - ACTOR_BOSS_05, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BOSS05, - sizeof(Boss05), - (ActorFunc)Boss05_Init, - (ActorFunc)Boss05_Destroy, - (ActorFunc)Boss05_Update, - (ActorFunc)Boss05_Draw, + /**/ ACTOR_BOSS_05, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_BOSS05, + /**/ sizeof(Boss05), + /**/ Boss05_Init, + /**/ Boss05_Destroy, + /**/ Boss05_Update, + /**/ Boss05_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index afce1ef95..5ae65a343 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -71,15 +71,15 @@ static DamageTable sDamageTable = { }; ActorInit Boss_06_InitVars = { - ACTOR_BOSS_06, - ACTORCAT_BOSS, - FLAGS, - OBJECT_KNIGHT, - sizeof(Boss06), - (ActorFunc)Boss06_Init, - (ActorFunc)Boss06_Destroy, - (ActorFunc)Boss06_Update, - (ActorFunc)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_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index d2bc5d6be..e2ca1d51c 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -235,15 +235,15 @@ static DamageTable D_80A07A00 = { }; ActorInit Boss_07_InitVars = { - ACTOR_BOSS_07, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS07, - sizeof(Boss07), - (ActorFunc)Boss07_Init, - (ActorFunc)Boss07_Destroy, - (ActorFunc)Boss07_Update, - (ActorFunc)Boss07_Draw, + /**/ ACTOR_BOSS_07, + /**/ ACTORCAT_BOSS, + /**/ FLAGS, + /**/ OBJECT_BOSS07, + /**/ sizeof(Boss07), + /**/ Boss07_Init, + /**/ Boss07_Destroy, + /**/ Boss07_Update, + /**/ Boss07_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[11] = { diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index 9c759b63c..c02184a4c 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -35,15 +35,15 @@ void func_80B0A8C4(BossHakugin* this, PlayState* play); #if 0 ActorInit Boss_Hakugin_InitVars = { - ACTOR_BOSS_HAKUGIN, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS_HAKUGIN, - sizeof(BossHakugin), - (ActorFunc)BossHakugin_Init, - (ActorFunc)BossHakugin_Destroy, - (ActorFunc)BossHakugin_Update, - (ActorFunc)BossHakugin_Draw, + /**/ ACTOR_BOSS_HAKUGIN, + /**/ ACTORCAT_BOSS, + /**/ FLAGS, + /**/ OBJECT_BOSS_HAKUGIN, + /**/ sizeof(BossHakugin), + /**/ BossHakugin_Init, + /**/ BossHakugin_Destroy, + /**/ BossHakugin_Update, + /**/ BossHakugin_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[19] = { diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 3f29047fa..d4bc604eb 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -25,15 +25,15 @@ void DemoEffect_DrawTimewarp(Actor* thisx, PlayState* play); void DemoEffect_DrawLight(Actor* thisx, PlayState* play2); ActorInit Demo_Effect_InitVars = { - ACTOR_DEMO_EFFECT, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DemoEffect), - (ActorFunc)DemoEffect_Init, - (ActorFunc)DemoEffect_Destroy, - (ActorFunc)DemoEffect_Update, - (ActorFunc)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 d72fdca4f..8a24f423c 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,15 @@ void DemoGetitem_PerformCutsceneActions(DemoGetitem* this, PlayState* play); void DemoGetitem_Draw(Actor* thisx, PlayState* play); ActorInit Demo_Getitem_InitVars = { - ACTOR_DEMO_GETITEM, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DemoGetitem), - (ActorFunc)DemoGetitem_Init, - (ActorFunc)DemoGetitem_Destroy, - (ActorFunc)DemoGetitem_Update, - (ActorFunc)NULL, + /**/ ACTOR_DEMO_GETITEM, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(DemoGetitem), + /**/ DemoGetitem_Init, + /**/ DemoGetitem_Destroy, + /**/ DemoGetitem_Update, + /**/ NULL, }; static s16 sObjectIds[] = { 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 bce779aa7..9899926c8 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,15 @@ 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), - (ActorFunc)DemoKankyo_Init, - (ActorFunc)DemoKankyo_Destroy, - (ActorFunc)DemoKankyo_Update, - (ActorFunc)DemoKankyo_Draw, + /**/ ACTOR_DEMO_KANKYO, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(DemoKankyo), + /**/ DemoKankyo_Init, + /**/ DemoKankyo_Destroy, + /**/ DemoKankyo_Update, + /**/ DemoKankyo_Draw, }; static s32 sObjectBubbleId = OBJECT_BUBBLE | 0x10000; diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index 11fafb5f1..b40707f64 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -20,16 +20,16 @@ void func_80C17B60(DemoMoonend* this, PlayState* play); void func_80C17C48(DemoMoonend* this, PlayState* play); void func_80C17FCC(Actor* thisx, PlayState* play); -const ActorInit Demo_Moonend_InitVars = { - ACTOR_DEMO_MOONEND, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_MOONEND, - sizeof(DemoMoonend), - (ActorFunc)DemoMoonend_Init, - (ActorFunc)DemoMoonend_Destroy, - (ActorFunc)DemoMoonend_Update, - (ActorFunc)DemoMoonend_Draw, +ActorInit Demo_Moonend_InitVars = { + /**/ ACTOR_DEMO_MOONEND, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_MOONEND, + /**/ sizeof(DemoMoonend), + /**/ DemoMoonend_Init, + /**/ DemoMoonend_Destroy, + /**/ DemoMoonend_Update, + /**/ DemoMoonend_Draw, }; void DemoMoonend_Init(Actor* thisx, PlayState* play) { 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 f5e20a509..4f26c9132 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,15 @@ 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), - (ActorFunc)DemoShd_Init, - (ActorFunc)DemoShd_Destroy, - (ActorFunc)DemoShd_Update, - (ActorFunc)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 09f4fe1c1..bdae31ac9 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,15 @@ 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), - (ActorFunc)DemoSyoten_Init, - (ActorFunc)DemoSyoten_Destroy, - (ActorFunc)DemoSyoten_Update, - (ActorFunc)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 6ca5da41f..e9b7e0fab 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,15 @@ static DemoTreLgtInfo D_808E1490[2] = { }; ActorInit Demo_Tre_Lgt_InitVars = { - ACTOR_DEMO_TRE_LGT, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BOX, - sizeof(DemoTreLgt), - (ActorFunc)DemoTreLgt_Init, - (ActorFunc)DemoTreLgt_Destroy, - (ActorFunc)DemoTreLgt_Update, - (ActorFunc)DemoTreLgt_Draw, + /**/ ACTOR_DEMO_TRE_LGT, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_BOX, + /**/ sizeof(DemoTreLgt), + /**/ DemoTreLgt_Init, + /**/ DemoTreLgt_Destroy, + /**/ DemoTreLgt_Update, + /**/ DemoTreLgt_Draw, }; static CurveAnimationHeader* 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 79e52d082..7023d20c7 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,15 @@ 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), - (ActorFunc)DmAh_Init, - (ActorFunc)DmAh_Destroy, - (ActorFunc)DmAh_Update, - (ActorFunc)DmAh_Draw, + /**/ ACTOR_DM_AH, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_AH, + /**/ sizeof(DmAh), + /**/ DmAh_Init, + /**/ DmAh_Destroy, + /**/ DmAh_Update, + /**/ DmAh_Draw, }; typedef enum { 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 91fd6ea80..cfe3f65d6 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,15 @@ 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), - (ActorFunc)DmAl_Init, - (ActorFunc)DmAl_Destroy, - (ActorFunc)DmAl_Update, - (ActorFunc)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 e67e9e6f5..33dfde40c 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,15 @@ void DmAn_DoNothing(DmAn* this, PlayState* play); void DmAn_Draw(Actor* thisx, PlayState* play); ActorInit Dm_An_InitVars = { - ACTOR_DM_AN, - ACTORCAT_NPC, - FLAGS, - OBJECT_AN1, - sizeof(DmAn), - (ActorFunc)DmAn_Init, - (ActorFunc)DmAn_Destroy, - (ActorFunc)DmAn_Update, - (ActorFunc)NULL, + /**/ ACTOR_DM_AN, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_AN1, + /**/ sizeof(DmAn), + /**/ DmAn_Init, + /**/ DmAn_Destroy, + /**/ DmAn_Update, + /**/ NULL, }; /** 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 254a4ca90..bf4372962 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,15 @@ void DmBal_SetupDoNothing(DmBal* this); void DmBal_DoNothing(DmBal* this, PlayState* play); ActorInit Dm_Bal_InitVars = { - ACTOR_DM_BAL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BAL, - sizeof(DmBal), - (ActorFunc)DmBal_Init, - (ActorFunc)DmBal_Destroy, - (ActorFunc)DmBal_Update, - (ActorFunc)DmBal_Draw, + /**/ ACTOR_DM_BAL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BAL, + /**/ sizeof(DmBal), + /**/ DmBal_Init, + /**/ DmBal_Destroy, + /**/ DmBal_Update, + /**/ DmBal_Draw, }; // These animations are the same and in the same order as in the main NPC actor EnBal 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 97d892f9e..2e071f823 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,15 @@ 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), - (ActorFunc)DmChar00_Init, - (ActorFunc)DmChar00_Destroy, - (ActorFunc)DmChar00_Update, - (ActorFunc)DmChar00_Draw, + /**/ ACTOR_DM_CHAR00, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_DELF, + /**/ sizeof(DmChar00), + /**/ DmChar00_Init, + /**/ DmChar00_Destroy, + /**/ DmChar00_Update, + /**/ DmChar00_Draw, }; typedef enum { 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 d224694ec..710a1863c 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -37,15 +37,15 @@ 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), - (ActorFunc)DmChar01_Init, - (ActorFunc)DmChar01_Destroy, - (ActorFunc)DmChar01_Update, - (ActorFunc)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 23a045e0d..157b00c38 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,15 @@ void DmChar02_Draw(Actor* thisx, PlayState* play); void DmChar02_HandleCutscene(DmChar02* this, PlayState* play); ActorInit Dm_Char02_InitVars = { - ACTOR_DM_CHAR02, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_STK2, - sizeof(DmChar02), - (ActorFunc)DmChar02_Init, - (ActorFunc)DmChar02_Destroy, - (ActorFunc)DmChar02_Update, - (ActorFunc)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 d7d7460c8..9ba0ea42d 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,15 @@ 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), - (ActorFunc)DmChar03_Init, - (ActorFunc)DmChar03_Destroy, - (ActorFunc)DmChar03_Update, - (ActorFunc)DmChar03_Draw, + /**/ ACTOR_DM_CHAR03, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_OSN, + /**/ sizeof(DmChar03), + /**/ DmChar03_Init, + /**/ DmChar03_Destroy, + /**/ DmChar03_Update, + /**/ DmChar03_Draw, }; typedef enum { 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 22a01491b..484592584 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,15 @@ void DmChar04_Draw(Actor* thisx, PlayState* play); void DmChar04_HandleCutscene(DmChar04* this, PlayState* play); ActorInit Dm_Char04_InitVars = { - ACTOR_DM_CHAR04, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DmChar04), - (ActorFunc)DmChar04_Init, - (ActorFunc)DmChar04_Destroy, - (ActorFunc)DmChar04_Update, - (ActorFunc)DmChar04_Draw, + /**/ ACTOR_DM_CHAR04, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(DmChar04), + /**/ DmChar04_Init, + /**/ DmChar04_Destroy, + /**/ DmChar04_Update, + /**/ DmChar04_Draw, }; typedef enum { 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 43c049f97..37cfa2ad1 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,15 @@ 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), - (ActorFunc)DmChar05_Init, - (ActorFunc)DmChar05_Destroy, - (ActorFunc)DmChar05_Update, - (ActorFunc)DmChar05_Draw, + /**/ ACTOR_DM_CHAR05, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_DMASK, + /**/ sizeof(DmChar05), + /**/ DmChar05_Init, + /**/ DmChar05_Destroy, + /**/ DmChar05_Update, + /**/ DmChar05_Draw, }; typedef enum { 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 52d3c316d..1fec6458f 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,15 @@ void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc); void DmChar06_HandleCutscene(DmChar06* this, PlayState* play); ActorInit Dm_Char06_InitVars = { - ACTOR_DM_CHAR06, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_YUKIYAMA, - sizeof(DmChar06), - (ActorFunc)DmChar06_Init, - (ActorFunc)DmChar06_Destroy, - (ActorFunc)DmChar06_Update, - (ActorFunc)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 2ad9f0c9b..a21f06e5d 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,15 @@ 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), - (ActorFunc)DmChar07_Init, - (ActorFunc)DmChar07_Destroy, - (ActorFunc)DmChar07_Update, - (ActorFunc)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 250abea20..f829219c9 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -37,15 +37,15 @@ typedef enum { } TurtleEyeMode; ActorInit Dm_Char08_InitVars = { - ACTOR_DM_CHAR08, - ACTORCAT_BG, - FLAGS, - OBJECT_KAMEJIMA, - sizeof(DmChar08), - (ActorFunc)DmChar08_Init, - (ActorFunc)DmChar08_Destroy, - (ActorFunc)DmChar08_Update, - (ActorFunc)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 24362cd99..3ac3f2947 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,15 @@ void DmChar09_DoNothing(DmChar09* this, PlayState* play); void DmChar09_HandleCutscene(DmChar09* this, PlayState* play); ActorInit Dm_Char09_InitVars = { - ACTOR_DM_CHAR09, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BEE, - sizeof(DmChar09), - (ActorFunc)DmChar09_Init, - (ActorFunc)DmChar09_Destroy, - (ActorFunc)DmChar09_Update, - (ActorFunc)DmChar09_Draw, + /**/ ACTOR_DM_CHAR09, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_BEE, + /**/ sizeof(DmChar09), + /**/ DmChar09_Init, + /**/ DmChar09_Destroy, + /**/ DmChar09_Update, + /**/ DmChar09_Draw, }; typedef enum { 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 4eb139998..1ed1f23b9 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,15 @@ void DmGm_DoNothing(DmGm* this, PlayState* play); void DmGm_Draw(Actor* thisx, PlayState* play); ActorInit Dm_Gm_InitVars = { - ACTOR_DM_GM, - ACTORCAT_NPC, - FLAGS, - OBJECT_AN1, - sizeof(DmGm), - (ActorFunc)DmGm_Init, - (ActorFunc)DmGm_Destroy, - (ActorFunc)DmGm_Update, - (ActorFunc)NULL, + /**/ ACTOR_DM_GM, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_AN1, + /**/ sizeof(DmGm), + /**/ DmGm_Init, + /**/ DmGm_Destroy, + /**/ DmGm_Update, + /**/ NULL, }; /** diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index b28a44d1b..15980f11c 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -22,15 +22,15 @@ void func_80A1F5AC(DmHina* this, PlayState* play); void func_80A1F63C(DmHina* this, PlayState* play); ActorInit Dm_Hina_InitVars = { - ACTOR_DM_HINA, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BSMASK, - sizeof(DmHina), - (ActorFunc)DmHina_Init, - (ActorFunc)DmHina_Destroy, - (ActorFunc)DmHina_Update, - (ActorFunc)DmHina_Draw, + /**/ ACTOR_DM_HINA, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_BSMASK, + /**/ sizeof(DmHina), + /**/ DmHina_Init, + /**/ DmHina_Destroy, + /**/ DmHina_Update, + /**/ DmHina_Draw, }; void DmHina_Init(Actor* thisx, PlayState* play) { 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 cf62f4557..9a3d331b0 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,15 @@ 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), - (ActorFunc)DmNb_Init, - (ActorFunc)DmNb_Destroy, - (ActorFunc)DmNb_Update, - (ActorFunc)DmNb_Draw, + /**/ ACTOR_DM_NB, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_NB, + /**/ sizeof(DmNb), + /**/ DmNb_Init, + /**/ DmNb_Destroy, + /**/ DmNb_Update, + /**/ DmNb_Draw, }; typedef enum { 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 b26948090..6aa2e7bae 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,15 @@ void DmOpstage_Draw(Actor* thisx, PlayState* play); void DmOpstage_HandleCutscene(DmOpstage* this, PlayState* play); ActorInit Dm_Opstage_InitVars = { - ACTOR_DM_OPSTAGE, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_KEIKOKU_DEMO, - sizeof(DmOpstage), - (ActorFunc)DmOpstage_Init, - (ActorFunc)DmOpstage_Destroy, - (ActorFunc)DmOpstage_Update, - (ActorFunc)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 ca8f40aa5..f76fc0caa 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,15 @@ 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), - (ActorFunc)DmRavine_Init, - (ActorFunc)DmRavine_Destroy, - (ActorFunc)DmRavine_Update, - (ActorFunc)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 945a47472..44b1dbe8a 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,15 @@ 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), - (ActorFunc)DmSa_Init, - (ActorFunc)DmSa_Destroy, - (ActorFunc)DmSa_Update, - (ActorFunc)DmSa_Draw, + /**/ ACTOR_DM_SA, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_STK, + /**/ sizeof(DmSa), + /**/ DmSa_Init, + /**/ DmSa_Destroy, + /**/ DmSa_Update, + /**/ DmSa_Draw, }; typedef enum { 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 77ce3c738..833905ba0 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,15 @@ 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), - (ActorFunc)DmStatue_Init, - (ActorFunc)DmStatue_Destroy, - (ActorFunc)DmStatue_Update, - (ActorFunc)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 73bf18c1a..5feb13536 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -152,15 +152,15 @@ typedef enum { } SkullKidDekuPipesCutsceneState; ActorInit Dm_Stk_InitVars = { - ACTOR_DM_STK, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_STK, - sizeof(DmStk), - (ActorFunc)DmStk_Init, - (ActorFunc)DmStk_Destroy, - (ActorFunc)DmStk_Update, - (ActorFunc)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 4531f235a..86dcf4955 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,15 @@ void DmTag_DoNothing(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), - (ActorFunc)DmTag_Init, - (ActorFunc)DmTag_Destroy, - (ActorFunc)DmTag_Update, - (ActorFunc)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_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index 7dec0540e..6d7839896 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -17,15 +17,15 @@ void DmTsg_Draw(Actor* thisx, PlayState* play); #if 0 ActorInit Dm_Tsg_InitVars = { - ACTOR_DM_TSG, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_OPEN_OBJ, - sizeof(DmTsg), - (ActorFunc)DmTsg_Init, - (ActorFunc)DmTsg_Destroy, - (ActorFunc)DmTsg_Update, - (ActorFunc)DmTsg_Draw, + /**/ ACTOR_DM_TSG, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_OPEN_OBJ, + /**/ sizeof(DmTsg), + /**/ DmTsg_Init, + /**/ DmTsg_Destroy, + /**/ DmTsg_Update, + /**/ DmTsg_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index 4a585c779..9fd2b9741 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,15 @@ 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), - (ActorFunc)DmZl_Init, - (ActorFunc)DmZl_Destroy, - (ActorFunc)DmZl_Update, - (ActorFunc)DmZl_Draw, + /**/ ACTOR_DM_ZL, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_ZL4, + /**/ sizeof(DmZl), + /**/ DmZl_Init, + /**/ DmZl_Destroy, + /**/ DmZl_Update, + /**/ DmZl_Draw, }; typedef enum { 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 f002bc8bd..3e7b1898e 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,15 @@ 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), - (ActorFunc)DoorAna_Init, - (ActorFunc)DoorAna_Destroy, - (ActorFunc)DoorAna_Update, - (ActorFunc)DoorAna_Draw, + /**/ ACTOR_DOOR_ANA, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ GAMEPLAY_FIELD_KEEP, + /**/ sizeof(DoorAna), + /**/ DoorAna_Init, + /**/ DoorAna_Destroy, + /**/ DoorAna_Update, + /**/ DoorAna_Draw, }; static ColliderCylinderInit sCylinderInit = { @@ -132,7 +132,7 @@ void DoorAna_WaitOpen(DoorAna* this, PlayState* play) { if (Math_StepToF(&this->actor.scale.x, 0.01f, 0.001f)) { if ((this->actor.targetMode != TARGET_MODE_0) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) && (player->stateFlags1 & PLAYER_STATE1_80000000) && - (player->actionVar1 == 0)) { + (player->av1.actionVar1 == 0)) { if (grottoType == DOORANA_TYPE_VISIBLE_SCENE_EXIT) { s32 exitIndex = DOORANA_GET_EXIT_INDEX(&this->actor); 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 10c2f050a..3d94e261a 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,15 @@ 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), - (ActorFunc)DoorShutter_Init, - (ActorFunc)DoorShutter_Destroy, - (ActorFunc)DoorShutter_Update, - (ActorFunc)NULL, + /**/ ACTOR_DOOR_SHUTTER, + /**/ ACTORCAT_DOOR, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(DoorShutter), + /**/ DoorShutter_Init, + /**/ DoorShutter_Destroy, + /**/ DoorShutter_Update, + /**/ NULL, }; typedef struct { @@ -410,7 +410,7 @@ void func_808A1288(DoorShutter* this, PlayState* play) { this->unk_164 = sp38; this->unk_168 = 0.0f; - Camera_ChangeDoorCam(play->cameraPtrs[CAM_ID_MAIN], &this->slidingDoor.dyna.actor, player->doorBgCamIndex, + Camera_ChangeDoorCam(play->cameraPtrs[CAM_ID_MAIN], &this->slidingDoor.dyna.actor, player->cv.doorBgCamIndex, this->unk_168, 12, sp34, 10); } } 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 0370023a8..245dcbea5 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -32,15 +32,15 @@ void func_809A3098(DoorSpiral* this, PlayState* play); s32 func_809A2EA0(DoorSpiral* this, PlayState* play); ActorInit Door_Spiral_InitVars = { - ACTOR_DOOR_SPIRAL, - ACTORCAT_DOOR, - FLAGS, - GAMEPLAY_KEEP, - sizeof(DoorSpiral), - (ActorFunc)DoorSpiral_Init, - (ActorFunc)DoorSpiral_Destroy, - (ActorFunc)DoorSpiral_Update, - (ActorFunc)DoorSpiral_Draw, + /**/ ACTOR_DOOR_SPIRAL, + /**/ ACTORCAT_DOOR, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(DoorSpiral), + /**/ DoorSpiral_Init, + /**/ DoorSpiral_Destroy, + /**/ DoorSpiral_Update, + /**/ DoorSpiral_Draw, }; typedef struct { 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 4d44941b3..5f491f431 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -51,15 +51,15 @@ s16 D_808BC000; f32 D_808BC004; ActorInit Door_Warp1_InitVars = { - ACTOR_DOOR_WARP1, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_WARP1, - sizeof(DoorWarp1), - (ActorFunc)DoorWarp1_Init, - (ActorFunc)DoorWarp1_Destroy, - (ActorFunc)DoorWarp1_Update, - (ActorFunc)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 470f9b89d..9839d29d5 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,15 @@ 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), - (ActorFunc)EffChange_Init, - (ActorFunc)EffChange_Destroy, - (ActorFunc)EffChange_Update, - (ActorFunc)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 742b3bb70..d7c9f6a29 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,15 @@ 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), - (ActorFunc)EffDust_Init, - (ActorFunc)EffDust_Destroy, - (ActorFunc)EffDust_Update, - (ActorFunc)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 ee493fe24..5e5ca289e 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 @@ -23,15 +23,15 @@ 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), - (ActorFunc)EffKamejimaWave_Init, - (ActorFunc)EffKamejimaWave_Destroy, - (ActorFunc)EffKamejimaWave_Update, - (ActorFunc)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 8ec3ac959..8acaddf9b 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,15 @@ typedef enum EffLastDayAction { } EffLastDayAction; ActorInit Eff_Lastday_InitVars = { - ACTOR_EFF_LASTDAY, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_LASTDAY, - sizeof(EffLastday), - (ActorFunc)EffLastday_Init, - (ActorFunc)EffLastday_Destroy, - (ActorFunc)EffLastday_Update, - (ActorFunc)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_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index 88c604c5e..e6e2694c3 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -19,15 +19,15 @@ void EffStk_Draw(Actor* thisx, PlayState* play); void func_80BF0DE0(EffStk* this, PlayState* play); ActorInit Eff_Stk_InitVars = { - ACTOR_EFF_STK, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_STK2, - sizeof(EffStk), - (ActorFunc)EffStk_Init, - (ActorFunc)EffStk_Destroy, - (ActorFunc)EffStk_Update, - (ActorFunc)EffStk_Draw, + /**/ ACTOR_EFF_STK, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_STK2, + /**/ sizeof(EffStk), + /**/ EffStk_Init, + /**/ EffStk_Destroy, + /**/ EffStk_Update, + /**/ EffStk_Draw, }; void EffStk_Init(Actor* thisx, PlayState* play) { 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 c8127a98f..6d54c1eec 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,15 @@ 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), - (ActorFunc)EffZoraband_Init, - (ActorFunc)EffZoraband_Destroy, - (ActorFunc)EffZoraband_Update, - (ActorFunc)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 eb1d5761e..597823ff6 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,15 @@ 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), - (ActorFunc)ElfMsg_Init, - (ActorFunc)ElfMsg_Destroy, - (ActorFunc)ElfMsg_Update, - (ActorFunc)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 409202468..ac5fa65f7 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,15 @@ 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), - (ActorFunc)ElfMsg2_Init, - (ActorFunc)ElfMsg2_Destroy, - (ActorFunc)ElfMsg2_Update, - (ActorFunc)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 ba8256361..57cbaada3 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,15 @@ 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), - (ActorFunc)ElfMsg3_Init, - (ActorFunc)ElfMsg3_Destroy, - (ActorFunc)ElfMsg3_Update, - (ActorFunc)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 5f1f0d3dc..545ac0688 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,15 @@ s32 ElfMsg4_GetTextId(ElfMsg4* this); s32 func_80AFD5E0(ElfMsg4* this); ActorInit Elf_Msg4_InitVars = { - ACTOR_ELF_MSG4, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ElfMsg4), - (ActorFunc)ElfMsg4_Init, - (ActorFunc)ElfMsg4_Destroy, - (ActorFunc)ElfMsg4_Update, - (ActorFunc)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 236933fc9..af48b53f3 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,15 @@ 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), - (ActorFunc)ElfMsg5_Init, - (ActorFunc)ElfMsg5_Destroy, - (ActorFunc)ElfMsg5_Update, - (ActorFunc)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 4c565fdf8..7f144ad53 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,15 @@ 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), - (ActorFunc)ElfMsg6_Init, - (ActorFunc)ElfMsg6_Destroy, - (ActorFunc)ElfMsg6_Update, - (ActorFunc)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 09928dfe9..afea1d55e 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,15 @@ 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), - (ActorFunc)EnAh_Init, - (ActorFunc)EnAh_Destroy, - (ActorFunc)EnAh_Update, - (ActorFunc)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 c7bfb6234..53320ffd1 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,15 @@ 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), - (ActorFunc)EnAkindonuts_Init, - (ActorFunc)EnAkindonuts_Destroy, - (ActorFunc)EnAkindonuts_Update, - (ActorFunc)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 0f8679b3c..10ee17444 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -85,15 +85,15 @@ s32 D_80BDFF24[] = { }; ActorInit En_Al_InitVars = { - ACTOR_EN_AL, - ACTORCAT_NPC, - FLAGS, - OBJECT_AL, - sizeof(EnAl), - (ActorFunc)EnAl_Init, - (ActorFunc)EnAl_Destroy, - (ActorFunc)EnAl_Update, - (ActorFunc)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 916bfca1b..17885f6e8 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -39,15 +39,15 @@ 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), - (ActorFunc)EnAm_Init, - (ActorFunc)EnAm_Destroy, - (ActorFunc)EnAm_Update, - (ActorFunc)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_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 7dc4620df..c896148eb 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -764,15 +764,15 @@ s32 sAnjuMsgScript_80B58B88[2] = { 0x0E29612D, 0x10C10 }; s32 sAnjuMsgScript_SchWithKafei[3] = { 0x0E291B2D, 0x10C12, 0x10000000 }; ActorInit En_An_InitVars = { - ACTOR_EN_AN, - ACTORCAT_NPC, - FLAGS, - OBJECT_AN1, - sizeof(EnAn), - (ActorFunc)EnAn_Init, - (ActorFunc)EnAn_Destroy, - (ActorFunc)EnAn_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_AN, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_AN1, + /**/ sizeof(EnAn), + /**/ EnAn_Init, + /**/ EnAn_Destroy, + /**/ EnAn_Update, + /**/ NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index c244a0c5e..768f56d6f 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -18,15 +18,15 @@ void EnAnd_Update(Actor* thisx, PlayState* play); void EnAnd_Draw(Actor* thisx, PlayState* play); ActorInit En_And_InitVars = { - ACTOR_EN_AND, - ACTORCAT_NPC, - FLAGS, - OBJECT_AND, - sizeof(EnAnd), - (ActorFunc)EnAnd_Init, - (ActorFunc)EnAnd_Destroy, - (ActorFunc)EnAnd_Update, - (ActorFunc)EnAnd_Draw, + /**/ ACTOR_EN_AND, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_AND, + /**/ sizeof(EnAnd), + /**/ EnAnd_Init, + /**/ EnAnd_Destroy, + /**/ EnAnd_Update, + /**/ EnAnd_Draw, }; typedef enum { 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 d27a8a93d..dfd372a68 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,15 @@ 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), - (ActorFunc)EnAni_Init, - (ActorFunc)EnAni_Destroy, - (ActorFunc)EnAni_Update, - (ActorFunc)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 58b2589c9..90ba60b78 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 @@ -33,15 +33,15 @@ void EnAob01_AfterRace_Talk(EnAob01* this, PlayState* play); s32 EnAob01_PlayerIsHoldingDog(EnAob01* this, PlayState* play); ActorInit En_Aob_01_InitVars = { - ACTOR_EN_AOB_01, - ACTORCAT_NPC, - FLAGS, - OBJECT_AOB, - sizeof(EnAob01), - (ActorFunc)EnAob01_Init, - (ActorFunc)EnAob01_Destroy, - (ActorFunc)EnAob01_Update, - (ActorFunc)EnAob01_Draw, + /**/ ACTOR_EN_AOB_01, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_AOB, + /**/ sizeof(EnAob01), + /**/ EnAob01_Init, + /**/ EnAob01_Destroy, + /**/ EnAob01_Update, + /**/ EnAob01_Draw, }; typedef enum { 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 304dc3a3e..cd1a9626c 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,15 @@ 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), - (ActorFunc)EnArrow_Init, - (ActorFunc)EnArrow_Destroy, - (ActorFunc)EnArrow_Update, - (ActorFunc)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 e8c4c9fa2..f4f56a630 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,15 @@ 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), - (ActorFunc)EnAttackNiw_Init, - (ActorFunc)EnAttackNiw_Destroy, - (ActorFunc)EnAttackNiw_Update, - (ActorFunc)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 43a557aae..e0de6afe5 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -95,15 +95,15 @@ static AnimationSpeedInfo sAnimationSpeedInfo[BEAVER_ANIM_IDLE_FACE_MAX] = { }; ActorInit En_Az_InitVars = { - ACTOR_EN_AZ, - ACTORCAT_NPC, - FLAGS, - OBJECT_AZ, - sizeof(EnAz), - (ActorFunc)EnAz_Init, - (ActorFunc)EnAz_Destroy, - (ActorFunc)EnAz_Update, - (ActorFunc)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 43cbd2969..580f8d1c2 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -42,15 +42,15 @@ typedef enum { } BombShopLadyScheduleResult; ActorInit En_Baba_InitVars = { - ACTOR_EN_BABA, - ACTORCAT_NPC, - FLAGS, - OBJECT_BBA, - sizeof(EnBaba), - (ActorFunc)EnBaba_Init, - (ActorFunc)EnBaba_Destroy, - (ActorFunc)EnBaba_Update, - (ActorFunc)EnBaba_Draw, + /**/ ACTOR_EN_BABA, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BBA, + /**/ sizeof(EnBaba), + /**/ EnBaba_Init, + /**/ EnBaba_Destroy, + /**/ EnBaba_Update, + /**/ EnBaba_Draw, }; typedef enum { 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 25f867ec1..9b7fded36 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -43,15 +43,15 @@ typedef enum { } NejironRollDirection; ActorInit En_Baguo_InitVars = { - ACTOR_EN_BAGUO, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_GMO, - sizeof(EnBaguo), - (ActorFunc)EnBaguo_Init, - (ActorFunc)EnBaguo_Destroy, - (ActorFunc)EnBaguo_Update, - (ActorFunc)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 e6ac52cee..e7b638bcd 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,15 @@ 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), - (ActorFunc)EnBaisen_Init, - (ActorFunc)EnBaisen_Destroy, - (ActorFunc)EnBaisen_Update, - (ActorFunc)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_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index 3bd63b1a6..7678a3ccd 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -91,15 +91,15 @@ void EnBal_SetupThankYou(EnBal* this); void EnBal_ThankYou(EnBal* this, PlayState* play); ActorInit En_Bal_InitVars = { - ACTOR_EN_BAL, - ACTORCAT_NPC, - FLAGS, - OBJECT_BAL, - sizeof(EnBal), - (ActorFunc)EnBal_Init, - (ActorFunc)EnBal_Destroy, - (ActorFunc)EnBal_Update, - (ActorFunc)EnBal_Draw, + /**/ ACTOR_EN_BAL, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BAL, + /**/ sizeof(EnBal), + /**/ EnBal_Init, + /**/ EnBal_Destroy, + /**/ EnBal_Update, + /**/ EnBal_Draw, }; static DamageTable sDamageTable = { 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 e57ec81cc..51c7d5212 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -30,15 +30,15 @@ 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), - (ActorFunc)EnBat_Init, - (ActorFunc)EnBat_Destroy, - (ActorFunc)EnBat_Update, - (ActorFunc)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 06c70aa24..53b50dc51 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -37,15 +37,15 @@ typedef enum { } EnBbBodyPartDrawStatus; ActorInit En_Bb_InitVars = { - ACTOR_EN_BB, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BB, - sizeof(EnBb), - (ActorFunc)EnBb_Init, - (ActorFunc)EnBb_Destroy, - (ActorFunc)EnBb_Update, - (ActorFunc)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 54595f360..7476baf70 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,15 @@ 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), - (ActorFunc)EnBba01_Init, - (ActorFunc)EnBba01_Destroy, - (ActorFunc)EnBba01_Update, - (ActorFunc)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 0f9d16a47..d24296068 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -37,15 +37,15 @@ typedef enum { } EnBbfallBodyPartDrawStatus; ActorInit En_Bbfall_InitVars = { - ACTOR_EN_BBFALL, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BB, - sizeof(EnBbfall), - (ActorFunc)EnBbfall_Init, - (ActorFunc)EnBbfall_Destroy, - (ActorFunc)EnBbfall_Update, - (ActorFunc)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 d3fa6ad4a..a23a4d486 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,15 @@ void EnBee_Attack(EnBee* this, PlayState* play); s32 sNumLoadedBees = 0; ActorInit En_Bee_InitVars = { - ACTOR_EN_BEE, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BEE, - sizeof(EnBee), - (ActorFunc)EnBee_Init, - (ActorFunc)EnBee_Destroy, - (ActorFunc)EnBee_Update, - (ActorFunc)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 ac19bdb44..c29527ea5 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,15 @@ 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), - (ActorFunc)EnBh_Init, - (ActorFunc)EnBh_Destroy, - (ActorFunc)EnBh_Update, - (ActorFunc)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 12a14af77..837e3560c 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -32,15 +32,15 @@ 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), - (ActorFunc)EnBigokuta_Init, - (ActorFunc)EnBigokuta_Destroy, - (ActorFunc)EnBigokuta_Update, - (ActorFunc)EnBigokuta_Draw, + /**/ ACTOR_EN_BIGOKUTA, + /**/ ACTORCAT_BOSS, + /**/ FLAGS, + /**/ OBJECT_BIGOKUTA, + /**/ sizeof(EnBigokuta), + /**/ EnBigokuta_Init, + /**/ EnBigokuta_Destroy, + /**/ EnBigokuta_Update, + /**/ EnBigokuta_Draw, }; static ColliderCylinderInit sShellCylinderInit = { @@ -169,7 +169,7 @@ void EnBigokuta_ShootPlayer(EnBigokuta* this, PlayState* play) { if (&this->picto.actor == player->actor.parent) { player->actor.parent = NULL; - player->actionVar2 = 100; + player->av2.actionVar2 = 100; player->actor.velocity.y = 0.0f; player->actor.world.pos.x += 20.0f * Math_SinS(this->picto.actor.home.rot.y); player->actor.world.pos.z += 20.0f * Math_CosS(this->picto.actor.home.rot.y); @@ -310,7 +310,7 @@ void EnBigokuta_SuckInPlayer(EnBigokuta* this, PlayState* play) { this->timer++; } - player->actionVar2 = 0; + player->av2.actionVar2 = 0; Math_Vec3f_Copy(&player->actor.world.pos, &this->playerPos); if (Math_Vec3f_StepTo(&player->actor.world.pos, &this->playerHoldPos, sqrtf(this->timer) * 5.0f) < 0.1f) { s16 rotY = this->picto.actor.shape.rot.y; 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 bd17bb873..07dd8c44f 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,15 @@ void func_80A28D80(EnBigpamet* this); void func_80A28ED4(EnBigpamet* this); ActorInit En_Bigpamet_InitVars = { - ACTOR_EN_BIGPAMET, - ACTORCAT_BOSS, - FLAGS, - OBJECT_TL, - sizeof(EnBigpamet), - (ActorFunc)EnBigpamet_Init, - (ActorFunc)EnBigpamet_Destroy, - (ActorFunc)EnBigpamet_Update, - (ActorFunc)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 c4e1433e7..e9f1a263a 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -84,15 +84,15 @@ 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), - (ActorFunc)EnBigpo_Init, - (ActorFunc)EnBigpo_Destroy, - (ActorFunc)EnBigpo_Update, - (ActorFunc)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 f9abf465c..2e04e768a 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -213,15 +213,15 @@ static EnBigslimeTri sBigslimeTri[BIGSLIME_NUM_FACES] = { }; ActorInit En_Bigslime_InitVars = { - ACTOR_EN_BIGSLIME, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BIGSLIME, - sizeof(EnBigslime), - (ActorFunc)EnBigslime_Init, - (ActorFunc)EnBigslime_Destroy, - (ActorFunc)EnBigslime_UpdateGekko, - (ActorFunc)EnBigslime_DrawGekko, + /**/ ACTOR_EN_BIGSLIME, + /**/ ACTORCAT_BOSS, + /**/ FLAGS, + /**/ OBJECT_BIGSLIME, + /**/ sizeof(EnBigslime), + /**/ EnBigslime_Init, + /**/ EnBigslime_Destroy, + /**/ EnBigslime_UpdateGekko, + /**/ EnBigslime_DrawGekko, }; static ColliderCylinderInit sCylinderInit = { @@ -729,7 +729,7 @@ void EnBigslime_SetPlayerParams(EnBigslime* this, PlayState* play) { if (player->stateFlags2 & PLAYER_STATE2_80) { player->actor.parent = NULL; - player->actionVar2 = 100; + player->av2.actionVar2 = 100; func_800B8D98(play, &this->actor, 10.0f, this->actor.world.rot.y, 10.0f); } } @@ -1528,7 +1528,7 @@ void EnBigslime_CutsceneGrabPlayer(EnBigslime* this, PlayState* play) { s32 i; s32 j; - player->actionVar2 = 0; + player->av2.actionVar2 = 0; Math_ScaledStepToS(&this->gekkoRot.x, 0, 0x400); EnBigslime_UpdateCameraGrabPlayer(this, play); if (this->grabPlayerTimer > 0) { @@ -1577,7 +1577,7 @@ void EnBigslime_AttackPlayerInBigslime(EnBigslime* this, PlayState* play) { Player* player = GET_PLAYER(play); s16 pitch = this->scaleFactor * 0x3333; // polar (zenith) angle - player->actionVar2 = 0; + player->av2.actionVar2 = 0; Math_ScaledStepToS(&this->gekkoRot.x, 0, 0x400); EnBigslime_UpdateCameraGrabPlayer(this, play); EnBigslime_UpdateWavySurface(this); @@ -1710,7 +1710,7 @@ void EnBigslime_WindupThrowPlayer(EnBigslime* this, PlayState* play) { if (this->windupPunchTimer == -5) { if (player->stateFlags2 & PLAYER_STATE2_80) { player->actor.parent = NULL; - player->actionVar2 = 100; + player->av2.actionVar2 = 100; } player->actor.velocity.y = 0.0f; 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 a9f290371..ecceed7ea 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 @@ -25,15 +25,15 @@ void func_809CD70C(EnBji01* this, PlayState* play); void func_809CD77C(EnBji01* this, PlayState* play); ActorInit En_Bji_01_InitVars = { - ACTOR_EN_BJI_01, - ACTORCAT_NPC, - FLAGS, - OBJECT_BJI, - sizeof(EnBji01), - (ActorFunc)EnBji01_Init, - (ActorFunc)EnBji01_Destroy, - (ActorFunc)EnBji01_Update, - (ActorFunc)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 ed68e212f..4870fedea 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,15 @@ static u8 sMsgEventScript[] = { }; ActorInit En_Bjt_InitVars = { - ACTOR_EN_BJT, - ACTORCAT_NPC, - FLAGS, - OBJECT_BJT, - sizeof(EnBjt), - (ActorFunc)EnBjt_Init, - (ActorFunc)EnBjt_Destroy, - (ActorFunc)EnBjt_Update, - (ActorFunc)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 6abc25f79..43084b301 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,15 @@ 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), - (ActorFunc)EnBoj01_Init, - (ActorFunc)EnBoj01_Destroy, - (ActorFunc)EnBoj01_Update, - (ActorFunc)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 ccf96aa67..8ed9bc327 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,15 @@ 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), - (ActorFunc)EnBoj02_Init, - (ActorFunc)EnBoj02_Destroy, - (ActorFunc)EnBoj02_Update, - (ActorFunc)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 ee00b2b5c..3ecb8dc38 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,15 @@ 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), - (ActorFunc)EnBoj03_Init, - (ActorFunc)EnBoj03_Destroy, - (ActorFunc)EnBoj03_Update, - (ActorFunc)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 8ef2c98ea..98d7c3da0 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,15 @@ 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), - (ActorFunc)EnBoj04_Init, - (ActorFunc)EnBoj04_Destroy, - (ActorFunc)EnBoj04_Update, - (ActorFunc)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 ccb7f1cef..b3f892c9d 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,15 @@ 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), - (ActorFunc)EnBoj05_Init, - (ActorFunc)EnBoj05_Destroy, - (ActorFunc)EnBoj05_Update, - (ActorFunc)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 2f76201c5..aa67e2e6a 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -35,15 +35,15 @@ typedef struct { PowderKegFuseSegment sPowderKegFuseSegments[16]; ActorInit En_Bom_InitVars = { - ACTOR_EN_BOM, - ACTORCAT_EXPLOSIVES, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnBom), - (ActorFunc)EnBom_Init, - (ActorFunc)EnBom_Destroy, - (ActorFunc)EnBom_Update, - (ActorFunc)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_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 948ee526f..1f2073db6 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -38,15 +38,15 @@ s32 D_809C6100 = 0; s32 D_809C6104 = 0; ActorInit En_Bom_Bowl_Man_InitVars = { - ACTOR_EN_BOM_BOWL_MAN, - ACTORCAT_NPC, - FLAGS, - OBJECT_CS, - sizeof(EnBomBowlMan), - (ActorFunc)EnBomBowlMan_Init, - (ActorFunc)EnBomBowlMan_Destroy, - (ActorFunc)EnBomBowlMan_Update, - (ActorFunc)EnBomBowlMan_Draw, + /**/ ACTOR_EN_BOM_BOWL_MAN, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_CS, + /**/ sizeof(EnBomBowlMan), + /**/ EnBomBowlMan_Init, + /**/ EnBomBowlMan_Destroy, + /**/ EnBomBowlMan_Update, + /**/ EnBomBowlMan_Draw, }; typedef enum { 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 4409a7316..4c2003f6a 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,15 @@ 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), - (ActorFunc)EnBomChu_Init, - (ActorFunc)EnBomChu_Destroy, - (ActorFunc)EnBomChu_Update, - (ActorFunc)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 5d45ffc55..5e705af2a 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -27,15 +27,15 @@ 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), - (ActorFunc)EnBombal_Init, - (ActorFunc)EnBombal_Destroy, - (ActorFunc)EnBombal_Update, - (ActorFunc)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 4f4b15545..db6cb78e7 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -25,15 +25,15 @@ 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), - (ActorFunc)EnBombers_Init, - (ActorFunc)EnBombers_Destroy, - (ActorFunc)EnBombers_Update, - (ActorFunc)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 b8795c3f2..92444c961 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -23,15 +23,15 @@ 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), - (ActorFunc)EnBombers2_Init, - (ActorFunc)EnBombers2_Destroy, - (ActorFunc)EnBombers2_Update, - (ActorFunc)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 92dfe8418..a241d94d0 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -26,15 +26,15 @@ 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), - (ActorFunc)EnBombf_Init, - (ActorFunc)EnBombf_Destroy, - (ActorFunc)EnBombf_Update, - (ActorFunc)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 cb8d48d3e..4771d116b 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -53,15 +53,15 @@ static s32 D_80C009F0 = 0; static s32 D_80C009F4 = 0; ActorInit En_Bomjima_InitVars = { - ACTOR_EN_BOMJIMA, - ACTORCAT_NPC, - FLAGS, - OBJECT_CS, - sizeof(EnBomjima), - (ActorFunc)EnBomjima_Init, - (ActorFunc)EnBomjima_Destroy, - (ActorFunc)EnBomjima_Update, - (ActorFunc)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 2e1984651..b3042e119 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -40,15 +40,15 @@ 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), - (ActorFunc)EnBomjimb_Init, - (ActorFunc)EnBomjimb_Destroy, - (ActorFunc)EnBomjimb_Update, - (ActorFunc)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 c89179e8b..ffd7fdae5 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,15 @@ 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), - (ActorFunc)EnBoom_Init, - (ActorFunc)EnBoom_Destroy, - (ActorFunc)EnBoom_Update, - (ActorFunc)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 447c8ddb6..c27583eac 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,15 @@ 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), - (ActorFunc)EnBox_Init, - (ActorFunc)EnBox_Destroy, - (ActorFunc)EnBox_Update, - (ActorFunc)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_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index cdcf0879f..c6e91411b 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -113,15 +113,15 @@ static DamageTable D_80C0F9E0 = { }; ActorInit En_Bsb_InitVars = { - ACTOR_EN_BSB, - ACTORCAT_PROP, - FLAGS, - OBJECT_BSB, - sizeof(EnBsb), - (ActorFunc)EnBsb_Init, - (ActorFunc)EnBsb_Destroy, - (ActorFunc)EnBsb_Update, - (ActorFunc)EnBsb_Draw, + /**/ ACTOR_EN_BSB, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_BSB, + /**/ sizeof(EnBsb), + /**/ EnBsb_Init, + /**/ EnBsb_Destroy, + /**/ EnBsb_Update, + /**/ EnBsb_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c index ad26cf99d..038a59420 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,15 @@ 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), - (ActorFunc)EnBu_Init, - (ActorFunc)EnBu_Destroy, - (ActorFunc)EnBu_Update, - (ActorFunc)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 7453c6d79..453dadccd 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,15 @@ 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), - (ActorFunc)EnBubble_Init, - (ActorFunc)EnBubble_Destroy, - (ActorFunc)EnBubble_Update, - (ActorFunc)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 d27aaf679..4f11479db 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -55,15 +55,15 @@ static ColliderJntSphInit sJntSphInit = { }; ActorInit En_Butte_InitVars = { - ACTOR_EN_BUTTE, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(EnButte), - (ActorFunc)EnButte_Init, - (ActorFunc)EnButte_Destroy, - (ActorFunc)EnButte_Update, - (ActorFunc)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 cbe96e0f0..07058af7a 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,15 @@ 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), - (ActorFunc)EnCha_Init, - (ActorFunc)EnCha_Destroy, - (ActorFunc)EnCha_Update, - (ActorFunc)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 edae8b849..3bef992a9 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,15 @@ 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), - (ActorFunc)EnClearTag_Init, - (ActorFunc)EnClearTag_Destroy, - (ActorFunc)EnClearTag_Update, - (ActorFunc)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 d2d2323c5..2cb07160a 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,15 @@ 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), - (ActorFunc)EnCne01_Init, - (ActorFunc)EnCne01_Destroy, - (ActorFunc)EnCne01_Update, - (ActorFunc)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 0c10f72cd..ec779f0dc 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 @@ -49,15 +49,15 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Col_Man_InitVars = { - ACTOR_EN_COL_MAN, - ACTORCAT_MISC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnColMan), - (ActorFunc)EnColMan_Init, - (ActorFunc)EnColMan_Destroy, - (ActorFunc)EnColMan_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_COL_MAN, + /**/ ACTORCAT_MISC, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnColMan), + /**/ EnColMan_Init, + /**/ EnColMan_Destroy, + /**/ EnColMan_Update, + /**/ NULL, }; void EnColMan_Init(Actor* thisx, PlayState* play) { 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 5a234c05e..f9f1925d0 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -29,15 +29,15 @@ 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), - (ActorFunc)EnCow_Init, - (ActorFunc)EnCow_Destroy, - (ActorFunc)EnCow_Update, - (ActorFunc)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 ca1f1db13..e08ed2bdf 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -29,15 +29,15 @@ 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), - (ActorFunc)EnCrow_Init, - (ActorFunc)EnCrow_Destroy, - (ActorFunc)EnCrow_Update, - (ActorFunc)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 d9147aa26..1857e7ffe 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -19,15 +19,15 @@ 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), - (ActorFunc)EnDai_Init, - (ActorFunc)EnDai_Destroy, - (ActorFunc)EnDai_Update, - (ActorFunc)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 ddf98cd3d..e2dd48317 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -21,15 +21,15 @@ 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), - (ActorFunc)EnDaiku_Init, - (ActorFunc)EnDaiku_Destroy, - (ActorFunc)EnDaiku_Update, - (ActorFunc)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 90d8673f6..8cf340ee8 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,15 @@ 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), - (ActorFunc)EnDaiku2_Init, - (ActorFunc)EnDaiku2_Destroy, - (ActorFunc)EnDaiku2_Update, - (ActorFunc)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_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index ca7fd6a3b..0eb9268f7 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -39,15 +39,15 @@ void func_808C7DCC(EnDeath* this, PlayState* play); #if 0 ActorInit En_Death_InitVars = { - ACTOR_EN_DEATH, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DEATH, - sizeof(EnDeath), - (ActorFunc)EnDeath_Init, - (ActorFunc)EnDeath_Destroy, - (ActorFunc)EnDeath_Update, - (ActorFunc)EnDeath_Draw, + /**/ ACTOR_EN_DEATH, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_DEATH, + /**/ sizeof(EnDeath), + /**/ EnDeath_Init, + /**/ EnDeath_Destroy, + /**/ EnDeath_Update, + /**/ EnDeath_Draw, }; // static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index aa0b0ff5f..bb603211a 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -44,15 +44,15 @@ void EnDekubaba_SetupDeadStickDrop(EnDekubaba* this, PlayState* play); void EnDekubaba_DeadStickDrop(EnDekubaba* this, PlayState* play); ActorInit En_Dekubaba_InitVars = { - ACTOR_EN_DEKUBABA, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DEKUBABA, - sizeof(EnDekubaba), - (ActorFunc)EnDekubaba_Init, - (ActorFunc)EnDekubaba_Destroy, - (ActorFunc)EnDekubaba_Update, - (ActorFunc)EnDekubaba_Draw, + /**/ ACTOR_EN_DEKUBABA, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_DEKUBABA, + /**/ sizeof(EnDekubaba), + /**/ EnDekubaba_Init, + /**/ EnDekubaba_Destroy, + /**/ EnDekubaba_Update, + /**/ EnDekubaba_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[7] = { diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 4fb015365..45391eefc 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -41,15 +41,15 @@ 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), - (ActorFunc)EnDekunuts_Init, - (ActorFunc)EnDekunuts_Destroy, - (ActorFunc)EnDekunuts_Update, - (ActorFunc)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 86d8524be..65ea69f69 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 @@ -21,15 +21,15 @@ void EnDemoheishi_SetupTalk(EnDemoheishi* this); void EnDemoheishi_Talk(EnDemoheishi* this, PlayState* play); ActorInit En_Demo_heishi_InitVars = { - ACTOR_EN_DEMO_HEISHI, - ACTORCAT_NPC, - FLAGS, - OBJECT_SDN, - sizeof(EnDemoheishi), - (ActorFunc)EnDemoheishi_Init, - (ActorFunc)EnDemoheishi_Destroy, - (ActorFunc)EnDemoheishi_Update, - (ActorFunc)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 bd0139222..3b0552ce6 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -38,15 +38,15 @@ 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), - (ActorFunc)EnDg_Init, - (ActorFunc)EnDg_Destroy, - (ActorFunc)EnDg_Update, - (ActorFunc)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 c7bb3c44c..0c52ca7b7 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,15 @@ void func_8089C164(EnDinofos* this); void func_8089C244(EnDinofos* this); ActorInit En_Dinofos_InitVars = { - ACTOR_EN_DINOFOS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DINOFOS, - sizeof(EnDinofos), - (ActorFunc)EnDinofos_Init, - (ActorFunc)EnDinofos_Destroy, - (ActorFunc)EnDinofos_Update, - (ActorFunc)EnDinofos_Draw, + /**/ ACTOR_EN_DINOFOS, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_DINOFOS, + /**/ sizeof(EnDinofos), + /**/ EnDinofos_Init, + /**/ EnDinofos_Destroy, + /**/ EnDinofos_Update, + /**/ EnDinofos_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[9] = { @@ -450,7 +450,7 @@ s32 func_8089AE00(EnDinofos* this, PlayState* play) { return true; } - if ((GET_PLAYER_FORM == PLAYER_FORM_GORON) && (player->actor.velocity.y < -5.0f) && (player->actionVar1 == 1) && + if ((GET_PLAYER_FORM == PLAYER_FORM_GORON) && (player->actor.velocity.y < -5.0f) && (player->av1.actionVar1 == 1) && (this->unk_28B == 0)) { this->unk_28B = 1; for (i = 0; i < ARRAY_COUNT(this->colliderJntSphElement) - 3; i++) { 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 c7dbd8888..d4a442277 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,15 @@ 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), - (ActorFunc)EnDnb_Init, - (ActorFunc)EnDnb_Destroy, - (ActorFunc)EnDnb_Update, - (ActorFunc)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_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c index c2b6f508f..ce2c6f82a 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -43,15 +43,15 @@ UNK_TYPE D_80A5138C[] = { }; ActorInit En_Dnh_InitVars = { - ACTOR_EN_DNH, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRO, - sizeof(EnDnh), - (ActorFunc)EnDnh_Init, - (ActorFunc)EnDnh_Destroy, - (ActorFunc)EnDnh_Update, - (ActorFunc)EnDnh_Draw, + /**/ ACTOR_EN_DNH, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_TRO, + /**/ sizeof(EnDnh), + /**/ EnDnh_Init, + /**/ EnDnh_Destroy, + /**/ EnDnh_Update, + /**/ EnDnh_Draw, }; typedef enum { 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 3f8318a37..e03ee1999 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -22,15 +22,15 @@ 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), - (ActorFunc)EnDnk_Init, - (ActorFunc)EnDnk_Destroy, - (ActorFunc)EnDnk_Update, - (ActorFunc)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 d32f2f3f4..7fb1767bf 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -92,15 +92,15 @@ static AnimationSpeedInfo sAnimationSpeedInfo[EN_DNO_ANIM_MAX] = { }; ActorInit En_Dno_InitVars = { - ACTOR_EN_DNO, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNJ, - sizeof(EnDno), - (ActorFunc)EnDno_Init, - (ActorFunc)EnDno_Destroy, - (ActorFunc)EnDno_Update, - (ActorFunc)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 2518cbc47..065a7d957 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,15 @@ typedef enum { } EnDnpEyeIndex; ActorInit En_Dnp_InitVars = { - ACTOR_EN_DNP, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNQ, - sizeof(EnDnp), - (ActorFunc)EnDnp_Init, - (ActorFunc)EnDnp_Destroy, - (ActorFunc)EnDnp_Update, - (ActorFunc)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 cd25a835b..91675f0d5 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,15 @@ static s32 D_80A53400[] = { }; ActorInit En_Dnq_InitVars = { - ACTOR_EN_DNQ, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNO, - sizeof(EnDnq), - (ActorFunc)EnDnq_Init, - (ActorFunc)EnDnq_Destroy, - (ActorFunc)EnDnq_Update, - (ActorFunc)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 02777ec44..1a17c8e89 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -26,15 +26,15 @@ static s32 D_8092DCB0[] = { }; ActorInit En_Dns_InitVars = { - ACTOR_EN_DNS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNS, - sizeof(EnDns), - (ActorFunc)EnDns_Init, - (ActorFunc)EnDns_Destroy, - (ActorFunc)EnDns_Update, - (ActorFunc)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 c85cdf6ee..ac05fc9a1 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,15 @@ 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), - (ActorFunc)EnDodongo_Init, - (ActorFunc)EnDodongo_Destroy, - (ActorFunc)EnDodongo_Update, - (ActorFunc)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 151b340ac..8ecab48f9 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -277,15 +277,15 @@ u8* D_8086778C[] = { }; ActorInit En_Door_InitVars = { - ACTOR_EN_DOOR, - ACTORCAT_DOOR, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnDoor), - (ActorFunc)EnDoor_Init, - (ActorFunc)EnDoor_Destroy, - (ActorFunc)EnDoor_Update, - (ActorFunc)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 c6c1b312e..a14f18f8e 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,15 @@ 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), - (ActorFunc)EnDoorEtc_Init, - (ActorFunc)EnDoorEtc_Destroy, - (ActorFunc)EnDoorEtc_Update, - (ActorFunc)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 d87ac9f9e..bb1d60c2c 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -45,15 +45,15 @@ typedef enum { static s32 sNumPythonsDead = 0; ActorInit En_Dragon_InitVars = { - ACTOR_EN_DRAGON, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_UTUBO, - sizeof(EnDragon), - (ActorFunc)EnDragon_Init, - (ActorFunc)EnDragon_Destroy, - (ActorFunc)EnDragon_Update, - (ActorFunc)EnDragon_Draw, + /**/ ACTOR_EN_DRAGON, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_UTUBO, + /**/ sizeof(EnDragon), + /**/ EnDragon_Init, + /**/ EnDragon_Destroy, + /**/ EnDragon_Update, + /**/ EnDragon_Draw, }; typedef enum { @@ -548,7 +548,7 @@ void EnDragon_Grab(EnDragon* this, PlayState* play) { play->unk_18770(play, player); player->actor.parent = &this->actor; - player->actionVar2 = 50; + player->av2.actionVar2 = 50; this->action = DEEP_PYTHON_ACTION_GRAB; Actor_PlaySfx(&this->actor, NA_SE_EN_UTSUBO_EAT); EnDragon_SetupAttack(this); @@ -626,7 +626,7 @@ void EnDragon_Attack(EnDragon* this, PlayState* play) { this->grabWaitTimer = 30; CutsceneManager_Stop(this->grabCsId); if (player->stateFlags2 & PLAYER_STATE2_80) { - player->actionVar2 = 100; + player->av2.actionVar2 = 100; } this->actor.flags &= ~ACTOR_FLAG_100000; 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 8f5111582..8de21d00e 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,15 @@ 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), - (ActorFunc)EnDrs_Init, - (ActorFunc)EnDrs_Destroy, - (ActorFunc)EnDrs_Update, - (ActorFunc)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 8287c0680..f6c1b6931 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,15 @@ 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), - (ActorFunc)EnDs2n_Init, - (ActorFunc)EnDs2n_Destroy, - (ActorFunc)EnDs2n_Update, - (ActorFunc)EnDs2n_Draw, + /**/ ACTOR_EN_DS2N, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_DS2N, + /**/ sizeof(EnDs2n), + /**/ EnDs2n_Init, + /**/ EnDs2n_Destroy, + /**/ EnDs2n_Update, + /**/ EnDs2n_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index e82d6d6e3..605c52705 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -17,15 +17,15 @@ void EnDt_Draw(Actor* thisx, PlayState* play); #if 0 ActorInit En_Dt_InitVars = { - ACTOR_EN_DT, - ACTORCAT_NPC, - FLAGS, - OBJECT_DT, - sizeof(EnDt), - (ActorFunc)EnDt_Init, - (ActorFunc)EnDt_Destroy, - (ActorFunc)EnDt_Update, - (ActorFunc)EnDt_Draw, + /**/ ACTOR_EN_DT, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_DT, + /**/ sizeof(EnDt), + /**/ EnDt_Init, + /**/ EnDt_Destroy, + /**/ EnDt_Update, + /**/ EnDt_Draw, }; // static ColliderCylinderInit sCylinderInit = { 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 b8dea95a0..2d81ef052 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,15 @@ void EnDyExtra_WaitForTrigger(EnDyExtra* this, PlayState* play); void EnDyExtra_Fall(EnDyExtra* this, PlayState* play); ActorInit En_Dy_Extra_InitVars = { - ACTOR_EN_DY_EXTRA, - ACTORCAT_PROP, - FLAGS, - OBJECT_DY_OBJ, - sizeof(EnDyExtra), - (ActorFunc)EnDyExtra_Init, - (ActorFunc)EnDyExtra_Destroy, - (ActorFunc)EnDyExtra_Update, - (ActorFunc)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 bd9949c61..9c012b9cd 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,15 @@ 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), - (ActorFunc)EnEgblock_Init, - (ActorFunc)EnEgblock_Destroy, - (ActorFunc)EnEgblock_Update, - (ActorFunc)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 9d5c148f9..d912cdfa6 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -276,15 +276,15 @@ static Color_RGB8 sLightOrbColors[] = { }; ActorInit En_Egol_InitVars = { - ACTOR_EN_EGOL, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_EG, - sizeof(EnEgol), - (ActorFunc)EnEgol_Init, - (ActorFunc)EnEgol_Destroy, - (ActorFunc)EnEgol_Update, - (ActorFunc)EnEgol_Draw, + /**/ ACTOR_EN_EGOL, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_EG, + /**/ sizeof(EnEgol), + /**/ EnEgol_Init, + /**/ EnEgol_Destroy, + /**/ EnEgol_Update, + /**/ EnEgol_Draw, }; typedef enum { 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 53864ab9c..da222569f 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -33,15 +33,15 @@ 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), - (ActorFunc)EnElf_Init, - (ActorFunc)EnElf_Destroy, - (ActorFunc)EnElf_Update, - (ActorFunc)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 c9d86e4f6..97b95435a 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,15 @@ 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), - (ActorFunc)EnElfbub_Init, - (ActorFunc)EnElfbub_Destroy, - (ActorFunc)EnElfbub_Update, - (ActorFunc)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 3eb2e357b..9c914c5ec 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -67,15 +67,15 @@ typedef enum ElfgrpSpawnedFairyTypes { } ElfgrpSpawnedFairyTypes; ActorInit En_Elfgrp_InitVars = { - ACTOR_EN_ELFGRP, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnElfgrp), - (ActorFunc)EnElfgrp_Init, - (ActorFunc)EnElfgrp_Destroy, - (ActorFunc)EnElfgrp_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_ELFGRP, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnElfgrp), + /**/ EnElfgrp_Init, + /**/ EnElfgrp_Destroy, + /**/ EnElfgrp_Update, + /**/ NULL, }; /** 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 3dc3cd7bc..75bf60891 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,15 @@ 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), - (ActorFunc)EnElforg_Init, - (ActorFunc)EnElforg_Destroy, - (ActorFunc)EnElforg_Update, - (ActorFunc)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 22a28ed43..19d149861 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -19,15 +19,15 @@ void EnEncount1_Update(Actor* thisx, PlayState* play); void EnEncount1_SpawnActor(EnEncount1* this, PlayState* play); ActorInit En_Encount1_InitVars = { - ACTOR_EN_ENCOUNT1, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnEncount1), - (ActorFunc)EnEncount1_Init, - (ActorFunc)NULL, - (ActorFunc)EnEncount1_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_ENCOUNT1, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnEncount1), + /**/ EnEncount1_Init, + /**/ NULL, + /**/ EnEncount1_Update, + /**/ NULL, }; static s16 sActorIds[] = { 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 e56252b43..f114b1cd9 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -27,15 +27,15 @@ 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), - (ActorFunc)EnEncount2_Init, - (ActorFunc)EnEncount2_Destroy, - (ActorFunc)EnEncount2_Update, - (ActorFunc)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_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index 61ff3039f..7646f7113 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -23,15 +23,15 @@ void func_809AD194(EnEncount3* this, PlayState* play); void func_809AD1EC(EnEncount3* this, PlayState* play); ActorInit En_Encount3_InitVars = { - ACTOR_EN_ENCOUNT3, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_BIG_FWALL, - sizeof(EnEncount3), - (ActorFunc)EnEncount3_Init, - (ActorFunc)EnEncount3_Destroy, - (ActorFunc)EnEncount3_Update, - (ActorFunc)EnEncount3_Draw, + /**/ ACTOR_EN_ENCOUNT3, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_BIG_FWALL, + /**/ sizeof(EnEncount3), + /**/ EnEncount3_Init, + /**/ EnEncount3_Destroy, + /**/ EnEncount3_Update, + /**/ EnEncount3_Draw, }; s32 D_809AD810 = false; 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 376401ae4..a5281a572 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,15 @@ 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), - (ActorFunc)EnEncount4_Init, - (ActorFunc)EnEncount4_Destroy, - (ActorFunc)EnEncount4_Update, - (ActorFunc)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_Hero/z_en_ending_hero.c b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c index c281bd61f..fae51e685 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c @@ -19,15 +19,15 @@ void EnEndingHero1_SetupIdle(EnEndingHero* this); void EnEndingHero1_Idle(EnEndingHero* this, PlayState* play); ActorInit En_Ending_Hero_InitVars = { - ACTOR_EN_ENDING_HERO, - ACTORCAT_NPC, - FLAGS, - OBJECT_DT, - sizeof(EnEndingHero), - (ActorFunc)EnEndingHero_Init, - (ActorFunc)EnEndingHero_Destroy, - (ActorFunc)EnEndingHero_Update, - (ActorFunc)EnEndingHero_Draw, + /**/ ACTOR_EN_ENDING_HERO, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_DT, + /**/ sizeof(EnEndingHero), + /**/ EnEndingHero_Init, + /**/ EnEndingHero_Destroy, + /**/ EnEndingHero_Update, + /**/ EnEndingHero_Draw, }; void EnEndingHero_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c index 31bc4be65..eeb02f669 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c @@ -19,15 +19,15 @@ void EnEndingHero2_SetupIdle(EnEndingHero2* this); void EnEndingHero2_Idle(EnEndingHero2* this, PlayState* play); ActorInit En_Ending_Hero2_InitVars = { - ACTOR_EN_ENDING_HERO2, - ACTORCAT_NPC, - FLAGS, - OBJECT_BAI, - sizeof(EnEndingHero2), - (ActorFunc)EnEndingHero2_Init, - (ActorFunc)EnEndingHero2_Destroy, - (ActorFunc)EnEndingHero2_Update, - (ActorFunc)EnEndingHero2_Draw, + /**/ ACTOR_EN_ENDING_HERO2, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BAI, + /**/ sizeof(EnEndingHero2), + /**/ EnEndingHero2_Init, + /**/ EnEndingHero2_Destroy, + /**/ EnEndingHero2_Update, + /**/ EnEndingHero2_Draw, }; void EnEndingHero2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c index bfca5a5b5..3fe768c81 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 @@ -19,15 +19,15 @@ void EnEndingHero3_SetupIdle(EnEndingHero3* this); void EnEndingHero3_Idle(EnEndingHero3* this, PlayState* play); ActorInit En_Ending_Hero3_InitVars = { - ACTOR_EN_ENDING_HERO3, - ACTORCAT_NPC, - FLAGS, - OBJECT_TORYO, - sizeof(EnEndingHero3), - (ActorFunc)EnEndingHero3_Init, - (ActorFunc)EnEndingHero3_Destroy, - (ActorFunc)EnEndingHero3_Update, - (ActorFunc)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_Hero4/z_en_ending_hero4.c b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c index b75e0f21c..6f4d42b03 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c @@ -19,15 +19,15 @@ void EnEndingHero4_SetupIdle(EnEndingHero4* this); void EnEndingHero4_Idle(EnEndingHero4* this, PlayState* play); ActorInit En_Ending_Hero4_InitVars = { - ACTOR_EN_ENDING_HERO4, - ACTORCAT_NPC, - FLAGS, - OBJECT_SDN, - sizeof(EnEndingHero4), - (ActorFunc)EnEndingHero4_Init, - (ActorFunc)EnEndingHero4_Destroy, - (ActorFunc)EnEndingHero4_Update, - (ActorFunc)EnEndingHero4_Draw, + /**/ ACTOR_EN_ENDING_HERO4, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_SDN, + /**/ sizeof(EnEndingHero4), + /**/ EnEndingHero4_Init, + /**/ EnEndingHero4_Destroy, + /**/ EnEndingHero4_Update, + /**/ EnEndingHero4_Draw, }; void EnEndingHero4_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c index 2120f0a27..e470dae2f 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 @@ -19,15 +19,15 @@ void EnEndingHero5_SetupIdle(EnEndingHero5* this); void EnEndingHero5_Idle(EnEndingHero5* this, PlayState* play); ActorInit En_Ending_Hero5_InitVars = { - ACTOR_EN_ENDING_HERO5, - ACTORCAT_NPC, - FLAGS, - OBJECT_DAIKU, - sizeof(EnEndingHero5), - (ActorFunc)EnEndingHero5_Init, - (ActorFunc)EnEndingHero5_Destroy, - (ActorFunc)EnEndingHero5_Update, - (ActorFunc)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 47312b722..4d9b932db 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 @@ -19,15 +19,15 @@ 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), - (ActorFunc)EnEndingHero6_Init, - (ActorFunc)EnEndingHero6_Destroy, - (ActorFunc)EnEndingHero6_Update, - (ActorFunc)EnEndingHero6_Draw, + /**/ ACTOR_EN_ENDING_HERO6, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnEndingHero6), + /**/ EnEndingHero6_Init, + /**/ EnEndingHero6_Destroy, + /**/ EnEndingHero6_Update, + /**/ EnEndingHero6_Draw, }; typedef enum { 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 a40bf8718..7a4f4ec28 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,15 @@ 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), - (ActorFunc)EnEstone_Init, - (ActorFunc)EnEstone_Destroy, - (ActorFunc)EnEstone_Update, - (ActorFunc)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 33a6bf992..1d78c27ef 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -64,15 +64,15 @@ typedef struct { EnFallDebrisEffect debrisEffects[EN_FALL_DEBRIS_EFFECT_COUNT]; ActorInit En_Fall_InitVars = { - ACTOR_EN_FALL, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnFall), - (ActorFunc)EnFall_Init, - (ActorFunc)EnFall_Destroy, - (ActorFunc)EnFall_Update, - (ActorFunc)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 8ba7c66bc..68f9d4dab 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -19,15 +19,15 @@ void EnFall2_DoNothing(EnFall2* this, PlayState* play); void EnFall2_HandleCutscene(EnFall2* this, PlayState* play); ActorInit En_Fall2_InitVars = { - ACTOR_EN_FALL2, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_FALL2, - sizeof(EnFall2), - (ActorFunc)EnFall2_Init, - (ActorFunc)EnFall2_Destroy, - (ActorFunc)EnFall2_Update, - (ActorFunc)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 8219a23a3..95a740e02 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -48,15 +48,15 @@ void EnFamos_SetupDeathFade(EnFamos* this); void EnFamos_DeathFade(EnFamos* this, PlayState* play); ActorInit En_Famos_InitVars = { - ACTOR_EN_FAMOS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_FAMOS, - sizeof(EnFamos), - (ActorFunc)EnFamos_Init, - (ActorFunc)EnFamos_Destroy, - (ActorFunc)EnFamos_Update, - (ActorFunc)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 3da9f2673..251d0f7bb 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -33,15 +33,15 @@ typedef enum { } BetaFrogDamageEffect; ActorInit En_Fg_InitVars = { - ACTOR_EN_FG, - ACTORCAT_NPC, - FLAGS, - OBJECT_FR, - sizeof(EnFg), - (ActorFunc)EnFg_Init, - (ActorFunc)EnFg_Destroy, - (ActorFunc)EnFg_Update, - (ActorFunc)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 1e8425412..31ab42ff1 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,15 @@ 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), - (ActorFunc)EnFireRock_Init, - (ActorFunc)EnFireRock_Destroy, - (ActorFunc)EnFireRock_Update, - (ActorFunc)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 6b9d031df..09756f3b4 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,15 @@ typedef enum { } KeeseAuraType; ActorInit En_Firefly_InitVars = { - ACTOR_EN_FIREFLY, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_FIREFLY, - sizeof(EnFirefly), - (ActorFunc)EnFirefly_Init, - (ActorFunc)EnFirefly_Destroy, - (ActorFunc)EnFirefly_Update, - (ActorFunc)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 3459faf40..8621e10c8 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -17,15 +17,15 @@ 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), - (ActorFunc)EnFirefly2_Init, - (ActorFunc)EnFirefly2_Destroy, - (ActorFunc)EnFirefly2_Update, - (ActorFunc)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 0a7e892a7..af335c872 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -68,15 +68,15 @@ static Color_RGB8 D_8091FA94[] = { }; ActorInit En_Fish_InitVars = { - ACTOR_EN_FISH, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnFish), - (ActorFunc)EnFish_Init, - (ActorFunc)EnFish_Destroy, - (ActorFunc)EnFish_Update, - (ActorFunc)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 f8c10408c..5e36b20f9 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -49,15 +49,15 @@ static s32 D_80B2B2F0 = 0; static Actor* D_80B2B2F4 = NULL; ActorInit En_Fish2_InitVars = { - ACTOR_EN_FISH2, - ACTORCAT_PROP, - FLAGS, - OBJECT_FB, - sizeof(EnFish2), - (ActorFunc)EnFish2_Init, - (ActorFunc)EnFish2_Destroy, - (ActorFunc)EnFish2_Update, - (ActorFunc)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 4d2fc4db8..c1320150a 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -147,9 +147,9 @@ f32 sSubCamVelFactor; f32 D_80911F50; Vec3f sSinkingLureBasePos; f32 D_80911F64; -s32 sRandSeed0; -s32 sRandSeed1; -s32 sRandSeed2; +s32 sFishingRandSeed1; +s32 sFishingRandSeed2; +s32 sFishingRandSeed3; FishingProp sPondProps[POND_PROP_COUNT]; FishingGroupFish sGroupFishes[GROUP_FISH_COUNT]; f32 sFishGroupAngle1; @@ -202,15 +202,15 @@ u8 D_80917274; Vec3f D_80917278; ActorInit En_Fishing_InitVars = { - ACTOR_EN_FISHING, - ACTORCAT_NPC, - FLAGS, - OBJECT_FISH, - sizeof(EnFishing), - (ActorFunc)EnFishing_Init, - (ActorFunc)EnFishing_Destroy, - (ActorFunc)EnFishing_UpdateFish, - (ActorFunc)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; @@ -404,26 +404,26 @@ void EnFishing_SetColliderElement(s32 index, ColliderJntSph* collider, Vec3f* po collider->elements[index].dim.modelSphere.radius * collider->elements[index].dim.scale * scale * 1.6f; } -void EnFishing_SeedRand(s32 seed0, s32 seed1, s32 seed2) { - sRandSeed0 = seed0; - sRandSeed1 = seed1; - sRandSeed2 = seed2; +void EnFishing_InitRand(s32 seedInit1, s32 seedInit2, s32 seedInit3) { + sFishingRandSeed1 = seedInit1; + sFishingRandSeed2 = seedInit2; + sFishingRandSeed3 = seedInit3; } f32 EnFishing_RandZeroOne(void) { - f32 rand; - // Wichmann-Hill algorithm - sRandSeed0 = (sRandSeed0 * 171) % 30269; - sRandSeed1 = (sRandSeed1 * 172) % 30307; - sRandSeed2 = (sRandSeed2 * 170) % 30323; + f32 randFloat; - rand = (sRandSeed0 / 30269.0f) + (sRandSeed1 / 30307.0f) + (sRandSeed2 / 30323.0f); - while (rand >= 1.0f) { - rand -= 1.0f; + sFishingRandSeed1 = (sFishingRandSeed1 * 171) % 30269; + sFishingRandSeed2 = (sFishingRandSeed2 * 172) % 30307; + sFishingRandSeed3 = (sFishingRandSeed3 * 170) % 30323; + + randFloat = (sFishingRandSeed1 / 30269.0f) + (sFishingRandSeed2 / 30307.0f) + (sFishingRandSeed3 / 30323.0f); + while (randFloat >= 1.0f) { + randFloat -= 1.0f; } - return fabsf(rand); + return fabsf(randFloat); } s16 EnFishing_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step) { @@ -730,7 +730,7 @@ void EnFishing_InitPondProps(EnFishing* this, PlayState* play) { Vec3f colliderPos; s16 i; - EnFishing_SeedRand(1, 29100, 9786); + EnFishing_InitRand(1, 29100, 9786); for (i = 0; i < POND_PROP_COUNT; i++) { if (sPondPropInits[i].type == FS_PROP_INIT_STOP) { 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 bd706810d..351c01b19 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -61,15 +61,15 @@ 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), - (ActorFunc)EnFloormas_Init, - (ActorFunc)EnFloormas_Destroy, - (ActorFunc)EnFloormas_Update, - (ActorFunc)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 07e4d60b9..b2d149795 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,15 @@ 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), - (ActorFunc)EnFr_Init, - (ActorFunc)EnFr_Destroy, - (ActorFunc)EnFr_Update, - (ActorFunc)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 ec8c09b71..99d48772b 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -53,15 +53,15 @@ typedef enum { } EnFsnCutsceneState; ActorInit En_Fsn_InitVars = { - ACTOR_EN_FSN, - ACTORCAT_NPC, - FLAGS, - OBJECT_FSN, - sizeof(EnFsn), - (ActorFunc)EnFsn_Init, - (ActorFunc)EnFsn_Destroy, - (ActorFunc)EnFsn_Update, - (ActorFunc)EnFsn_Draw, + /**/ ACTOR_EN_FSN, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_FSN, + /**/ sizeof(EnFsn), + /**/ EnFsn_Init, + /**/ EnFsn_Destroy, + /**/ EnFsn_Update, + /**/ EnFsn_Draw, }; typedef enum { 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 6a68f283a..75b587533 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,15 @@ 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), - (ActorFunc)EnFu_Init, - (ActorFunc)EnFu_Destroy, - (ActorFunc)EnFu_Update, - (ActorFunc)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 8aa3909f7..088cde75e 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,15 @@ 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), - (ActorFunc)EnFuKago_Init, - (ActorFunc)EnFuKago_Destroy, - (ActorFunc)EnFuKago_Update, - (ActorFunc)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 c7066cf30..397b877da 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,15 @@ 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), - (ActorFunc)EnFuMato_Init, - (ActorFunc)EnFuMato_Destroy, - (ActorFunc)EnFuMato_Update, - (ActorFunc)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 0bf2f3544..0b4652496 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,15 @@ 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), - (ActorFunc)EnFz_Init, - (ActorFunc)EnFz_Destroy, - (ActorFunc)EnFz_Update, - (ActorFunc)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 481c155b4..1b5890e8e 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,15 @@ 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), - (ActorFunc)EnGakufu_Init, - (ActorFunc)EnGakufu_Destroy, - (ActorFunc)EnGakufu_Update, - (ActorFunc)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 97567e5f4..a251ef000 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,15 @@ void EnGamelupy_SetupIdle(EnGamelupy* this); void EnGamelupy_SetupCollected(EnGamelupy* this); ActorInit En_Gamelupy_InitVars = { - ACTOR_EN_GAMELUPY, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnGamelupy), - (ActorFunc)EnGamelupy_Init, - (ActorFunc)EnGamelupy_Destroy, - (ActorFunc)EnGamelupy_Update, - (ActorFunc)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 5e459fcbc..fa31aa428 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -36,15 +36,15 @@ 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), - (ActorFunc)EnGb2_Init, - (ActorFunc)EnGb2_Destroy, - (ActorFunc)EnGb2_Update, - (ActorFunc)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 c83305a8c..b653e3953 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,15 @@ 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), - (ActorFunc)EnGe1_Init, - (ActorFunc)EnGe1_Destroy, - (ActorFunc)EnGe1_Update, - (ActorFunc)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_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index eb9f21f55..78a79f14a 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -24,15 +24,15 @@ void EnGe2_GuardStationary(EnGe2* this, PlayState* play); s32 EnGe2_ValidatePictograph(PlayState* play, Actor* thisx); ActorInit En_Ge2_InitVars = { - ACTOR_EN_GE2, - ACTORCAT_NPC, - FLAGS, - OBJECT_GLA, - sizeof(EnGe2), - (ActorFunc)EnGe2_Init, - (ActorFunc)EnGe2_Destroy, - (ActorFunc)EnGe2_Update, - (ActorFunc)EnGe2_Draw, + /**/ ACTOR_EN_GE2, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_GLA, + /**/ sizeof(EnGe2), + /**/ EnGe2_Init, + /**/ EnGe2_Destroy, + /**/ EnGe2_Update, + /**/ EnGe2_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 71ac20e76..c9623136e 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -36,15 +36,15 @@ typedef enum GerudoAveilAnimation { } GerudoAveilAnimation; ActorInit En_Ge3_InitVars = { - ACTOR_EN_GE3, - ACTORCAT_NPC, - FLAGS, - OBJECT_GELDB, - sizeof(EnGe3), - (ActorFunc)EnGe3_Init, - (ActorFunc)EnGe3_Destroy, - (ActorFunc)EnGe3_Update, - (ActorFunc)EnGe3_Draw, + /**/ ACTOR_EN_GE3, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_GELDB, + /**/ sizeof(EnGe3), + /**/ EnGe3_Init, + /**/ EnGe3_Destroy, + /**/ EnGe3_Update, + /**/ EnGe3_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 ea78222e4..70cd58b84 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -37,15 +37,15 @@ 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), - (ActorFunc)EnGeg_Init, - (ActorFunc)EnGeg_Destroy, - (ActorFunc)EnGeg_Update, - (ActorFunc)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 5a0f0f3f2..9fcd4e7c2 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -26,15 +26,15 @@ 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), - (ActorFunc)EnGg_Init, - (ActorFunc)EnGg_Destroy, - (ActorFunc)EnGg_Update, - (ActorFunc)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 3b6d62775..c446cd2d2 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -27,15 +27,15 @@ 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), - (ActorFunc)EnGg2_Init, - (ActorFunc)EnGg2_Destroy, - (ActorFunc)EnGg2_Update, - (ActorFunc)EnGg2_Draw, + /**/ ACTOR_EN_GG2, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_GG, + /**/ sizeof(EnGg2), + /**/ EnGg2_Init, + /**/ EnGg2_Destroy, + /**/ EnGg2_Update, + /**/ EnGg2_Draw, }; typedef enum { 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 d68e6902f..fcfbe7eb4 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -51,15 +51,15 @@ typedef enum { } GiantCueId; ActorInit En_Giant_InitVars = { - ACTOR_EN_GIANT, - ACTORCAT_NPC, - FLAGS, - OBJECT_GIANT, - sizeof(EnGiant), - (ActorFunc)EnGiant_Init, - (ActorFunc)EnGiant_Destroy, - (ActorFunc)EnGiant_Update, - (ActorFunc)EnGiant_Draw, + /**/ ACTOR_EN_GIANT, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_GIANT, + /**/ sizeof(EnGiant), + /**/ EnGiant_Init, + /**/ EnGiant_Destroy, + /**/ EnGiant_Update, + /**/ EnGiant_Draw, }; /** 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 2a5e6712a..0c1a39519 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 @@ -30,15 +30,15 @@ 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), - (ActorFunc)EnGinkoMan_Init, - (ActorFunc)EnGinkoMan_Destroy, - (ActorFunc)EnGinkoMan_Update, - (ActorFunc)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 5481d8a70..89537787f 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,15 @@ 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), - (ActorFunc)EnGirlA_Init, - (ActorFunc)EnGirlA_Destroy, - (ActorFunc)EnGirlA_Update, - (ActorFunc)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 c631b24e3..31f9634b1 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -33,15 +33,15 @@ 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), - (ActorFunc)EnGk_Init, - (ActorFunc)EnGk_Destroy, - (ActorFunc)EnGk_Update, - (ActorFunc)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 2731a0d71..c18cdf08c 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -155,15 +155,15 @@ 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), - (ActorFunc)EnGm_Init, - (ActorFunc)EnGm_Destroy, - (ActorFunc)EnGm_Update, - (ActorFunc)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 b03909337..e2ee6d95a 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -191,15 +191,15 @@ static s32 sMsgScriptGoronAthleticHamstring[] = { 0x100060E, 0xE060C12, 0x100E0E static s32 sMsgScriptGoronSleeping[] = { 0xE023A0C, 0x12100000 }; ActorInit En_Go_InitVars = { - ACTOR_EN_GO, - ACTORCAT_NPC, - FLAGS, - OBJECT_OF1D_MAP, - sizeof(EnGo), - (ActorFunc)EnGo_Init, - (ActorFunc)EnGo_Destroy, - (ActorFunc)EnGo_Update, - (ActorFunc)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 aa6eb041f..cec8d03cc 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,15 @@ 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), - (ActorFunc)EnGoroiwa_Init, - (ActorFunc)EnGoroiwa_Destroy, - (ActorFunc)EnGoroiwa_Update, - (ActorFunc)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 90b39f860..38766afdc 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -211,15 +211,15 @@ static DamageTable sDamageTable = { }; ActorInit En_Grasshopper_InitVars = { - ACTOR_EN_GRASSHOPPER, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_GRASSHOPPER, - sizeof(EnGrasshopper), - (ActorFunc)EnGrasshopper_Init, - (ActorFunc)EnGrasshopper_Destroy, - (ActorFunc)EnGrasshopper_Update, - (ActorFunc)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 4c815dc1e..c8c3016c2 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -40,15 +40,15 @@ 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), - (ActorFunc)EnGs_Init, - (ActorFunc)EnGs_Destroy, - (ActorFunc)EnGs_Update, - (ActorFunc)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 92e3bf306..1355a4cf3 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,15 @@ 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), - (ActorFunc)EnGuardNuts_Init, - (ActorFunc)EnGuardNuts_Destroy, - (ActorFunc)EnGuardNuts_Update, - (ActorFunc)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 7c5a3319e..dec53e5f9 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -27,15 +27,15 @@ 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), - (ActorFunc)EnGuruguru_Init, - (ActorFunc)EnGuruguru_Destroy, - (ActorFunc)EnGuruguru_Update, - (ActorFunc)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 f5885b3cf..de1d719dd 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,15 @@ 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), - (ActorFunc)EnHakurock_Init, - (ActorFunc)EnHakurock_Destroy, - (ActorFunc)EnHakurock_Update, - (ActorFunc)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 85000e5cb..efa7f2e97 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,15 @@ 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), - (ActorFunc)EnHanabi_Init, - (ActorFunc)EnHanabi_Destroy, - (ActorFunc)EnHanabi_Update, - (ActorFunc)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 b22949cb0..5ca1e2013 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,15 @@ 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), - (ActorFunc)EnHata_Init, - (ActorFunc)EnHata_Destroy, - (ActorFunc)EnHata_Update, - (ActorFunc)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 650d4c69d..2cd56d796 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -21,15 +21,15 @@ void EnHeishi_SetupIdle(EnHeishi* this); void EnHeishi_Idle(EnHeishi* this, PlayState* play); ActorInit En_Heishi_InitVars = { - ACTOR_EN_HEISHI, - ACTORCAT_NPC, - FLAGS, - OBJECT_SDN, - sizeof(EnHeishi), - (ActorFunc)EnHeishi_Init, - (ActorFunc)EnHeishi_Destroy, - (ActorFunc)EnHeishi_Update, - (ActorFunc)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 648b63b6b..76315b650 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -37,15 +37,15 @@ typedef enum { } HgCsIndex; ActorInit En_Hg_InitVars = { - ACTOR_EN_HG, - ACTORCAT_PROP, - FLAGS, - OBJECT_HARFGIBUD, - sizeof(EnHg), - (ActorFunc)EnHg_Init, - (ActorFunc)EnHg_Destroy, - (ActorFunc)EnHg_Update, - (ActorFunc)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 c4d9c0371..952adeada 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -39,15 +39,15 @@ typedef enum { } EyeState; ActorInit En_Hgo_InitVars = { - ACTOR_EN_HGO, - ACTORCAT_NPC, - FLAGS, - OBJECT_HARFGIBUD, - sizeof(EnHgo), - (ActorFunc)EnHgo_Init, - (ActorFunc)EnHgo_Destroy, - (ActorFunc)EnHgo_Update, - (ActorFunc)EnHgo_Draw, + /**/ ACTOR_EN_HGO, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_HARFGIBUD, + /**/ sizeof(EnHgo), + /**/ EnHgo_Init, + /**/ EnHgo_Destroy, + /**/ EnHgo_Update, + /**/ EnHgo_Draw, }; typedef enum { 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 ef88474f8..c7c516d12 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 @@ -31,15 +31,15 @@ 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), - (ActorFunc)EnHiddenNuts_Init, - (ActorFunc)EnHiddenNuts_Destroy, - (ActorFunc)EnHiddenNuts_Update, - (ActorFunc)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 e62be0095..dca9f9294 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,15 @@ 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), - (ActorFunc)EnHintSkb_Init, - (ActorFunc)EnHintSkb_Destroy, - (ActorFunc)EnHintSkb_Update, - (ActorFunc)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 208708c58..5109ad9ed 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,15 @@ 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), - (ActorFunc)EnHitTag_Init, - (ActorFunc)EnHitTag_Destroy, - (ActorFunc)EnHitTag_Update, - (ActorFunc)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 d715e4c7d..1ba450a38 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,15 @@ 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), - (ActorFunc)EnHoll_Init, - (ActorFunc)EnHoll_Destroy, - (ActorFunc)EnHoll_Update, - (ActorFunc)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_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index d57fb078b..bcc83766a 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -32,15 +32,15 @@ void func_8092F878(EnHonotrap* this, PlayState* play); #if 0 ActorInit En_Honotrap_InitVars = { - ACTOR_EN_HONOTRAP, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(EnHonotrap), - (ActorFunc)EnHonotrap_Init, - (ActorFunc)EnHonotrap_Destroy, - (ActorFunc)EnHonotrap_Update, - (ActorFunc)EnHonotrap_Draw, + /**/ ACTOR_EN_HONOTRAP, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_DANGEON_KEEP, + /**/ sizeof(EnHonotrap), + /**/ EnHonotrap_Init, + /**/ EnHonotrap_Destroy, + /**/ EnHonotrap_Update, + /**/ EnHonotrap_Draw, }; // static ColliderTrisElementInit sTrisElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 59f085ec4..5c2a6a44d 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -162,15 +162,15 @@ static SkeletonHeader* sSkeletonHeaders[HORSE_TYPE_MAX] = { }; ActorInit En_Horse_InitVars = { - ACTOR_EN_HORSE, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnHorse), - (ActorFunc)EnHorse_Init, - (ActorFunc)EnHorse_Destroy, - (ActorFunc)EnHorse_Update, - (ActorFunc)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_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 7fbd43a54..16f361114 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -38,15 +38,15 @@ s32 func_808F99C4(EnHorseGameCheck* this, PlayState* play); s32 func_808F99D8(EnHorseGameCheck* this, PlayState* play); ActorInit En_Horse_Game_Check_InitVars = { - ACTOR_EN_HORSE_GAME_CHECK, - ACTORCAT_BG, - FLAGS, - OBJECT_HORSE_GAME_CHECK, - sizeof(EnHorseGameCheck), - (ActorFunc)EnHorseGameCheck_Init, - (ActorFunc)EnHorseGameCheck_Destroy, - (ActorFunc)EnHorseGameCheck_Update, - (ActorFunc)EnHorseGameCheck_Draw, + /**/ ACTOR_EN_HORSE_GAME_CHECK, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_HORSE_GAME_CHECK, + /**/ sizeof(EnHorseGameCheck), + /**/ EnHorseGameCheck_Init, + /**/ EnHorseGameCheck_Destroy, + /**/ EnHorseGameCheck_Update, + /**/ EnHorseGameCheck_Draw, }; #include "overlays/ovl_En_Horse_Game_Check/ovl_En_Horse_Game_Check.c" diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 78d6f8624..1c4461824 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -31,15 +31,15 @@ void EnHorseLinkChild_SetupActionFunc4(EnHorseLinkChild* this); void EnHorseLinkChild_ActionFunc4(EnHorseLinkChild* this, PlayState* play); ActorInit En_Horse_Link_Child_InitVars = { - ACTOR_EN_HORSE_LINK_CHILD, - ACTORCAT_BG, - FLAGS, - OBJECT_HORSE_LINK_CHILD, - sizeof(EnHorseLinkChild), - (ActorFunc)EnHorseLinkChild_Init, - (ActorFunc)EnHorseLinkChild_Destroy, - (ActorFunc)EnHorseLinkChild_Update, - (ActorFunc)EnHorseLinkChild_Draw, + /**/ ACTOR_EN_HORSE_LINK_CHILD, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_HORSE_LINK_CHILD, + /**/ sizeof(EnHorseLinkChild), + /**/ EnHorseLinkChild_Init, + /**/ EnHorseLinkChild_Destroy, + /**/ EnHorseLinkChild_Update, + /**/ EnHorseLinkChild_Draw, }; typedef enum { 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 983cf2bdf..c171ec958 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,15 @@ 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), - (ActorFunc)EnHs_Init, - (ActorFunc)EnHs_Destroy, - (ActorFunc)EnHs_Update, - (ActorFunc)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 07a6748af..ecf292358 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,15 @@ 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), - (ActorFunc)EnHs2_Init, - (ActorFunc)EnHs2_Destroy, - (ActorFunc)EnHs2_Update, - (ActorFunc)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 2186bd945..f7061a53b 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -89,15 +89,15 @@ static s32 D_80BF33F0[] = { }; ActorInit En_Ig_InitVars = { - ACTOR_EN_IG, - ACTORCAT_NPC, - FLAGS, - OBJECT_DAI, - sizeof(EnIg), - (ActorFunc)EnIg_Init, - (ActorFunc)EnIg_Destroy, - (ActorFunc)EnIg_Update, - (ActorFunc)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 7f3ed6de4..c40b18e68 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -76,15 +76,15 @@ static Gfx* sIronKnuckleArmorType[3][3] = { }; ActorInit En_Ik_InitVars = { - ACTOR_EN_IK, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_IK, - sizeof(EnIk), - (ActorFunc)EnIk_Init, - (ActorFunc)EnIk_Destroy, - (ActorFunc)EnIk_Update, - (ActorFunc)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 54b21b7ba..9a7961bfb 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,15 @@ 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), - (ActorFunc)EnIn_Init, - (ActorFunc)EnIn_Destroy, - (ActorFunc)EnIn_Update, - (ActorFunc)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 9d8667f0a..9d3c63d6a 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -32,15 +32,15 @@ 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), - (ActorFunc)EnInsect_Init, - (ActorFunc)EnInsect_Destroy, - (ActorFunc)EnInsect_Update, - (ActorFunc)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 e29a91b4b..018820502 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -8,19 +8,19 @@ void EnInvadepoh_Init(Actor* thisx, PlayState* play); void EnInvadepoh_Destroy(Actor* thisx, PlayState* play); void EnInvadepoh_Update(Actor* thisx, PlayState* play); -/* -const ActorInit En_Invadepoh_InitVars = { - ACTOR_EN_INVADEPOH, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnInvadepoh), - (ActorFunc)EnInvadepoh_Init, - (ActorFunc)EnInvadepoh_Destroy, - (ActorFunc)EnInvadepoh_Update, - (ActorFunc)NULL, +#if 0 +ActorInit En_Invadepoh_InitVars = { + /**/ ACTOR_EN_INVADEPOH, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnInvadepoh), + /**/ EnInvadepoh_Init, + /**/ EnInvadepoh_Destroy, + /**/ EnInvadepoh_Update, + /**/ NULL, }; -*/ +#endif #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Invadepoh/func_80B439B0.s") diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index 8efc69c14..87164778e 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -94,15 +94,15 @@ typedef enum { } EnInvadepohDemoUfoCueId; ActorInit En_Invadepoh_Demo_InitVars = { - ACTOR_EN_INVADEPOH_DEMO, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnInvadepohDemo), - (ActorFunc)EnInvadepohDemo_Init, - (ActorFunc)EnInvadepohDemo_Destroy, - (ActorFunc)EnInvadepohDemo_Update, - (ActorFunc)EnInvadepohDemo_Draw, + /**/ ACTOR_EN_INVADEPOH_DEMO, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnInvadepohDemo), + /**/ EnInvadepohDemo_Init, + /**/ EnInvadepohDemo_Destroy, + /**/ EnInvadepohDemo_Update, + /**/ EnInvadepohDemo_Draw, }; static s32 sCueTypes[EN_INVADEPOH_DEMO_TYPE_MAX] = { diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index a9cf2e351..ad00a5371 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -19,15 +19,15 @@ void func_80C2590C(EnInvisibleRuppe* this, PlayState* play); void func_80C259E8(EnInvisibleRuppe* this, PlayState* play); ActorInit En_Invisible_Ruppe_InitVars = { - ACTOR_EN_INVISIBLE_RUPPE, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnInvisibleRuppe), - (ActorFunc)EnInvisibleRuppe_Init, - (ActorFunc)EnInvisibleRuppe_Destroy, - (ActorFunc)EnInvisibleRuppe_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_INVISIBLE_RUPPE, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnInvisibleRuppe), + /**/ EnInvisibleRuppe_Init, + /**/ EnInvisibleRuppe_Destroy, + /**/ EnInvisibleRuppe_Update, + /**/ NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 44967e4bd..1f50942b3 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -46,15 +46,15 @@ static s16 D_8095F690 = 0; static s16 D_8095F694 = 0; ActorInit En_Ishi_InitVars = { - ACTOR_EN_ISHI, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnIshi), - (ActorFunc)EnIshi_Init, - (ActorFunc)EnIshi_Destroy, - (ActorFunc)EnIshi_Update, - (ActorFunc)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 6bf6b4434..dbe0b20fe 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -50,15 +50,15 @@ s32 D_80BC366C[] = { }; ActorInit En_Ja_InitVars = { - ACTOR_EN_JA, - ACTORCAT_NPC, - FLAGS, - OBJECT_BOJ, - sizeof(EnJa), - (ActorFunc)EnJa_Init, - (ActorFunc)EnJa_Destroy, - (ActorFunc)EnJa_Update, - (ActorFunc)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 c66c9a355..b055e9165 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,15 @@ 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), - (ActorFunc)EnJcMato_Init, - (ActorFunc)EnJcMato_Destroy, - (ActorFunc)EnJcMato_Update, - (ActorFunc)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 e3f657ece..79ca62afe 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -42,15 +42,15 @@ typedef enum { } EnJgAction; ActorInit En_Jg_InitVars = { - ACTOR_EN_JG, - ACTORCAT_NPC, - FLAGS, - OBJECT_JG, - sizeof(EnJg), - (ActorFunc)EnJg_Init, - (ActorFunc)EnJg_Destroy, - (ActorFunc)EnJg_Update, - (ActorFunc)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 aba7cdeeb..7973f3f8e 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,15 @@ 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), - (ActorFunc)EnJgameTsn_Init, - (ActorFunc)EnJgameTsn_Destroy, - (ActorFunc)EnJgameTsn_Update, - (ActorFunc)EnJgameTsn_Draw, + /**/ ACTOR_EN_JGAME_TSN, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_TSN, + /**/ sizeof(EnJgameTsn), + /**/ EnJgameTsn_Init, + /**/ EnJgameTsn_Destroy, + /**/ EnJgameTsn_Update, + /**/ EnJgameTsn_Draw, }; typedef enum EnJgameTsnAnimation { 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 7d5185935..e50e33e78 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,15 @@ 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), - (ActorFunc)EnJs_Init, - (ActorFunc)EnJs_Destroy, - (ActorFunc)EnJs_Update, - (ActorFunc)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_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index 1354a0a1c..18c342296 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -148,15 +148,15 @@ static DamageTable sDamageTable = { }; ActorInit En_Jso_InitVars = { - ACTOR_EN_JSO, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_JSO, - sizeof(EnJso), - (ActorFunc)EnJso_Init, - (ActorFunc)EnJso_Destroy, - (ActorFunc)EnJso_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_JSO, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_JSO, + /**/ sizeof(EnJso), + /**/ EnJso_Init, + /**/ EnJso_Destroy, + /**/ EnJso_Update, + /**/ NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index b9bdbe6b9..f4ff79480 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -74,15 +74,15 @@ static DamageTable D_80A7B4F0 = { }; ActorInit En_Jso2_InitVars = { - ACTOR_EN_JSO2, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_JSO, - sizeof(EnJso2), - (ActorFunc)EnJso2_Init, - (ActorFunc)EnJso2_Destroy, - (ActorFunc)EnJso2_Update, - (ActorFunc)EnJso2_Draw, + /**/ ACTOR_EN_JSO2, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_JSO, + /**/ sizeof(EnJso2), + /**/ EnJso2_Init, + /**/ EnJso2_Destroy, + /**/ EnJso2_Update, + /**/ EnJso2_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 b7310c1d3..6dff9c532 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -151,15 +151,15 @@ static DamageTable sDamageTable = { }; ActorInit En_Kaizoku_InitVars = { - ACTOR_EN_KAIZOKU, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_KZ, - sizeof(EnKaizoku), - (ActorFunc)EnKaizoku_Init, - (ActorFunc)EnKaizoku_Destroy, - (ActorFunc)EnKaizoku_Update, - (ActorFunc)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 8f4fe160b..2a0f05201 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,15 @@ static ColliderCylinderInit D_80971D80 = { }; ActorInit En_Kakasi_InitVars = { - ACTOR_EN_KAKASI, - ACTORCAT_NPC, - FLAGS, - OBJECT_KA, - sizeof(EnKakasi), - (ActorFunc)EnKakasi_Init, - (ActorFunc)EnKakasi_Destroy, - (ActorFunc)EnKakasi_Update, - (ActorFunc)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 8171e56b4..bf865545b 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -58,15 +58,15 @@ typedef enum { } EnKameEyeTexture; ActorInit En_Kame_InitVars = { - ACTOR_EN_KAME, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_TL, - sizeof(EnKame), - (ActorFunc)EnKame_Init, - (ActorFunc)EnKame_Destroy, - (ActorFunc)EnKame_Update, - (ActorFunc)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 cd34383be..2a12074aa 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,15 @@ 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), - (ActorFunc)EnKanban_Init, - (ActorFunc)EnKanban_Destroy, - (ActorFunc)EnKanban_Update, - (ActorFunc)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 903b1232b..ebfe9e7d1 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -40,15 +40,15 @@ void EnKarebaba_SetupDead(EnKarebaba* this); void EnKarebaba_Dead(EnKarebaba* this, PlayState* play); ActorInit En_Karebaba_InitVars = { - ACTOR_EN_KAREBABA, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DEKUBABA, - sizeof(EnKarebaba), - (ActorFunc)EnKarebaba_Init, - (ActorFunc)EnKarebaba_Destroy, - (ActorFunc)EnKarebaba_Update, - (ActorFunc)EnKarebaba_Draw, + /**/ ACTOR_EN_KAREBABA, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_DEKUBABA, + /**/ sizeof(EnKarebaba), + /**/ EnKarebaba_Init, + /**/ EnKarebaba_Destroy, + /**/ EnKarebaba_Update, + /**/ EnKarebaba_Draw, }; static ColliderCylinderInit sHurtCylinderInit = { 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 01e781ecb..a96612a2e 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -40,15 +40,15 @@ typedef enum EnKbtAnimation { } EnKbtAnimation; ActorInit En_Kbt_InitVars = { - ACTOR_EN_KBT, - ACTORCAT_NPC, - FLAGS, - OBJECT_KBT, - sizeof(EnKbt), - (ActorFunc)EnKbt_Init, - (ActorFunc)EnKbt_Destroy, - (ActorFunc)EnKbt_Update, - (ActorFunc)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 31d98abf0..76c3b0ec5 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,15 @@ 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), - (ActorFunc)EnKendoJs_Init, - (ActorFunc)EnKendoJs_Destroy, - (ActorFunc)EnKendoJs_Update, - (ActorFunc)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 5f180a285..659c641c7 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -46,15 +46,15 @@ typedef enum EnKgyAnimation { } EnKgyAnimation; ActorInit En_Kgy_InitVars = { - ACTOR_EN_KGY, - ACTORCAT_NPC, - FLAGS, - OBJECT_KGY, - sizeof(EnKgy), - (ActorFunc)EnKgy_Init, - (ActorFunc)EnKgy_Destroy, - (ActorFunc)EnKgy_Update, - (ActorFunc)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_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index d1edd3880..83635f6c2 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -16,15 +16,15 @@ void EnKitan_Update(Actor* thisx, PlayState* play); #if 0 ActorInit En_Kitan_InitVars = { - ACTOR_EN_KITAN, - ACTORCAT_NPC, - FLAGS, - OBJECT_KITAN, - sizeof(EnKitan), - (ActorFunc)EnKitan_Init, - (ActorFunc)EnKitan_Destroy, - (ActorFunc)EnKitan_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_KITAN, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_KITAN, + /**/ sizeof(EnKitan), + /**/ EnKitan_Init, + /**/ EnKitan_Destroy, + /**/ EnKitan_Update, + /**/ NULL, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index fd4bc7a5b..654a30928 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -194,15 +194,15 @@ static ColliderCylinderInit D_809BDC64 = { }; ActorInit En_Knight_InitVars = { - ACTOR_EN_KNIGHT, - ACTORCAT_BOSS, - FLAGS, - OBJECT_KNIGHT, - sizeof(EnKnight), - (ActorFunc)EnKnight_Init, - (ActorFunc)EnKnight_Destroy, - (ActorFunc)EnKnight_Update, - (ActorFunc)EnKnight_Draw, + /**/ ACTOR_EN_KNIGHT, + /**/ ACTORCAT_BOSS, + /**/ FLAGS, + /**/ OBJECT_KNIGHT, + /**/ sizeof(EnKnight), + /**/ EnKnight_Init, + /**/ EnKnight_Destroy, + /**/ EnKnight_Update, + /**/ EnKnight_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index 24fa855c5..7276c38fb 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,15 @@ 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), - (ActorFunc)EnKujiya_Init, - (ActorFunc)EnKujiya_Destroy, - (ActorFunc)EnKujiya_Update, - (ActorFunc)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 dafd131ee..c5c1422c2 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -59,15 +59,15 @@ s16 D_80936CDE; s16 D_80936CE0; ActorInit En_Kusa_InitVars = { - ACTOR_EN_KUSA, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnKusa), - (ActorFunc)EnKusa_Init, - (ActorFunc)EnKusa_Destroy, - (ActorFunc)EnKusa_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_KUSA, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnKusa), + /**/ EnKusa_Init, + /**/ EnKusa_Destroy, + /**/ EnKusa_Update, + /**/ NULL, }; static s16 sObjectIds[] = { 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 e471eb8f7..6c833867c 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -55,15 +55,15 @@ s16 D_80A60B0E; s16 D_80A60B10; ActorInit En_Kusa2_InitVars = { - ACTOR_EN_KUSA2, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(EnKusa2), - (ActorFunc)EnKusa2_Init, - (ActorFunc)EnKusa2_Destroy, - (ActorFunc)EnKusa2_Update, - (ActorFunc)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 b9044ea38..bc82301c5 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,15 @@ void EnLiftNuts_UpdateEyes(EnLiftNuts* this); void EnLiftNuts_SpawnDust(EnLiftNuts* this, PlayState* play); ActorInit En_Lift_Nuts_InitVars = { - ACTOR_EN_LIFT_NUTS, - ACTORCAT_NPC, - FLAGS, - OBJECT_DNT, - sizeof(EnLiftNuts), - (ActorFunc)EnLiftNuts_Init, - (ActorFunc)EnLiftNuts_Destroy, - (ActorFunc)EnLiftNuts_Update, - (ActorFunc)EnLiftNuts_Draw, + /**/ ACTOR_EN_LIFT_NUTS, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_DNT, + /**/ sizeof(EnLiftNuts), + /**/ EnLiftNuts_Init, + /**/ EnLiftNuts_Destroy, + /**/ EnLiftNuts_Update, + /**/ EnLiftNuts_Draw, }; typedef enum { 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 065a58cf5..b4d7ccdbd 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,15 @@ 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), - (ActorFunc)EnLight_Init, - (ActorFunc)EnLight_Destroy, - (ActorFunc)EnLight_Update, - (ActorFunc)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 30f705aa7..e06fff62b 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,15 @@ 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), - (ActorFunc)EnLookNuts_Init, - (ActorFunc)EnLookNuts_Destroy, - (ActorFunc)EnLookNuts_Update, - (ActorFunc)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 14a9c4add..267557fea 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,15 @@ 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), - (ActorFunc)EnMFire1_Init, - (ActorFunc)EnMFire1_Destroy, - (ActorFunc)EnMFire1_Update, - (ActorFunc)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 89b9fcfff..3140ad744 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,15 @@ 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), - (ActorFunc)EnMThunder_Init, - (ActorFunc)EnMThunder_Destroy, - (ActorFunc)EnMThunder_Update, - (ActorFunc)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 669621570..b14919a8e 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,15 @@ typedef enum { } EnMa4State; ActorInit En_Ma4_InitVars = { - ACTOR_EN_MA4, - ACTORCAT_NPC, - FLAGS, - OBJECT_MA1, - sizeof(EnMa4), - (ActorFunc)EnMa4_Init, - (ActorFunc)EnMa4_Destroy, - (ActorFunc)EnMa4_Update, - (ActorFunc)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 5e73bc43a..a37405713 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,15 @@ s32 EnMaYto_HasSpokenToPlayer(void); void EnMaYto_SetTalkedFlag(void); ActorInit En_Ma_Yto_InitVars = { - ACTOR_EN_MA_YTO, - ACTORCAT_NPC, - FLAGS, - OBJECT_MA2, - sizeof(EnMaYto), - (ActorFunc)EnMaYto_Init, - (ActorFunc)EnMaYto_Destroy, - (ActorFunc)EnMaYto_Update, - (ActorFunc)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 41a764f1c..d1e9c91f5 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,15 @@ 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), - (ActorFunc)EnMaYts_Init, - (ActorFunc)EnMaYts_Destroy, - (ActorFunc)EnMaYts_Update, - (ActorFunc)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 f9ad697ce..4b94b1994 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,15 @@ static s16 sTextAlphaTargetIndex = 0; static s16 sTextAlphaTimer = 20; ActorInit En_Mag_InitVars = { - ACTOR_EN_MAG, - ACTORCAT_PROP, - FLAGS, - OBJECT_MAG, - sizeof(EnMag), - (ActorFunc)EnMag_Init, - (ActorFunc)EnMag_Destroy, - (ActorFunc)EnMag_Update, - (ActorFunc)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 f19dbae14..c85ca35c2 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,15 @@ 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), - (ActorFunc)EnMaruta_Init, - (ActorFunc)EnMaruta_Destroy, - (ActorFunc)EnMaruta_Update, - (ActorFunc)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_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index f4e66b7b4..c8e0bdd42 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -30,15 +30,15 @@ void func_808CB7CC(EnMinideath* this, PlayState* play); #if 0 ActorInit En_Minideath_InitVars = { - ACTOR_EN_MINIDEATH, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DEATH, - sizeof(EnMinideath), - (ActorFunc)EnMinideath_Init, - (ActorFunc)EnMinideath_Destroy, - (ActorFunc)EnMinideath_Update, - (ActorFunc)NULL, + /**/ ACTOR_EN_MINIDEATH, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_DEATH, + /**/ sizeof(EnMinideath), + /**/ EnMinideath_Init, + /**/ EnMinideath_Destroy, + /**/ EnMinideath_Update, + /**/ NULL, }; // static ColliderJntSphElementInit sJntSphElementsInit[3] = { diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index ce3beaa2a..9ea492dbb 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -26,15 +26,15 @@ 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), - (ActorFunc)EnMinifrog_Init, - (ActorFunc)EnMinifrog_Destroy, - (ActorFunc)EnMinifrog_Update, - (ActorFunc)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 0f44becad..7684e85c8 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,15 @@ 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), - (ActorFunc)EnMinislime_Init, - (ActorFunc)EnMinislime_Destroy, - (ActorFunc)EnMinislime_Update, - (ActorFunc)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 0c9f545f1..d24396dc8 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,15 @@ 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), - (ActorFunc)EnMk_Init, - (ActorFunc)EnMk_Destroy, - (ActorFunc)EnMk_Update, - (ActorFunc)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 e83911b46..1eca74125 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,15 @@ 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), - (ActorFunc)EnMkk_Init, - (ActorFunc)EnMkk_Destroy, - (ActorFunc)EnMkk_Update, - (ActorFunc)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 a0a308ef9..e7d98d77a 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,15 @@ 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), - (ActorFunc)EnMm_Init, - (ActorFunc)EnMm_Destroy, - (ActorFunc)EnMm_Update, - (ActorFunc)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 64cc47ad8..4d956a954 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,15 @@ 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), - (ActorFunc)EnMm2_Init, - (ActorFunc)EnMm2_Destroy, - (ActorFunc)EnMm2_Update, - (ActorFunc)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 f544dd2d2..42790116e 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,15 @@ 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), - (ActorFunc)EnMm3_Init, - (ActorFunc)EnMm3_Destroy, - (ActorFunc)EnMm3_Update, - (ActorFunc)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_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index cc75d7503..3c4e9f3e5 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -42,16 +42,16 @@ void func_80AB92CC(EnMnk* this, PlayState* play); s32 EnMnk_ValidatePictograph(PlayState* play, Actor* thisx); s32 EnMnk_AlreadyExists(EnMnk* this, PlayState* play); -const ActorInit En_Mnk_InitVars = { - ACTOR_EN_MNK, - ACTORCAT_NPC, - FLAGS, - OBJECT_MNK, - sizeof(EnMnk), - (ActorFunc)EnMnk_Init, - (ActorFunc)EnMnk_Destroy, - (ActorFunc)EnMnk_Update, - (ActorFunc)EnMnk_Draw, +ActorInit En_Mnk_InitVars = { + /**/ ACTOR_EN_MNK, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_MNK, + /**/ sizeof(EnMnk), + /**/ EnMnk_Init, + /**/ EnMnk_Destroy, + /**/ EnMnk_Update, + /**/ EnMnk_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 d17a8b98c..6afcfc5b5 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,15 @@ 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), - (ActorFunc)EnMs_Init, - (ActorFunc)EnMs_Destroy, - (ActorFunc)EnMs_Update, - (ActorFunc)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 fbee0e80e..3175e736b 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,15 @@ typedef enum { } PlayerCheatStatus; ActorInit En_Mt_tag_InitVars = { - ACTOR_EN_MT_TAG, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnMttag), - (ActorFunc)EnMttag_Init, - (ActorFunc)EnMttag_Destroy, - (ActorFunc)EnMttag_Update, - (ActorFunc)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 5ee8a68e0..6aea97807 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,15 @@ 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), - (ActorFunc)EnMushi2_Init, - (ActorFunc)EnMushi2_Destroy, - (ActorFunc)EnMushi2_Update, - (ActorFunc)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 5ed82cbc2..37b3b7f51 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,15 @@ 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), - (ActorFunc)EnMuto_Init, - (ActorFunc)EnMuto_Destroy, - (ActorFunc)EnMuto_Update, - (ActorFunc)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 7ac6a3b58..e18cb88f8 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -108,15 +108,15 @@ u8 D_80BC15C8[] = { }; ActorInit En_Nb_InitVars = { - ACTOR_EN_NB, - ACTORCAT_NPC, - FLAGS, - OBJECT_NB, - sizeof(EnNb), - (ActorFunc)EnNb_Init, - (ActorFunc)EnNb_Destroy, - (ActorFunc)EnNb_Update, - (ActorFunc)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 a6301a495..56067b315 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,15 @@ 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), - (ActorFunc)EnNeoReeba_Init, - (ActorFunc)EnNeoReeba_Destroy, - (ActorFunc)EnNeoReeba_Update, - (ActorFunc)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 472196ae9..ef9f6dd84 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,15 @@ 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), - (ActorFunc)EnNimotsu_Init, - (ActorFunc)EnNimotsu_Destroy, - (ActorFunc)EnNimotsu_Update, - (ActorFunc)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 fa8771862..d5c4fa8ff 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,15 @@ typedef enum EnNiwState { } EnNiwState; ActorInit En_Niw_InitVars = { - ACTOR_EN_NIW, - ACTORCAT_PROP, - FLAGS, - OBJECT_NIW, - sizeof(EnNiw), - (ActorFunc)EnNiw_Init, - (ActorFunc)EnNiw_Destroy, - (ActorFunc)EnNiw_Update, - (ActorFunc)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 f5e35f478..5a7defaa3 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,15 @@ 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), - (ActorFunc)EnNnh_Init, - (ActorFunc)EnNnh_Destroy, - (ActorFunc)EnNnh_Update, - (ActorFunc)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 f8673c307..9bdd2859b 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,15 @@ 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), - (ActorFunc)EnNutsball_Init, - (ActorFunc)EnNutsball_Destroy, - (ActorFunc)EnNutsball_Update, - (ActorFunc)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 d151f6aff..4218fe5ed 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,15 @@ typedef enum EnNwcState { } EnNwcState; ActorInit En_Nwc_InitVars = { - ACTOR_EN_NWC, - ACTORCAT_PROP, - FLAGS, - OBJECT_NWC, - sizeof(EnNwc), - (ActorFunc)EnNwc_Init, - (ActorFunc)EnNwc_Destroy, - (ActorFunc)EnNwc_Update, - (ActorFunc)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 780e3b300..cef823a35 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,15 @@ 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), - (ActorFunc)EnOkarinaEffect_Init, - (ActorFunc)EnOkarinaEffect_Destroy, - (ActorFunc)EnOkarinaEffect_Update, - (ActorFunc)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 4b225880b..3d34c4069 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,15 @@ 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), - (ActorFunc)EnOkarinaTag_Init, - (ActorFunc)EnOkarinaTag_Destroy, - (ActorFunc)EnOkarinaTag_Update, - (ActorFunc)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_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 3263d9b71..8c8e3ce41 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -29,15 +29,15 @@ void func_8086F694(EnOkuta* this, PlayState* play); #if 0 ActorInit En_Okuta_InitVars = { - ACTOR_EN_OKUTA, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_OKUTA, - sizeof(EnOkuta), - (ActorFunc)EnOkuta_Init, - (ActorFunc)EnOkuta_Destroy, - (ActorFunc)EnOkuta_Update, - (ActorFunc)EnOkuta_Draw, + /**/ ACTOR_EN_OKUTA, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_OKUTA, + /**/ sizeof(EnOkuta), + /**/ EnOkuta_Init, + /**/ EnOkuta_Destroy, + /**/ EnOkuta_Update, + /**/ EnOkuta_Draw, }; // static ColliderCylinderInit sCylinderInit = { 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 eb6907c7c..3f739df64 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,15 @@ 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), - (ActorFunc)EnOnpuman_Init, - (ActorFunc)EnOnpuman_Destroy, - (ActorFunc)EnOnpuman_Update, - (ActorFunc)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 3a58ba62b..335e09dff 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,15 @@ 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), - (ActorFunc)EnOsk_Init, - (ActorFunc)EnOsk_Destroy, - (ActorFunc)EnOsk_Update, - (ActorFunc)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 29361e80f..f98695028 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,15 @@ typedef enum { } OsnAnimation; ActorInit En_Osn_InitVars = { - ACTOR_EN_OSN, - ACTORCAT_NPC, - FLAGS, - OBJECT_OSN, - sizeof(EnOsn), - (ActorFunc)EnOsn_Init, - (ActorFunc)EnOsn_Destroy, - (ActorFunc)EnOsn_Update, - (ActorFunc)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 bcdd2934e..ded860c33 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,15 @@ typedef enum { } AniAnimation; ActorInit En_Ossan_InitVars = { - ACTOR_EN_OSSAN, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnOssan), - (ActorFunc)EnOssan_Init, - (ActorFunc)EnOssan_Destroy, - (ActorFunc)EnOssan_Update, - (ActorFunc)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 fa7e72acc..63e652abd 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,15 @@ EnOt* D_80B5E884; EnOt* D_80B5E888; ActorInit En_Ot_InitVars = { - ACTOR_EN_OT, - ACTORCAT_NPC, - FLAGS, - OBJECT_OT, - sizeof(EnOt), - (ActorFunc)EnOt_Init, - (ActorFunc)EnOt_Destroy, - (ActorFunc)EnOt_Update, - (ActorFunc)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 4389ca237..3ab43d6d1 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -48,15 +48,15 @@ typedef enum { } EnOwlMessageChoice; ActorInit En_Owl_InitVars = { - ACTOR_EN_OWL, - ACTORCAT_NPC, - FLAGS, - OBJECT_OWL, - sizeof(EnOwl), - (ActorFunc)EnOwl_Init, - (ActorFunc)EnOwl_Destroy, - (ActorFunc)EnOwl_Update, - (ActorFunc)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 fc4dc720b..8c6585dd3 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,15 @@ 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), - (ActorFunc)EnPamera_Init, - (ActorFunc)EnPamera_Destroy, - (ActorFunc)EnPamera_Update, - (ActorFunc)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 f774b07bf..09ef040ae 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -69,15 +69,15 @@ 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), - (ActorFunc)EnPametfrog_Init, - (ActorFunc)EnPametfrog_Destroy, - (ActorFunc)EnPametfrog_Update, - (ActorFunc)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 b2b3b5669..e16077094 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -28,15 +28,15 @@ void EnPaper_InitConfettiPiece(EnPaper* this, EnPaperConfetto* piece); void EnPaper_FlyConfettiPiece(EnPaper* this, EnPaperConfetto* piece); ActorInit En_Paper_InitVars = { - ACTOR_EN_PAPER, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_BAL, - sizeof(EnPaper), - (ActorFunc)EnPaper_Init, - (ActorFunc)EnPaper_Destroy, - (ActorFunc)EnPaper_Update, - (ActorFunc)EnPaper_Draw, + /**/ ACTOR_EN_PAPER, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_BAL, + /**/ sizeof(EnPaper), + /**/ EnPaper_Init, + /**/ EnPaper_Destroy, + /**/ EnPaper_Update, + /**/ EnPaper_Draw, }; static Vec3f sUnitVecZ = { 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 e56970e10..14d0f823c 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,15 @@ 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), - (ActorFunc)EnPart_Init, - (ActorFunc)EnPart_Destroy, - (ActorFunc)EnPart_Update, - (ActorFunc)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 e2557b1c3..e50b4dc76 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -40,15 +40,15 @@ 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), - (ActorFunc)EnPeehat_Init, - (ActorFunc)EnPeehat_Destroy, - (ActorFunc)EnPeehat_Update, - (ActorFunc)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 49ff19809..143df78aa 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,15 @@ static UNK_TYPE D_80AFB764[] = { }; ActorInit En_Pm_InitVars = { - ACTOR_EN_PM, - ACTORCAT_NPC, - FLAGS, - OBJECT_MM, - sizeof(EnPm), - (ActorFunc)EnPm_Init, - (ActorFunc)EnPm_Destroy, - (ActorFunc)EnPm_Update, - (ActorFunc)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_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index 0772249ba..ed8606208 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -29,15 +29,15 @@ void func_80BC58E0(EnPoComposer* this, PlayState* play); #if 0 ActorInit En_Po_Composer_InitVars = { - ACTOR_EN_PO_COMPOSER, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_PO_COMPOSER, - sizeof(EnPoComposer), - (ActorFunc)EnPoComposer_Init, - (ActorFunc)EnPoComposer_Destroy, - (ActorFunc)EnPoComposer_Update, - (ActorFunc)EnPoComposer_Draw, + /**/ ACTOR_EN_PO_COMPOSER, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_PO_COMPOSER, + /**/ sizeof(EnPoComposer), + /**/ EnPoComposer_Init, + /**/ EnPoComposer_Destroy, + /**/ EnPoComposer_Update, + /**/ EnPoComposer_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 d5174f66a..39c41ff98 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,15 @@ 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), - (ActorFunc)EnPoFusen_Init, - (ActorFunc)EnPoFusen_Destroy, - (ActorFunc)EnPoFusen_Update, - (ActorFunc)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 bc0a3610c..3ea5514ea 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 @@ -64,15 +64,15 @@ static Color_RGBA8 sPoSisterEnvColors[] = { }; ActorInit En_Po_Sisters_InitVars = { - ACTOR_EN_PO_SISTERS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PO_SISTERS, - sizeof(EnPoSisters), - (ActorFunc)EnPoSisters_Init, - (ActorFunc)EnPoSisters_Destroy, - (ActorFunc)EnPoSisters_Update, - (ActorFunc)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 f0109b40a..0d27f0339 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -48,15 +48,15 @@ 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), - (ActorFunc)EnPoh_Init, - (ActorFunc)EnPoh_Destroy, - (ActorFunc)EnPoh_Update, - (ActorFunc)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 1c6774b1a..95389ccc5 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -117,15 +117,15 @@ static DamageTable sDamageTable = { }; ActorInit En_Pp_InitVars = { - ACTOR_EN_PP, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PP, - sizeof(EnPp), - (ActorFunc)EnPp_Init, - (ActorFunc)EnPp_Destroy, - (ActorFunc)EnPp_Update, - (ActorFunc)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 74efc10ca..e9934bf37 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -76,15 +76,15 @@ f32 D_80A338C0[PLAYER_FORM_MAX] = { }; ActorInit En_Pr_InitVars = { - ACTOR_EN_PR, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PR, - sizeof(EnPr), - (ActorFunc)EnPr_Init, - (ActorFunc)EnPr_Destroy, - (ActorFunc)EnPr_Update, - (ActorFunc)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 5ebdcd43f..6eed95020 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,15 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Pr2_InitVars = { - ACTOR_EN_PR2, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PR, - sizeof(EnPr2), - (ActorFunc)EnPr2_Init, - (ActorFunc)EnPr2_Destroy, - (ActorFunc)EnPr2_Update, - (ActorFunc)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 f314ebef0..f7fa2df27 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -89,15 +89,15 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Prz_InitVars = { - ACTOR_EN_PRZ, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_PR, - sizeof(EnPrz), - (ActorFunc)EnPrz_Init, - (ActorFunc)EnPrz_Destroy, - (ActorFunc)EnPrz_Update, - (ActorFunc)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 c3a7d9a78..3570922e8 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,15 @@ s32 D_80B2C488[] = { 0x2C27A40C, 0x10000000 }; s32 D_80B2C490[] = { 0x2C27850C, 0x10000000 }; ActorInit En_Pst_InitVars = { - ACTOR_EN_PST, - ACTORCAT_PROP, - FLAGS, - OBJECT_PST, - sizeof(EnPst), - (ActorFunc)EnPst_Init, - (ActorFunc)EnPst_Destroy, - (ActorFunc)EnPst_Update, - (ActorFunc)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 a1df0f8ad..2466fa751 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -71,15 +71,15 @@ typedef struct { } RaceDogInfo; // size = 0x10 ActorInit En_Racedog_InitVars = { - ACTOR_EN_RACEDOG, - ACTORCAT_NPC, - FLAGS, - OBJECT_DOG, - sizeof(EnRacedog), - (ActorFunc)EnRacedog_Init, - (ActorFunc)EnRacedog_Destroy, - (ActorFunc)EnRacedog_Update, - (ActorFunc)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 a7b7d9c13..1139e9a89 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -69,15 +69,15 @@ typedef enum { } EnRafPetalScaleType; ActorInit En_Raf_InitVars = { - ACTOR_EN_RAF, - ACTORCAT_PROP, - FLAGS, - OBJECT_RAF, - sizeof(EnRaf), - (ActorFunc)EnRaf_Init, - (ActorFunc)EnRaf_Destroy, - (ActorFunc)EnRaf_Update, - (ActorFunc)EnRaf_Draw, + /**/ ACTOR_EN_RAF, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_RAF, + /**/ sizeof(EnRaf), + /**/ EnRaf_Init, + /**/ EnRaf_Destroy, + /**/ EnRaf_Update, + /**/ EnRaf_Draw, }; static ColliderCylinderInit sCylinderInit = { @@ -319,7 +319,7 @@ void EnRaf_Idle(EnRaf* this, PlayState* play) { if (player->transformation == PLAYER_FORM_GORON) { this->grabTarget = EN_RAF_GRAB_TARGET_GORON_PLAYER; } else { - player->actionVar2 = 50; + player->av2.actionVar2 = 50; } this->playerRotYWhenGrabbed = player->actor.world.rot.y; @@ -455,7 +455,7 @@ void EnRaf_Chew(EnRaf* this, PlayState* play) { case EN_RAF_GRAB_TARGET_GORON_PLAYER: if (this->chewCount > (BREG(54) + 4)) { player->actor.parent = NULL; - player->actionVar2 = 1000; + player->av2.actionVar2 = 1000; EnRaf_Explode(this, play); } break; 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 fdda7ed14..ee88e3dc3 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 @@ -52,15 +52,15 @@ 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), - (ActorFunc)EnRailSkb_Init, - (ActorFunc)EnRailSkb_Destroy, - (ActorFunc)EnRailSkb_Update, - (ActorFunc)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 9aa218e2f..64e342885 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,15 @@ typedef enum { } EnRailgibudGrabState; ActorInit En_Railgibud_InitVars = { - ACTOR_EN_RAILGIBUD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RD, - sizeof(EnRailgibud), - (ActorFunc)EnRailgibud_Init, - (ActorFunc)EnRailgibud_Destroy, - (ActorFunc)EnRailgibud_Update, - (ActorFunc)EnRailgibud_Draw, + /**/ ACTOR_EN_RAILGIBUD, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_RD, + /**/ sizeof(EnRailgibud), + /**/ EnRailgibud_Init, + /**/ EnRailgibud_Destroy, + /**/ EnRailgibud_Update, + /**/ EnRailgibud_Draw, }; static AnimationInfo sAnimationInfo[] = { @@ -463,7 +463,7 @@ void EnRailgibud_Grab(EnRailgibud* this, PlayState* play) { if (!(player->stateFlags2 & PLAYER_STATE2_80) || (player->unk_B62 != 0)) { if ((player->unk_B62 != 0) && (player->stateFlags2 & PLAYER_STATE2_80)) { player->stateFlags2 &= ~PLAYER_STATE2_80; - player->actionVar2 = 100; + player->av2.actionVar2 = 100; } Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_RAILGIBUD_ANIM_GRAB_END); 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 1dea0c2ee..e5543ba2d 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,15 @@ typedef enum { } EnRatHookedState; ActorInit En_Rat_InitVars = { - ACTOR_EN_RAT, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RAT, - sizeof(EnRat), - (ActorFunc)EnRat_Init, - (ActorFunc)EnRat_Destroy, - (ActorFunc)EnRat_Update, - (ActorFunc)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 e1c41ab1b..b83dbf1f1 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,15 @@ typedef enum { } EnRdGrabState; ActorInit En_Rd_InitVars = { - ACTOR_EN_RD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RD, - sizeof(EnRd), - (ActorFunc)EnRd_Init, - (ActorFunc)EnRd_Destroy, - (ActorFunc)EnRd_Update, - (ActorFunc)EnRd_Draw, + /**/ ACTOR_EN_RD, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_RD, + /**/ sizeof(EnRd), + /**/ EnRd_Init, + /**/ EnRd_Destroy, + /**/ EnRd_Update, + /**/ EnRd_Draw, }; static ColliderCylinderInit sCylinderInit = { @@ -843,7 +843,7 @@ void EnRd_Grab(EnRd* this, PlayState* play) { if (!(player->stateFlags2 & PLAYER_STATE2_80) || (player->unk_B62 != 0)) { if ((player->unk_B62 != 0) && (player->stateFlags2 & PLAYER_STATE2_80)) { player->stateFlags2 &= ~PLAYER_STATE2_80; - player->actionVar2 = 100; + player->av2.actionVar2 = 100; } Animation_Change(&this->skelAnime, &gGibdoRedeadGrabEndAnim, 0.5f, 0.0f, Animation_GetLastFrame(&gGibdoRedeadGrabEndAnim), ANIMMODE_ONCE_INTERP, 0.0f); 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 b9ea1f142..7cb45630d 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,15 @@ 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), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)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 856070fba..f3d89deaf 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,15 @@ 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), - (ActorFunc)EnRg_Init, - (ActorFunc)EnRg_Destroy, - (ActorFunc)EnRg_Update, - (ActorFunc)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 cfb8f82ea..8ea65af8c 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,15 @@ 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), - (ActorFunc)EnRiverSound_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)EnRiverSound_Update, - (ActorFunc)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 24fc306cf..bd5beb388 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -30,15 +30,15 @@ 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), - (ActorFunc)EnRr_Init, - (ActorFunc)EnRr_Destroy, - (ActorFunc)EnRr_Update, - (ActorFunc)EnRr_Draw, + /**/ ACTOR_EN_RR, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_RR, + /**/ sizeof(EnRr), + /**/ EnRr_Init, + /**/ EnRr_Destroy, + /**/ EnRr_Update, + /**/ EnRr_Draw, }; static ColliderCylinderInit sCylinderInit1 = { @@ -299,7 +299,7 @@ void func_808FA4F4(EnRr* this, PlayState* play) { if (player->stateFlags2 & PLAYER_STATE2_80) { player->actor.parent = NULL; - player->actionVar2 = 100; + player->av2.actionVar2 = 100; this->actor.flags |= ACTOR_FLAG_TARGETABLE; this->unk_1F0 = 110; this->unk_1F6 = 2500; @@ -636,7 +636,7 @@ void func_808FB1C0(EnRr* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_EYEGOLE_DEMO_EYE); } - player->actionVar2 = 0; + player->av2.actionVar2 = 0; this->unk_1F0 = 8; this->unk_1EA--; @@ -654,7 +654,7 @@ void func_808FB2C0(EnRr* this, PlayState* play) { Player* player = GET_PLAYER(play); this->unk_1E6--; - player->actionVar2 = 0; + player->av2.actionVar2 = 0; Math_StepToF(&player->actor.world.pos.x, this->unk_228.x, 30.0f); Math_StepToF(&player->actor.world.pos.y, this->unk_228.y + this->unk_218, 30.0f); Math_StepToF(&player->actor.world.pos.z, this->unk_228.z, 30.0f); 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 b1632ecc8..9abc1deef 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,15 @@ 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), - (ActorFunc)EnRsn_Init, - (ActorFunc)EnRsn_Destroy, - (ActorFunc)EnRsn_Update, - (ActorFunc)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 66ee8f546..3152da152 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,15 @@ 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), - (ActorFunc)EnRu_Init, - (ActorFunc)EnRu_Destroy, - (ActorFunc)EnRu_Update, - (ActorFunc)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 27f95af01..320373003 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,15 @@ void EnRuppecrow_UpdateSpeed(EnRuppecrow*, PlayState*); void EnRuppecrow_FlyToDespawn(EnRuppecrow*, PlayState*); ActorInit En_Ruppecrow_InitVars = { - ACTOR_EN_RUPPECROW, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_CROW, - sizeof(EnRuppecrow), - (ActorFunc)EnRuppecrow_Init, - (ActorFunc)EnRuppecrow_Destroy, - (ActorFunc)EnRuppecrow_Update, - (ActorFunc)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 a1ed46868..537c3f527 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,15 @@ typedef enum { } EnRzPathStatus; ActorInit En_Rz_InitVars = { - ACTOR_EN_RZ, - ACTORCAT_NPC, - FLAGS, - OBJECT_RZ, - sizeof(EnRz), - (ActorFunc)EnRz_Init, - (ActorFunc)EnRz_Destroy, - (ActorFunc)EnRz_Update, - (ActorFunc)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 9c2aad8af..54876acee 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,15 @@ typedef enum EnSGoroAnimation { } EnSGoroAnimation; ActorInit En_S_Goro_InitVars = { - ACTOR_EN_S_GORO, - ACTORCAT_NPC, - FLAGS, - OBJECT_OF1D_MAP, - sizeof(EnSGoro), - (ActorFunc)EnSGoro_Init, - (ActorFunc)EnSGoro_Destroy, - (ActorFunc)EnSGoro_Update, - (ActorFunc)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 eaf5b88d3..179b91e38 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -27,15 +27,15 @@ 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), - (ActorFunc)EnSb_Init, - (ActorFunc)EnSb_Destroy, - (ActorFunc)EnSb_Update, - (ActorFunc)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 5a3dc440a..62e04e5ab 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,15 @@ typedef struct { } RuppeInfo; // size = 0x8 ActorInit En_Sc_Ruppe_InitVars = { - ACTOR_EN_SC_RUPPE, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnScRuppe), - (ActorFunc)EnScRuppe_Init, - (ActorFunc)EnScRuppe_Destroy, - (ActorFunc)EnScRuppe_Update, - (ActorFunc)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 4ef4fdd46..4f9220ec2 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,15 @@ 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), - (ActorFunc)EnScopecoin_Init, - (ActorFunc)EnScopecoin_Destroy, - (ActorFunc)EnScopecoin_Update, - (ActorFunc)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 448683376..a49c08b77 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,15 @@ 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), - (ActorFunc)EnScopecrow_Init, - (ActorFunc)EnScopecrow_Destroy, - (ActorFunc)EnScopecrow_Update, - (ActorFunc)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 80fbff4b1..23203552a 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,15 @@ 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), - (ActorFunc)EnScopenuts_Init, - (ActorFunc)EnScopenuts_Destroy, - (ActorFunc)EnScopenuts_Update, - (ActorFunc)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 9334d2d29..56a6e2c32 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,15 @@ 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), - (ActorFunc)EnSda_Init, - (ActorFunc)EnSda_Destroy, - (ActorFunc)EnSda_Update, - (ActorFunc)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 0b22f3d9c..099bc07c2 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,15 @@ 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), - (ActorFunc)EnSekihi_Init, - (ActorFunc)EnSekihi_Destroy, - (ActorFunc)EnSekihi_Update, - (ActorFunc)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 6661796e6..4f55a9593 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,15 @@ 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), - (ActorFunc)EnSellnuts_Init, - (ActorFunc)EnSellnuts_Destroy, - (ActorFunc)EnSellnuts_Update, - (ActorFunc)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 1bdc7026a..db44bd738 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,15 @@ 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), - (ActorFunc)EnShn_Init, - (ActorFunc)EnShn_Destroy, - (ActorFunc)EnShn_Update, - (ActorFunc)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_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index b75de6359..a917c30b0 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -18,15 +18,15 @@ void EnSi_Draw(Actor* thisx, PlayState* play); void EnSi_DraggedByHookshot(EnSi* this, PlayState* play); ActorInit En_Si_InitVars = { - ACTOR_EN_SI, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_ST, - sizeof(EnSi), - (ActorFunc)EnSi_Init, - (ActorFunc)EnSi_Destroy, - (ActorFunc)EnSi_Update, - (ActorFunc)EnSi_Draw, + /**/ ACTOR_EN_SI, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_ST, + /**/ sizeof(EnSi), + /**/ EnSi_Init, + /**/ EnSi_Destroy, + /**/ EnSi_Update, + /**/ EnSi_Draw, }; static ColliderSphereInit sSphereInit = { 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 e2f40f35c..7e956c2f9 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -147,15 +147,15 @@ static DamageTable sDamageTable = { }; ActorInit En_Skb_InitVars = { - ACTOR_EN_SKB, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SKB, - sizeof(EnSkb), - (ActorFunc)EnSkb_Init, - (ActorFunc)EnSkb_Destroy, - (ActorFunc)EnSkb_Update, - (ActorFunc)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_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 79dfe2ced..79af2640e 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -66,16 +66,16 @@ void EnSlime_WaitForRevive(EnSlime* this, PlayState* play); void EnSlime_SetupRevive(EnSlime* this); void EnSlime_Revive(EnSlime* this, PlayState* play); -const ActorInit En_Slime_InitVars = { - ACTOR_EN_SLIME, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SLIME, - sizeof(EnSlime), - (ActorFunc)EnSlime_Init, - (ActorFunc)EnSlime_Destroy, - (ActorFunc)EnSlime_Update, - (ActorFunc)EnSlime_Draw, +ActorInit En_Slime_InitVars = { + /**/ ACTOR_EN_SLIME, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_SLIME, + /**/ sizeof(EnSlime), + /**/ EnSlime_Init, + /**/ EnSlime_Destroy, + /**/ EnSlime_Update, + /**/ EnSlime_Draw, }; static ColliderCylinderInit sCylinderInit = { 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 f1be3d5f4..6cd481a6e 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -63,15 +63,15 @@ typedef enum { } EnSnowmanCombineState; ActorInit En_Snowman_InitVars = { - ACTOR_EN_SNOWMAN, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SNOWMAN, - sizeof(EnSnowman), - (ActorFunc)EnSnowman_Init, - (ActorFunc)EnSnowman_Destroy, - (ActorFunc)EnSnowman_Update, - (ActorFunc)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_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index b99673197..c82fdd77b 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -19,15 +19,15 @@ void EnSnowwd_Draw(Actor* thisx, PlayState* play); void EnSnowwd_Idle(EnSnowwd* this, PlayState* play); ActorInit En_Snowwd_InitVars = { - ACTOR_EN_SNOWWD, - ACTORCAT_PROP, - FLAGS, - OBJECT_SNOWWD, - sizeof(EnSnowwd), - (ActorFunc)EnSnowwd_Init, - (ActorFunc)EnSnowwd_Destroy, - (ActorFunc)EnSnowwd_Update, - (ActorFunc)EnSnowwd_Draw, + /**/ ACTOR_EN_SNOWWD, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_SNOWWD, + /**/ sizeof(EnSnowwd), + /**/ EnSnowwd_Init, + /**/ EnSnowwd_Destroy, + /**/ EnSnowwd_Update, + /**/ EnSnowwd_Draw, }; static ColliderCylinderInit sCylinderInit = { 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 5c7f95a95..42a2b3663 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,15 @@ static AnimationInfoS sAnimationInfoBombShopkeeper[] = { }; ActorInit En_Sob1_InitVars = { - ACTOR_EN_OSSAN, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnSob1), - (ActorFunc)EnSob1_Init, - (ActorFunc)EnSob1_Destroy, - (ActorFunc)EnSob1_Update, - (ActorFunc)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 a4cec2e80..3d7a0d605 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -27,15 +27,15 @@ 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), - (ActorFunc)EnSsh_Init, - (ActorFunc)EnSsh_Destroy, - (ActorFunc)EnSsh_Update, - (ActorFunc)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 10f7c457c..3c8bfd054 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -27,15 +27,15 @@ 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), - (ActorFunc)EnSt_Init, - (ActorFunc)EnSt_Destroy, - (ActorFunc)EnSt_Update, - (ActorFunc)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 c80aaed0b..a656b1232 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,15 @@ void EnSth_Update(Actor* thisx, PlayState* play); void EnSth_Draw(Actor* thisx, PlayState* play); ActorInit En_Sth_InitVars = { - ACTOR_EN_STH, - ACTORCAT_NPC, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnSth), - (ActorFunc)EnSth_Init, - (ActorFunc)EnSth_Destroy, - (ActorFunc)EnSth_UpdateWaitForObject, - (ActorFunc)NULL, + /**/ ACTOR_EN_STH, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnSth), + /**/ EnSth_Init, + /**/ EnSth_Destroy, + /**/ EnSth_UpdateWaitForObject, + /**/ 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 e45dd1394..fb7e31670 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,15 @@ 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), - (ActorFunc)EnSth2_Init, - (ActorFunc)EnSth2_Destroy, - (ActorFunc)EnSth2_Update, - (ActorFunc)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_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index 581962d60..34d542703 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -28,15 +28,15 @@ void EnStoneheishi_GiveItemReward(EnStoneheishi* this, PlayState* play); void EnStoneheishi_SetupDrinkBottleProcess(EnStoneheishi* this); ActorInit En_Stone_heishi_InitVars = { - ACTOR_EN_STONE_HEISHI, - ACTORCAT_NPC, - FLAGS, - OBJECT_SDN, - sizeof(EnStoneheishi), - (ActorFunc)EnStoneheishi_Init, - (ActorFunc)EnStoneheishi_Destroy, - (ActorFunc)EnStoneheishi_Update, - (ActorFunc)EnStoneheishi_Draw, + /**/ ACTOR_EN_STONE_HEISHI, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_SDN, + /**/ sizeof(EnStoneheishi), + /**/ EnStoneheishi_Init, + /**/ EnStoneheishi_Destroy, + /**/ EnStoneheishi_Update, + /**/ EnStoneheishi_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 99c5441a6..f31e7bf70 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -35,15 +35,15 @@ typedef enum { } SoldierAnimation; ActorInit En_Stop_heishi_InitVars = { - ACTOR_EN_STOP_HEISHI, - ACTORCAT_NPC, - FLAGS, - OBJECT_SDN, - sizeof(EnStopheishi), - (ActorFunc)EnStopheishi_Init, - (ActorFunc)EnStopheishi_Destroy, - (ActorFunc)EnStopheishi_Update, - (ActorFunc)EnStopheishi_Draw, + /**/ ACTOR_EN_STOP_HEISHI, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_SDN, + /**/ sizeof(EnStopheishi), + /**/ EnStopheishi_Init, + /**/ EnStopheishi_Destroy, + /**/ EnStopheishi_Update, + /**/ EnStopheishi_Draw, }; static ColliderCylinderInit sCylinderInit = { 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 a5cb80095..8e1f9fe88 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,15 @@ 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), - (ActorFunc)EnStream_Init, - (ActorFunc)EnStream_Destroy, - (ActorFunc)EnStream_Update, - (ActorFunc)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 6e1e3bdb5..7a8f82f84 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,15 @@ 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), - (ActorFunc)EnSuttari_Init, - (ActorFunc)EnSuttari_Destroy, - (ActorFunc)EnSuttari_Update, - (ActorFunc)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 8cab11988..6599ec001 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -30,15 +30,15 @@ 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), - (ActorFunc)EnSw_Init, - (ActorFunc)EnSw_Destroy, - (ActorFunc)EnSw_Update, - (ActorFunc)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 7e5cebb1c..fa68d1072 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,15 @@ 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), - (ActorFunc)EnSyatekiCrow_Init, - (ActorFunc)EnSyatekiCrow_Destroy, - (ActorFunc)EnSyatekiCrow_Update, - (ActorFunc)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_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index c4d366718..6582d8b62 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -40,15 +40,15 @@ typedef enum { } ShootingGalleryDekuScrubHeaddressType; ActorInit En_Syateki_Dekunuts_InitVars = { - ACTOR_EN_SYATEKI_DEKUNUTS, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_DEKUNUTS, - sizeof(EnSyatekiDekunuts), - (ActorFunc)EnSyatekiDekunuts_Init, - (ActorFunc)EnSyatekiDekunuts_Destroy, - (ActorFunc)EnSyatekiDekunuts_Update, - (ActorFunc)EnSyatekiDekunuts_Draw, + /**/ ACTOR_EN_SYATEKI_DEKUNUTS, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_DEKUNUTS, + /**/ sizeof(EnSyatekiDekunuts), + /**/ EnSyatekiDekunuts_Init, + /**/ EnSyatekiDekunuts_Destroy, + /**/ EnSyatekiDekunuts_Update, + /**/ EnSyatekiDekunuts_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 28eeafc09..c501e30b3 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 @@ -87,15 +87,15 @@ void EnSyatekiMan_Town_EndGame(EnSyatekiMan* this, PlayState* play); #define SG_SWAMP_HEART_PIECE_SCORE (SG_SWAMP_PERFECT_SCORE_WITHOUT_BONUS + (6 * SG_BONUS_POINTS_PER_SECOND)) ActorInit En_Syateki_Man_InitVars = { - ACTOR_EN_SYATEKI_MAN, - ACTORCAT_NPC, - FLAGS, - OBJECT_SHN, - sizeof(EnSyatekiMan), - (ActorFunc)EnSyatekiMan_Init, - (ActorFunc)EnSyatekiMan_Destroy, - (ActorFunc)EnSyatekiMan_Update, - (ActorFunc)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 114a5fe22..fa9d864f0 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,15 @@ void EnSyatekiOkuta_Die(EnSyatekiOkuta* this, PlayState* play); void EnSyatekiOkuta_UpdateHeadScale(EnSyatekiOkuta* this); ActorInit En_Syateki_Okuta_InitVars = { - ACTOR_EN_SYATEKI_OKUTA, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_OKUTA, - sizeof(EnSyatekiOkuta), - (ActorFunc)EnSyatekiOkuta_Init, - (ActorFunc)EnSyatekiOkuta_Destroy, - (ActorFunc)EnSyatekiOkuta_Update, - (ActorFunc)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 7f1f3cd4a..f7d93376a 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,15 @@ static Vec3f sVelocity = { 0.0f, 20.0f, 0.0f }; static Vec3f sAccel = { 0.0f, 0.0f, 0.0f }; ActorInit En_Syateki_Wf_InitVars = { - ACTOR_EN_SYATEKI_WF, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WF, - sizeof(EnSyatekiWf), - (ActorFunc)EnSyatekiWf_Init, - (ActorFunc)EnSyatekiWf_Destroy, - (ActorFunc)EnSyatekiWf_Update, - (ActorFunc)EnSyatekiWf_Draw, + /**/ ACTOR_EN_SYATEKI_WF, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_WF, + /**/ sizeof(EnSyatekiWf), + /**/ EnSyatekiWf_Init, + /**/ EnSyatekiWf_Destroy, + /**/ EnSyatekiWf_Update, + /**/ EnSyatekiWf_Draw, }; typedef enum { 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 364d8874b..e48c574b8 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,15 @@ s32 D_80BE1A0C[] = { }; ActorInit En_Tab_InitVars = { - ACTOR_EN_TAB, - ACTORCAT_NPC, - FLAGS, - OBJECT_TAB, - sizeof(EnTab), - (ActorFunc)EnTab_Init, - (ActorFunc)EnTab_Destroy, - (ActorFunc)EnTab_Update, - (ActorFunc)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 9a4b0f2d7..d0066845f 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 @@ -36,15 +36,15 @@ static ColliderCylinderInit sUnusedColliderInit = { }; ActorInit En_Tag_Obj_InitVars = { - ACTOR_EN_TAG_OBJ, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTagObj), - (ActorFunc)EnTagObj_Init, - (ActorFunc)EnTagObj_Destroy, - (ActorFunc)EnTagObj_Update, - (ActorFunc)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_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index 04eda15cb..0c3b2e7cb 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -35,15 +35,15 @@ s32 EnTakaraya_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec void EnTakaraya_TransformLimbDraw(PlayState* play, s32 limbIndex, Actor* thisx); ActorInit En_Takaraya_InitVars = { - ACTOR_EN_TAKARAYA, - ACTORCAT_NPC, - FLAGS, - OBJECT_BG, - sizeof(EnTakaraya), - (ActorFunc)EnTakaraya_Init, - (ActorFunc)EnTakaraya_Destroy, - (ActorFunc)EnTakaraya_Update, - (ActorFunc)EnTakaraya_Draw, + /**/ ACTOR_EN_TAKARAYA, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_BG, + /**/ sizeof(EnTakaraya), + /**/ EnTakaraya_Init, + /**/ EnTakaraya_Destroy, + /**/ EnTakaraya_Update, + /**/ EnTakaraya_Draw, }; TexturePtr sEyesUpTextures[] = { 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 832a1313e..c76ba320c 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,15 @@ 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), - (ActorFunc)EnTalk_Init, - (ActorFunc)EnTalk_Destroy, - (ActorFunc)EnTalk_Update, - (ActorFunc)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 667f5d8c4..2bfa81c84 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,15 @@ typedef enum { } EnTalkGibudGrabState; ActorInit En_Talk_Gibud_InitVars = { - ACTOR_EN_TALK_GIBUD, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_RD, - sizeof(EnTalkGibud), - (ActorFunc)EnTalkGibud_Init, - (ActorFunc)EnTalkGibud_Destroy, - (ActorFunc)EnTalkGibud_Update, - (ActorFunc)EnTalkGibud_Draw, + /**/ ACTOR_EN_TALK_GIBUD, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_RD, + /**/ sizeof(EnTalkGibud), + /**/ EnTalkGibud_Init, + /**/ EnTalkGibud_Destroy, + /**/ EnTalkGibud_Update, + /**/ EnTalkGibud_Draw, }; static AnimationInfo sAnimationInfo[] = { @@ -421,7 +421,7 @@ void EnTalkGibud_Grab(EnTalkGibud* this, PlayState* play) { if (!(player->stateFlags2 & PLAYER_STATE2_80) || (player->unk_B62 != 0)) { if ((player->unk_B62 != 0) && (player->stateFlags2 & PLAYER_STATE2_80)) { player->stateFlags2 &= ~PLAYER_STATE2_80; - player->actionVar2 = 100; + player->av2.actionVar2 = 100; } Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, EN_TALK_GIBUD_ANIM_GRAB_END); 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 876b433d4..d812b9a04 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,15 @@ 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), - (ActorFunc)EnTanron1_Init, - (ActorFunc)EnTanron1_Destroy, - (ActorFunc)EnTanron1_Update, - (ActorFunc)EnTanron1_Draw, + /**/ ACTOR_EN_TANRON1, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnTanron1), + /**/ EnTanron1_Init, + /**/ EnTanron1_Destroy, + /**/ EnTanron1_Update, + /**/ EnTanron1_Draw, }; static s32 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 a539e82f5..c667753e6 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,15 @@ f32 D_80BB8454; EnTanron2* D_80BB8458[82]; ActorInit En_Tanron2_InitVars = { - ACTOR_EN_TANRON2, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS04, - sizeof(EnTanron2), - (ActorFunc)EnTanron2_Init, - (ActorFunc)EnTanron2_Destroy, - (ActorFunc)EnTanron2_Update, - (ActorFunc)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 2c7a9fd55..f207a6352 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,15 @@ 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), - (ActorFunc)EnTanron3_Init, - (ActorFunc)EnTanron3_Destroy, - (ActorFunc)EnTanron3_Update, - (ActorFunc)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 ab190b38c..c2e952176 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,15 @@ typedef enum { } SeagullTimer; ActorInit En_Tanron4_InitVars = { - ACTOR_EN_TANRON4, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_TANRON4, - sizeof(EnTanron4), - (ActorFunc)EnTanron4_Init, - (ActorFunc)EnTanron4_Destroy, - (ActorFunc)EnTanron4_Update, - (ActorFunc)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 3f8442dad..f1ab9dc49 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -45,15 +45,15 @@ typedef enum { s32 sFragmentAndItemDropCount = 0; ActorInit En_Tanron5_InitVars = { - ACTOR_EN_TANRON5, - ACTORCAT_BOSS, - FLAGS, - OBJECT_BOSS02, - sizeof(EnTanron5), - (ActorFunc)EnTanron5_Init, - (ActorFunc)EnTanron5_Destroy, - (ActorFunc)EnTanron5_Update, - (ActorFunc)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 8ed4c36f3..553062218 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,15 @@ 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), - (ActorFunc)EnTanron6_Init, - (ActorFunc)EnTanron6_Destroy, - (ActorFunc)EnTanron6_Update, - (ActorFunc)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 1372d8791..12aba1abb 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,15 @@ 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), - (ActorFunc)EnTest_Init, - (ActorFunc)EnTest_Destroy, - (ActorFunc)EnTest_Update, - (ActorFunc)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 7a9e45bc2..649c6022f 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,15 @@ typedef struct EnTest2ModelInfo { } EnTest2ModelInfo; // size = 0xC ActorInit En_Test2_InitVars = { - ACTOR_EN_TEST2, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest2), - (ActorFunc)EnTest2_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)EnTest2_Update, - (ActorFunc)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 1ee840b11..89ba11090 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,15 @@ static u8 sScheduleScript[] = { }; ActorInit En_Test3_InitVars = { - ACTOR_EN_TEST3, - ACTORCAT_NPC, - FLAGS, - OBJECT_TEST3, - sizeof(EnTest3), - (ActorFunc)EnTest3_Init, - (ActorFunc)EnTest3_Destroy, - (ActorFunc)EnTest3_Update, - (ActorFunc)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 8816ceb64..75eed7148 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,15 @@ 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), - (ActorFunc)EnTest4_Init, - (ActorFunc)EnTest4_Destroy, - (ActorFunc)EnTest4_Update, - (ActorFunc)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 f7a9b431b..f07270824 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,15 @@ 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), - (ActorFunc)EnTest5_Init, - (ActorFunc)EnTest5_Destroy, - (ActorFunc)EnTest5_Update, - (ActorFunc)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 52a0153c7..5d99b99d4 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -52,15 +52,15 @@ void EnTest6_SharedSoTCutscene(EnTest6* this, PlayState* play); SoTCsAmmoDrops sSoTCsAmmoDrops[12]; ActorInit En_Test6_InitVars = { - ACTOR_EN_TEST6, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTest6), - (ActorFunc)EnTest6_Init, - (ActorFunc)EnTest6_Destroy, - (ActorFunc)EnTest6_Update, - (ActorFunc)EnTest6_Draw, + /**/ ACTOR_EN_TEST6, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnTest6), + /**/ EnTest6_Init, + /**/ EnTest6_Destroy, + /**/ EnTest6_Update, + /**/ EnTest6_Draw, }; CutsceneData sDoubleSoTCsCamData[] = { 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 417176d96..59de7be65 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -36,15 +36,15 @@ 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), - (ActorFunc)EnTest7_Init, - (ActorFunc)EnTest7_Destroy, - (ActorFunc)EnTest7_Update, - (ActorFunc)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 efdc48713..f0d003302 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,15 @@ 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), - (ActorFunc)EnTg_Init, - (ActorFunc)EnTg_Destroy, - (ActorFunc)EnTg_Update, - (ActorFunc)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 3671693c7..48272b8d9 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -36,15 +36,15 @@ 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), - (ActorFunc)EnThiefbird_Init, - (ActorFunc)EnThiefbird_Destroy, - (ActorFunc)EnThiefbird_Update, - (ActorFunc)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 7d277a61f..81527654f 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 @@ -38,15 +38,15 @@ void EnTimeTag_KickOut_WaitForTrigger(EnTimeTag* this, PlayState* play); void EnTimeTag_KickOut_WaitForTime(EnTimeTag* this, PlayState* play); ActorInit En_Time_Tag_InitVars = { - ACTOR_EN_TIME_TAG, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTimeTag), - (ActorFunc)EnTimeTag_Init, - (ActorFunc)EnTimeTag_Destroy, - (ActorFunc)EnTimeTag_Update, - (ActorFunc)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 bf861c2da..8048c3d52 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -48,15 +48,15 @@ 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), - (ActorFunc)EnTite_Init, - (ActorFunc)EnTite_Destroy, - (ActorFunc)EnTite_Update, - (ActorFunc)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 d57dfe9df..d6e7d4667 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,15 @@ static u8 D_80AEF800[] = { }; ActorInit En_Tk_InitVars = { - ACTOR_EN_TK, - ACTORCAT_NPC, - FLAGS, - OBJECT_TK, - sizeof(EnTk), - (ActorFunc)EnTk_Init, - (ActorFunc)EnTk_Destroy, - (ActorFunc)EnTk_Update, - (ActorFunc)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 00335577b..304e822b7 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,15 @@ void EnTorch_Init(Actor* thisx, PlayState* play); ActorInit En_Torch_InitVars = { - ACTOR_EN_TORCH, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch), - (ActorFunc)EnTorch_Init, (ActorFunc)NULL, (ActorFunc)NULL, (ActorFunc)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 204fa8714..7980c8094 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,15 @@ 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), - (ActorFunc)EnTorch2_Init, - (ActorFunc)EnTorch2_Destroy, - (ActorFunc)EnTorch2_Update, - (ActorFunc)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 75d880cd8..672c79857 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,15 @@ 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), - (ActorFunc)EnToto_Init, - (ActorFunc)EnToto_Destroy, - (ActorFunc)EnToto_Update, - (ActorFunc)EnToto_Draw, + /**/ ACTOR_EN_TOTO, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_ZM, + /**/ sizeof(EnToto), + /**/ EnToto_Init, + /**/ EnToto_Destroy, + /**/ EnToto_Update, + /**/ EnToto_Draw, }; static ColliderCylinderInit sCylinderInit = { @@ -337,7 +337,7 @@ void func_80BA3DBC(EnToto* this, PlayState* play) { } } else { player = GET_PLAYER(play); - if ((player->stateFlags1 & PLAYER_STATE1_400) && (player->actionVar1 != 0)) { + if ((player->stateFlags1 & PLAYER_STATE1_400) && (player->av1.actionVar1 != 0)) { Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_RECEIVED_CIRCUS_LEADERS_MASK); Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_TOTO); Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_GORMAN); 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 499a3a748..13041c81f 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,15 @@ static AnimationInfoS sAnimationInfo[] = { }; ActorInit En_Trt_InitVars = { - ACTOR_EN_TRT, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRT, - sizeof(EnTrt), - (ActorFunc)EnTrt_Init, - (ActorFunc)EnTrt_Destroy, - (ActorFunc)EnTrt_Update, - (ActorFunc)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 8bc8e2541..9f3374a3d 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,15 @@ static AnimationInfoS sAnimationInfo[] = { }; ActorInit En_Trt2_InitVars = { - ACTOR_EN_TRT2, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRT, - sizeof(EnTrt2), - (ActorFunc)EnTrt2_Init, - (ActorFunc)EnTrt2_Destroy, - (ActorFunc)EnTrt2_Update, - (ActorFunc)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 a5938d4cf..238da0a63 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,15 @@ static UNK_TYPE D_80A889A4[] = { }; ActorInit En_Tru_InitVars = { - ACTOR_EN_TRU, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRU, - sizeof(EnTru), - (ActorFunc)EnTru_Init, - (ActorFunc)EnTru_Destroy, - (ActorFunc)EnTru_Update, - (ActorFunc)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 8ca8857db..176db5e60 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,15 @@ typedef enum { } KoumeMtAnimation; ActorInit En_Tru_Mt_InitVars = { - ACTOR_EN_TRU_MT, - ACTORCAT_NPC, - FLAGS, - OBJECT_TRU, - sizeof(EnTruMt), - (ActorFunc)EnTruMt_Init, - (ActorFunc)EnTruMt_Destroy, - (ActorFunc)EnTruMt_Update, - (ActorFunc)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 f95b1a8e8..d0e58035d 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,15 @@ 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), - (ActorFunc)EnTsn_Init, - (ActorFunc)EnTsn_Destroy, - (ActorFunc)EnTsn_Update, - (ActorFunc)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 cc1df3cdb..83d54f837 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,15 @@ static ColliderCylinderInit sCylinderInit = { }; ActorInit En_Tubo_Trap_InitVars = { - ACTOR_EN_TUBO_TRAP, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(EnTuboTrap), - (ActorFunc)EnTuboTrap_Init, - (ActorFunc)EnTuboTrap_Destroy, - (ActorFunc)EnTuboTrap_Update, - (ActorFunc)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 93c494489..d6dd30c07 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -25,15 +25,15 @@ 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), - (ActorFunc)EnTwig_Init, - (ActorFunc)EnTwig_Destroy, - (ActorFunc)EnTwig_Update, - (ActorFunc)EnTwig_Draw, + /**/ ACTOR_EN_TWIG, + /**/ ACTORCAT_MISC, + /**/ FLAGS, + /**/ OBJECT_TWIG, + /**/ sizeof(EnTwig), + /**/ EnTwig_Init, + /**/ EnTwig_Destroy, + /**/ EnTwig_Update, + /**/ EnTwig_Draw, }; 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 3221878e3..e6f8d1f1e 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,15 @@ static u8 D_8089F3E0 = 0; static u8 D_8089F3E4 = 0; ActorInit En_Viewer_InitVars = { - ACTOR_EN_VIEWER, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnViewer), - (ActorFunc)EnViewer_Init, - (ActorFunc)EnViewer_Destroy, - (ActorFunc)EnViewer_Update, - (ActorFunc)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 1866a2381..644b72098 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,15 @@ 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), - (ActorFunc)EnVm_Init, - (ActorFunc)EnVm_Destroy, - (ActorFunc)EnVm_Update, - (ActorFunc)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 16fdd5cf2..6eaf13b70 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -45,15 +45,15 @@ 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), - (ActorFunc)EnWallmas_Init, - (ActorFunc)EnWallmas_Destroy, - (ActorFunc)EnWallmas_Update, - (ActorFunc)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 b5603e613..70ad13b38 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,15 @@ 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), - (ActorFunc)EnWarpUzu_Init, - (ActorFunc)EnWarpUzu_Destroy, - (ActorFunc)EnWarpUzu_Update, - (ActorFunc)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 14469f556..21d9ff069 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,15 @@ 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), - (ActorFunc)EnWarptag_Init, - (ActorFunc)EnWarptag_Destroy, - (ActorFunc)EnWarptag_Update, - (ActorFunc)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 bc960b96b..4c3c6a315 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 @@ -32,15 +32,15 @@ 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), - (ActorFunc)EnWaterEffect_Init, - (ActorFunc)EnWaterEffect_Destroy, - (ActorFunc)EnWaterEffect_Update, - (ActorFunc)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_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index 221ff557c..ae491fbf0 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -17,15 +17,15 @@ void EnWdhand_Draw(Actor* thisx, PlayState* play); #if 0 ActorInit En_Wdhand_InitVars = { - ACTOR_EN_WDHAND, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WDHAND, - sizeof(EnWdhand), - (ActorFunc)EnWdhand_Init, - (ActorFunc)EnWdhand_Destroy, - (ActorFunc)EnWdhand_Update, - (ActorFunc)EnWdhand_Draw, + /**/ ACTOR_EN_WDHAND, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_WDHAND, + /**/ sizeof(EnWdhand), + /**/ EnWdhand_Init, + /**/ EnWdhand_Destroy, + /**/ EnWdhand_Update, + /**/ EnWdhand_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[7] = { diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 3aa4360f9..e0319ad7e 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,15 @@ 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), - (ActorFunc)EnWeatherTag_Init, - (ActorFunc)EnWeatherTag_Destroy, - (ActorFunc)EnWeatherTag_Update, - (ActorFunc)EnWeatherTag_Draw, + /**/ ACTOR_EN_WEATHER_TAG, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(EnWeatherTag), + /**/ EnWeatherTag_Init, + /**/ EnWeatherTag_Destroy, + /**/ EnWeatherTag_Update, + /**/ EnWeatherTag_Draw, }; void EnWeatherTag_SetupAction(EnWeatherTag* this, EnWeatherTagActionFunc func) { 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 b1332885e..d2f1595cf 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -57,15 +57,15 @@ 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), - (ActorFunc)EnWf_Init, - (ActorFunc)EnWf_Destroy, - (ActorFunc)EnWf_Update, - (ActorFunc)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 c44ec1442..94d8e7924 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -82,15 +82,15 @@ typedef enum { } EnWizAnimation; ActorInit En_Wiz_InitVars = { - ACTOR_EN_WIZ, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WIZ, - sizeof(EnWiz), - (ActorFunc)EnWiz_Init, - (ActorFunc)EnWiz_Destroy, - (ActorFunc)EnWiz_Update, - (ActorFunc)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 ac6ae3152..a7056aac5 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,15 @@ 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), - (ActorFunc)EnWizBrock_Init, - (ActorFunc)EnWizBrock_Destroy, - (ActorFunc)EnWizBrock_Update, - (ActorFunc)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 a3df9a7a2..39deef393 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,15 @@ typedef enum { static s32 sPoolHitByIceArrow = false; ActorInit En_Wiz_Fire_InitVars = { - ACTOR_EN_WIZ_FIRE, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_WIZ, - sizeof(EnWizFire), - (ActorFunc)EnWizFire_Init, - (ActorFunc)EnWizFire_Destroy, - (ActorFunc)EnWizFire_Update, - (ActorFunc)EnWizFire_Draw, + /**/ ACTOR_EN_WIZ_FIRE, + /**/ ACTORCAT_ENEMY, + /**/ FLAGS, + /**/ OBJECT_WIZ, + /**/ sizeof(EnWizFire), + /**/ EnWizFire_Init, + /**/ EnWizFire_Destroy, + /**/ EnWizFire_Update, + /**/ EnWizFire_Draw, }; static ColliderCylinderInit sCylinderInit = { @@ -639,8 +639,8 @@ void EnWizFire_Update(Actor* thisx, PlayState* play2) { } } - if ((player->stateFlags2 & PLAYER_STATE2_4000) && (player->actionVar2 < 90)) { - player->actionVar2 = 90; + if ((player->stateFlags2 & PLAYER_STATE2_4000) && (player->av2.actionVar2 < 90)) { + player->av2.actionVar2 = 90; } if (!this->hitByIceArrow && !sPoolHitByIceArrow && 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 8611c1c30..1a2d3cef6 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,15 @@ f32 sWood02SpawnCos; f32 sWood02SpawnSin; ActorInit En_Wood02_InitVars = { - ACTOR_EN_WOOD02, - ACTORCAT_PROP, - FLAGS, - OBJECT_WOOD02, - sizeof(EnWood02), - (ActorFunc)EnWood02_Init, - (ActorFunc)EnWood02_Destroy, - (ActorFunc)EnWood02_Update, - (ActorFunc)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 b39a77408..02f9dbb3d 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,15 @@ 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), - (ActorFunc)EnYb_Init, - (ActorFunc)EnYb_Destroy, - (ActorFunc)EnYb_Update, - (ActorFunc)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 1e813813e..0daf4d7c0 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,15 @@ 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), - (ActorFunc)EnZl1_Init, - (ActorFunc)EnZl1_Destroy, - (ActorFunc)EnZl1_Update, - (ActorFunc)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_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 3dffe0a6f..1a132520b 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -19,15 +19,15 @@ void func_809A1D0C(EnZl4* this, PlayState* play); #if 0 ActorInit En_Zl4_InitVars = { - ACTOR_EN_ZL4, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_STK, - sizeof(EnZl4), - (ActorFunc)EnZl4_Init, - (ActorFunc)EnZl4_Destroy, - (ActorFunc)EnZl4_Update, - (ActorFunc)EnZl4_Draw, + /**/ ACTOR_EN_ZL4, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ OBJECT_STK, + /**/ sizeof(EnZl4), + /**/ EnZl4_Init, + /**/ EnZl4_Destroy, + /**/ EnZl4_Update, + /**/ EnZl4_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 95e8f2ceb..63e545ce9 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,15 @@ 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), - (ActorFunc)EnZo_Init, - (ActorFunc)EnZo_Destroy, - (ActorFunc)EnZo_Update, - (ActorFunc)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 68dbd0e48..440e05f4d 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,15 @@ 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), - (ActorFunc)EnZob_Init, - (ActorFunc)EnZob_Destroy, - (ActorFunc)EnZob_Update, - (ActorFunc)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_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index c706e850d..be2d1bc5a 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -45,16 +45,16 @@ typedef enum { /* 9 */ ENZOD_INSTRUMENT_BASS_DRUM } EnZodInstrument; -const ActorInit En_Zod_InitVars = { - ACTOR_EN_ZOD, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZOD, - sizeof(EnZod), - (ActorFunc)EnZod_Init, - (ActorFunc)EnZod_Destroy, - (ActorFunc)EnZod_Update, - (ActorFunc)EnZod_Draw, +ActorInit En_Zod_InitVars = { + /**/ ACTOR_EN_ZOD, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_ZOD, + /**/ sizeof(EnZod), + /**/ EnZod_Init, + /**/ EnZod_Destroy, + /**/ EnZod_Update, + /**/ EnZod_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 92fa313a6..a09670a99 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,15 @@ 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), - (ActorFunc)EnZog_Init, - (ActorFunc)EnZog_Destroy, - (ActorFunc)EnZog_Update, - (ActorFunc)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 099f75a57..ac50731ca 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -38,15 +38,15 @@ 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), - (ActorFunc)EnZoraegg_Init, - (ActorFunc)EnZoraegg_Destroy, - (ActorFunc)EnZoraegg_Update, - (ActorFunc)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 249b8f6bb..9f5a20231 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,15 @@ typedef enum { } EnZosAnimation; ActorInit En_Zos_InitVars = { - ACTOR_EN_ZOS, - ACTORCAT_NPC, - FLAGS, - OBJECT_ZOS, - sizeof(EnZos), - (ActorFunc)EnZos_Init, - (ActorFunc)EnZos_Destroy, - (ActorFunc)EnZos_Update, - (ActorFunc)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 57689ebd8..d49486151 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,15 @@ 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), - (ActorFunc)EnZot_Init, - (ActorFunc)EnZot_Destroy, - (ActorFunc)EnZot_Update, - (ActorFunc)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 8e85f4675..7ab2724cf 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -28,15 +28,15 @@ 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), - (ActorFunc)EnZov_Init, - (ActorFunc)EnZov_Destroy, - (ActorFunc)EnZov_Update, - (ActorFunc)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 dfcf7225e..1f205e32b 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,15 @@ 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), - (ActorFunc)EnZow_Init, - (ActorFunc)EnZow_Destroy, - (ActorFunc)EnZow_Update, - (ActorFunc)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 661d24636..9a86b8277 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 @@ -18,16 +18,16 @@ void ItemBHeart_Draw(Actor* thisx, PlayState* play); void ItemBHeart_UpdateModel(ItemBHeart* this, PlayState* play); -const ActorInit Item_B_Heart_InitVars = { - ACTOR_ITEM_B_HEART, - ACTORCAT_BOSS, - FLAGS, - OBJECT_GI_HEARTS, - sizeof(ItemBHeart), - (ActorFunc)ItemBHeart_Init, - (ActorFunc)ItemBHeart_Destroy, - (ActorFunc)ItemBHeart_Update, - (ActorFunc)ItemBHeart_Draw, +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, }; 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 e7308c10d..b2ffd38f4 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,15 @@ 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), - (ActorFunc)ItemEtcetera_Init, - (ActorFunc)ItemEtcetera_Destroy, - (ActorFunc)ItemEtcetera_Update, - (ActorFunc)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 0b554f665..d57a377a7 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,15 @@ 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), - (ActorFunc)ItemInbox_Init, - (ActorFunc)ItemInbox_Destroy, - (ActorFunc)ItemInbox_Update, - (ActorFunc)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 412687b7f..65ba00792 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,15 @@ typedef struct { } MirRayDataEntry; // size = 0x20 ActorInit Mir_Ray_InitVars = { - ACTOR_MIR_RAY, - ACTORCAT_ITEMACTION, - FLAGS, - OBJECT_MIR_RAY, - sizeof(MirRay), - (ActorFunc)MirRay_Init, - (ActorFunc)MirRay_Destroy, - (ActorFunc)MirRay_Update, - (ActorFunc)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 d475a263e..8886d30f4 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,15 @@ 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), - (ActorFunc)MirRay2_Init, - (ActorFunc)MirRay2_Destroy, - (ActorFunc)MirRay2_Update, - (ActorFunc)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 520684fb7..ade3d5db6 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,15 @@ 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), - (ActorFunc)MirRay3_Init, - (ActorFunc)MirRay3_Destroy, - (ActorFunc)MirRay3_Update, - (ActorFunc)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 7324448a4..17c146da3 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,15 @@ 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), - (ActorFunc)ObjAqua_Init, - (ActorFunc)ObjAqua_Destroy, - (ActorFunc)ObjAqua_Update, - (ActorFunc)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 d713c9d04..7de81dca0 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,15 @@ 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), - (ActorFunc)ObjArmos_Init, - (ActorFunc)ObjArmos_Destroy, - (ActorFunc)ObjArmos_Update, - (ActorFunc)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 7a8272c83..60eacb8f9 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,15 @@ 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), - (ActorFunc)ObjBean_Init, - (ActorFunc)ObjBean_Destroy, - (ActorFunc)ObjBean_Update, - (ActorFunc)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 0a50c85c5..8b0275f47 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,15 @@ 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), - (ActorFunc)ObjBell_Init, - (ActorFunc)ObjBell_Destroy, - (ActorFunc)ObjBell_Update, - (ActorFunc)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 afcf7aaa0..db8df4f27 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,15 @@ 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), - (ActorFunc)ObjBigicicle_Init, - (ActorFunc)ObjBigicicle_Destroy, - (ActorFunc)ObjBigicicle_Update, - (ActorFunc)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 f21ebff2b..a2860a884 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,15 @@ 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), - (ActorFunc)ObjBlockstop_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjBlockstop_Update, - (ActorFunc)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 a4640c476..b5a358f88 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,15 @@ void ObjBoat_Draw(Actor* thisx, PlayState* play); void ObjBoat_UpdateCutscene(Actor* thisx, PlayState* play2); ActorInit Obj_Boat_InitVars = { - ACTOR_OBJ_BOAT, - ACTORCAT_BG, - FLAGS, - OBJECT_KAIZOKU_OBJ, - sizeof(ObjBoat), - (ActorFunc)ObjBoat_Init, - (ActorFunc)ObjBoat_Destroy, - (ActorFunc)ObjBoat_Update, - (ActorFunc)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 95ff47db2..7b633f915 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,15 @@ 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), - (ActorFunc)ObjBombiwa_Init, - (ActorFunc)ObjBombiwa_Destroy, - (ActorFunc)ObjBombiwa_Update, - (ActorFunc)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 9e791f7ae..f346ad98b 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -17,16 +17,16 @@ void ObjBoyo_PushPirate(ObjBoyo* this, Actor* actor); void ObjBoyo_ExplodeBomb(ObjBoyo* this, Actor* actor); Actor* ObjBoyo_FindCollidedActor(ObjBoyo* this, PlayState* play, s32* index); -const ActorInit Obj_Boyo_InitVars = { - ACTOR_OBJ_BOYO, - ACTORCAT_PROP, - FLAGS, - OBJECT_BOYO, - sizeof(ObjBoyo), - (ActorFunc)ObjBoyo_Init, - (ActorFunc)ObjBoyo_Destroy, - (ActorFunc)ObjBoyo_Update, - (ActorFunc)ObjBoyo_Draw, +ActorInit Obj_Boyo_InitVars = { + /**/ ACTOR_OBJ_BOYO, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_BOYO, + /**/ sizeof(ObjBoyo), + /**/ ObjBoyo_Init, + /**/ ObjBoyo_Destroy, + /**/ ObjBoyo_Update, + /**/ ObjBoyo_Draw, }; typedef void (*ObjBoyoCollisionHandler)(ObjBoyo* this, Actor* actor); 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 8f326af48..b632b0fa8 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,15 @@ void ObjChan_ChandelierAction(ObjChan* this, PlayState* play); void ObjChan_PotAction(ObjChan* this, PlayState* play); ActorInit Obj_Chan_InitVars = { - ACTOR_OBJ_CHAN, - ACTORCAT_BG, - FLAGS, - OBJECT_OBJ_CHAN, - sizeof(ObjChan), - (ActorFunc)ObjChan_Init, - (ActorFunc)ObjChan_Destroy, - (ActorFunc)ObjChan_Update, - (ActorFunc)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 4d2bee782..40d7d3c2a 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,15 @@ 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), - (ActorFunc)ObjChikuwa_Init, - (ActorFunc)ObjChikuwa_Destroy, - (ActorFunc)ObjChikuwa_Update, - (ActorFunc)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 8f9f21ddf..fdbc54e5c 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,15 @@ 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), - (ActorFunc)ObjComb_Init, - (ActorFunc)ObjComb_Destroy, - (ActorFunc)ObjComb_Update, - (ActorFunc)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 9d468d834..fd6a88fb2 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,15 @@ 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), - (ActorFunc)ObjDanpeilift_Init, - (ActorFunc)ObjDanpeilift_Destroy, - (ActorFunc)ObjDanpeilift_Update, - (ActorFunc)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 ba4782d02..d35240f5f 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,15 @@ 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), - (ActorFunc)ObjDemo_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjDemo_Update, - (ActorFunc)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 ac31cbc64..9c6df1ca5 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,15 @@ 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), - (ActorFunc)ObjDhouse_Init, - (ActorFunc)ObjDhouse_Destroy, - (ActorFunc)ObjDhouse_Update, - (ActorFunc)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 774632cb4..e725437cf 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,15 @@ 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), - (ActorFunc)ObjDinner_Init, - (ActorFunc)ObjDinner_Destroy, - (ActorFunc)ObjDinner_Update, - (ActorFunc)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 8a11c507b..2241f99f2 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,15 @@ typedef enum { } ObjDoraDamageEffect; ActorInit Obj_Dora_InitVars = { - ACTOR_OBJ_DORA, - ACTORCAT_NPC, - FLAGS, - OBJECT_DORA, - sizeof(ObjDora), - (ActorFunc)ObjDora_Init, - (ActorFunc)ObjDora_Destroy, - (ActorFunc)ObjDora_Update, - (ActorFunc)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 f1dc17968..a15b6355f 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,15 @@ 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), - (ActorFunc)ObjDowsing_Init, - (ActorFunc)ObjDowsing_Destroy, - (ActorFunc)ObjDowsing_Update, - (ActorFunc)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 13a88568b..c019fedac 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,15 @@ 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), - (ActorFunc)ObjDriftice_Init, - (ActorFunc)ObjDriftice_Destroy, - (ActorFunc)ObjDriftice_Update, - (ActorFunc)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 fd2bf4c02..ec8b5e60f 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,15 @@ 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), - (ActorFunc)ObjEnding_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjEnding_Update, - (ActorFunc)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 0bd55b296..f76b5a794 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,15 @@ 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), - (ActorFunc)ObjEntotu_Init, - (ActorFunc)ObjEntotu_Destroy, - (ActorFunc)ObjEntotu_Update, - (ActorFunc)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 57bfa823c..36f8186d9 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,15 @@ 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), - (ActorFunc)ObjEtcetera_Init, - (ActorFunc)ObjEtcetera_Destroy, - (ActorFunc)ObjEtcetera_Update, - (ActorFunc)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 9933b36f2..99deb2917 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,15 @@ void func_80A4CCBC(ObjFireshield* this); void func_80A4CD28(ObjFireshield* this); ActorInit Obj_Fireshield_InitVars = { - ACTOR_OBJ_FIRESHIELD, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjFireshield), - (ActorFunc)ObjFireshield_Init, - (ActorFunc)ObjFireshield_Destroy, - (ActorFunc)ObjFireshield_Update, - (ActorFunc)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 cd8632659..258c57e32 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -33,15 +33,15 @@ s16 D_80A1DA3E; s16 D_80A1DA40; ActorInit Obj_Flowerpot_InitVars = { - ACTOR_OBJ_FLOWERPOT, - ACTORCAT_PROP, - FLAGS, - OBJECT_FLOWERPOT, - sizeof(ObjFlowerpot), - (ActorFunc)ObjFlowerpot_Init, - (ActorFunc)ObjFlowerpot_Destroy, - (ActorFunc)ObjFlowerpot_Update, - (ActorFunc)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 a75a43cda..a8f368773 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,15 @@ 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), (ActorFunc)ObjFunen_Init, - (ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)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 92479cc4a..ace1cca0b 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,15 @@ 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), - (ActorFunc)ObjGhaka_Init, - (ActorFunc)ObjGhaka_Destroy, - (ActorFunc)ObjGhaka_Update, - (ActorFunc)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 a1ce45b82..ee845d0bb 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -28,15 +28,15 @@ f32 sNearestGrassElementsDistSq[OBJ_GRASS_NEAREST_ELEM_MAX]; #include "overlays/ovl_Obj_Grass/ovl_Obj_Grass.c" ActorInit Obj_Grass_InitVars = { - ACTOR_OBJ_GRASS, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(ObjGrass), - (ActorFunc)ObjGrass_Init, - (ActorFunc)ObjGrass_Destroy, - (ActorFunc)ObjGrass_Update, - (ActorFunc)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 4b9c424f4..4c937b2f9 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,15 @@ void ObjGrassCarry_Fall(ObjGrassCarry* this, PlayState* play); void ObjGrassCarry_Draw(Actor* this, PlayState* play); ActorInit Obj_Grass_Carry_InitVars = { - ACTOR_OBJ_GRASS_CARRY, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_FIELD_KEEP, - sizeof(ObjGrassCarry), - (ActorFunc)ObjGrassCarry_Init, - (ActorFunc)ObjGrassCarry_Destroy, - (ActorFunc)ObjGrassCarry_Update, - (ActorFunc)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_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index dfb5d0527..4b6d995ac 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -22,9 +22,15 @@ void ObjGrassUnit_Init(Actor* this, PlayState* play2); ActorInit Obj_Grass_Unit_InitVars = { - ACTOR_OBJ_GRASS_UNIT, ACTORCAT_BG, FLAGS, - GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassUnit), (ActorFunc)ObjGrassUnit_Init, - (ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)NULL, + /**/ ACTOR_OBJ_GRASS_UNIT, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ GAMEPLAY_FIELD_KEEP, + /**/ sizeof(ObjGrassUnit), + /**/ ObjGrassUnit_Init, + /**/ Actor_Noop, + /**/ Actor_Noop, + /**/ NULL, }; // Neat circular pattern with a single bush in the center 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 a76476bde..bbd90fbc4 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,15 @@ 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), - (ActorFunc)ObjHakaisi_Init, - (ActorFunc)ObjHakaisi_Destroy, - (ActorFunc)ObjHakaisi_Update, - (ActorFunc)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 5ccbf3d50..a49f341f4 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,15 @@ 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), - (ActorFunc)ObjHamishi_Init, - (ActorFunc)ObjHamishi_Destroy, - (ActorFunc)ObjHamishi_Update, - (ActorFunc)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 fbc581aec..d0be9cc36 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,15 @@ 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), - (ActorFunc)ObjHana_Init, - (ActorFunc)ObjHana_Destroy, - (ActorFunc)ObjHana_Update, - (ActorFunc)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 b390644c7..9486f177c 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,15 @@ 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), - (ActorFunc)ObjHariko_Init, - (ActorFunc)ObjHariko_Destroy, - (ActorFunc)ObjHariko_Update, - (ActorFunc)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 d69c8d0fd..264053dff 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,15 @@ 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), - (ActorFunc)ObjHgdoor_Init, - (ActorFunc)ObjHgdoor_Destroy, - (ActorFunc)ObjHgdoor_Update, - (ActorFunc)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 3dde506b9..55ed25d87 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,15 @@ 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), - (ActorFunc)ObjHsStump_Init, - (ActorFunc)ObjHsStump_Destroy, - (ActorFunc)ObjHsStump_Update, - (ActorFunc)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 5cced7f48..d6927792e 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,15 @@ 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), - (ActorFunc)ObjHsblock_Init, - (ActorFunc)ObjHsblock_Destroy, - (ActorFunc)ObjHsblock_Update, - (ActorFunc)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 a2b376a28..071270739 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,15 @@ 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), - (ActorFunc)ObjHugebombiwa_Init, - (ActorFunc)ObjHugebombiwa_Destroy, - (ActorFunc)ObjHugebombiwa_Update, - (ActorFunc)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 8ee8520ed..5f15c41cf 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,15 @@ ObjHansuiStruct D_80B9DC70[] = { }; ActorInit Obj_Hunsui_InitVars = { - ACTOR_OBJ_HUNSUI, - ACTORCAT_BG, - FLAGS, - OBJECT_HUNSUI, - sizeof(ObjHunsui), - (ActorFunc)ObjHunsui_Init, - (ActorFunc)ObjHunsui_Destroy, - (ActorFunc)ObjHunsui_Update, - (ActorFunc)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 c98645d17..15dddae99 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,15 @@ 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), - (ActorFunc)ObjIcePoly_Init, - (ActorFunc)ObjIcePoly_Destroy, - (ActorFunc)ObjIcePoly_Update, - (ActorFunc)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 6216fa6c8..9b9a30010 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,15 @@ 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), - (ActorFunc)ObjIceblock_Init, - (ActorFunc)ObjIceblock_Destroy, - (ActorFunc)ObjIceblock_Update, - (ActorFunc)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 276c4a28e..77a8d739d 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,15 @@ 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), - (ActorFunc)ObjJgGakki_Init, - (ActorFunc)ObjJgGakki_Destroy, - (ActorFunc)ObjJgGakki_Update, - (ActorFunc)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 e69995ed2..bd88548e2 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,15 @@ 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), - (ActorFunc)ObjJgameLight_Init, - (ActorFunc)ObjJgameLight_Destroy, - (ActorFunc)ObjJgameLight_Update, - (ActorFunc)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_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 048aa9bcc..927cae59f 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -45,15 +45,15 @@ void ObjKendoKanban_HandlePhysics(ObjKendoKanban* this, PlayState* play); s32 ObjKendoKanban_IsPlayerOnTop(ObjKendoKanban* this, PlayState* play); ActorInit Obj_Kendo_Kanban_InitVars = { - ACTOR_OBJ_KENDO_KANBAN, - ACTORCAT_NPC, - FLAGS, - OBJECT_DORA, - sizeof(ObjKendoKanban), - (ActorFunc)ObjKendoKanban_Init, - (ActorFunc)ObjKendoKanban_Destroy, - (ActorFunc)ObjKendoKanban_Update, - (ActorFunc)ObjKendoKanban_Draw, + /**/ ACTOR_OBJ_KENDO_KANBAN, + /**/ ACTORCAT_NPC, + /**/ FLAGS, + /**/ OBJECT_DORA, + /**/ sizeof(ObjKendoKanban), + /**/ ObjKendoKanban_Init, + /**/ ObjKendoKanban_Destroy, + /**/ ObjKendoKanban_Update, + /**/ ObjKendoKanban_Draw, }; // Directly applied to the velocity of the actor upon object creation. diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index abd9b2577..dc51156e5 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,15 @@ 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), - (ActorFunc)ObjKepnKoya_Init, - (ActorFunc)ObjKepnKoya_Destroy, - (ActorFunc)ObjKepnKoya_Update, - (ActorFunc)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 3885041fd..a42fd5a87 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,15 @@ static s16 D_80927388 = 0; static s16 D_8092738C = 0; ActorInit Obj_Kibako_InitVars = { - ACTOR_OBJ_KIBAKO, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjKibako), - (ActorFunc)ObjKibako_Init, - (ActorFunc)ObjKibako_Destroy, - (ActorFunc)ObjKibako_Update, - (ActorFunc)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 4d3bdc348..8d7c79382 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,15 @@ 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), - (ActorFunc)ObjKibako2_Init, - (ActorFunc)ObjKibako2_Destroy, - (ActorFunc)ObjKibako2_Update, - (ActorFunc)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 c6529625c..7b76546eb 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,15 @@ 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), - (ActorFunc)ObjKinoko_Init, - (ActorFunc)ObjKinoko_Destroy, - (ActorFunc)ObjKinoko_Update, - (ActorFunc)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 94937b164..da9650cb8 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,15 @@ 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), - (ActorFunc)ObjKzsaku_Init, - (ActorFunc)ObjKzsaku_Destroy, - (ActorFunc)ObjKzsaku_Update, - (ActorFunc)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 61822bde7..1ca9d95d0 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,15 @@ 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), - (ActorFunc)ObjLift_Init, - (ActorFunc)ObjLift_Destroy, - (ActorFunc)ObjLift_Update, - (ActorFunc)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 28ead0679..2a7f36e9a 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -24,15 +24,15 @@ void ObjLightblock_SetupFadeAway(ObjLightblock* this); void ObjLightblock_FadeAway(ObjLightblock* this, PlayState* play); ActorInit Obj_Lightblock_InitVars = { - ACTOR_OBJ_LIGHTBLOCK, - ACTORCAT_BG, - FLAGS, - OBJECT_LIGHTBLOCK, - sizeof(ObjLightblock), - (ActorFunc)ObjLightblock_Init, - (ActorFunc)ObjLightblock_Destroy, - (ActorFunc)ObjLightblock_Update, - (ActorFunc)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 1acb015ea..dc5b112a5 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,15 @@ 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), - (ActorFunc)ObjLightswitch_Init, - (ActorFunc)ObjLightswitch_Destroy, - (ActorFunc)ObjLightswitch_Update, - (ActorFunc)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_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index 7cace2621..9feb70c1d 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -22,15 +22,15 @@ void func_80AF0514(ObjLupygamelift* this); void func_80AF0530(ObjLupygamelift* this, PlayState* play); ActorInit Obj_Lupygamelift_InitVars = { - ACTOR_OBJ_LUPYGAMELIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_RAILLIFT, - sizeof(ObjLupygamelift), - (ActorFunc)ObjLupygamelift_Init, - (ActorFunc)ObjLupygamelift_Destroy, - (ActorFunc)ObjLupygamelift_Update, - (ActorFunc)ObjLupygamelift_Draw, + /**/ ACTOR_OBJ_LUPYGAMELIFT, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_RAILLIFT, + /**/ sizeof(ObjLupygamelift), + /**/ ObjLupygamelift_Init, + /**/ ObjLupygamelift_Destroy, + /**/ ObjLupygamelift_Update, + /**/ ObjLupygamelift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 56b23e839..9a1b309ca 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,15 @@ 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), - (ActorFunc)ObjMakekinsuta_Init, - (ActorFunc)ObjMakekinsuta_Destroy, - (ActorFunc)ObjMakekinsuta_Update, - (ActorFunc)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_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 76ccba1b1..03755af58 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -14,15 +14,15 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play); void ObjMakeoshihiki_Update(Actor* thisx, PlayState* play); ActorInit Obj_Makeoshihiki_InitVars = { - ACTOR_OBJ_MAKEOSHIHIKI, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjMakeoshihiki), - (ActorFunc)ObjMakeoshihiki_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjMakeoshihiki_Update, - (ActorFunc)NULL, + /**/ ACTOR_OBJ_MAKEOSHIHIKI, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(ObjMakeoshihiki), + /**/ ObjMakeoshihiki_Init, + /**/ Actor_Noop, + /**/ ObjMakeoshihiki_Update, + /**/ NULL, }; s32 ObjMakeoshihiki_GetChildSpawnPointIndex(ObjMakeoshihiki* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index 75ff18b6b..5c4f97cdc 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,15 @@ 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), - (ActorFunc)ObjMilkBin_Init, - (ActorFunc)ObjMilkBin_Destroy, - (ActorFunc)ObjMilkBin_Update, - (ActorFunc)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_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index 556f72b67..36537cfe3 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -17,15 +17,15 @@ void ObjMine_Draw(Actor* thisx, PlayState* play); #if 0 ActorInit Obj_Mine_InitVars = { - ACTOR_OBJ_MINE, - ACTORCAT_PROP, - FLAGS, - OBJECT_NY, - sizeof(ObjMine), - (ActorFunc)ObjMine_Init, - (ActorFunc)ObjMine_Destroy, - (ActorFunc)ObjMine_Update, - (ActorFunc)ObjMine_Draw, + /**/ ACTOR_OBJ_MINE, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ OBJECT_NY, + /**/ sizeof(ObjMine), + /**/ ObjMine_Init, + /**/ ObjMine_Destroy, + /**/ ObjMine_Update, + /**/ ObjMine_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index dddbaa256..625855363 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,15 @@ 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), - (ActorFunc)ObjMoonStone_Init, - (ActorFunc)ObjMoonStone_Destroy, - (ActorFunc)ObjMoonStone_Update, - (ActorFunc)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 f0315a16e..f74956e46 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,15 @@ 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), - (ActorFunc)ObjMuPict_Init, - (ActorFunc)ObjMuPict_Destroy, - (ActorFunc)ObjMuPict_Update, - (ActorFunc)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 49a0bb656..c2599941b 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -25,15 +25,15 @@ 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), - (ActorFunc)ObjMure_Init, - (ActorFunc)ObjMure_Destroy, - (ActorFunc)ObjMure_Update, - (ActorFunc)NULL, + /**/ ACTOR_OBJ_MURE, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(ObjMure), + /**/ ObjMure_Init, + /**/ ObjMure_Destroy, + /**/ ObjMure_Update, + /**/ NULL, }; static f32 sZClip[OBJMURE_TYPE_MAX] = { diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index bda4dc258..78fc7263a 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -19,15 +19,15 @@ void func_80961490(ObjMure2* this, PlayState* play); #if 0 ActorInit Obj_Mure2_InitVars = { - ACTOR_OBJ_MURE2, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjMure2), - (ActorFunc)ObjMure2_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjMure2_Update, - (ActorFunc)NULL, + /**/ ACTOR_OBJ_MURE2, + /**/ ACTORCAT_PROP, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(ObjMure2), + /**/ ObjMure2_Init, + /**/ Actor_Noop, + /**/ ObjMure2_Update, + /**/ NULL, }; // static InitChainEntry sInitChain[] = { 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 d894c64a6..b0a7c57bf 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,15 @@ 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), - (ActorFunc)ObjMure3_Init, - (ActorFunc)ObjMure3_Destroy, - (ActorFunc)ObjMure3_Update, - (ActorFunc)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 a4259857a..cf0191078 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,15 @@ s32 D_80BA36B4; f32 D_80BA36B8; ActorInit Obj_Nozoki_InitVars = { - ACTOR_OBJ_NOZOKI, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjNozoki), - (ActorFunc)ObjNozoki_Init, - (ActorFunc)ObjNozoki_Destroy, - (ActorFunc)ObjNozoki_Update, - (ActorFunc)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_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index 569a6e6f2..6072e7677 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -32,15 +32,15 @@ void func_80AC9C20(ObjOcarinalift* this); void func_80AC9C48(ObjOcarinalift* this, PlayState* play); ActorInit Obj_Ocarinalift_InitVars = { - ACTOR_OBJ_OCARINALIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_RAILLIFT, - sizeof(ObjOcarinalift), - (ActorFunc)ObjOcarinalift_Init, - (ActorFunc)ObjOcarinalift_Destroy, - (ActorFunc)ObjOcarinalift_Update, - (ActorFunc)ObjOcarinalift_Draw, + /**/ ACTOR_OBJ_OCARINALIFT, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_RAILLIFT, + /**/ sizeof(ObjOcarinalift), + /**/ ObjOcarinalift_Init, + /**/ ObjOcarinalift_Destroy, + /**/ ObjOcarinalift_Update, + /**/ ObjOcarinalift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 9d49067fe..9fe6b8235 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,15 @@ 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), - (ActorFunc)ObjOshihiki_Init, - (ActorFunc)ObjOshihiki_Destroy, - (ActorFunc)ObjOshihiki_Update, - (ActorFunc)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 9be9106d6..07672c352 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,15 @@ typedef struct ObjPurifyInfo { } ObjPurifyInfo; // size = 0x28 ActorInit Obj_Purify_InitVars = { - ACTOR_OBJ_PURIFY, - ACTORCAT_BG, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjPurify), - (ActorFunc)ObjPurify_Init, - (ActorFunc)ObjPurify_Destroy, - (ActorFunc)ObjPurify_Update, - (ActorFunc)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 478991a86..d7ea5b710 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,15 @@ 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), - (ActorFunc)ObjPzlblock_Init, - (ActorFunc)ObjPzlblock_Destroy, - (ActorFunc)ObjPzlblock_Update, - (ActorFunc)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 dc5e9e315..799ad6b1d 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,15 @@ 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), - (ActorFunc)ObjRaillift_Init, - (ActorFunc)ObjRaillift_Destroy, - (ActorFunc)ObjRaillift_Update, - (ActorFunc)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 1fe208ba8..dc4335015 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,15 @@ 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), - (ActorFunc)ObjRoomtimer_Init, - (ActorFunc)ObjRoomtimer_Destroy, - (ActorFunc)ObjRoomtimer_Update, - (ActorFunc)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 4c63908c6..dbf04b3be 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,15 @@ typedef struct ObjRotliftModelInfo { } ObjRotliftModelInfo; // size = 0xC ActorInit Obj_Rotlift_InitVars = { - ACTOR_OBJ_ROTLIFT, - ACTORCAT_BG, - FLAGS, - OBJECT_ROTLIFT, - sizeof(ObjRotlift), - (ActorFunc)ObjRotlift_Init, - (ActorFunc)ObjRotlift_Destroy, - (ActorFunc)ObjRotlift_Update, - (ActorFunc)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 bd567ca2d..ca5df0a44 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,15 @@ 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), - (ActorFunc)ObjShutter_Init, - (ActorFunc)ObjShutter_Destroy, - (ActorFunc)ObjShutter_Update, - (ActorFunc)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 6f16c9e50..0a951b0fe 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,15 @@ 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), - (ActorFunc)ObjSkateblock_Init, - (ActorFunc)ObjSkateblock_Destroy, - (ActorFunc)ObjSkateblock_Update, - (ActorFunc)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 a34050cc2..765fd8389 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,15 @@ 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), - (ActorFunc)ObjSmork_Init, - (ActorFunc)ObjSmork_Destroy, - (ActorFunc)ObjSmork_Update, - (ActorFunc)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 06de02581..5e82c7e69 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,15 @@ 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), - (ActorFunc)ObjSnowball_Init, - (ActorFunc)ObjSnowball_Destroy, - (ActorFunc)ObjSnowball_Update, - (ActorFunc)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 c19c537ce..fe44795c7 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,15 @@ 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), - (ActorFunc)ObjSnowball2_Init, - (ActorFunc)ObjSnowball2_Destroy, - (ActorFunc)ObjSnowball2_Update, - (ActorFunc)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_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index 1bcfd0ab5..51295590a 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -16,15 +16,15 @@ void ObjSound_Update(Actor* thisx, PlayState* play); void ObjSound_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Sound_InitVars = { - ACTOR_OBJ_SOUND, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjSound), - (ActorFunc)ObjSound_Init, - (ActorFunc)ObjSound_Destroy, - (ActorFunc)ObjSound_Update, - (ActorFunc)NULL, + /**/ ACTOR_OBJ_SOUND, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(ObjSound), + /**/ ObjSound_Init, + /**/ ObjSound_Destroy, + /**/ ObjSound_Update, + /**/ NULL, }; void ObjSound_Init(Actor* thisx, PlayState* play) { 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 bb13f0601..2df0a57af 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,15 @@ 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), - (ActorFunc)ObjSpidertent_Init, - (ActorFunc)ObjSpidertent_Destroy, - (ActorFunc)ObjSpidertent_Update, - (ActorFunc)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 4ff089a72..220d6eded 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,15 @@ 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), - (ActorFunc)ObjSpinyroll_Init, - (ActorFunc)ObjSpinyroll_Destroy, - (ActorFunc)ObjSpinyroll_Update, - (ActorFunc)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 52652c8bb..bebbd6e6a 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,15 @@ static TexturePtr sEyeSwitchTextures[][4] = { static s32 sIsSegmentTableInit = false; ActorInit Obj_Switch_InitVars = { - ACTOR_OBJ_SWITCH, - ACTORCAT_SWITCH, - FLAGS, - GAMEPLAY_DANGEON_KEEP, - sizeof(ObjSwitch), - (ActorFunc)ObjSwitch_Init, - (ActorFunc)ObjSwitch_Destroy, - (ActorFunc)ObjSwitch_Update, - (ActorFunc)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 f1b7bfa6f..78c8d6568 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,15 @@ 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), - (ActorFunc)ObjSwprize_Init, - (ActorFunc)ObjSwprize_Destroy, - (ActorFunc)ObjSwprize_Update, - (ActorFunc)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 43bf3cb21..fd11eb325 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,15 @@ 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), - (ActorFunc)ObjSyokudai_Init, - (ActorFunc)ObjSyokudai_Destroy, - (ActorFunc)ObjSyokudai_Update, - (ActorFunc)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_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index b8ab34df0..4d9b48831 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -19,15 +19,15 @@ void func_80AD9B04(ObjTakarayaWall* this, PlayState* play); #if 0 ActorInit Obj_Takaraya_Wall_InitVars = { - ACTOR_OBJ_TAKARAYA_WALL, - ACTORCAT_BG, - FLAGS, - OBJECT_TAKARAYA_OBJECTS, - sizeof(ObjTakarayaWall), - (ActorFunc)ObjTakarayaWall_Init, - (ActorFunc)ObjTakarayaWall_Destroy, - (ActorFunc)ObjTakarayaWall_Update, - (ActorFunc)ObjTakarayaWall_Draw, + /**/ ACTOR_OBJ_TAKARAYA_WALL, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_TAKARAYA_OBJECTS, + /**/ sizeof(ObjTakarayaWall), + /**/ ObjTakarayaWall_Init, + /**/ ObjTakarayaWall_Destroy, + /**/ ObjTakarayaWall_Update, + /**/ ObjTakarayaWall_Draw, }; // static ColliderCylinderInit sCylinderInit = { 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 e8389e91f..fb39e274f 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,15 @@ 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), - (ActorFunc)ObjTaru_Init, - (ActorFunc)ObjTaru_Destroy, - (ActorFunc)ObjTaru_Update, - (ActorFunc)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 cecb80832..ca2cc260d 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,15 @@ 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), - (ActorFunc)ObjToge_Init, - (ActorFunc)ObjToge_Destroy, - (ActorFunc)ObjToge_Update, - (ActorFunc)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 a198f4a0f..c3c6be76b 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,15 @@ 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), - (ActorFunc)ObjTokeiStep_Init, - (ActorFunc)ObjTokeiStep_Destroy, - (ActorFunc)ObjTokeiStep_Update, - (ActorFunc)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_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 85b7e9414..251df376e 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -18,15 +18,15 @@ void ObjTokeiTobira_Draw(Actor* thisx, PlayState* play); void ObjTokeiTobira_StartCutscene(ObjTokeiTobira* this); ActorInit Obj_Tokei_Tobira_InitVars = { - ACTOR_OBJ_TOKEI_TOBIRA, - ACTORCAT_BG, - FLAGS, - OBJECT_TOKEI_TOBIRA, - sizeof(ObjTokeiTobira), - (ActorFunc)ObjTokeiTobira_Init, - (ActorFunc)ObjTokeiTobira_Destroy, - (ActorFunc)ObjTokeiTobira_Update, - (ActorFunc)ObjTokeiTobira_Draw, + /**/ ACTOR_OBJ_TOKEI_TOBIRA, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_TOKEI_TOBIRA, + /**/ sizeof(ObjTokeiTobira), + /**/ ObjTokeiTobira_Init, + /**/ ObjTokeiTobira_Destroy, + /**/ ObjTokeiTobira_Update, + /**/ ObjTokeiTobira_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index 21fe5f572..cf04be080 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -17,15 +17,15 @@ void ObjTokeiTurret_Update(Actor* thisx, PlayState* play); void ObjTokeiTurret_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Tokei_Turret_InitVars = { - ACTOR_OBJ_TOKEI_TURRET, - ACTORCAT_BG, - FLAGS, - OBJECT_TOKEI_TURRET, - sizeof(ObjTokeiTurret), - (ActorFunc)ObjTokeiTurret_Init, - (ActorFunc)ObjTokeiTurret_Destroy, - (ActorFunc)ObjTokeiTurret_Update, - (ActorFunc)ObjTokeiTurret_Draw, + /**/ ACTOR_OBJ_TOKEI_TURRET, + /**/ ACTORCAT_BG, + /**/ FLAGS, + /**/ OBJECT_TOKEI_TURRET, + /**/ sizeof(ObjTokeiTurret), + /**/ ObjTokeiTurret_Init, + /**/ ObjTokeiTurret_Destroy, + /**/ ObjTokeiTurret_Update, + /**/ ObjTokeiTurret_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 7f8d87ca4..07a75650b 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,15 @@ 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), - (ActorFunc)ObjTokeidai_Init, - (ActorFunc)ObjTokeidai_Destroy, - (ActorFunc)ObjTokeidai_Update, - (ActorFunc)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 b2b5e0314..7c0809096 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,15 @@ 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), - (ActorFunc)ObjToudai_Init, - (ActorFunc)ObjToudai_Destroy, - (ActorFunc)ObjToudai_Update, - (ActorFunc)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 3fff091b6..158880f5f 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,15 @@ 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), - (ActorFunc)ObjTree_Init, - (ActorFunc)ObjTree_Destroy, - (ActorFunc)ObjTree_Update, - (ActorFunc)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 bdfc48aa8..119ab4f22 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,15 @@ s16 D_80929508 = 0; s16 D_8092950C = 0; ActorInit Obj_Tsubo_InitVars = { - ACTOR_OBJ_TSUBO, - ACTORCAT_PROP, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjTsubo), - (ActorFunc)ObjTsubo_Init, - (ActorFunc)ObjTsubo_Destroy, - (ActorFunc)ObjTsubo_Update, - (ActorFunc)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 3f556d640..c556146c1 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -63,15 +63,15 @@ 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), - (ActorFunc)ObjUm_Init, - (ActorFunc)ObjUm_Destroy, - (ActorFunc)ObjUm_Update, - (ActorFunc)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 23e6eb0ac..001a00501 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,15 @@ 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), - (ActorFunc)ObjUsiyane_Init, - (ActorFunc)ObjUsiyane_Destroy, - (ActorFunc)ObjUsiyane_Update, - (ActorFunc)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 c685f2836..81cd33221 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,15 @@ 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), - (ActorFunc)ObjVisiblock_Init, - (ActorFunc)ObjVisiblock_Destroy, - (ActorFunc)Actor_Noop, - (ActorFunc)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 793838c8b..d74073d65 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,15 @@ 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), - (ActorFunc)ObjVspinyroll_Init, - (ActorFunc)ObjVspinyroll_Destroy, - (ActorFunc)ObjVspinyroll_Update, - (ActorFunc)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 62ec8f0f7..4579d368f 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,15 @@ 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), - (ActorFunc)ObjWarpstone_Init, - (ActorFunc)ObjWarpstone_Destroy, - (ActorFunc)ObjWarpstone_Update, - (ActorFunc)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_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index 3b6b90731..a99843120 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -17,15 +17,15 @@ void ObjWind_Update(Actor* thisx, PlayState* play); void ObjWind_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Wind_InitVars = { - ACTOR_OBJ_WIND, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(ObjWind), - (ActorFunc)ObjWind_Init, - (ActorFunc)ObjWind_Destroy, - (ActorFunc)ObjWind_Update, - (ActorFunc)ObjWind_Draw, + /**/ ACTOR_OBJ_WIND, + /**/ ACTORCAT_ITEMACTION, + /**/ FLAGS, + /**/ GAMEPLAY_KEEP, + /**/ sizeof(ObjWind), + /**/ ObjWind_Init, + /**/ ObjWind_Destroy, + /**/ ObjWind_Update, + /**/ ObjWind_Draw, }; static InitChainEntry sInitChain[] = { 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 f4b5ca225..72192320c 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,15 @@ 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), (ActorFunc)ObjWturn_Init, - (ActorFunc)Actor_Noop, (ActorFunc)ObjWturn_Update, (ActorFunc)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 791afcd6a..8866416c4 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,15 @@ 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), - (ActorFunc)ObjY2lift_Init, - (ActorFunc)ObjY2lift_Destroy, - (ActorFunc)ObjY2lift_Update, - (ActorFunc)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 d1b39bb24..3d5f1265c 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,15 @@ typedef struct ShutterInfo { } ShutterInfo; // size = 0x20 ActorInit Obj_Y2shutter_InitVars = { - ACTOR_OBJ_Y2SHUTTER, - ACTORCAT_BG, - FLAGS, - OBJECT_KAIZOKU_OBJ, - sizeof(ObjY2shutter), - (ActorFunc)ObjY2shutter_Init, - (ActorFunc)ObjY2shutter_Destroy, - (ActorFunc)ObjY2shutter_Update, - (ActorFunc)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 b4a78851a..d258d1ee1 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,15 @@ 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), - (ActorFunc)ObjYado_Init, - (ActorFunc)ObjYado_Destroy, - (ActorFunc)ObjYado_Update, - (ActorFunc)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 b11454095..30ea80a23 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,15 @@ 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), - (ActorFunc)ObjYasi_Init, - (ActorFunc)ObjYasi_Destroy, - (ActorFunc)ObjYasi_Update, - (ActorFunc)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 dbefd93b9..309bbd8ad 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,15 @@ 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), - (ActorFunc)ObjectKankyo_Init, - (ActorFunc)ObjectKankyo_Destroy, - (ActorFunc)ObjectKankyo_Update, - (ActorFunc)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 2dbfecfdf..7414effc3 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,15 @@ 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), - (ActorFunc)OceffSpot_Init, - (ActorFunc)OceffSpot_Destroy, - (ActorFunc)OceffSpot_Update, - (ActorFunc)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 5fa5d58c3..4ec6e05aa 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,15 @@ 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), - (ActorFunc)OceffStorm_Init, - (ActorFunc)OceffStorm_Destroy, - (ActorFunc)OceffStorm_Update, - (ActorFunc)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 59cd120cf..fa0bf7821 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,15 @@ 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), - (ActorFunc)OceffWipe_Init, - (ActorFunc)OceffWipe_Destroy, - (ActorFunc)OceffWipe_Update, - (ActorFunc)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 6dbea9128..59f9386a5 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,15 @@ 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), - (ActorFunc)OceffWipe2_Init, - (ActorFunc)OceffWipe2_Destroy, - (ActorFunc)OceffWipe2_Update, - (ActorFunc)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 f0ab978c8..070fa9965 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,15 @@ 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), - (ActorFunc)OceffWipe3_Init, - (ActorFunc)OceffWipe3_Destroy, - (ActorFunc)OceffWipe3_Update, - (ActorFunc)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 0bda6d1b9..cccb3e169 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,15 @@ 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), - (ActorFunc)OceffWipe4_Init, - (ActorFunc)OceffWipe4_Destroy, - (ActorFunc)OceffWipe4_Update, - (ActorFunc)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 272d0fb88..3d98236b2 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,15 @@ 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), - (ActorFunc)OceffWipe5_Init, - (ActorFunc)OceffWipe5_Destroy, - (ActorFunc)OceffWipe5_Update, - (ActorFunc)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 28a5dfb04..601c62d5d 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,15 @@ 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), - (ActorFunc)OceffWipe6_Init, - (ActorFunc)OceffWipe6_Destroy, - (ActorFunc)OceffWipe6_Update, - (ActorFunc)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 49f9fc0dd..76946aa83 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,15 @@ 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), - (ActorFunc)OceffWipe7_Init, - (ActorFunc)OceffWipe7_Destroy, - (ActorFunc)OceffWipe7_Update, - (ActorFunc)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 7a5cc209d..68e3dccd7 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,15 @@ 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), - (ActorFunc)ShotSun_Init, - (ActorFunc)ShotSun_Destroy, - (ActorFunc)ShotSun_Update, - (ActorFunc)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 6279c367e..2a15d11c9 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -20,15 +20,15 @@ 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), - (ActorFunc)TGSw_Init, - (ActorFunc)TGSw_Destroy, - (ActorFunc)TGSw_Update, - (ActorFunc)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) { diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 07a18db57..b74580dc2 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -648,14 +648,14 @@ void func_8082DE50(PlayState* play, Player* this) { s32 func_8082DE88(Player* this, s32 arg1, s32 arg2) { s16 controlStickAngleDiff = this->prevControlStickAngle - sPlayerControlStickAngle; - this->actionVar2 += + this->av2.actionVar2 += arg1 + TRUNCF_BINANG(ABS_ALT(controlStickAngleDiff) * fabsf(sPlayerControlStickMagnitude) * (1.0f / 0x600F0)); if (CHECK_BTN_ANY(sPlayerControlInput->press.button, BTN_B | BTN_A)) { - this->actionVar2 += 5; + this->av2.actionVar2 += 5; } - return this->actionVar2 >= arg2; + return this->av2.actionVar2 >= arg2; } void func_8082DF2C(PlayState* play) { @@ -4267,8 +4267,8 @@ s32 Player_SetAction(PlayState* play, Player* this, PlayerActionFunc actionFunc, PLAYER_STATE3_8000 | PLAYER_STATE3_10000 | PLAYER_STATE3_20000 | PLAYER_STATE3_40000 | PLAYER_STATE3_80000 | PLAYER_STATE3_200000 | PLAYER_STATE3_1000000 | PLAYER_STATE3_20000000); - this->actionVar1 = 0; - this->actionVar2 = 0; + this->av1.actionVar1 = 0; + this->av2.actionVar2 = 0; this->unk_AA4 = 0; this->unk_B86[0] = 0; this->unk_B86[1] = 0; @@ -4501,7 +4501,7 @@ void func_80831F34(PlayState* play, Player* this, PlayerAnimationHeader* anim) { if (Inventory_ConsumeFairy(play)) { play->gameOverCtx.state = GAMEOVER_REVIVE_START; - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } else { play->gameOverCtx.state = GAMEOVER_DEATH_START; Audio_StopFanfare(0); @@ -5352,7 +5352,7 @@ void func_8083375C(Player* this, PlayerMeleeWeaponAnimation meleeWeaponAnim) { void func_80833864(PlayState* play, Player* this, PlayerMeleeWeaponAnimation meleeWeaponAnim) { func_8083375C(this, meleeWeaponAnim); Player_SetAction(play, this, Player_Action_84, 0); - this->actionVar2 = 0; + this->av2.actionVar2 = 0; if ((meleeWeaponAnim < PLAYER_MWA_FLIPSLASH_FINISH) || (meleeWeaponAnim > PLAYER_MWA_ZORA_JUMPKICK_FINISH)) { func_8082DC38(this); @@ -5419,7 +5419,7 @@ void func_80833A64(Player* this) { void func_80833AA0(Player* this, PlayState* play) { if (Player_SetAction(play, this, Player_Action_25, 0)) { Player_AnimationPlayLoop(play, this, &gPlayerAnim_link_normal_landing_wait); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } if (this->unk_AA5 != PLAYER_UNKAA5_4) { this->unk_AA5 = PLAYER_UNKAA5_0; @@ -5482,7 +5482,7 @@ void func_80833B18(PlayState* play, Player* this, s32 arg2, f32 speed, f32 veloc func_8082DB60(play, this, &gPlayerAnim_link_normal_electric_shock); func_8082DAD4(this); - this->actionVar2 = 20; + this->av2.actionVar2 = 20; this->actor.velocity.y = 0.0f; Player_RequestRumble(play, this, 255, 80, 150, SQ(0)); @@ -5514,7 +5514,7 @@ void func_80833B18(PlayState* play, Player* this, s32 arg2, f32 speed, f32 veloc func_8082DAD4(this); if (arg2 == 2) { - this->actionVar2 = 4; + this->av2.actionVar2 = 4; this->actor.speed = 3.0f; this->linearVelocity = 3.0f; @@ -5609,11 +5609,11 @@ void func_80834140(PlayState* play, Player* this, PlayerAnimationHeader* anim) { if (!(this->stateFlags1 & PLAYER_STATE1_80)) { func_80834104(play, this); if (func_8082DA90(play)) { - this->actionVar2 = -30; + this->av2.actionVar2 = -30; } this->stateFlags1 |= PLAYER_STATE1_80; PlayerAnimation_Change(play, &this->skelAnime, anim, 1.0f, 0.0f, 84.0f, ANIMMODE_ONCE, -6.0f); - this->actionVar1 = 1; + this->av1.actionVar1 = 1; this->linearVelocity = 0.0f; } } @@ -5773,7 +5773,7 @@ s32 func_80834600(Player* this, PlayState* play) { Player_SetAction(play, this, Player_Action_19, 0); } - this->actionVar1 = sp64; + this->av1.actionVar1 = sp64; if ((s8)sp64 == 0) { Player_SetUpperAction(play, this, Player_UpperAction_4); var_a2 = (this->unk_B40 < 0.5f) ? D_8085CFD4[Player_IsHoldingTwoHandedWeapon(this)] @@ -6002,8 +6002,8 @@ void func_80835324(PlayState* play, Player* this, f32 arg2, s16 arg3) { func_8082DD2C(play, this); this->csId = CS_ID_NONE; - this->actionVar1 = 1; - this->actionVar2 = 1; + this->av1.actionVar1 = 1; + this->av2.actionVar2 = 1; this->unk_3A0.x = Math_SinS(arg3) * arg2 + this->actor.world.pos.x; this->unk_3A0.z = Math_CosS(arg3) * arg2 + this->actor.world.pos.z; @@ -6082,7 +6082,7 @@ void func_808354A4(PlayState* play, s32 exitIndex, s32 arg2) { void func_808355D8(PlayState* play, Player* this, PlayerAnimationHeader* anim) { func_80833AA0(this, play); - this->actionVar2 = -2; + this->av2.actionVar2 = -2; func_8082E5EC(play, this, anim); func_8082E1F0(this, NA_SE_IT_DEKUNUTS_FLOWER_CLOSE); } @@ -6203,11 +6203,11 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol this->stateFlags1 |= PLAYER_STATE1_20000000; } else { func_80834104(play, this); - this->actionVar2 = 9999; + this->av2.actionVar2 = 9999; if (this->floorProperty == FLOOR_PROPERTY_5) { - this->actionVar1 = -1; + this->av1.actionVar1 = -1; } else { - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } } } @@ -6306,7 +6306,7 @@ void Player_Door_Staircase(PlayState* play, Player* this, Actor* door) { func_80835324(play, this, 50.0f, this->actor.shape.rot.y); this->unk_397 = this->doorType; - this->actionVar1 = 0; + this->av1.actionVar1 = 0; this->stateFlags1 |= PLAYER_STATE1_20000000; func_80835BF8(&doorStaircase->actor.world.pos, doorStaircase->actor.shape.rot.y, -140.0f, &this->unk_3A0); @@ -6319,7 +6319,7 @@ void Player_Door_Staircase(PlayState* play, Player* this, Actor* door) { func_8082DAD4(this); if (this->doorTimer != 0) { - this->actionVar2 = 0; + this->av2.actionVar2 = 0; func_8082E438(play, this, func_8082ED20(this)); this->skelAnime.endFrame = 0.0f; } else { @@ -6327,7 +6327,7 @@ void Player_Door_Staircase(PlayState* play, Player* this, Actor* door) { } Camera_ChangeSetting(Play_GetCamera(play, CAM_ID_MAIN), CAM_SET_SCENE0); - this->doorBgCamIndex = + this->cv.doorBgCamIndex = play->doorCtx.transitionActorList[DOOR_GET_TRANSITION_ID(&doorStaircase->actor)].sides[0].bgCamIndex; Actor_DeactivateLens(play); this->floorSfxOffset = NA_SE_PL_WALK_CONCRETE - SFX_FLAG; @@ -6350,7 +6350,7 @@ void Player_Door_Sliding(PlayState* play, Player* this, Actor* door) { } func_80835324(play, this, 50.0f, this->actor.shape.rot.y); - this->actionVar1 = 0; + this->av1.actionVar1 = 0; this->unk_397 = this->doorType; this->stateFlags1 |= PLAYER_STATE1_20000000; Actor_OffsetOfPointInActorCoords(&doorSliding->dyna.actor, &sp38, &this->actor.world.pos); @@ -6366,7 +6366,7 @@ void Player_Door_Sliding(PlayState* play, Player* this, Actor* door) { func_8082DAD4(this); if (this->doorTimer != 0) { - this->actionVar2 = 0; + this->av2.actionVar2 = 0; func_8082E438(play, this, func_8082ED20(this)); this->skelAnime.endFrame = 0.0f; } else { @@ -6374,9 +6374,9 @@ void Player_Door_Sliding(PlayState* play, Player* this, Actor* door) { } if (doorSliding->dyna.actor.category == ACTORCAT_DOOR) { - this->doorBgCamIndex = play->doorCtx.transitionActorList[DOOR_GET_TRANSITION_ID(&doorSliding->dyna.actor)] - .sides[this->doorDirection > 0 ? 0 : 1] - .bgCamIndex; + this->cv.doorBgCamIndex = play->doorCtx.transitionActorList[DOOR_GET_TRANSITION_ID(&doorSliding->dyna.actor)] + .sides[this->doorDirection > 0 ? 0 : 1] + .bgCamIndex; Actor_DeactivateLens(play); } } @@ -6469,14 +6469,14 @@ void Player_Door_Knob(PlayState* play, Player* this, Actor* door) { } else if (enDoorType != ENDOOR_TYPE_7) { Camera* mainCam; - this->actionVar1 = 38.0f * D_8085C3E8; + this->av1.actionVar1 = 38.0f * D_8085C3E8; mainCam = Play_GetCamera(play, CAM_ID_MAIN); Camera_ChangeDoorCam(mainCam, &knobDoor->dyna.actor, play->doorCtx.transitionActorList[DOOR_GET_TRANSITION_ID(&knobDoor->dyna.actor)] .sides[(this->doorDirection > 0) ? 0 : 1] .bgCamIndex, - 0.0f, this->actionVar1, 26.0f * D_8085C3E8, 10.0f * D_8085C3E8); + 0.0f, this->av1.actionVar1, 26.0f * D_8085C3E8, 10.0f * D_8085C3E8); } } } @@ -6591,7 +6591,7 @@ void func_808369F4(Player* this, PlayState* play) { void func_80836A5C(Player* this, PlayState* play) { func_808369F4(this, play); if (func_80123420(this)) { - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } } @@ -6787,9 +6787,9 @@ void func_80837134(PlayState* play, Player* this) { } } else if (this->stateFlags2 & PLAYER_STATE2_80000) { if (func_80123420(this)) { - anim = D_8085C2A4[this->actionVar1].unk_8; + anim = D_8085C2A4[this->av1.actionVar1].unk_8; } else { - anim = D_8085C2A4[this->actionVar1].unk_4; + anim = D_8085C2A4[this->av1.actionVar1].unk_4; } } else if (this->skelAnime.animation == &gPlayerAnim_link_normal_run_jump) { anim = &gPlayerAnim_link_normal_run_jump_end; @@ -6808,9 +6808,9 @@ void func_80837134(PlayState* play, Player* this) { this->skelAnime.endFrame = 8.0f; if (temp_v0_2 == 1) { - this->actionVar2 = 0xA; + this->av2.actionVar2 = 0xA; } else { - this->actionVar2 = 0x14; + this->av2.actionVar2 = 0x14; } } else if (temp_v0_2 == 0) { func_80836A98(this, anim, play); @@ -6855,9 +6855,9 @@ s32 func_808373F8(PlayState* play, Player* this, u16 sfxId) { } func_80834D50(play, this, D_8085C2A4[var_v1].unk_0, speed, ((var_v1 == 4) ? NA_SE_VO_LI_SWORD_N : sfxId)); - this->actionVar2 = -1; + this->av2.actionVar2 = -1; this->stateFlags2 |= PLAYER_STATE2_80000; - this->actionVar1 = var_v1; + this->av1.actionVar1 = var_v1; return true; } anim = &gPlayerAnim_link_normal_run_jump; @@ -6873,7 +6873,7 @@ s32 func_808373F8(PlayState* play, Player* this, u16 sfxId) { if ((this->actor.depthInWater > 0.0f) && (this->remainingHopsCounter != 0)) { this->actor.world.pos.y += this->actor.depthInWater; func_80834D50(play, this, anim, speed, NA_SE_NONE); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; this->stateFlags3 |= PLAYER_STATE3_200000; Player_PlaySfx(this, (NA_SE_PL_DEKUNUTS_JUMP5 + 1 - this->remainingHopsCounter)); Player_AnimSfx_PlayVoice(this, sfxId); @@ -6892,7 +6892,7 @@ s32 func_808373F8(PlayState* play, Player* this, u16 sfxId) { } func_80834D50(play, this, anim, speed, sfxId); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; return true; } @@ -7003,14 +7003,14 @@ void func_80837BF8(PlayState* play, Player* this) { } void func_80837C20(PlayState* play, Player* this) { - s32 sp1C = this->actionVar2; - s32 sp18 = this->actionVar1; + s32 sp1C = this->av2.actionVar2; + s32 sp18 = this->av1.actionVar1; Player_SetAction_PreserveMoveFlags(play, this, Player_Action_50, 0); this->actor.velocity.y = 0.0f; - this->actionVar2 = sp1C; - this->actionVar1 = sp18; + this->av2.actionVar2 = sp1C; + this->av1.actionVar1 = sp18; } void func_80837C78(PlayState* play, Player* this) { @@ -7018,9 +7018,9 @@ void func_80837C78(PlayState* play, Player* this) { this->stateFlags1 |= (PLAYER_STATE1_400 | PLAYER_STATE1_20000000); if (this->getItemId == GI_HEART_CONTAINER) { - this->actionVar2 = 20; + this->av2.actionVar2 = 20; } else if (this->getItemId >= GI_NONE) { - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } else { this->getItemId = -this->getItemId; } @@ -7116,8 +7116,8 @@ s32 func_80837DEC(Player* this, PlayState* play) { func_8082E920(play, this, ANIM_FLAG_1 | ANIM_FLAG_UPDATE_Y | ANIM_FLAG_4 | ANIM_FLAG_8 | ANIM_FLAG_NOMOVE | ANIM_FLAG_80); - this->actionVar2 = -1; - this->actionVar1 = var_v1_2; + this->av2.actionVar2 = -1; + this->av1.actionVar1 = var_v1_2; } else { this->stateFlags1 |= PLAYER_STATE1_2000; this->stateFlags1 &= ~PLAYER_STATE1_20000; @@ -7287,7 +7287,7 @@ s32 func_808387A0(PlayState* play, Player* this) { Player_StopCutscene(this); this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED; Player_SetAction(play, this, Player_Action_97, 0); - if (this->unk_3BA) { + if (this->cv.haltActorsDuringCsAction) { this->stateFlags1 |= PLAYER_STATE1_20000000; } func_8082DC38(this); @@ -7538,8 +7538,8 @@ s32 Player_ActionChange_13(Player* this, PlayState* play) { func_8082E438(play, this, D_8085BE84[31][this->modelAnimType]); } this->stateFlags1 |= PLAYER_STATE1_20000000; - this->actionVar2 = 80; - this->actionVar1 = -1; + this->av2.actionVar2 = 80; + this->av1.actionVar1 = -1; this->lockOnActor = this->talkActor; } else { this->csId = CS_ID_GLOBAL_TALK; @@ -7551,13 +7551,13 @@ s32 Player_ActionChange_13(Player* this, PlayState* play) { } else { this->stateFlags1 |= (PLAYER_STATE1_20000000 | PLAYER_STATE1_10000000 | PLAYER_STATE1_40); this->csId = play->playerCsIds[PLAYER_CS_ID_ITEM_SHOW]; - this->actionVar1 = 1; + this->av1.actionVar1 = 1; this->actor.textId = 0xFE; } this->actor.flags |= ACTOR_FLAG_TALK_REQUESTED; this->exchangeItemAction = this->itemAction; - if (this->actionVar1 >= 0) { - Player_AnimationPlayOnce(play, this, D_8085D1F8[this->actionVar1]); + if (this->av1.actionVar1 >= 0) { + Player_AnimationPlayOnce(play, this, D_8085D1F8[this->av1.actionVar1]); } func_8082DAD4(this); return true; @@ -7613,7 +7613,7 @@ s32 Player_ActionChange_13(Player* this, PlayState* play) { Player_StopCutscene(this); if (!(this->stateFlags1 & PLAYER_STATE1_800000)) { Player_SetAction(play, this, Player_Action_43, 1); - this->actionVar2 = 13; + this->av2.actionVar2 = 13; func_80836D8C(this); if (this->unk_AA5 == PLAYER_UNKAA5_2) { play->actorCtx.flags |= ACTORCTX_FLAG_PICTO_BOX_ON; @@ -7805,8 +7805,8 @@ void func_80839860(Player* this, PlayState* play, s32 arg2) { func_80834D50(play, this, D_8085C2A4[arg2].unk_0, speed, NA_SE_VO_LI_SWORD_N); - this->actionVar2 = 1; - this->actionVar1 = arg2; + this->av2.actionVar2 = 1; + this->av1.actionVar1 = arg2; this->currentYaw = this->actor.shape.rot.y + (arg2 << 0xE); this->linearVelocity = !(arg2 & 1) ? 6.0f : 8.5f; @@ -7964,7 +7964,7 @@ void func_8083A04C(Player* this) { this->currentBoots = PLAYER_BOOTS_ZORA_LAND; } if (Player_Action_54 == this->actionFunc) { - this->actionVar2 = 20; + this->av2.actionVar2 = 20; } } else { if (CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_B)) { @@ -8115,9 +8115,9 @@ s32 func_8083A6C0(PlayState* play, Player* this) { if (Player_GetBottleHeld(this) > PLAYER_BOTTLE_NONE) { Player_SetAction(play, this, Player_Action_68, 0); if (this->actor.depthInWater > 12.0f) { - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } - func_8082DB90(play, this, D_8085D200[this->actionVar2].unk_0); + func_8082DB90(play, this, D_8085D200[this->av2.actionVar2].unk_0); Player_PlaySfx(this, NA_SE_IT_SWORD_SWING); Player_AnimSfx_PlayVoice(this, NA_SE_VO_LI_AUTO_JUMP); return true; @@ -8155,7 +8155,7 @@ s32 func_8083A878(PlayState* play, Player* this, f32 arg2) { Player_SetAction(play, this, Player_Action_55, 0); func_8082E634(play, this, &gPlayerAnim_link_swimer_swim); this->stateFlags1 |= (PLAYER_STATE1_8000000 | PLAYER_STATE1_20000000); - this->actionVar2 = 20; + this->av2.actionVar2 = 20; this->linearVelocity = 2.0f; func_80123140(play, this); return false; @@ -8184,11 +8184,11 @@ void func_8083A98C(Actor* thisx, PlayState* play2) { return; } - if (DECR(this->actionVar2) != 0) { + if (DECR(this->av2.actionVar2) != 0) { camMode = (play->sceneId != SCENE_AYASHIISHOP) ? CAM_MODE_FIRSTPERSON : CAM_MODE_DEKUHIDE; // Show controls overlay. SCENE_AYASHIISHOP does not have Zoom, so has a different one. - if (this->actionVar2 == 1) { + if (this->av2.actionVar2 == 1) { Message_StartTextbox(play, (play->sceneId == SCENE_AYASHIISHOP) ? 0x2A00 : 0x5E6, NULL); } } else { @@ -8268,15 +8268,15 @@ void Player_InitMode_Telescope(PlayState* play, Player* this) { if (play->sceneId == SCENE_00KEIKOKU) { this->actor.focus.rot.x = 0xBD8; this->actor.focus.rot.y = -0x4D74; - this->actionVar2 = 20; + this->av2.actionVar2 = 20; } else if (play->sceneId == SCENE_AYASHIISHOP) { this->actor.focus.rot.x = 0x9A6; this->actor.focus.rot.y = 0x2102; - this->actionVar2 = 2; + this->av2.actionVar2 = 2; } else { this->actor.focus.rot.x = 0x9A6; this->actor.focus.rot.y = 0x2102; - this->actionVar2 = 20; + this->av2.actionVar2 = 20; } play->actorCtx.flags |= ACTORCTX_FLAG_1; } @@ -8287,7 +8287,7 @@ void Player_InitMode_B(PlayState* play, Player* this) { void Player_InitMode_D(PlayState* play, Player* this) { if (func_8083A878(play, this, 180.0f)) { - this->actionVar2 = -20; + this->av2.actionVar2 = -20; } } @@ -8297,7 +8297,7 @@ void func_8083ADF0(PlayState* play, Player* this) { gSaveContext.entranceSpeed = 2.0f; if (func_8083A878(play, this, 120.0f)) { - this->actionVar2 = -15; + this->av2.actionVar2 = -15; } } @@ -8308,9 +8308,9 @@ void Player_InitMode_F(PlayState* play, Player* this) { this->linearVelocity = gSaveContext.entranceSpeed; if (func_8083A878(play, this, 800.0f)) { - this->actionVar2 = -80.0f / this->linearVelocity; - if (this->actionVar2 < -20) { - this->actionVar2 = -20; + this->av2.actionVar2 = -80.0f / this->linearVelocity; + if (this->av2.actionVar2 < -20) { + this->av2.actionVar2 = -20; } } } @@ -8372,7 +8372,7 @@ void func_8083B1A0(Player* this, PlayState* play) { void func_8083B23C(Player* this, PlayState* play) { Player_SetAction(play, this, Player_Action_2, 1); func_8082E438(play, this, D_8085BE84[PLAYER_ANIMGROUP_6][this->modelAnimType]); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } void func_8083B29C(Player* this, PlayState* play) { @@ -8465,7 +8465,7 @@ s32 func_8083B3B4(PlayState* play, Player* this, Input* input) { if (this->stateFlags1 & PLAYER_STATE1_400) { this->stateFlags1 |= (PLAYER_STATE1_400 | PLAYER_STATE1_800 | PLAYER_STATE1_20000000); } - this->actionVar2 = 2; + this->av2.actionVar2 = 2; } func_8082E438(play, this, @@ -8492,7 +8492,7 @@ void func_8083B798(PlayState* play, Player* this) { this->unk_B48 = 2.0f; } else { Player_AnimationPlayLoop(play, this, &gPlayerAnim_link_swimer_swim); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } this->unk_AAA = 0x3E80; @@ -8534,7 +8534,7 @@ void func_8083B930(PlayState* play, Player* this) { } else if ((this->currentBoots < PLAYER_BOOTS_ZORA_UNDERWATER) && (this->stateFlags2 & PLAYER_STATE2_400)) { this->stateFlags2 &= ~PLAYER_STATE2_400; func_8083B3B4(play, this, NULL); - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } else if (Player_Action_27 == this->actionFunc) { Player_SetAction(play, this, Player_Action_59, 0); func_8083B798(play, this); @@ -9018,11 +9018,11 @@ s32 Player_HandleSlopes(PlayState* play, Player* this) { } else { Player_SetAction(play, this, Player_Action_73, 0); func_8082DE50(play, this); - func_8082E514(play, this, sPlayerSlopeSlipAnims[this->actionVar1]); + func_8082E514(play, this, sPlayerSlopeSlipAnims[this->av1.actionVar1]); this->linearVelocity = sqrtf(SQXZ(this->actor.velocity)); this->currentYaw = downwardSlopeYaw; if (sPlayerFloorPitchShape >= 0) { - this->actionVar1 = 1; + this->av1.actionVar1 = 1; Player_AnimSfx_PlayVoice(this, NA_SE_VO_LI_HANG); } @@ -9270,7 +9270,7 @@ s32 func_8083D860(Player* this, PlayState* play) { this->stateFlags1 &= ~PLAYER_STATE1_8000000; if ((var_t0 != 0) || temp_t2) { - if ((this->actionVar1 = var_t0) != 0) { + if ((this->av1.actionVar1 = var_t0) != 0) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { anim = &gPlayerAnim_link_normal_Fclimb_startA; @@ -9283,14 +9283,14 @@ s32 func_8083D860(Player* this, PlayState* play) { distToInteractWall = 20.5f; } - this->actionVar2 = -2; + this->av2.actionVar2 = -2; this->actor.world.pos.y += yOut; this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw + 0x8000; } else { anim = this->ageProperties->unk_B0; distToInteractWall = (this->ageProperties->wallCheckRadius - this->ageProperties->unk_3C) + 17.0f; - this->actionVar2 = -4; + this->av2.actionVar2 = -4; this->actor.shape.rot.y = this->currentYaw = i = this->actor.wallYaw; //! FAKE } @@ -9974,7 +9974,7 @@ s32 func_8083FD80(Player* this, PlayState* play) { //! Calling this function sets the meleeWeaponQuads' damage properties correctly, patching "Power Crouch Stab". func_8083375C(this, PLAYER_MWA_STAB_1H); Player_AnimationPlayOnce(play, this, &gPlayerAnim_link_normal_defense_kiru); - this->actionVar1 = 1; + this->av1.actionVar1 = 1; this->meleeWeaponAnimation = PLAYER_MWA_STAB_1H; this->currentYaw = this->actor.shape.rot.y + this->upperLimbRot.y; this->unk_ADD = 0; @@ -10206,10 +10206,10 @@ s32 func_808401F4(PlayState* play, Player* this) { Vec3f D_8085D2A4 = { 0.0f, 0.0f, 5.0f }; void func_80840770(PlayState* play, Player* this) { - if (this->actionVar2 != 0) { - if (this->actionVar2 > 0) { - this->actionVar2--; - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 != 0) { + if (this->av2.actionVar2 > 0) { + this->av2.actionVar2--; + if (this->av2.actionVar2 == 0) { if (this->stateFlags1 & PLAYER_STATE1_8000000) { PlayerAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_swimer_swim_wait, 1.0f, 0.0f, Animation_GetLastFrame(&gPlayerAnim_link_swimer_swim_wait), ANIMMODE_ONCE, @@ -10220,7 +10220,7 @@ void func_80840770(PlayState* play, Player* this) { 0.0f); } gSaveContext.healthAccumulator = 0xA0; - this->actionVar2 = -1; + this->av2.actionVar2 = -1; } } else if (gSaveContext.healthAccumulator == 0) { Player_StopCutscene(this); @@ -10236,10 +10236,10 @@ void func_80840770(PlayState* play, Player* this) { func_808339B4(this, -20); Audio_SetBgmVolumeOn(); } - } else if (this->actionVar1 != 0) { + } else if (this->av1.actionVar1 != 0) { Player_StopCutscene(this); this->csId = play->playerCsIds[PLAYER_CS_ID_REVIVE]; - this->actionVar2 = 60; + this->av2.actionVar2 = 60; Player_SpawnFairy(play, this, &this->actor.world.pos, &D_8085D2A4, FAIRY_PARAMS(FAIRY_TYPE_5, false, 0)); Player_PlaySfx(this, NA_SE_EV_FIATY_HEAL - SFX_FLAG); } else if (play->gameOverCtx.state == GAMEOVER_DEATH_WAIT_GROUND) { @@ -10310,7 +10310,7 @@ s32 func_80840A30(PlayState* play, Player* this, f32* arg2, f32 arg3) { } else { Player_SetAction(play, this, Player_Action_26, 0); Player_AnimationPlayOnce(play, this, D_8085BE84[PLAYER_ANIMGROUP_16][this->modelAnimType]); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } } @@ -10369,7 +10369,7 @@ void func_80840E5C(Player* this, PlayState* play) { void func_80840EC0(Player* this, PlayState* play) { Player_SetAction(play, this, Player_Action_30, 1); Player_AnimationPlayLoop(play, this, D_8085CF60[Player_IsHoldingTwoHandedWeapon(this)]); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; this->unk_B38 = 0.0f; } @@ -10488,7 +10488,7 @@ void Player_InitMode_1(PlayState* play, Player* this) { if (this->transformation == PLAYER_FORM_FIERCE_DEITY) { func_80841358(play, this, false); } - this->actionVar2 = 20; + this->av2.actionVar2 = 20; } void Player_InitMode_3(PlayState* play, Player* this) { @@ -10518,7 +10518,7 @@ void Player_InitMode_6(PlayState* play, Player* this) { Player_SetAction(play, this, Player_Action_0, 0); func_8082E514(play, this, D_8085BE84[PLAYER_ANIMGROUP_43][this->modelAnimType]); this->stateFlags1 |= PLAYER_STATE1_20000000; - this->actionVar2 = 0x28; + this->av2.actionVar2 = 0x28; gSaveContext.save.isOwlSave = false; } else { Player_SetAction(play, this, Player_Action_4, 0); @@ -10542,7 +10542,7 @@ void func_80841744(PlayState* play, Player* this) { } this->stateFlags1 |= PLAYER_STATE1_20000000; this->unk_ABC = -10000.0f; - this->actionVar2 = 0x2710; + this->av2.actionVar2 = 0x2710; this->unk_B10[5] = 8.0f; } @@ -11551,7 +11551,7 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) { (this->meleeWeaponAnimation >= PLAYER_MWA_FORWARD_SLASH_1H) && (this->meleeWeaponAnimation <= PLAYER_MWA_ZORA_PUNCH_KICK)) || (this->stateFlags3 & PLAYER_STATE3_8) || - ((Player_Action_52 == this->actionFunc) && (this->actionVar2 == 0)) || + ((Player_Action_52 == this->actionFunc) && (this->av2.actionVar2 == 0)) || (Player_Action_53 == this->actionFunc)) { camMode = CAM_MODE_STILL; } else { @@ -11833,7 +11833,7 @@ void func_80844784(PlayState* play, Player* this) { Audio_SetSfxTimerLerpInterval(4, 2); } - this->actionVar2 = 0x270F; + this->av2.actionVar2 = 0x270F; Math_Vec3f_Copy(this->unk_AF0, &this->actor.world.pos); } @@ -12023,7 +12023,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { func_8083B930(play, this); this->stateFlags2 &= ~PLAYER_STATE2_400; if (Player_Action_54 == this->actionFunc) { - this->actionVar2 = 20; + this->av2.actionVar2 = 20; } } this->prevBoots = this->currentBoots; @@ -12031,7 +12031,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { if ((this->actor.parent == NULL) && (this->stateFlags1 & PLAYER_STATE1_800000)) { this->actor.parent = this->rideActor; func_80837BD0(play, this); - this->actionVar2 = -1; + this->av2.actionVar2 = -1; Player_AnimationPlayOnce(play, this, &gPlayerAnim_link_uma_wait_1); func_8082E920(play, this, ANIM_FLAG_1 | ANIM_FLAG_UPDATE_Y | ANIM_FLAG_8 | ANIM_FLAG_NOMOVE | ANIM_FLAG_80); } @@ -12329,7 +12329,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } if (!(this->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_4000000)) && (this->invincibilityTimer <= 0)) { if ((Player_Action_93 != this->actionFunc) && - ((Player_Action_96 != this->actionFunc) || (this->actionVar1 != 1))) { + ((Player_Action_96 != this->actionFunc) || (this->av1.actionVar1 != 1))) { if (this->cylinder.base.atFlags != AT_NONE) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->cylinder.base); } @@ -12558,7 +12558,7 @@ void Player_Draw(Actor* thisx, PlayState* play) { spE0 = 0.0f; } else { Matrix_Translate(0.0f, -this->unk_ABC, 0.0f, MTXMODE_APPLY); - spE0 = this->actionVar2 - 6; + spE0 = this->av2.actionVar2 - 6; if (spE0 < 0.0f) { spE8 = D_8085D55C; spE0 = this->unk_B86[0]; @@ -12639,11 +12639,11 @@ void Player_Draw(Actor* thisx, PlayState* play) { func_80122BA4(play, &this->unk_3D0, 2, 255); if (this->unk_B86[1] < 3) { - if (this->actionVar1 >= 5) { + if (this->av1.actionVar1 >= 5) { f32 var_fa1; u8 sp9B; - var_fa1 = (this->actionVar1 - 4) * 0.02f; + var_fa1 = (this->av1.actionVar1 - 4) * 0.02f; if (this->unk_B86[1] != 0) { sp9B = (-this->unk_B86[1] * 0x55) + 0xFF; @@ -12932,7 +12932,7 @@ void func_808479F4(PlayState* play, Player* this, f32 arg2) { } void func_80847A50(Player* this) { - Player_PlaySfx(this, ((this->actionVar1 != 0) ? NA_SE_PL_WALK_METAL1 : NA_SE_PL_WALK_LADDER) + + Player_PlaySfx(this, ((this->av1.actionVar1 != 0) ? NA_SE_PL_WALK_METAL1 : NA_SE_PL_WALK_LADDER) + this->ageProperties->surfaceSfxIdOffset); } @@ -12984,8 +12984,8 @@ s32 func_80847BF0(Player* this, PlayState* play) { s32 var_a2; f32 sp34; - if (this->actionVar2 < 0) { - this->actionVar2 = 0x63; + if (this->av2.actionVar2 < 0) { + this->av2.actionVar2 = 0x63; } else { var_a2 = (this->mountSide < 0) ? 0 : 1; @@ -13149,10 +13149,10 @@ s32 func_808482E0(PlayState* play, Player* this) { return true; } - if (this->actionVar1 == 0) { + if (this->av1.actionVar1 == 0) { GetItemEntry* giEntry = &sGetItemTable[this->getItemId - 1]; - this->actionVar1 = 1; + this->av1.actionVar1 = 1; Message_StartTextbox(play, giEntry->textId, &this->actor); Item_Give(play, giEntry->itemId); @@ -13648,15 +13648,15 @@ void Player_Action_0(Player* this, PlayState* play) { PlayerAnimation_Update(play, &this->skelAnime); func_808323C0(this, play->playerCsIds[PLAYER_CS_ID_ITEM_BOTTLE]); - if (DECR(this->actionVar2) == 0) { + if (DECR(this->av2.actionVar2) == 0) { if (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) { Player_StopCutscene(this); Player_SetAction(play, this, Player_Action_4, 0); this->stateFlags1 &= ~PLAYER_STATE1_20000000; } - } else if (this->actionVar2 == 30) { + } else if (this->av2.actionVar2 == 30) { if (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE) { - this->actionVar2++; + this->av2.actionVar2++; } else { Message_StartTextbox(play, 0xC03, NULL); } @@ -13702,7 +13702,7 @@ void Player_Action_1(Player* this, PlayState* play) { Player_AnimationPlayOnce(play, this, func_8082ED20(this)); if ((play->roomCtx.curRoom.num == this->unk_3CE) && (play->roomCtx.prevRoom.num < 0)) { - this->actionVar2 = 5; + this->av2.actionVar2 = 5; } else { play->roomCtx.curRoom.num = -1; play->roomCtx.prevRoom.num = -1; @@ -13710,19 +13710,19 @@ void Player_Action_1(Player* this, PlayState* play) { play->roomCtx.prevRoom.segment = NULL; func_8012EBF8(play, &play->roomCtx); - this->actionVar2 = -1; - this->actionVar1 = this->unk_3CE; + this->av2.actionVar2 = -1; + this->av1.actionVar1 = this->unk_3CE; } } } - } else if (this->actionVar2 < 0) { - if (Room_StartRoomTransition(play, &play->roomCtx, this->actionVar1)) { + } else if (this->av2.actionVar2 < 0) { + if (Room_StartRoomTransition(play, &play->roomCtx, this->av1.actionVar1)) { Map_InitRoomData(play, play->roomCtx.curRoom.num); Minimap_SavePlayerRoomInitInfo(play); - this->actionVar2 = 5; + this->av2.actionVar2 = 5; } - } else if (this->actionVar2 > 0) { - this->actionVar2--; + } else if (this->av2.actionVar2 > 0) { + this->av2.actionVar2--; } else { R_PLAY_FILL_SCREEN_ALPHA += R_PLAY_FILL_SCREEN_ON; if (R_PLAY_FILL_SCREEN_ALPHA < 0) { @@ -13740,11 +13740,11 @@ void Player_Action_2(Player* this, PlayState* play) { s16 yawTarget; s32 temp_v0; - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { if (PlayerAnimation_Update(play, &this->skelAnime)) { func_8082E794(this); Player_AnimationPlayLoop(play, this, func_8082EF54(this)); - this->actionVar2 = 0; + this->av2.actionVar2 = 0; this->stateFlags3 &= ~PLAYER_STATE3_8; } func_8082FC60(this); @@ -13862,13 +13862,13 @@ void Player_Action_4(Player* this, PlayState* play) { if (animFinished || ((this->currentMask == PLAYER_MASK_SCENTS) && (this->skelAnime.animation != &gPlayerAnim_cl_msbowait)) || ((this->currentMask != PLAYER_MASK_SCENTS) && (this->skelAnime.animation == &gPlayerAnim_cl_msbowait))) { - if (this->actionVar2 != 0) { - if (DECR(this->actionVar2) == 0) { + if (this->av2.actionVar2 != 0) { + if (DECR(this->av2.actionVar2) == 0) { this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; } this->skelAnime.jointTable[PLAYER_LIMB_ROOT - 1].y = - (this->skelAnime.jointTable[PLAYER_LIMB_ROOT - 1].y + ((this->actionVar2 & 1) * 0x50)) - 0x28; + (this->skelAnime.jointTable[PLAYER_LIMB_ROOT - 1].y + ((this->av2.actionVar2 & 1) * 0x50)) - 0x28; } else { func_8082E794(this); Player_ChooseIdleAnim(play, this); @@ -13877,7 +13877,7 @@ void Player_Action_4(Player* this, PlayState* play) { } func_80832F24(this); - if ((this->actionVar2 == 0) && !func_80847880(play, this) && + if ((this->av2.actionVar2 == 0) && !func_80847880(play, this) && !Player_TryActionChangeList(play, this, sPlayerActionChangeList7, true)) { if (func_8082FB68(this)) { func_8083B23C(this, play); @@ -14336,7 +14336,7 @@ void Player_Action_17(Player* this, PlayState* play) { func_8082E67C(play, this, D_8085BE84[PLAYER_ANIMGROUP_32][this->modelAnimType]); } - if (DECR(this->actionVar2) == 0) { + if (DECR(this->av2.actionVar2) == 0) { if (!Player_ActionChange_13(this, play)) { func_80836A98(this, D_8085BE84[PLAYER_ANIMGROUP_33][this->modelAnimType], play); } @@ -14375,8 +14375,8 @@ void Player_Action_18(Player* this, PlayState* play) { Player_AnimationPlayLoop(play, this, D_8085BE84[PLAYER_ANIMGROUP_20][this->modelAnimType]); } - this->actionVar2 = 1; - this->actionVar1 = 0; + this->av2.actionVar2 = 1; + this->av1.actionVar1 = 0; } if (!Player_IsGoronOrDeku(this)) { @@ -14388,7 +14388,7 @@ void Player_Action_18(Player* this, PlayState* play) { } } - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { f32 yStick = sPlayerControlInput->rel.stick_y * 180; f32 xStick = sPlayerControlInput->rel.stick_x * -120; s16 temp_a0 = this->actor.shape.rot.y - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play)); @@ -14411,14 +14411,14 @@ void Player_Action_18(Player* this, PlayState* play) { this->upperLimbRot.x = this->actor.focus.rot.x; Math_ScaledStepToS(&this->upperLimbRot.y, temp_ft5, var_a3); - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { if (!func_808401F4(play, this)) { if (this->skelAnime.curFrame < 2.0f) { func_8082FA5C(play, this, PLAYER_MELEE_WEAPON_STATE_1); } } else { - this->actionVar2 = 1; - this->actionVar1 = 0; + this->av2.actionVar2 = 1; + this->av1.actionVar1 = 0; } } else if (!func_8083FE38(this, play)) { if (Player_ActionChange_11(this, play)) { @@ -14454,7 +14454,7 @@ void Player_Action_18(Player* this, PlayState* play) { void Player_Action_19(Player* this, PlayState* play) { func_80832F24(this); - if (this->actionVar1 == 0) { + if (this->av1.actionVar1 == 0) { D_80862B04 = Player_UpdateUpperBody(this, play); if ((Player_UpperAction_3 == this->upperActionFunc) || (func_808331FC(play, this, &this->skelAnimeUpper, 4.0f) > 0)) { @@ -14494,7 +14494,7 @@ void Player_Action_21(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_20 | PLAYER_STATE2_40; func_808345A8(this); - if (!(this->stateFlags1 & PLAYER_STATE1_20000000) && (this->actionVar2 == 0) && (this->unk_B75 != 0)) { + if (!(this->stateFlags1 & PLAYER_STATE1_20000000) && (this->av2.actionVar2 == 0) && (this->unk_B75 != 0)) { s16 temp_v0 = this->unk_B76; s16 temp_v1 = this->actor.shape.rot.y - temp_v0; @@ -14513,15 +14513,15 @@ void Player_Action_21(Player* this, PlayState* play) { } if (PlayerAnimation_Update(play, &this->skelAnime) && (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { - if (this->actionVar2 != 0) { - this->actionVar2--; - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 != 0) { + this->av2.actionVar2--; + if (this->av2.actionVar2 == 0) { func_8085B384(this, play); } } else if ((this->stateFlags1 & PLAYER_STATE1_20000000) || (!(this->cylinder.base.acFlags & AC_HIT) && (this->unk_B75 == 0))) { if (this->stateFlags1 & PLAYER_STATE1_20000000) { - this->actionVar2++; + this->av2.actionVar2++; } else { Player_SetAction(play, this, Player_Action_22, 0); this->stateFlags1 |= PLAYER_STATE1_4000000; @@ -14546,7 +14546,7 @@ void Player_Action_22(Player* this, PlayState* play) { func_80832F24(this); if (PlayerAnimation_Update(play, &this->skelAnime) && (this->linearVelocity == 0.0f)) { if (this->stateFlags1 & PLAYER_STATE1_20000000) { - this->actionVar2++; + this->av2.actionVar2++; } else { Player_SetAction(play, this, Player_Action_23, 0); this->stateFlags1 |= PLAYER_STATE1_4000000; @@ -14664,11 +14664,12 @@ void Player_Action_25(Player* this, PlayState* play) { } Player_UpdateUpperBody(this, play); - if ((((this->stateFlags2 & PLAYER_STATE2_80000) && ((this->actionVar1 == 2) || (this->actionVar1 >= 4))) || + if ((((this->stateFlags2 & PLAYER_STATE2_80000) && + ((this->av1.actionVar1 == 2) || (this->av1.actionVar1 >= 4))) || !func_80839770(this, play)) && (this->actor.velocity.y < 0.0f)) { - if (this->actionVar2 >= 0) { - if ((this->actor.bgCheckFlags & BGCHECKFLAG_WALL) || (this->actionVar2 == 0) || + if (this->av2.actionVar2 >= 0) { + if ((this->actor.bgCheckFlags & BGCHECKFLAG_WALL) || (this->av2.actionVar2 == 0) || (this->fallDistance > 0)) { if ((sPlayerYDistToFloor > 800.0f) || (this->stateFlags3 & PLAYER_STATE3_10000)) { func_80840980(this, NA_SE_VO_LI_FALL_S); @@ -14676,11 +14677,11 @@ void Player_Action_25(Player* this, PlayState* play) { } PlayerAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_normal_landing, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 8.0f); - this->actionVar2 = -1; + this->av2.actionVar2 = -1; } } else { - if ((this->actionVar2 == -1) && (this->fallDistance > 120) && (sPlayerYDistToFloor > 280.0f)) { - this->actionVar2 = -2; + if ((this->av2.actionVar2 == -1) && (this->fallDistance > 120) && (sPlayerYDistToFloor > 280.0f)) { + this->av2.actionVar2 = -2; func_80840980(this, NA_SE_VO_LI_FALL_L); } @@ -14757,7 +14758,7 @@ void Player_Action_26(Player* this, PlayState* play) { return; } - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { s32 temp_v0; Math_StepToF(&this->linearVelocity, 0.0f, 2.0f); @@ -14879,16 +14880,16 @@ void Player_Action_30(Player* this, PlayState* play) { func_8083133C(this); this->stateFlags1 &= ~PLAYER_STATE1_20000; Player_AnimationPlayLoop(play, this, D_8085CF60[Player_IsHoldingTwoHandedWeapon(this)]); - this->actionVar2 = -1; + this->av2.actionVar2 = -1; } func_80832F24(this); - if (!func_8083FE38(this, play) && (this->actionVar2 != 0)) { + if (!func_8083FE38(this, play) && (this->av2.actionVar2 != 0)) { func_80840F34(this); - if (this->actionVar2 < 0) { + if (this->av2.actionVar2 < 0) { if (this->unk_B08 >= 0.1f) { this->unk_ADD = 0; - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } else if (!CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_B)) { func_80840E5C(this, play); } @@ -15048,7 +15049,7 @@ void Player_Action_33(Player* this, PlayState* play) { } func_80834D50(play, this, NULL, speed, NA_SE_VO_LI_AUTO_JUMP); - this->actionVar2 = -1; + this->av2.actionVar2 = -1; } } else { temp_v0 = func_808331FC(play, this, &this->skelAnime, 4.0f); @@ -15081,9 +15082,9 @@ void Player_Action_33(Player* this, PlayState* play) { } if ((this->skelAnime.animation == &gPlayerAnim_link_normal_100step_up) || (this->skelAnime.curFrame > 5.0f)) { - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { Player_AnimSfx_PlayFloorJump(this); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } Math_SmoothStepToF(&this->unk_ABC, 0.0f, 0.1f, 400.0f, 150.0f); } @@ -15113,13 +15114,13 @@ void Player_Action_35(Player* this, PlayState* play) { if ((this->stateFlags3 & PLAYER_STATE3_10) && !(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { func_80833AA0(this, play); this->stateFlags1 |= PLAYER_STATE1_20000000; - } else if (this->actionVar2 == 0) { + } else if (this->av2.actionVar2 == 0) { PlayerAnimation_Update(play, &this->skelAnime); if (DECR(this->doorTimer) == 0) { this->linearVelocity = 0.1f; - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } - } else if (this->actionVar1 == 0) { + } else if (this->av1.actionVar1 == 0) { f32 sp6C = 5.0f * D_8085C3E4; s32 var_t0 = func_808411D4(play, this, &sp6C, -1); @@ -15146,7 +15147,7 @@ void Player_Action_35(Player* this, PlayState* play) { } if (var_t0 < 0x1E) { - this->actionVar1 = 1; + this->av1.actionVar1 = 1; this->stateFlags1 |= PLAYER_STATE1_20000000; this->unk_3A0.x = this->unk_3AC.x; this->unk_3A0.z = this->unk_3AC.z; @@ -15163,8 +15164,8 @@ void Player_Action_35(Player* this, PlayState* play) { this->unk_3A0.z = (Math_CosS(sPlayerConveyorYaw) * 400.0f) + this->actor.world.pos.z; } } else { - if (this->actionVar2 < 0) { - this->actionVar2++; + if (this->av2.actionVar2 < 0) { + this->av2.actionVar2++; sp5C = gSaveContext.entranceSpeed; sp58 = -1; } else if (this->unk_397 == 4) { @@ -15230,7 +15231,7 @@ void Player_Action_35(Player* this, PlayState* play) { Player_TranslateAndRotateY(this, &this->unk_3A0, &D_8085D644, &this->unk_3AC); this->actor.shape.rot.y += (this->doorDirection != 0) ? 0x4000 : -0x4000; - this->actionVar1 = 0; + this->av1.actionVar1 = 0; this->actor.world.rot.y = this->currentYaw = this->actor.shape.rot.y; } @@ -15243,8 +15244,8 @@ void Player_Action_35(Player* this, PlayState* play) { } temp_v0_8 = func_808411D4(play, this, &sp5C, sp58); - if ((this->actionVar2 == 0) || ((temp_v0_8 == 0) && (this->linearVelocity == 0.0f) && - (Play_GetCamera(play, CAM_ID_MAIN)->stateFlags & CAM_STATE_4))) { + if ((this->av2.actionVar2 == 0) || ((temp_v0_8 == 0) && (this->linearVelocity == 0.0f) && + (Play_GetCamera(play, CAM_ID_MAIN)->stateFlags & CAM_STATE_4))) { if (this->unk_397 == 4) { Map_InitRoomData(play, play->roomCtx.curRoom.num); Minimap_SavePlayerRoomInitInfo(play); @@ -15285,7 +15286,7 @@ void Player_Action_36(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_20; - if (DECR(this->actionVar1) == 0) { + if (DECR(this->av1.actionVar1) == 0) { func_80835DF8(play, this, &poly, &bgId); } @@ -15293,9 +15294,9 @@ void Player_Action_36(Player* this, PlayState* play) { Player_UpdateUpperBody(this, play); if (animFinished) { - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { if (DECR(this->doorTimer) == 0) { - this->actionVar2 = 1; + this->av2.actionVar2 = 1; this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; } } else { @@ -15354,8 +15355,8 @@ void Player_Action_38(Player* this, PlayState* play) { if (PlayerAnimation_Update(play, &this->skelAnime)) { Player_AnimationPlayLoop(play, this, &gPlayerAnim_link_silver_wait); - this->actionVar2 = 1; - } else if (this->actionVar2 == 0) { + this->av2.actionVar2 = 1; + } else if (this->av2.actionVar2 == 0) { if (PlayerAnimation_OnFrame(&this->skelAnime, 27.0f)) { Actor* interactRangeActor = this->interactRangeActor; @@ -15390,10 +15391,10 @@ void Player_Action_39(Player* this, PlayState* play) { void Player_Action_40(Player* this, PlayState* play) { if (PlayerAnimation_Update(play, &this->skelAnime)) { Player_AnimationPlayLoop(play, this, &gPlayerAnim_link_normal_nocarry_free_wait); - this->actionVar2 = 15; - } else if (this->actionVar2 != 0) { - this->actionVar2--; - if (this->actionVar2 == 0) { + this->av2.actionVar2 = 15; + } else if (this->av2.actionVar2 != 0) { + this->av2.actionVar2--; + if (this->av2.actionVar2 == 0) { func_80836A98(this, &gPlayerAnim_link_normal_nocarry_free_end, play); this->stateFlags1 &= ~PLAYER_STATE1_800; Player_AnimSfx_PlayVoice(this, NA_SE_VO_LI_DAMAGE_S); @@ -15467,7 +15468,7 @@ void Player_Action_43(Player* this, PlayState* play) { Player_ActionChange_4(this, play)))) { func_80839ED0(this, play); Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_UP); - } else if ((DECR(this->actionVar2) == 0) || (this->unk_AA5 != PLAYER_UNKAA5_3)) { + } else if ((DECR(this->av2.actionVar2) == 0) || (this->unk_AA5 != PLAYER_UNKAA5_3)) { if (func_801240DC(this)) { this->unk_AA6 |= 0x43; } else { @@ -15492,10 +15493,10 @@ void Player_Action_44(Player* this, PlayState* play) { func_800E0238(Play_GetCamera(play, CAM_ID_MAIN)); CutsceneManager_Stop(CS_ID_GLOBAL_TALK); if (this->stateFlags1 & PLAYER_STATE1_800000) { - s32 sp44 = this->actionVar2; + s32 sp44 = this->av2.actionVar2; func_80837BD0(play, this); - this->actionVar2 = sp44; + this->av2.actionVar2 = sp44; } else if (!func_80847994(play, this) && !func_80847880(play, this) && !func_808387A0(play, this) && ((this->talkActor != this->interactRangeActor) || !Player_ActionChange_2(this, play))) { if (func_801242B4(this)) { @@ -15533,11 +15534,11 @@ void Player_Action_44(Player* this, PlayState* play) { if (this->lockOnActor != NULL) { this->currentYaw = func_8083C62C(this, false); this->actor.shape.rot.y = this->currentYaw; - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { if (!(this->stateFlags1 & PLAYER_STATE1_800)) { if (PlayerAnimation_Update(play, &this->skelAnimeUpper)) { - this->actionVar1--; - if (this->actionVar1 != 0) { + this->av1.actionVar1--; + if (this->av1.actionVar1 != 0) { PlayerAnimation_Change(play, &this->skelAnimeUpper, &gPlayerAnim_link_normal_talk_free, 1.0f, 0.0f, Animation_GetLastFrame(&gPlayerAnim_link_normal_talk_free), ANIMMODE_ONCE, -6.0f); @@ -15554,7 +15555,7 @@ void Player_Action_44(Player* this, PlayState* play) { PlayerAnimation_Change( play, &this->skelAnimeUpper, D_8085BE84[PLAYER_ANIMGROUP_25][this->modelAnimType], 0.4f, 0.0f, Animation_GetLastFrame(D_8085BE84[PLAYER_ANIMGROUP_25][this->modelAnimType]), ANIMMODE_ONCE, -6.0f); - this->actionVar1 = 2; + this->av1.actionVar1 = 2; } } } @@ -15588,8 +15589,8 @@ void Player_Action_46(Player* this, PlayState* play) { this->stateFlags2 |= (PLAYER_STATE2_1 | PLAYER_STATE2_40 | PLAYER_STATE2_100); if (func_8082E67C(play, this, &gPlayerAnim_link_normal_pushing)) { - this->actionVar2 = 1; - } else if ((this->actionVar2 == 0) && PlayerAnimation_OnFrame(&this->skelAnime, 11.0f)) { + this->av2.actionVar2 = 1; + } else if ((this->av2.actionVar2 == 0) && PlayerAnimation_OnFrame(&this->skelAnime, 11.0f)) { Player_AnimSfx_PlayVoice(this, NA_SE_VO_LI_PUSH); } @@ -15631,8 +15632,8 @@ void Player_Action_47(Player* this, PlayState* play) { this->stateFlags2 |= (PLAYER_STATE2_1 | PLAYER_STATE2_40 | PLAYER_STATE2_100); if (func_8082E67C(play, this, anim)) { - this->actionVar2 = 1; - } else if (this->actionVar2 == 0) { + this->av2.actionVar2 = 1; + } else if (this->av2.actionVar2 == 0) { if (PlayerAnimation_OnFrame(&this->skelAnime, 11.0f)) { Player_AnimSfx_PlayVoice(this, NA_SE_VO_LI_PUSH); } @@ -15691,9 +15692,9 @@ void Player_Action_48(Player* this, PlayState* play) { if (PlayerAnimation_Update(play, &this->skelAnime)) { Player_AnimationPlayLoop(play, this, - (this->actionVar1 > 0) ? &gPlayerAnim_link_normal_fall_wait - : D_8085BE84[PLAYER_ANIMGROUP_39][this->modelAnimType]); - } else if (this->actionVar1 == 0) { + (this->av1.actionVar1 > 0) ? &gPlayerAnim_link_normal_fall_wait + : D_8085BE84[PLAYER_ANIMGROUP_39][this->modelAnimType]); + } else if (this->av1.actionVar1 == 0) { f32 frame; if (this->skelAnime.animation == &gPlayerAnim_link_normal_fall) { @@ -15705,25 +15706,25 @@ void Player_Action_48(Player* this, PlayState* play) { if (PlayerAnimation_OnFrame(&this->skelAnime, frame)) { Player_AnimSfx_PlayFloor(this, NA_SE_PL_WALK_GROUND); if (this->skelAnime.animation == &gPlayerAnim_link_normal_fall) { - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } else { - this->actionVar1 = -1; + this->av1.actionVar1 = -1; } } } Math_ScaledStepToS(&this->actor.shape.rot.y, this->currentYaw, 0x800); - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { Player_GetMovementSpeedAndYaw(this, &speedTarget, &yawTarget, SPEED_MODE_LINEAR, play); if (this->unk_ADF[this->unk_ADE] >= 0) { func_808381A0(this, - (this->actionVar1 > 0) ? D_8085BE84[PLAYER_ANIMGROUP_37][this->modelAnimType] - : D_8085BE84[PLAYER_ANIMGROUP_40][this->modelAnimType], + (this->av1.actionVar1 > 0) ? D_8085BE84[PLAYER_ANIMGROUP_37][this->modelAnimType] + : D_8085BE84[PLAYER_ANIMGROUP_40][this->modelAnimType], play); } else if (CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A) || (this->actor.shape.feetFloorFlags != 0)) { func_80833A64(this); - if (this->actionVar1 < 0) { + if (this->av1.actionVar1 < 0) { this->linearVelocity = -0.8f; } else { this->linearVelocity = 0.8f; @@ -15771,7 +15772,7 @@ void Player_Action_50(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_40; - if ((this->actionVar1 != 0) && (ABS_ALT(yStick) < ABS_ALT(xStick))) { + if ((this->av1.actionVar1 != 0) && (ABS_ALT(yStick) < ABS_ALT(xStick))) { var_fv0 = ABS_ALT(xStick) * 0.0325f; yStick = 0; } else { @@ -15793,7 +15794,7 @@ void Player_Action_50(Player* this, PlayState* play) { this->skelAnime.playSpeed = var_fv1 * var_fv0; - if (this->actionVar2 >= 0) { + if (this->av2.actionVar2 >= 0) { if ((this->actor.wallPoly != NULL) && (this->actor.wallBgId != BGCHECK_SCENE)) { dyna = DynaPoly_GetActor(&play->colCtx, this->actor.wallBgId); @@ -15810,14 +15811,14 @@ void Player_Action_50(Player* this, PlayState* play) { func_80831944(play, this); - if ((this->actionVar2 < 0) || !func_8083E354(this, play)) { + if ((this->av2.actionVar2 < 0) || !func_8083E354(this, play)) { if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar2 < 0) { - this->actionVar2 = ABS_ALT(this->actionVar2) & 1; + if (this->av2.actionVar2 < 0) { + this->av2.actionVar2 = ABS_ALT(this->av2.actionVar2) & 1; } else if (yStick != 0) { f32 yIntersect; - sp78 = this->actionVar1 + this->actionVar2; + sp78 = this->av1.actionVar1 + this->av2.actionVar2; if (yStick > 0) { sp6C.x = 0.0f; @@ -15827,7 +15828,7 @@ void Player_Action_50(Player* this, PlayState* play) { yIntersect = func_80835D2C(play, this, &sp6C, &sp60); if (this->actor.world.pos.y < yIntersect) { - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { this->actor.world.pos.y = yIntersect; this->stateFlags1 &= ~PLAYER_STATE1_200000; func_80837CEC(play, this, this->actor.wallPoly, this->ageProperties->unk_3C, @@ -15837,22 +15838,22 @@ void Player_Action_50(Player* this, PlayState* play) { func_808381A0(this, &gPlayerAnim_link_normal_jump_climb_up_free, play); this->stateFlags1 |= PLAYER_STATE1_4000; } else { - func_8083DCC4(this, this->ageProperties->unk_D4[this->actionVar2], play); + func_8083DCC4(this, this->ageProperties->unk_D4[this->av2.actionVar2], play); } } else { this->skelAnime.prevTransl = this->ageProperties->unk_4A[sp78]; Player_AnimationPlayOnce(play, this, this->ageProperties->unk_B4[sp78]); } } else if ((this->actor.world.pos.y - this->actor.floorHeight) < 15.0f) { - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { func_8083E2F4(this, play); } else { - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { this->skelAnime.prevTransl = this->ageProperties->unk_44; } - func_8083DCC4(this, this->ageProperties->unk_CC[this->actionVar2], play); - this->actionVar2 = 1; + func_8083DCC4(this, this->ageProperties->unk_CC[this->av2.actionVar2], play); + this->av2.actionVar2 = 1; } } else { sp78 ^= 1; @@ -15862,15 +15863,15 @@ void Player_Action_50(Player* this, PlayState* play) { 0.0f); } - this->actionVar2 ^= 1; - } else if ((this->actionVar1 != 0) && (xStick != 0)) { - anim2 = this->ageProperties->unk_C4[this->actionVar2]; + this->av2.actionVar2 ^= 1; + } else if ((this->av1.actionVar1 != 0) && (xStick != 0)) { + anim2 = this->ageProperties->unk_C4[this->av2.actionVar2]; if (xStick > 0) { - this->skelAnime.prevTransl = this->ageProperties->unk_7A[this->actionVar2]; + this->skelAnime.prevTransl = this->ageProperties->unk_7A[this->av2.actionVar2]; Player_AnimationPlayOnce(play, this, anim2); } else { - this->skelAnime.prevTransl = this->ageProperties->unk_7A[this->actionVar2 + 2]; + this->skelAnime.prevTransl = this->ageProperties->unk_7A[this->av2.actionVar2 + 2]; PlayerAnimation_Change(play, &this->skelAnime, anim2, -1.0f, Animation_GetLastFrame(anim2), 0.0f, 2, 0.0f); } @@ -15882,10 +15883,10 @@ void Player_Action_50(Player* this, PlayState* play) { } } - if (this->actionVar2 < 0) { - if (((this->actionVar2 == -2) && + if (this->av2.actionVar2 < 0) { + if (((this->av2.actionVar2 == -2) && (PlayerAnimation_OnFrame(&this->skelAnime, 14.0f) || PlayerAnimation_OnFrame(&this->skelAnime, 29.0f))) || - ((this->actionVar2 == -4) && + ((this->av2.actionVar2 == -4) && (PlayerAnimation_OnFrame(&this->skelAnime, 22.0f) || PlayerAnimation_OnFrame(&this->skelAnime, 35.0f) || PlayerAnimation_OnFrame(&this->skelAnime, 49.0f) || PlayerAnimation_OnFrame(&this->skelAnime, 55.0f)))) { func_80847A50(this); @@ -15918,7 +15919,7 @@ void Player_Action_51(Player* this, PlayState* play) { } else { f32* var_v1 = D_8085D66C; - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { Player_PlayAnimSfx(this, D_8085D67C); var_v1 = D_8085D674; } @@ -16015,10 +16016,10 @@ void Player_Action_52(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_40; func_80847E2C(this, 1.0f, 10.0f); - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { if (PlayerAnimation_Update(play, &this->skelAnime)) { this->skelAnime.animation = &gPlayerAnim_link_uma_wait_1; - this->actionVar2 = 0x63; + this->av2.actionVar2 = 0x63; } else { s32 var_v0 = (this->mountSide < 0) ? 0 : 1; @@ -16038,8 +16039,9 @@ void Player_Action_52(Player* this, PlayState* play) { this->skelAnime.prevTransl = D_8085D6E0; - if ((this->actionVar2 < 0) || ((rideActor->animIndex != (this->actionVar2 & 0xFFFF)) && - ((rideActor->animIndex >= ENHORSE_ANIM_STOPPING) || (this->actionVar2 >= 2)))) { + if ((this->av2.actionVar2 < 0) || + ((rideActor->animIndex != (this->av2.actionVar2 & 0xFFFF)) && + ((rideActor->animIndex >= ENHORSE_ANIM_STOPPING) || (this->av2.actionVar2 >= 2)))) { s32 animIndex = rideActor->animIndex; if (animIndex < ENHORSE_ANIM_STOPPING) { @@ -16056,24 +16058,24 @@ void Player_Action_52(Player* this, PlayState* play) { Player_AnimationPlayOnce(play, this, D_8085D6D0[index]); } else { this->skelAnime.animation = D_8085D688[animIndex - 2]; - if (this->actionVar2 >= 0) { + if (this->av2.actionVar2 >= 0) { Animation_SetMorph(play, &this->skelAnime, 8.0f); } if (animIndex < ENHORSE_ANIM_WALK) { func_808309CC(play, this); - this->actionVar1 = 0; + this->av1.actionVar1 = 0; } } - this->actionVar2 = animIndex; + this->av2.actionVar2 = animIndex; } - if (this->actionVar2 == 1) { + if (this->av2.actionVar2 == 1) { if (D_80862B04 || func_8082DAFC(play)) { Player_AnimationPlayOnce(play, this, &gPlayerAnim_link_uma_wait_3); } else if (PlayerAnimation_Update(play, &this->skelAnime)) { - this->actionVar2 = 0x63; + this->av2.actionVar2 = 0x63; } else if (this->skelAnime.animation == &gPlayerAnim_link_uma_wait_1) { Player_PlayAnimSfx(this, D_8085D6E8); } @@ -16087,11 +16089,11 @@ void Player_Action_52(Player* this, PlayState* play) { if ((play->csCtx.state != CS_STATE_IDLE) || (this->csAction != PLAYER_CSACTION_NONE)) { this->unk_AA5 = PLAYER_UNKAA5_0; - this->actionVar1 = 0; - } else if ((this->actionVar2 < 2) || (this->actionVar2 >= 4)) { + this->av1.actionVar1 = 0; + } else if ((this->av2.actionVar2 < 2) || (this->av2.actionVar2 >= 4)) { D_80862B04 = Player_UpdateUpperBody(this, play); if (D_80862B04) { - this->actionVar1 = 0; + this->av1.actionVar1 = 0; } } @@ -16102,10 +16104,10 @@ void Player_Action_52(Player* this, PlayState* play) { this->currentYaw = this->actor.shape.rot.y = rideActor->actor.shape.rot.y; if (!D_80862B04) { - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { if (PlayerAnimation_Update(play, &this->skelAnimeUpper)) { rideActor->stateFlags &= ~ENHORSE_FLAG_8; - this->actionVar1 = 0; + this->av1.actionVar1 = 0; } if (this->skelAnimeUpper.animation == &gPlayerAnim_link_uma_stop_muti) { @@ -16131,14 +16133,14 @@ void Player_Action_52(Player* this, PlayState* play) { if (EN_HORSE_CHECK_3(rideActor)) { anim = &gPlayerAnim_link_uma_stop_muti; } else if (EN_HORSE_CHECK_2(rideActor)) { - if ((this->actionVar2 >= 2) && (this->actionVar2 != 0x63)) { - anim = D_8085D6A4[this->actionVar2]; + if ((this->av2.actionVar2 >= 2) && (this->av2.actionVar2 != 0x63)) { + anim = D_8085D6A4[this->av2.actionVar2]; } } if (anim != NULL) { PlayerAnimation_PlayOnce(play, &this->skelAnimeUpper, anim); - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } } } @@ -16227,7 +16229,7 @@ s32 func_80850734(PlayState* play, Player* this) { this->stateFlags2 |= PLAYER_STATE2_400; PlayerAnimation_Change(play, &this->skelAnime, &gPlayerAnim_pz_waterroll, 2.0f / 3.0f, 4.0f, Animation_GetLastFrame(&gPlayerAnim_pz_waterroll), ANIMMODE_ONCE, -6.0f); - this->actionVar2 = 5; + this->av2.actionVar2 = 5; this->unk_B86[0] = 0; this->unk_B48 = this->linearVelocity; this->actor.velocity.y = 0.0f; @@ -16255,18 +16257,19 @@ void Player_Action_54(Player* this, PlayState* play) { func_8082E67C(play, this, &gPlayerAnim_link_swimer_swim_wait); func_808475B4(this); - if (this->actionVar2 != 0) { - this->actionVar2--; + if (this->av2.actionVar2 != 0) { + this->av2.actionVar2--; } func_8082F164(this, BTN_R); if (CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_A)) { - this->actionVar2 = 0; + this->av2.actionVar2 = 0; } if (!func_8082DAFC(play) && !Player_TryActionChangeList(play, this, sPlayerActionChangeList11, true) && - !func_8083B3B4(play, this, sPlayerControlInput) && ((this->actionVar2 != 0) || !func_80850734(play, this))) { + !func_8083B3B4(play, this, sPlayerControlInput) && + ((this->av2.actionVar2 != 0) || !func_80850734(play, this))) { speedTarget = 0.0f; yawTarget = this->actor.shape.rot.y; @@ -16307,7 +16310,7 @@ void Player_Action_55(Player* this, PlayState* play) { func_808477D0(play, this, NULL, this->linearVelocity); func_808475B4(this); - if (DECR(this->actionVar2) == 0) { + if (DECR(this->av2.actionVar2) == 0) { func_808353DC(play, this); } } @@ -16362,13 +16365,13 @@ void Player_Action_56(Player* this, PlayState* play) { speedTarget = 0.0f; - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { if ((!func_8082DA90(play) && !CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A)) || (this->currentBoots != PLAYER_BOOTS_ZORA_LAND)) { this->unk_B86[0] = 1; } - if (PlayerAnimation_Update(play, &this->skelAnime) && (DECR(this->actionVar2) == 0)) { + if (PlayerAnimation_Update(play, &this->skelAnime) && (DECR(this->av2.actionVar2) == 0)) { if (this->unk_B86[0] != 0) { this->stateFlags3 &= ~PLAYER_STATE3_8000; func_8082DB90(play, this, &gPlayerAnim_pz_swimtowait); @@ -16536,10 +16539,10 @@ void Player_Action_59(Player* this, PlayState* play) { if (this->currentBoots >= PLAYER_BOOTS_ZORA_UNDERWATER) { func_808353DC(play, this); - } else if (this->actionVar1 == 0) { + } else if (this->av1.actionVar1 == 0) { f32 temp_fv0; - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { if (PlayerAnimation_Update(play, &this->skelAnime) || ((this->skelAnime.curFrame >= 22.0f) && !CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A))) { func_8083B798(play, this); @@ -16555,7 +16558,7 @@ void Player_Action_59(Player* this, PlayState* play) { !(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (this->actor.depthInWater < 120.0f)) { func_808481CC(play, this, -2.0f); } else { - this->actionVar1++; + this->av1.actionVar1++; func_8082E634(play, this, &gPlayerAnim_link_swimer_swim_wait); } } @@ -16564,16 +16567,16 @@ void Player_Action_59(Player* this, PlayState* play) { if (temp_fv0 < this->actor.velocity.y) { this->actor.velocity.y = temp_fv0; } - } else if (this->actionVar1 == 1) { + } else if (this->av1.actionVar1 == 1) { PlayerAnimation_Update(play, &this->skelAnime); func_808475B4(this); if (this->unk_AAA < 0x2710) { - this->actionVar1++; - this->actionVar2 = this->actor.depthInWater; + this->av1.actionVar1++; + this->av2.actionVar2 = this->actor.depthInWater; func_8082E634(play, this, &gPlayerAnim_link_swimer_swim); } } else if (!func_8083B3B4(play, this, sPlayerControlInput)) { - f32 var_fv1 = (this->actionVar2 * 0.018f) + 4.0f; + f32 var_fv1 = (this->av2.actionVar2 * 0.018f) + 4.0f; if (this->stateFlags1 & PLAYER_STATE1_800) { sPlayerControlInput = NULL; @@ -16824,7 +16827,7 @@ void func_8085255C(PlayState* play, Player* this) { } void func_808525C4(PlayState* play, Player* this) { - if (this->actionVar2++ >= 3) { + if (this->av2.actionVar2++ >= 3) { if ((this->transformation == PLAYER_FORM_ZORA) || (this->transformation == PLAYER_FORM_DEKU)) { func_8082E5A8(play, this, D_8085D190[this->transformation]); } else if (this->transformation == PLAYER_FORM_GORON) { @@ -16841,12 +16844,12 @@ void func_808525C4(PlayState* play, Player* this) { void Player_Action_63(Player* this, PlayState* play) { if ((this->unk_AA5 != PLAYER_UNKAA5_4) && ((PlayerAnimation_Update(play, &this->skelAnime) && (this->skelAnime.animation == D_8085D17C[this->transformation])) || - ((this->skelAnime.mode == 0) && (this->actionVar2 == 0)))) { + ((this->skelAnime.mode == 0) && (this->av2.actionVar2 == 0)))) { func_808525C4(play, this); if (!(this->actor.flags & ACTOR_FLAG_20000000) || (this->unk_A90->id == ACTOR_EN_ZOT)) { Message_DisplayOcarinaStaff(play, OCARINA_ACTION_FREE_PLAY); } - } else if (this->actionVar2 != 0) { + } else if (this->av2.actionVar2 != 0) { if (play->msgCtx.ocarinaMode == OCARINA_MODE_END) { play->interfaceCtx.unk_222 = 0; CutsceneManager_Stop(play->playerCsIds[PLAYER_CS_ID_ITEM_OCARINA]); @@ -16966,12 +16969,12 @@ void Player_Action_65(Player* this, PlayState* play) { func_8083249C(this); if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar2 != 0) { - if (this->actionVar2 > 1) { - this->actionVar2--; + if (this->av2.actionVar2 != 0) { + if (this->av2.actionVar2 > 1) { + this->av2.actionVar2--; } - if (func_808482E0(play, this) && (this->actionVar2 == 1)) { + if (func_808482E0(play, this) && (this->av2.actionVar2 == 1)) { Player_SetModels(this, Player_ActionToModelGroup(this, this->itemAction)); if ((this->getItemDrawIdPlusOne == GID_REMAINS_ODOLWA + 1) || @@ -17029,10 +17032,10 @@ void Player_Action_65(Player* this, PlayState* play) { ANIM_FLAG_80); Player_StopCutscene(this); this->csId = play->playerCsIds[PLAYER_CS_ID_ITEM_GET]; - this->actionVar2 = 2; + this->av2.actionVar2 = 2; } } - } else if (this->actionVar2 == 0) { + } else if (this->av2.actionVar2 == 0) { if (this->transformation == PLAYER_FORM_HUMAN) { Player_PlayAnimSfx(this, D_8085D73C); } else if (this->transformation == PLAYER_FORM_DEKU) { @@ -17061,9 +17064,9 @@ AnimSfxEntry D_8085D75C[] = { void Player_Action_66(Player* this, PlayState* play) { if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar1 == 0) { - if (DECR(this->actionVar2) == 0) { - this->actionVar1 = 1; + if (this->av1.actionVar1 == 0) { + if (DECR(this->av2.actionVar2) == 0) { + this->av1.actionVar1 = 1; this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; } } else { @@ -17110,7 +17113,7 @@ void Player_Action_67(Player* this, PlayState* play) { func_808323C0(this, play->playerCsIds[PLAYER_CS_ID_ITEM_BOTTLE]); if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { if (this->itemAction == PLAYER_IA_BOTTLE_POE) { s32 health = Rand_S16Offset(-1, 3); @@ -17149,31 +17152,31 @@ void Player_Action_67(Player* this, PlayState* play) { func_8082DB60(play, this, (this->transformation == PLAYER_FORM_DEKU) ? &gPlayerAnim_pn_drink : &gPlayerAnim_link_bottle_drink_demo_wait); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; //! FAKE dummy_label_235515:; - } else if (this->actionVar2 < 0) { - this->actionVar2++; - if (this->actionVar2 == 0) { - this->actionVar2 = 3; + } else if (this->av2.actionVar2 < 0) { + this->av2.actionVar2++; + if (this->av2.actionVar2 == 0) { + this->av2.actionVar2 = 3; this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; - } else if (this->actionVar2 == -6) { + } else if (this->av2.actionVar2 == -6) { func_808530E0(play, this); } } else { Player_StopCutscene(this); func_80839E74(this, play); } - } else if (this->actionVar2 == 1) { + } else if (this->av2.actionVar2 == 1) { if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { if (this->transformation == PLAYER_FORM_DEKU) { PlayerAnimation_Change(play, &this->skelAnime, &gPlayerAnim_pn_drinkend, 2.0f / 3.0f, 0.0f, 5.0f, 2, -6.0f); - this->actionVar2 = -7; + this->av2.actionVar2 = -7; } else { func_8082E4A4(play, this, &gPlayerAnim_link_bottle_drink_demo_end); - this->actionVar2 = 2; + this->av2.actionVar2 = 2; } Player_UpdateBottleHeld(play, this, @@ -17182,7 +17185,7 @@ void Player_Action_67(Player* this, PlayState* play) { } Player_AnimSfx_PlayVoice(this, NA_SE_VO_LI_DRINK - SFX_FLAG); - } else if ((this->actionVar2 == 2) && PlayerAnimation_OnFrame(&this->skelAnime, 29.0f)) { + } else if ((this->av2.actionVar2 == 2) && PlayerAnimation_OnFrame(&this->skelAnime, 29.0f)) { Player_AnimSfx_PlayVoice(this, NA_SE_VO_LI_BREATH_DRINK); } } @@ -17207,23 +17210,23 @@ struct_8085D798 D_8085D798[] = { }; void Player_Action_68(Player* this, PlayState* play) { - struct_8085D200* sp24 = &D_8085D200[this->actionVar2]; + struct_8085D200* sp24 = &D_8085D200[this->av2.actionVar2]; func_80832F24(this); if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { func_808323C0(this, play->playerCsIds[PLAYER_CS_ID_ITEM_SHOW]); - if (this->actionVar2 == 0) { - Message_StartTextbox(play, D_8085D798[this->actionVar1 - 1].textId, &this->actor); + if (this->av2.actionVar2 == 0) { + Message_StartTextbox(play, D_8085D798[this->av1.actionVar1 - 1].textId, &this->actor); Audio_PlayFanfare(NA_BGM_GET_ITEM | 0x900); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } else if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) { Actor* talkActor; - this->actionVar1 = 0; + this->av1.actionVar1 = 0; Player_StopCutscene(this); func_800E0238(Play_GetCamera(play, CAM_ID_MAIN)); @@ -17236,11 +17239,11 @@ void Player_Action_68(Player* this, PlayState* play) { func_80839E74(this, play); } } else { - if (this->actionVar1 == 0) { + if (this->av1.actionVar1 == 0) { s32 temp_ft5 = this->skelAnime.curFrame - sp24->unk_8; if ((temp_ft5 >= 0) && (sp24->unk_9 >= temp_ft5)) { - if ((this->actionVar2 != 0) && (temp_ft5 == 0)) { + if ((this->av2.actionVar2 != 0) && (temp_ft5 == 0)) { Player_PlaySfx(this, NA_SE_IT_SCOOP_UP_WATER); } @@ -17261,8 +17264,8 @@ void Player_Action_68(Player* this, PlayState* play) { } if (i < ARRAY_COUNT(D_8085D798)) { - this->actionVar1 = i + 1; - this->actionVar2 = 0; + this->av1.actionVar1 = i + 1; + this->av2.actionVar2 = 0; this->stateFlags1 |= PLAYER_STATE1_10000000 | PLAYER_STATE1_20000000; interactRangeActor->parent = &this->actor; Player_UpdateBottleHeld(play, this, entry->itemId, entry->itemAction); @@ -17400,12 +17403,12 @@ void Player_Action_71(Player* this, PlayState* play) { this->getItemDrawIdPlusOne = ABS_ALT(giEntry->gid); } - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { if ((this->actor.textId != 0) && (this->actor.textId != 0xFFFF)) { Message_StartTextbox(play, this->actor.textId, &this->actor); } - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } else if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) { Player_StopCutscene(this); this->getItemDrawIdPlusOne = GID_NONE + 1; @@ -17414,7 +17417,7 @@ void Player_Action_71(Player* this, PlayState* play) { this->unk_B5E = 0xA; } } - } else if (this->actionVar2 >= 0) { + } else if (this->av2.actionVar2 >= 0) { if ((Player_BottleFromIA(this, this->itemAction) > PLAYER_BOTTLE_NONE) && PlayerAnimation_OnFrame(&this->skelAnime, 36.0f)) { Player_SetModels(this, PLAYER_MODELGROUP_BOTTLE); @@ -17426,7 +17429,7 @@ void Player_Action_71(Player* this, PlayState* play) { Player_PlayAnimSfx(this, D_8085D840); } - if ((this->actionVar1 == 0) && (this->lockOnActor != NULL)) { + if ((this->av1.actionVar1 == 0) && (this->lockOnActor != NULL)) { this->currentYaw = func_8083C62C(this, 0); this->actor.shape.rot.y = this->currentYaw; } @@ -17480,7 +17483,7 @@ void Player_Action_73(Player* this, PlayState* play) { Actor_GetSlopeDirection(floorPoly, &slopeNormal, &downwardSlopeYaw); var_v0 = downwardSlopeYaw; - if (this->actionVar1 != 0) { + if (this->av1.actionVar1 != 0) { var_v0 = downwardSlopeYaw + 0x8000; } if (this->linearVelocity < 0.0f) { @@ -17500,8 +17503,8 @@ void Player_Action_73(Player* this, PlayState* play) { if (Math_AsymStepToF(&this->linearVelocity, var_fv0, temp_fv1, var_fa0) && (var_fv0 == 0.0f)) { func_80836A98(this, - (this->actionVar1 == 0) ? D_8085BE84[PLAYER_ANIMGROUP_41][this->modelAnimType] - : D_8085BE84[PLAYER_ANIMGROUP_42][this->modelAnimType], + (this->av1.actionVar1 == 0) ? D_8085BE84[PLAYER_ANIMGROUP_41][this->modelAnimType] + : D_8085BE84[PLAYER_ANIMGROUP_42][this->modelAnimType], play); } @@ -17512,7 +17515,7 @@ void Player_Action_73(Player* this, PlayState* play) { void func_80859CE0(PlayState* play, Player* this, s32 arg2); void Player_Action_74(Player* this, PlayState* play) { - if ((DECR(this->actionVar2) == 0) && func_808387A0(play, this)) { + if ((DECR(this->av2.actionVar2) == 0) && func_808387A0(play, this)) { func_80859CE0(play, this, 0); Player_SetAction(play, this, Player_Action_97, 0); Player_Action_97(this, play); @@ -17521,7 +17524,7 @@ void Player_Action_74(Player* this, PlayState* play) { void Player_Action_75(Player* this, PlayState* play) { Player_SetAction(play, this, Player_Action_74, 0); - this->actionVar2 = 0x28; + this->av2.actionVar2 = 0x28; Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_KANKYO, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0x10); } @@ -17530,11 +17533,11 @@ void Player_Cutscene_SetPosAndYawToStart(Player* this, CsCmdActorCue* cue); void Player_Action_76(Player* this, PlayState* play) { if (sPlayerYDistToFloor < 150.0f) { if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { this->skelAnime.endFrame = this->skelAnime.animLength - 1.0f; Player_AnimSfx_PlayFloorLand(this); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } } else { func_8085B384(this, play); @@ -17567,9 +17570,9 @@ void Player_Action_77(Player* this, PlayState* play) { } } - if ((this->actionVar2++ >= 9) && !func_8082DA90(play)) { - if (this->actionVar1 != 0) { - if (this->actionVar1 < 0) { + if ((this->av2.actionVar2++ >= 9) && !func_8082DA90(play)) { + if (this->av1.actionVar1 != 0) { + if (this->av1.actionVar1 < 0) { func_80169FDC(&play->state); } else { func_80169EFC(&play->state); @@ -17610,12 +17613,12 @@ void Player_Action_80(Player* this, PlayState* play) { if (play->unk_1887C < 0) { play->unk_1887C = 0; func_80839ED0(this, play); - } else if (this->actionVar1 == 0) { + } else if (this->av1.actionVar1 == 0) { if ((play->sceneId != SCENE_20SICHITAI) && CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_B)) { play->unk_1887C = 10; func_80847880(play, this); Player_SetAction(play, this, Player_Action_80, 1); - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } else { play->unk_1887C = 0; func_80847190(play, this, 0); @@ -17638,7 +17641,7 @@ void Player_Action_80(Player* this, PlayState* play) { play->unk_1887C = -1; Player_Action_81(this, play); Player_SetAction(play, this, Player_Action_80, 0); - this->actionVar1 = 0; + this->av1.actionVar1 = 0; } else { play->unk_1887C = 10; Player_Action_81(this, play); @@ -17662,13 +17665,13 @@ void Player_Action_81(Player* this, PlayState* play) { } void Player_Action_82(Player* this, PlayState* play) { - if (this->actionVar1 >= 0) { - if (this->actionVar1 < 6) { - this->actionVar1++; + if (this->av1.actionVar1 >= 0) { + if (this->av1.actionVar1 < 6) { + this->av1.actionVar1++; } else { - this->unk_B48 = (this->actionVar1 >> 1) * 22.0f; + this->unk_B48 = (this->av1.actionVar1 >> 1) * 22.0f; if (func_8082DE88(this, 1, 0x64)) { - this->actionVar1 = -1; + this->av1.actionVar1 = -1; EffectSsIcePiece_SpawnBurst(play, &this->actor.world.pos, this->actor.scale.x); Player_PlaySfx(this, NA_SE_PL_ICE_BROKEN); } @@ -17676,8 +17679,8 @@ void Player_Action_82(Player* this, PlayState* play) { if (this->transformation == PLAYER_FORM_ZORA) { func_80834104(play, this); this->skelAnime.animation = NULL; - this->actionVar2 = -0x28; - this->actionVar1 = 1; + this->av2.actionVar2 = -0x28; + this->av1.actionVar1 = 1; this->linearVelocity = 0.0f; } else if (play->gameplayFrames % 4 == 0) { Player_InflictDamage(play, -1); @@ -17695,8 +17698,8 @@ void Player_Action_83(Player* this, PlayState* play) { PlayerAnimation_Update(play, &this->skelAnime); func_808345A8(this); - if (((this->actionVar2 % 25) != 0) || (func_808339D4(play, this, -1) != 0)) { - if (DECR(this->actionVar2) == 0) { + if (((this->av2.actionVar2 % 25) != 0) || (func_808339D4(play, this, -1) != 0)) { + if (DECR(this->av2.actionVar2) == 0) { func_80836988(this, play); } } @@ -17746,7 +17749,7 @@ void Player_Action_84(Player* this, PlayState* play) { ((this->meleeWeaponAnimation >= PLAYER_MWA_FLIPSLASH_FINISH) && (this->meleeWeaponAnimation <= PLAYER_MWA_ZORA_JUMPKICK_FINISH) && (this->skelAnime.curFrame > 2.0f) && func_808333CC(this))) { - sPlayerUseHeldItem = this->actionVar2; + sPlayerUseHeldItem = this->av2.actionVar2; if (!Player_ActionChange_7(this, play)) { PlayerAnimationHeader* anim = func_80123420(this) ? attackInfoEntry->unk_8 : attackInfoEntry->unk_4; @@ -17782,7 +17785,7 @@ void Player_Action_84(Player* this, PlayState* play) { (this->meleeWeaponAnimation != PLAYER_MWA_ZORA_JUMPKICK_FINISH)) || ((this->transformation == PLAYER_FORM_GORON) && (this->meleeWeaponAnimation != PLAYER_MWA_GORON_PUNCH_BUTT))) { - this->actionVar2 |= CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_B) ? 1 : 0; + this->av2.actionVar2 |= CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_B) ? 1 : 0; } } @@ -17952,19 +17955,19 @@ void func_80855218(PlayState* play, Player* this, struct_8085D910** arg2) { func_8082DB60(play, this, &gPlayerAnim_cl_setmaskend); } else if ((this->skelAnime.animation == &gPlayerAnim_cl_setmask) || (this->skelAnime.animation == &gPlayerAnim_cl_setmaskend)) { - if (this->actionVar1 >= 58) { - Math_StepToS(&this->actionVar2, 255, 50); + if (this->av1.actionVar1 >= 58) { + Math_StepToS(&this->av2.actionVar2, 255, 50); } - if (this->actionVar1 >= 64) { + if (this->av1.actionVar1 >= 64) { Math_StepToF(&this->unk_B10[2], 0.0f, 0.015f); - } else if (this->actionVar1 >= 0xE) { + } else if (this->av1.actionVar1 >= 0xE) { Math_StepToF(&this->unk_B10[2], 0.3f, 0.3f); } - if (this->actionVar1 > 65) { + if (this->av1.actionVar1 > 65) { Math_StepToF(&this->unk_B10[3], 0.0f, 0.02f); - } else if (this->actionVar1 >= 0x10) { + } else if (this->av1.actionVar1 >= 0x10) { Math_StepToF(&this->unk_B10[3], -0.1f, 0.1f); } @@ -17972,13 +17975,13 @@ void func_80855218(PlayState* play, Player* this, struct_8085D910** arg2) { Player_PlayAnimSfx(this, D_8085D8F0); } } else { - if (this->actionVar1 >= 20) { - Math_StepToS(&this->actionVar2, 255, 20); + if (this->av1.actionVar1 >= 20) { + Math_StepToS(&this->av2.actionVar2, 255, 20); } if (R_PLAY_FILL_SCREEN_ON == 0) { Player_PlayAnimSfx(this, D_8085D904); - if (this->actionVar1 == 15) { + if (this->av1.actionVar1 == 15) { Player_PlaySfx(this, NA_SE_PL_FACE_CHANGE); } } @@ -18010,7 +18013,7 @@ void Player_Action_86(Player* this, PlayState* play) { func_80855218(play, this, &sp4C); - if (this->actionVar1 == 0x14) { + if (this->av1.actionVar1 == 0x14) { Play_EnableMotionBlurPriority(100); } @@ -18020,12 +18023,12 @@ void Player_Action_86(Player* this, PlayState* play) { R_PLAY_FILL_SCREEN_ALPHA = 255; this->actor.update = func_8012301C; this->actor.draw = NULL; - this->actionVar1 = 0; + this->av1.actionVar1 = 0; Play_DisableMotionBlurPriority(); SET_WEEKEVENTREG(D_8085D908[GET_PLAYER_FORM]); } - } else if ((this->actionVar1++ > ((this->transformation == PLAYER_FORM_HUMAN) ? 0x53 : 0x37)) || - ((this->actionVar1 >= 5) && + } else if ((this->av1.actionVar1++ > ((this->transformation == PLAYER_FORM_HUMAN) ? 0x53 : 0x37)) || + ((this->av1.actionVar1 >= 5) && (sp48 = ((this->transformation != PLAYER_FORM_HUMAN) || CHECK_WEEKEVENTREG(D_8085D908[GET_PLAYER_FORM])) && CHECK_BTN_ANY(sPlayerControlInput->press.button, @@ -18052,11 +18055,11 @@ void Player_Action_86(Player* this, PlayState* play) { Player_PlaySfx(this, NA_SE_SY_TRANSFORM_MASK_FLASH); } - if (this->actionVar1 >= sp4C->unk_0) { - if (this->actionVar1 < sp4C->unk_2) { + if (this->av1.actionVar1 >= sp4C->unk_0) { + if (this->av1.actionVar1 < sp4C->unk_2) { Math_StepToF(&this->unk_B10[4], 1.0f, sp4C->unk_1 / 100.0f); - } else if (this->actionVar1 < sp4C->unk_3) { - if (this->actionVar1 == sp4C->unk_2) { + } else if (this->av1.actionVar1 < sp4C->unk_3) { + if (this->av1.actionVar1 == sp4C->unk_2) { Lib_PlaySfx_2(NA_SE_EV_LIGHTNING_HARD); } @@ -18066,10 +18069,10 @@ void Player_Action_86(Player* this, PlayState* play) { } } - if (this->actionVar1 >= 0x10) { - if (this->actionVar1 < 0x40) { + if (this->av1.actionVar1 >= 0x10) { + if (this->av1.actionVar1 < 0x40) { Math_StepToF(&this->unk_B10[5], 1.0f, 0.2f); - } else if (this->actionVar1 < 0x37) { + } else if (this->av1.actionVar1 < 0x37) { Math_StepToF(&this->unk_B10[5], 2.0f, 1.0f); } else { Math_StepToF(&this->unk_B10[5], 3.0f, 0.55f); @@ -18090,8 +18093,8 @@ void Player_Action_87(Player* this, PlayState* play) { } } - if (this->actionVar1++ < 4) { - if ((this->prevMask == PLAYER_MASK_NONE) && (this->actionVar1 == 4)) { + if (this->av1.actionVar1++ < 4) { + if ((this->prevMask == PLAYER_MASK_NONE) && (this->av1.actionVar1 == 4)) { PlayerAnimation_Change(play, &this->skelAnime, func_8082ED20(this), 1.0f, 0.0f, 20.0f, ANIMMODE_ONCE, 20.0f); } @@ -18101,7 +18104,7 @@ void Player_Action_87(Player* this, PlayState* play) { s16 angle; Lib_GetControlStickData(&dist, &angle, play->state.input); - if (PlayerAnimation_Update(play, &this->skelAnime) || ((this->actionVar1 > 10) && (dist != 0.0f))) { + if (PlayerAnimation_Update(play, &this->skelAnime) || ((this->av1.actionVar1 > 10) && (dist != 0.0f))) { if (R_PLAY_FILL_SCREEN_ON == 0) { this->stateFlags1 &= ~PLAYER_STATE1_2; this->prevMask = this->currentMask; @@ -18120,10 +18123,10 @@ void Player_Action_87(Player* this, PlayState* play) { } void Player_Action_88(Player* this, PlayState* play) { - if (this->actionVar2++ > 90) { + if (this->av2.actionVar2++ > 90) { play->msgCtx.ocarinaMode = OCARINA_MODE_END; func_8085B384(this, play); - } else if (this->actionVar2 == 10) { + } else if (this->av2.actionVar2 == 10) { func_80848640(play, this); } } @@ -18133,7 +18136,7 @@ void Player_Action_89(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_40; func_80855218(play, this, NULL); - this->actionVar1++; + this->av1.actionVar1++; if (!(this->stateFlags1 & PLAYER_STATE1_100)) { this->prevMask = this->currentMask; @@ -18175,10 +18178,10 @@ void Player_Action_91(Player* this, PlayState* play) { var_a0 = 0; if ((this->actor.floorHeight - this->actor.world.pos.y) < 60.0f) { Math_StepToF(&this->unk_B10[5], 200.0f, 150.0f); - var_a0 = Math_StepToS(&this->actionVar2, 0xFA0, 0x15E); + var_a0 = Math_StepToS(&this->av2.actionVar2, 0xFA0, 0x15E); } - this->actor.shape.rot.y += this->actionVar2; + this->actor.shape.rot.y += this->av2.actionVar2; this->skelAnime.jointTable[PLAYER_LIMB_ROOT - 1].x = 0; this->skelAnime.jointTable[PLAYER_LIMB_ROOT - 1].z = 0; this->unk_ABC += this->unk_B10[5]; @@ -18199,9 +18202,9 @@ void Player_Action_91(Player* this, PlayState* play) { } } } - } else if (this->actionVar1 == 0) { + } else if (this->av1.actionVar1 == 0) { Player_PlaySfx(this, NA_SE_PL_WARP_PLATE_OUT); - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } } @@ -18296,15 +18299,15 @@ void Player_Action_93(Player* this, PlayState* play) { return; } - if (this->actionVar1 == 0) { + if (this->av1.actionVar1 == 0) { this->unk_ABC += this->unk_B48; if (this->unk_ABC < -1000.0f) { this->unk_ABC = -1000.0f; - this->actionVar1 = 1; + this->av1.actionVar1 = 1; this->unk_B48 = 0.0f; } func_80856074(play, this); - } else if (this->actionVar1 == 1) { + } else if (this->av1.actionVar1 == 1) { this->unk_B48 += -22.0f; if (this->unk_B48 < -170.0f) { this->unk_B48 = -170.0f; @@ -18312,7 +18315,7 @@ void Player_Action_93(Player* this, PlayState* play) { this->unk_ABC += this->unk_B48; if (this->unk_ABC < -3900.0f) { this->unk_ABC = -3900.0f; - this->actionVar1 = 2; + this->av1.actionVar1 = 2; this->actor.shape.rot.y = Camera_GetInputDirYaw(GET_ACTIVE_CAM(play)); this->actor.scale.y = 0.01f; this->currentYaw = this->actor.world.rot.y = this->actor.shape.rot.y; @@ -18332,22 +18335,22 @@ void Player_Action_93(Player* this, PlayState* play) { } func_80856074(play, this); - } else if (this->actionVar1 == 2) { + } else if (this->av1.actionVar1 == 2) { if (!CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A)) { if (func_80856000(play, this)) { - this->actionVar2 = 0; + this->av2.actionVar2 = 0; } else { - this->actionVar1 = 3; - if (this->actionVar2 >= 10) { + this->av1.actionVar1 = 3; + if (this->av2.actionVar2 >= 10) { this->unk_B48 = 2700.0f; } else { this->unk_B48 = 1450.0f; } func_8082E1F0(this, NA_SE_PL_DEKUNUTS_OUT_GRD); } - } else if (this->actionVar2 < 15) { - this->actionVar2++; - if (this->actionVar2 == 10) { + } else if (this->av2.actionVar2 < 15) { + this->av2.actionVar2++; + if (this->av2.actionVar2 == 10) { func_80856110(play, this, 20.0f, 3.8f, -0.1f, 140, 23, 15); } } @@ -18359,7 +18362,7 @@ void Player_Action_93(Player* this, PlayState* play) { if (temp_fv0_2 >= 0.0f) { f32 speed; - sp38 = (this->actionVar2 >= 10); + sp38 = (this->av2.actionVar2 >= 10); var_v1 = -1; speed = this->unk_B48 * this->actor.scale.y; if (this->actor.floorBgId != BGCHECK_SCENE) { @@ -18386,8 +18389,8 @@ void Player_Action_93(Player* this, PlayState* play) { this->stateFlags3 |= PLAYER_STATE3_40000; } - this->actionVar1 = var_v1; - this->actionVar2 = 9999; + this->av1.actionVar1 = var_v1; + this->av2.actionVar2 = 9999; Player_SetCylinderForAttack(this, DMG_DEKU_LAUNCH, 2, 20); } else if (this->unk_ABC < 0.0f) { func_80856074(play, this); @@ -18498,7 +18501,7 @@ void Player_Action_94(Player* this, PlayState* play) { func_80833AA0(this, play); } else if (this->stateFlags3 & PLAYER_STATE3_200) { if (this->actor.velocity.y < 0.0f) { - if (this->actionVar1 < 0) { + if (this->av1.actionVar1 < 0) { func_80833AA0(this, play); } else { PlayerAnimation_Update(play, &this->skelAnime); @@ -18548,14 +18551,14 @@ void Player_Action_94(Player* this, PlayState* play) { func_8085687C(this); - if (this->actionVar2 != 0) { - this->actionVar2--; + if (this->av2.actionVar2 != 0) { + this->av2.actionVar2--; } - temp_fv1 = D_8085D958[this->actionVar1] - Math_Vec3f_DistXZ(&this->actor.world.pos, this->unk_AF0); + temp_fv1 = D_8085D958[this->av1.actionVar1] - Math_Vec3f_DistXZ(&this->actor.world.pos, this->unk_AF0); PlayerAnimation_Update(play, &this->skelAnime); - if ((this->actionVar2 != 0) && (temp_fv1 > 300.0f)) { + if ((this->av2.actionVar2 != 0) && (temp_fv1 > 300.0f)) { sp76 = 0x1770; if (this->skelAnime.animation != &gPlayerAnim_pn_kakku) { func_8082E5EC(play, this, &gPlayerAnim_pn_kakkufinish); @@ -18572,7 +18575,7 @@ void Player_Action_94(Player* this, PlayState* play) { func_808566C0(play, this, PLAYER_BODYPART_RIGHT_HAND, 0.6f, 1.0f, 0.8f, 17); } } - } else if ((this->actionVar2 == 0) || (temp_fv1 < 0.0f)) { + } else if ((this->av2.actionVar2 == 0) || (temp_fv1 < 0.0f)) { sp76 = 0; func_808355D8(play, this, &gPlayerAnim_pn_rakkafinish); } else { @@ -18711,10 +18714,10 @@ void func_80857640(Player* this, f32 arg1, s32 arg2) { func_80834CD0(this, arg1, NA_SE_VO_LI_SWORD_N); Player_PlaySfx(this, NA_SE_PL_GORON_BALLJUMP); Player_StopHorizontalMovement(this); - if (this->actionVar2 < arg2) { - this->actionVar2 = arg2; + if (this->av2.actionVar2 < arg2) { + this->av2.actionVar2 = arg2; } - this->actionVar1 = 1; + this->av1.actionVar1 = 1; this->unk_B48 = 1.0f; } @@ -18723,7 +18726,7 @@ void func_808576BC(PlayState* play, Player* this) { (this->actor.velocity.x * Math_SinS(this->currentYaw))) * 800.0f; - var_v0 -= this->actionVar2; + var_v0 -= this->av2.actionVar2; var_v0 = ABS_ALT(var_v0); if (var_v0 <= 0x7D0) { @@ -18742,7 +18745,7 @@ void func_808576BC(PlayState* play, Player* this) { } void func_808577E0(Player* this) { - f32 temp_fa1 = ABS_ALT(this->actionVar2) * 0.00004f; + f32 temp_fa1 = ABS_ALT(this->av2.actionVar2) * 0.00004f; if (this->unk_ABC < temp_fa1) { this->unk_B48 += 0.08f; @@ -18763,7 +18766,7 @@ void func_808577E0(Player* this) { s32 func_80857950(PlayState* play, Player* this) { if (((this->unk_B86[1] == 0) && !CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A)) || - ((this->actionVar1 == 3) && (this->actor.velocity.y < 0.0f))) { + ((this->av1.actionVar1 == 3) && (this->actor.velocity.y < 0.0f))) { Player_SetAction(play, this, Player_Action_4, 1); Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.prevPos); PlayerAnimation_Change(play, &this->skelAnime, &gPlayerAnim_pg_maru_change, -2.0f / 3.0f, 7.0f, 0.0f, @@ -18781,9 +18784,9 @@ s32 func_80857A44(PlayState* play, Player* this) { this->actor.shape.shadowDraw = ActorShadow_DrawCircle; this->actor.bgCheckFlags |= BGCHECKFLAG_PLAYER_800; - this->actionVar1 = 4; + this->av1.actionVar1 = 4; this->actor.shape.shadowScale = 30.0f; - this->actionVar2 = this->linearVelocity * 500.0f; + this->av2.actionVar2 = this->linearVelocity * 500.0f; this->unk_B08 = this->linearVelocity; this->unk_B0C = 0.0f; this->actor.home.rot.y = this->currentYaw; @@ -18799,17 +18802,17 @@ void func_80857AEC(PlayState* play, Player* this) { this->unk_B0C += this->unk_B08 * 0.05f; if (this->unk_B86[1] == 0) { - if (this->actionVar1 == 1) { - this->actionVar1 = 2; + if (this->av1.actionVar1 == 1) { + this->av1.actionVar1 = 2; Player_RequestQuakeAndRumble(play, this, NA_SE_PL_GORON_PUNCH); play->actorCtx.unk2 = 4; EffectSsBlast_SpawnWhiteShockwave(play, &this->actor.world.pos, &gZeroVec3f, &gZeroVec3f); - this->actionVar2 = 0; + this->av2.actionVar2 = 0; this->unk_B08 = 0.0f; Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TEST, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0); } else { - this->actionVar1 = 4; + this->av1.actionVar1 = 4; } } @@ -18823,7 +18826,7 @@ void Player_Action_96(Player* this, PlayState* play) { return; } - if ((this->actionVar1 == 0) && !func_80857A44(play, this)) { + if ((this->av1.actionVar1 == 0) && !func_80857A44(play, this)) { return; } @@ -18846,7 +18849,7 @@ void Player_Action_96(Player* this, PlayState* play) { func_80834CD0(this, 10.0f, 0); if (this->unk_B86[1] != 0) { this->unk_B86[1] = 0; - this->actionVar1 = 3; + this->av1.actionVar1 = 3; } } else if ((this->actor.bgCheckFlags & BGCHECKFLAG_WALL) && (this->unk_B08 >= 12.0f)) { s16 temp_v0 = this->currentYaw - BINANG_ADD(this->actor.wallYaw, 0x8000); @@ -18879,17 +18882,18 @@ void Player_Action_96(Player* this, PlayState* play) { if (this->unk_B86[1] != 0) { speedTarget = 18.0f; - Math_StepToC(&this->actionVar1, 4, 1); + Math_StepToC(&this->av1.actionVar1, 4, 1); - if ((this->stateFlags3 & PLAYER_STATE3_80000) && (!CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A) || - (gSaveContext.save.saveInfo.playerData.magic == 0) || - ((this->actionVar1 == 4) && (this->unk_B08 < 12.0f)))) { + if ((this->stateFlags3 & PLAYER_STATE3_80000) && + (!CHECK_BTN_ALL(sPlayerControlInput->cur.button, BTN_A) || + (gSaveContext.save.saveInfo.playerData.magic == 0) || + ((this->av1.actionVar1 == 4) && (this->unk_B08 < 12.0f)))) { if (Math_StepToS(&this->unk_B86[1], 0, 1)) { this->stateFlags3 &= ~PLAYER_STATE3_80000; Magic_Reset(play); Player_PlaySfx(this, NA_SE_PL_GORON_BALL_CHARGE_FAILED); } - this->actionVar1 = 4; + this->av1.actionVar1 = 4; } else if (this->unk_B86[1] < 7) { if (!(this->stateFlags3 & PLAYER_STATE3_80000)) { this->unk_3D0.unk_00 = 2; @@ -18903,9 +18907,9 @@ void Player_Action_96(Player* this, PlayState* play) { Math_AsymStepToF(&this->unk_B10[0], (this->unk_B8A != 0) ? 1.0f : 0.0f, 0.8f, 0.05f); if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { func_80857AEC(play, this); - if (this->actionVar1 == 2) { + if (this->av1.actionVar1 == 2) { if (this->unk_B8A == 0) { - this->actionVar1 = 4; + this->av1.actionVar1 = 4; } else { this->unk_B8A--; this->unk_ABC = 0.0f; @@ -18936,7 +18940,7 @@ void Player_Action_96(Player* this, PlayState* play) { if (this->unk_B86[1] == 0) { this->unk_B0C = 0.0f; - if (this->actionVar1 >= 0x36) { + if (this->av1.actionVar1 >= 0x36) { Magic_Consume(play, 2, MAGIC_CONSUME_GORON_ZORA); this->unk_B08 = 18.0f; this->unk_B86[1] = 1; @@ -18973,12 +18977,12 @@ void Player_Action_96(Player* this, PlayState* play) { spCC = speedTarget; spCA = yawTarget; - if (func_8083A4A4(this, &spCC, &spCA, (this->actionVar1 >= 5) ? 0.0f : 1.0f)) { + if (func_8083A4A4(this, &spCC, &spCA, (this->av1.actionVar1 >= 5) ? 0.0f : 1.0f)) { if (this->unk_B86[1] == 0) { - this->actionVar1 = 4; + this->av1.actionVar1 = 4; } - if (this->actionVar1 == 4) { + if (this->av1.actionVar1 == 4) { spDC = -0xFA0; } } else { @@ -18990,7 +18994,7 @@ void Player_Action_96(Player* this, PlayState* play) { (sPlayerFloorType == FLOOR_TYPE_5)) && (spC0 >= 0x7D0)) ? 0.08f - : this->actionVar2 * 0.0003f; + : this->av2.actionVar2 * 0.0003f; f32 sp80 = (Math_SinS(this->floorPitch) * 8.0f) + 0.6f; s16 var_a3; s16 sp7C; @@ -19000,11 +19004,11 @@ void Player_Action_96(Player* this, PlayState* play) { if (this->unk_B86[1] == 0) { if ((gSaveContext.magicState == MAGIC_STATE_IDLE) && - (gSaveContext.save.saveInfo.playerData.magic >= 2) && (this->actionVar2 >= 0x36B0)) { - this->actionVar1++; + (gSaveContext.save.saveInfo.playerData.magic >= 2) && (this->av2.actionVar2 >= 0x36B0)) { + this->av1.actionVar1++; Actor_PlaySfx_FlaggedCentered1(&this->actor, NA_SE_PL_GORON_BALL_CHARGE - SFX_FLAG); } else { - this->actionVar1 = 4; + this->av1.actionVar1 = 4; } } @@ -19046,9 +19050,9 @@ void Player_Action_96(Player* this, PlayState* play) { if (this->unk_B86[1] != 0) { if ((ABS_ALT(sp8E) + ABS_ALT(this->floorPitch)) > 0x3A98) { this->unk_B86[1] = 0; - this->actionVar1 = 4; + this->av1.actionVar1 = 4; this->unk_B8E = 0x14; - this->actionVar2 = 0; + this->av2.actionVar2 = 0; this->stateFlags3 &= ~PLAYER_STATE3_80000; Magic_Reset(play); } @@ -19079,7 +19083,7 @@ void Player_Action_96(Player* this, PlayState* play) { this->unk_B28 = Math_Atan2S_XY(spA0, spA4); } - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { s32 temp_v0_10 = this->unk_B86[0]; s32 temp_ft3_2 = sp54 * 800.0f; @@ -19106,7 +19110,7 @@ void Player_Action_96(Player* this, PlayState* play) { func_808576BC(play, this); - if (ABS_ALT(this->actionVar2) > 0xFA0) { + if (ABS_ALT(this->av2.actionVar2) > 0xFA0) { this->stateFlags2 |= PLAYER_STATE2_8; } @@ -19136,7 +19140,7 @@ void Player_Action_96(Player* this, PlayState* play) { this->unk_B08 = CLAMP_MAX(this->unk_B08, 18.0f); } else { this->unk_B48 += this->actor.velocity.y * 0.005f; - if (this->actionVar1 == 1) { + if (this->av1.actionVar1 == 1) { if (this->actor.velocity.y > 0.0f) { if ((this->actor.velocity.y + this->actor.gravity) < 0.0f) { this->actor.velocity.y = -this->actor.gravity; @@ -19159,21 +19163,21 @@ void Player_Action_96(Player* this, PlayState* play) { Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x7D0); - Math_AsymStepToS(&this->actionVar2, spDC, (spDC >= 0) ? 0x7D0 : 0x3E8, 0x4B0); + Math_AsymStepToS(&this->av2.actionVar2, spDC, (spDC >= 0) ? 0x7D0 : 0x3E8, 0x4B0); - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { spD8 = this->actor.shape.rot.x; - this->actor.shape.rot.x += this->actionVar2; + this->actor.shape.rot.x += this->av2.actionVar2; - Math_ScaledStepToS(&this->unk_B86[0], 0, ABS_ALT(this->actionVar2)); - if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (((this->actionVar2 + spD8) * spD8) <= 0)) { + Math_ScaledStepToS(&this->unk_B86[0], 0, ABS_ALT(this->av2.actionVar2)); + if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (((this->av2.actionVar2 + spD8) * spD8) <= 0)) { spE0 = Player_GetFloorSfx(this, (this->unk_B86[1] != 0) ? NA_SE_PL_GORON_CHG_ROLL : NA_SE_PL_GORON_ROLL); Audio_PlaySfx_AtPosWithSyncedFreqAndVolume(&this->actor.projectedPos, spE0, this->unk_B08); } } - if (this->actionVar1 == 2) { + if (this->av1.actionVar1 == 2) { Player_SetCylinderForAttack(this, DMG_GORON_POUND, 4, 60); Actor_SetPlayerImpact(play, PLAYER_IMPACT_GORON_GROUND_POUND, 2, 100.0f, &this->actor.world.pos); } else if (this->unk_B86[1] != 0) { @@ -19390,7 +19394,7 @@ AnimSfxEntry D_8085DA90[] = { void Player_CsAnim_12(PlayState* play, Player* this, void* anim) { if (PlayerAnimation_Update(play, &this->skelAnime)) { func_80858D48(play, this, anim); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } if (this->skelAnime.animation == &gPlayerAnim_okiagaru_tatu) { @@ -19420,7 +19424,7 @@ void Player_CsAnim_17(PlayState* play, Player* this, void* anim) { void Player_CsAnim_13(PlayState* play, Player* this, void* anim) { if (PlayerAnimation_Update(play, &this->skelAnime)) { func_8082EB18(play, this, anim); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } } @@ -19450,9 +19454,9 @@ void func_8085929C(PlayState* play, Player* this, UNK_TYPE arg2) { void func_80859300(PlayState* play, Player* this, UNK_TYPE arg2) { this->actor.gravity = 0.0f; - if (this->actionVar1 == 0) { + if (this->av1.actionVar1 == 0) { if ((this->transformation == PLAYER_FORM_DEKU) || func_8083B3B4(play, this, NULL)) { - this->actionVar1 = 1; + this->av1.actionVar1 = 1; } else { func_808477D0(play, this, NULL, fabsf(this->actor.velocity.y)); Math_ScaledStepToS(&this->unk_AAA, -0x2710, 0x320); @@ -19460,7 +19464,7 @@ void func_80859300(PlayState* play, Player* this, UNK_TYPE arg2) { } } else { if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar1 == 1) { + if (this->av1.actionVar1 == 1) { func_8082E634(play, this, &gPlayerAnim_link_swimer_swim_wait); } else { Player_AnimationPlayLoop(play, this, &gPlayerAnim_link_swimer_swim_wait); @@ -19864,7 +19868,7 @@ void Player_CsAction_6(PlayState* play, Player* this, CsCmdActorCue* cue) { gSaveContext.save.playerForm = PLAYER_FORM_HUMAN; this->actor.update = func_8012301C; this->actor.draw = NULL; - this->actionVar1 = 0; + this->av1.actionVar1 = 0; } } else if (R_PLAY_FILL_SCREEN_ON < 0) { R_PLAY_FILL_SCREEN_ALPHA += R_PLAY_FILL_SCREEN_ON; @@ -19875,8 +19879,8 @@ void Player_CsAction_6(PlayState* play, Player* this, CsCmdActorCue* cue) { } else { sp24 = 2.5f; func_808411D4(play, this, &sp24, 0xA); - this->actionVar2++; - if (this->actionVar2 >= 0x15) { + this->av2.actionVar2++; + if (this->av2.actionVar2 >= 0x15) { this->csAction = PLAYER_CSACTION_10; } } @@ -19899,10 +19903,10 @@ void Player_CsAction_9(PlayState* play, Player* this, CsCmdActorCue* cue) { void Player_CsAction_10(PlayState* play, Player* this, CsCmdActorCue* cue) { func_80859248(this); - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { if (PlayerAnimation_Update(play, &this->skelAnime)) { Player_AnimationPlayLoop(play, this, func_8082EF54(this)); - this->actionVar2 = 0; + this->av2.actionVar2 = 0; } func_8082FC60(this); } else { @@ -20010,7 +20014,7 @@ void Player_CsAction_19(PlayState* play, Player* this, CsCmdActorCue* cue) { void Player_CsAction_20(PlayState* play, Player* this, CsCmdActorCue* cue) { if (PlayerAnimation_Update(play, &this->skelAnime)) { Player_CsAction_End(play, this, cue); - } else if (this->actionVar2 == 0) { + } else if (this->av2.actionVar2 == 0) { Item_Give(play, ITEM_SWORD_RAZOR); func_80841358(play, this, false); } else { @@ -20107,7 +20111,7 @@ void Player_CsAction_30(PlayState* play, Player* this, CsCmdActorCue* cue) { func_808525C4(play, this); return; } - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { func_8085255C(play, this); } } @@ -20142,12 +20146,12 @@ void Player_CsAction_33(PlayState* play, Player* this, CsCmdActorCue* cue) { } void Player_CsAction_34(PlayState* play, Player* this, CsCmdActorCue* cue) { - if (PlayerAnimation_Update(play, &this->skelAnime) && (this->actionVar2 == 0) && + if (PlayerAnimation_Update(play, &this->skelAnime) && (this->av2.actionVar2 == 0) && (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { Player_AnimationPlayOnce(play, this, &gPlayerAnim_link_normal_back_downB); - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } - if (this->actionVar2 != 0) { + if (this->av2.actionVar2 != 0) { func_80832F24(this); } } @@ -20160,7 +20164,7 @@ void Player_CsAction_35(PlayState* play, Player* this, CsCmdActorCue* cue) { void Player_CsAction_36(PlayState* play, Player* this, CsCmdActorCue* cue) { if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar2++ >= 0x15) { + if (this->av2.actionVar2++ >= 0x15) { PlayerAnimation_Change(play, &this->skelAnime, &gPlayerAnim_pz_wait, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -16.0f); } @@ -20199,18 +20203,18 @@ void Player_CsAction_40(PlayState* play, Player* this, CsCmdActorCue* cue) { void Player_CsAction_41(PlayState* play, Player* this, CsCmdActorCue* cue) { if (PlayerAnimation_Update(play, &this->skelAnime)) { - if (this->actionVar2 == 0) { + if (this->av2.actionVar2 == 0) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) || (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE)) { this->getItemDrawIdPlusOne = GID_NONE + 1; - this->actionVar2 = -1; + this->av2.actionVar2 = -1; } else { this->getItemDrawIdPlusOne = GID_PENDANT_OF_MEMORIES + 1; } - } else if (this->actionVar2 < 0) { + } else if (this->av2.actionVar2 < 0) { if (Actor_HasParent(&this->actor, play)) { this->actor.parent = NULL; - this->actionVar2 = 1; + this->av2.actionVar2 = 1; } else { Actor_OfferGetItem(&this->actor, play, GI_PENDANT_OF_MEMORIES, 9999.9f, 9999.9f); } @@ -20240,7 +20244,7 @@ void Player_CsAction_43(PlayState* play, Player* this, CsCmdActorCue* cue) { gSaveContext.save.playerForm = PLAYER_FORM_HUMAN; this->actor.update = func_8012301C; this->actor.draw = NULL; - this->actionVar1 = 0; + this->av1.actionVar1 = 0; } } else if (R_PLAY_FILL_SCREEN_ON < 0) { R_PLAY_FILL_SCREEN_ALPHA += R_PLAY_FILL_SCREEN_ON; @@ -20390,8 +20394,8 @@ void Player_CsAction_48(PlayState* play, Player* this, CsCmdActorCue* cue) { func_8085AD5C(play, this, ABS_ALT(csAction)); func_8085AC9C(play, this, playerCue, &sPlayerCsActionInitFuncs[ABS_ALT(csAction)]); - this->actionVar2 = 0; - this->actionVar1 = 0; + this->av2.actionVar2 = 0; + this->av1.actionVar1 = 0; this->cueId = playerCue->id; } @@ -20530,11 +20534,11 @@ void Player_TalkWithPlayer(PlayState* play, Actor* actor) { } if (player->stateFlags1 & PLAYER_STATE1_800000) { - s32 sp24 = player->actionVar2; + s32 sp24 = player->av2.actionVar2; func_8082DE14(play, player); func_80837B60(play, player); - player->actionVar2 = sp24; + player->av2.actionVar2 = sp24; } else { if (func_801242B4(player)) { func_80832558(play, player, func_80837B60); diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index eb21ac289..fdf90dd4a 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -6819,7 +6819,7 @@ 0x808FC5AC:("EnFr_Destroy",), 0x808FC5BC:("EnFr_Update",), 0x808FC6C0:("EnFishing_SetColliderElement",), - 0x808FC770:("EnFishing_SeedRand",), + 0x808FC770:("EnFishing_InitRand",), 0x808FC790:("EnFishing_RandZeroOne",), 0x808FC8B8:("EnFishing_SmoothStepToS",), 0x808FC964:("EnFishing_SpawnRipple",), @@ -9217,81 +9217,81 @@ 0x809D0090:("EnMttag_Init",), 0x809D0138:("EnMttag_Destroy",), 0x809D0168:("EnMttag_Update",), - 0x809D0530:("func_809D0530",), - 0x809D0550:("func_809D0550",), - 0x809D0678:("func_809D0678",), - 0x809D082C:("func_809D082C",), - 0x809D089C:("func_809D089C",), - 0x809D092C:("func_809D092C",), - 0x809D0AA4:("func_809D0AA4",), + 0x809D0530:("Boss01_InitRand",), + 0x809D0550:("Boss01_RandZeroOne",), + 0x809D0678:("Boss01_SpawnEffectFallingBlock",), + 0x809D082C:("Boss01_SpawnEffectRingOfFire",), + 0x809D089C:("Boss01_SetColliderSphere",), + 0x809D092C:("Boss01_SelectAttack",), + 0x809D0AA4:("Boss01_SpawnDustAtFeet",), 0x809D0CE8:("Boss01_Init",), 0x809D118C:("Boss01_Destroy",), - 0x809D119C:("func_809D119C",), - 0x809D1258:("func_809D1258",), - 0x809D12B4:("func_809D12B4",), - 0x809D1AB8:("func_809D1AB8",), - 0x809D1B2C:("func_809D1B2C",), - 0x809D1E5C:("func_809D1E5C",), - 0x809D1E74:("func_809D1E74",), - 0x809D1EA4:("func_809D1EA4",), - 0x809D20D0:("func_809D20D0",), - 0x809D2588:("func_809D2588",), - 0x809D25E8:("func_809D25E8",), - 0x809D2664:("func_809D2664",), - 0x809D26B8:("func_809D26B8",), - 0x809D2780:("func_809D2780",), - 0x809D27D4:("func_809D27D4",), - 0x809D2858:("func_809D2858",), - 0x809D2914:("func_809D2914",), - 0x809D2A44:("func_809D2A44",), - 0x809D2AA0:("func_809D2AA0",), - 0x809D2BCC:("func_809D2BCC",), - 0x809D2CDC:("func_809D2CDC",), - 0x809D2DE8:("func_809D2DE8",), - 0x809D2E4C:("func_809D2E4C",), - 0x809D3074:("func_809D3074",), - 0x809D30D0:("func_809D30D0",), - 0x809D32B4:("func_809D32B4",), - 0x809D3374:("func_809D3374",), - 0x809D3400:("func_809D3400",), - 0x809D345C:("func_809D345C",), - 0x809D34D4:("func_809D34D4",), - 0x809D3530:("func_809D3530",), - 0x809D35A8:("func_809D35A8",), - 0x809D365C:("func_809D365C",), - 0x809D370C:("func_809D370C",), - 0x809D3A7C:("func_809D3A7C",), - 0x809D3ADC:("func_809D3ADC",), - 0x809D3C10:("func_809D3C10",), - 0x809D3CD0:("func_809D3CD0",), - 0x809D441C:("func_809D441C",), - 0x809D4464:("func_809D4464",), - 0x809D44C0:("func_809D44C0",), - 0x809D4668:("func_809D4668",), + 0x809D119C:("Boss01_JumpAwayFromExplosive",), + 0x809D1258:("Boss01_SetupIntroCutscene",), + 0x809D12B4:("Boss01_IntroCutscene",), + 0x809D1AB8:("Boss01_SetupSummonBugsCutscene",), + 0x809D1B2C:("Boss01_SummonBugsCutscene",), + 0x809D1E5C:("Boss01_Afterimage_SetupWaitToDespawn",), + 0x809D1E74:("Boss01_Afterimage_WaitToDespawn",), + 0x809D1EA4:("Boss01_SetupWait",), + 0x809D20D0:("Boss01_Wait",), + 0x809D2588:("Boss01_SetupDazed",), + 0x809D25E8:("Boss01_Dazed",), + 0x809D2664:("Boss01_SetupSpinAttack",), + 0x809D26B8:("Boss01_SpinAttack",), + 0x809D2780:("Boss01_SetupDanceBeforeAttack",), + 0x809D27D4:("Boss01_DanceBeforeAttack",), + 0x809D2858:("Boss01_SetupRun",), + 0x809D2914:("Boss01_Run",), + 0x809D2A44:("Boss01_SetupJump",), + 0x809D2AA0:("Boss01_JumpSquat",), + 0x809D2BCC:("Boss01_Jump",), + 0x809D2CDC:("Boss01_JumpLand",), + 0x809D2DE8:("Boss01_SetupVerticalSlash",), + 0x809D2E4C:("Boss01_VerticalSlash",), + 0x809D3074:("Boss01_SetupHorizontalSlash",), + 0x809D30D0:("Boss01_HorizontalSlash",), + 0x809D32B4:("Boss01_SetupGuard",), + 0x809D3374:("Boss01_Guard",), + 0x809D3400:("Boss01_SetupKick",), + 0x809D345C:("Boss01_Kick",), + 0x809D34D4:("Boss01_SetupShieldBash",), + 0x809D3530:("Boss01_ShieldBash",), + 0x809D35A8:("Boss01_SetupDamaged",), + 0x809D365C:("Boss01_Damaged",), + 0x809D370C:("Boss01_UpdateDamage",), + 0x809D3A7C:("Boss01_SetupSummonMoths",), + 0x809D3ADC:("Boss01_SummonMoths",), + 0x809D3C10:("Boss01_SetupDeathCutscene",), + 0x809D3CD0:("Boss01_DeathCutscene",), + 0x809D441C:("Boss01_SetupStunned",), + 0x809D4464:("Boss01_Stunned",), + 0x809D44C0:("Boss01_Thaw",), + 0x809D4668:("Boss01_ArePlayerAndOdolwaFacing",), 0x809D46E4:("Boss01_Update",), - 0x809D519C:("func_809D519C",), - 0x809D5584:("func_809D5584",), - 0x809D55CC:("func_809D55CC",), + 0x809D519C:("Boss01_DrawSwordTrail",), + 0x809D5584:("Boss01_OverrideLimbDraw",), + 0x809D55CC:("Boss01_PostLimbDraw",), 0x809D5988:("Boss01_Draw",), - 0x809D5B0C:("func_809D5B0C",), - 0x809D5BC4:("func_809D5BC4",), - 0x809D5FB4:("func_809D5FB4",), - 0x809D606C:("func_809D606C",), - 0x809D62D4:("func_809D62D4",), - 0x809D6314:("func_809D6314",), - 0x809D6424:("func_809D6424",), - 0x809D6488:("func_809D6488",), - 0x809D64E0:("func_809D64E0",), - 0x809D6540:("func_809D6540",), - 0x809D6588:("func_809D6588",), - 0x809D65E0:("func_809D65E0",), - 0x809D670C:("func_809D670C",), - 0x809D694C:("func_809D694C",), - 0x809D6B08:("func_809D6B08",), - 0x809D6BB4:("func_809D6BB4",), - 0x809D6C98:("func_809D6C98",), - 0x809D6E7C:("func_809D6E7C",), - 0x809D73D4:("func_809D73D4",), + 0x809D5B0C:("Boss01_Afterimage_Draw",), + 0x809D5BC4:("Boss01_FillShadowTex",), + 0x809D5FB4:("Boss01_GenShadowTex",), + 0x809D606C:("Boss01_DrawShadowTex",), + 0x809D62D4:("Boss01_Bug_SetupCrawl",), + 0x809D6314:("Boss01_Bug_Crawl",), + 0x809D6424:("Boss01_Bug_SetupDamaged",), + 0x809D6488:("Boss01_Bug_Damaged",), + 0x809D64E0:("Boss01_Bug_SetupDead",), + 0x809D6540:("Boss01_Bug_SetupStunned",), + 0x809D6588:("Boss01_Bug_Stunned",), + 0x809D65E0:("Boss01_Bug_Dead",), + 0x809D670C:("Boss01_Bug_UpdateDamage",), + 0x809D694C:("Boss01_Bug_Update",), + 0x809D6B08:("Boss01_Bug_OverrideLimbDraw",), + 0x809D6BB4:("Boss01_Bug_Draw",), + 0x809D6C98:("Boss01_SpawnDustForFallingBlock",), + 0x809D6E7C:("Boss01_UpdateEffects",), + 0x809D73D4:("Boss01_DrawEffects",), 0x809DA1D0:("Boss02_FillScreen",), 0x809DA22C:("Boss02_SetFillScreenAlpha",), 0x809DA24C:("Boss02_StopFillScreen",), @@ -9321,7 +9321,7 @@ 0x809E299C:("Boss03_SpawnEffectSplash",), 0x809E2AB4:("Boss03_SpawnEffectBubble",), 0x809E2B8C:("Boss03_UpdateSphereElement",), - 0x809E2C1C:("Boss03_SeedRand",), + 0x809E2C1C:("Boss03_InitRand",), 0x809E2C3C:("Boss03_RandZeroOne",), 0x809E2D64:("Boss03_FindActorDblueMovebg",), 0x809E2DA0:("Boss03_SpawnDust",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index d1945898c..a02558a6b 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -7537,9 +7537,9 @@ 0x80911F50:("D_80911F50","UNK_TYPE1","",0x1), 0x80911F58:("sSinkingLureBasePos","Vec3f","",0xC), 0x80911F64:("D_80911F64","f32","",0x4), - 0x80911F68:("sRandSeed0","s32","",0x4), - 0x80911F6C:("sRandSeed1","s32","",0x4), - 0x80911F70:("sRandSeed2","s32","",0x4), + 0x80911F68:("sFishingRandSeed1","s32","",0x4), + 0x80911F6C:("sFishingRandSeed2","s32","",0x4), + 0x80911F70:("sFishingRandSeed3","s32","",0x4), 0x80911F78:("sPondProps","UNK_TYPE1","[140]",0x20D0), 0x80914048:("sGroupFishes","UNK_TYPE1","[60]",0x10E0), 0x80915128:("sFishGroupAngle1","f32","",0x4), @@ -9862,54 +9862,45 @@ 0x809D0434:("D_809D0434","f32","",0x4), 0x809D0438:("D_809D0438","f32","",0x4), 0x809D043C:("D_809D043C","f32","",0x4), - 0x809D7980:("D_809D7980","UNK_TYPE1","",0x1), - 0x809D798C:("D_809D798C","f32","",0x4), - 0x809D7990:("D_809D7990","UNK_TYPE1","",0x1), - 0x809D79B0:("D_809D79B0","UNK_TYPE1","",0x1), - 0x809D79D0:("D_809D79D0","UNK_TYPE1","",0x1), - 0x809D7A3C:("D_809D7A3C","UNK_TYPE1","",0x1), - 0x809D7A4C:("D_809D7A4C","UNK_TYPE1","",0x1), - 0x809D7A70:("D_809D7A70","UNK_TYPE1","",0x1), - 0x809D7A80:("D_809D7A80","UNK_TYPE1","",0x1), - 0x809D7C0C:("D_809D7C0C","UNK_TYPE1","",0x1), - 0x809D7C1C:("D_809D7C1C","UNK_TYPE1","",0x1), - 0x809D7C64:("D_809D7C64","UNK_TYPE1","",0x1), - 0x809D7C74:("D_809D7C74","UNK_TYPE1","",0x1), - 0x809D7CA0:("D_809D7CA0","UNK_TYPE1","",0x1), - 0x809D7CCC:("Boss_01_InitVars","UNK_TYPE1","",0x1), - 0x809D7CEC:("D_809D7CEC","UNK_TYPE1","",0x1), - 0x809D7CF0:("D_809D7CF0","UNK_TYPE1","",0x1), - 0x809D7CF4:("D_809D7CF4","UNK_TYPE1","",0x1), - 0x809D7D24:("D_809D7D24","UNK_TYPE4","",0x4), - 0x809D7D38:("D_809D7D38","UNK_TYPE4","",0x4), - 0x809D7D4C:("D_809D7D4C","UNK_TYPE1","",0x1), - 0x809D7D50:("D_809D7D50","UNK_TYPE1","",0x1), - 0x809D7D54:("D_809D7D54","UNK_TYPE1","",0x1), - 0x809D7D60:("D_809D7D60","UNK_TYPE1","",0x1), - 0x809D7D6C:("D_809D7D6C","UNK_TYPE1","",0x1), - 0x809D7D78:("D_809D7D78","UNK_TYPE1","",0x1), - 0x809D7D7A:("D_809D7D7A","UNK_TYPE1","",0x1), - 0x809D7D7E:("D_809D7D7E","UNK_TYPE1","",0x1), - 0x809D7D7F:("D_809D7D7F","UNK_TYPE1","",0x1), - 0x809D7D84:("D_809D7D84","UNK_TYPE1","",0x1), - 0x809D7D8E:("D_809D7D8E","UNK_TYPE1","",0x1), - 0x809D7D8F:("D_809D7D8F","UNK_TYPE1","",0x1), - 0x809D7D96:("D_809D7D96","UNK_TYPE1","",0x1), - 0x809D7D97:("D_809D7D97","UNK_TYPE1","",0x1), - 0x809D7D98:("D_809D7D98","UNK_TYPE1","",0x1), - 0x809D7DB4:("D_809D7DB4","UNK_TYPE1","",0x1), - 0x809D7E38:("D_809D7E38","UNK_TYPE1","",0x1), - 0x809D7E44:("D_809D7E44","UNK_TYPE1","",0x1), - 0x809D7E50:("D_809D7E50","UNK_TYPE1","",0x1), - 0x809D7E5C:("D_809D7E5C","UNK_TYPE1","",0x1), - 0x809D7E68:("D_809D7E68","UNK_TYPE1","",0x1), - 0x809D7EA0:("D_809D7EA0","UNK_TYPE1","",0x1), - 0x809D7EAC:("D_809D7EAC","UNK_TYPE4","",0x4), - 0x809D7EC4:("D_809D7EC4","UNK_TYPE4","",0x4), - 0x809D7EE0:("D_809D7EE0","UNK_TYPE4","",0x4), - 0x809D7F00:("D_809D7F00","UNK_TYPE4","",0x4), - 0x809D7F30:("D_809D7F30","UNK_TYPE4","",0x4), - 0x809D7F6C:("D_809D7F6C","UNK_TYPE1","",0x1), + 0x809D7980:("sFallingBlockSfxPos","Vec3f","",0xC), + 0x809D798C:("sSwordTrailAngularRangeDivisor","f32","",0x4), + 0x809D7990:("sOdolwaDamageTable","DamageTable","",0x20), + 0x809D79B0:("sBugDamageTable","DamageTable","",0x20), + 0x809D79D0:("sSwordColliderJntSphElementsInit","ColliderJntSphElementInit","[3]",0x6C), + 0x809D7A3C:("sSwordColliderJntSphInit","ColliderJntSphInit","",0x10), + 0x809D7A4C:("sShieldColliderJntSphElementsInit","ColliderJntSphElementInit","[1]",0x24), + 0x809D7A70:("sShieldColliderJntSphInit","ColliderJntSphInit","",0x10), + 0x809D7A80:("sBodyColliderJntSphElementsInit","ColliderJntSphElementInit","[11]", 0x18C), + 0x809D7C0C:("sBodyColliderJntSphInit","ColliderJntSphInit","",0x10), + 0x809D7C1C:("sKickAndShieldBashColliderJntSphElementsInit","ColliderJntSphElementInit","[2]",0x48), + 0x809D7C64:("sKickAndShieldBashColliderJntSphInit","ColliderJntSphInit","",0x10), + 0x809D7C74:("sBugACColliderCylinderInit","ColliderCylinderInit","",0x2C), + 0x809D7CA0:("sBugATColliderCylinderInit","ColliderCylinderInit","",0x2C), + 0x809D7CCC:("Boss_01_InitVars","ActorInit","",0x20), + 0x809D7CEC:("sDustPrimColor","Color_RGBA8","",0x4), + 0x809D7CF0:("sDustEnvColor","Color_RGBA8","",0x4), + 0x809D7CF4:("sWaitAnimations","AnimationHeader*","[12]",0x30), + 0x809D7D24:("sBlueWarpSpawnsX","f32","[5]",0x14), + 0x809D7D38:("sBlueWarpSpawnsZ","f32","[5]",0x14), + 0x809D7D4C:("sIcePrimColor","Color_RGBA8","",0x4), + 0x809D7D50:("sIceEnvColor","Color_RGBA8","",0x4), + 0x809D7D54:("sIceAccel","Vec3f","",0xC), + 0x809D7D60:("sSwordTrailOuterVertexIndices","u8","[11]",0xB), + 0x809D7D6C:("sSwordTrailInnerVertexIndices","u8","[11]",0xB), + 0x809D7D78:("sLimbToColliderBodyParts","s8","[60]",0x3C), + 0x809D7DB4:("sLimbColliderOffsets","Vec3f","[11]",0x84), + 0x809D7E38:("sShieldColliderOffset","Vec3f","",0xC), + 0x809D7E44:("sSwordBaseColliderOffset","Vec3f","",0xC), + 0x809D7E50:("sSwordTipColliderOffset","Vec3f","",0xC), + 0x809D7E5C:("sHorizontalSlashPelvisColliderOffset","Vec3f","",0xC), + 0x809D7E68:("sLimbToBodyParts","s8","[53]",0x35), + 0x809D7EA0:("sDefaultPelvisColliderOffset","Vec3f","",0xC), + 0x809D7EAC:("sShadowSmallMap","s32","[6]",0x18), + 0x809D7EC4:("sShadowMediumMap","s32","[7]",0x1C), + 0x809D7EE0:("sShadowLargeMap","s32","[8]",0x20), + 0x809D7F00:("sShadowExtraLargeMap","s32","[12]",0x30), + 0x809D7F30:("sParentShadowBodyParts","s32","[15]",0x3C), + 0x809D7F6C:("sShadowSizes","u8","[15]",0xF), 0x809D7F80:("D_809D7F80","f32","",0x4), 0x809D7F84:("D_809D7F84","f32","",0x4), 0x809D7F88:("D_809D7F88","f32","",0x4), @@ -9967,22 +9958,22 @@ 0x809D8150:("D_809D8150","f32","",0x4), 0x809D8154:("D_809D8154","f32","",0x4), 0x809D8158:("D_809D8158","f32","",0x4), - 0x809D8A10:("D_809D8A10","UNK_TYPE2","",0x2), - 0x809D8A14:("D_809D8A14","UNK_TYPE4","",0x4), - 0x809D8A18:("D_809D8A18","UNK_TYPE4","",0x4), - 0x809D8A1C:("D_809D8A1C","f32","",0x4), - 0x809D8A20:("D_809D8A20","f32","",0x4), - 0x809D8A24:("D_809D8A24","f32","",0x4), - 0x809D8A28:("D_809D8A28","f32","",0x4), - 0x809D8A2C:("D_809D8A2C","f32","",0x4), - 0x809D8A30:("D_809D8A30","f32","",0x4), - 0x809D8A34:("D_809D8A34","f32","",0x4), - 0x809D8A38:("D_809D8A38","UNK_TYPE1","",0x1), - 0x809D8A40:("D_809D8A40","UNK_TYPE1","",0x1), - 0x809D8A4C:("D_809D8A4C","UNK_TYPE4","",0x4), - 0x809D8A50:("D_809D8A50","UNK_TYPE4","",0x4), - 0x809D8A54:("D_809D8A54","UNK_TYPE4","",0x4), - 0x809D8A58:("D_809D8A58","UNK_TYPE1","",0x1), + 0x809D8A10:("sOdolwaBugCount","s16","",0x2), + 0x809D8A14:("sOdolwa","Boss01*","",0x4), + 0x809D8A18:("sMothSwarm","EnTanron1*","",0x4), + 0x809D8A1C:("sOdolwaSwordTrailPosX","f32","",0x4), + 0x809D8A20:("sOdolwaSwordTrailPosY","f32","",0x4), + 0x809D8A24:("sOdolwaSwordTrailPosZ","f32","",0x4), + 0x809D8A28:("sOdolwaSwordTrailRotX","f32","",0x4), + 0x809D8A2C:("sOdolwaSwordTrailRotY","f32","",0x4), + 0x809D8A30:("sOdolwaSwordTrailRotZ","f32","",0x4), + 0x809D8A34:("sOdolwaSwordTrailAlpha","f32","",0x4), + 0x809D8A38:("sOdolwaMusicStartTimer","u8","",0x1), + 0x809D8A40:("sOdolwaDamageSfxPos","Vec3f","",0xC), + 0x809D8A4C:("sOdolwaRandSeed1","s32","",0x4), + 0x809D8A50:("sOdolwaRandSeed2","s32","",0x4), + 0x809D8A54:("sOdolwaRandSeed3","s32","",0x4), + 0x809D8A58:("sOdolwaEffects","OdolwaEffect","[100]",0x1770), 0x809DF550:("D_809DF550","UNK_TYPE1","",0x1), 0x809DF570:("D_809DF570","UNK_TYPE1","",0x1), 0x809DF590:("Boss_02_InitVars","UNK_TYPE1","",0x1), @@ -10077,9 +10068,9 @@ 0x809E0424:("sRedTwinmold","UNK_TYPE4","",0x4), 0x809E0428:("sBlueTwinmold","UNK_TYPE4","",0x4), 0x809E042C:("sTwinmoldStatic","UNK_TYPE4","",0x4), - 0x809E0430:("sMusicStartTimer","UNK_TYPE1","",0x1), + 0x809E0430:("sTwinmoldMusicStartTimer","UNK_TYPE1","",0x1), 0x809E0434:("sBlueWarp","UNK_TYPE4","",0x4), - 0x809E0438:("sEffects","UNK_TYPE1","",0x1), + 0x809E0438:("sTwinmoldEffects","UNK_TYPE1","",0x1), 0x809E8EA0:("D_809E8EA0","UNK_TYPE4","",0x4), 0x809E8EAC:("Boss_03_InitVars","UNK_TYPE1","",0x1), 0x809E8ECC:("D_809E8ECC","UNK_TYPE1","",0x1), @@ -10161,9 +10152,9 @@ 0x809E9848:("D_809E9848","UNK_TYPE1","",0x1), 0x809E9858:("sGyorgEffects","UNK_TYPE1","[150]",0x27D8), 0x809EC030:("sGyorgBossInstance","UNK_TYPE4","",0x4), - 0x809EC034:("sRandSeed0","UNK_TYPE4","",0x4), - 0x809EC038:("sRandSeed1","UNK_TYPE4","",0x4), - 0x809EC03C:("sRandSeed2","UNK_TYPE4","",0x4), + 0x809EC034:("sGyorgRandSeed1","UNK_TYPE4","",0x4), + 0x809EC038:("sGyorgRandSeed2","UNK_TYPE4","",0x4), + 0x809EC03C:("sGyorgRandSeed3","UNK_TYPE4","",0x4), 0x809EE150:("D_809EE150","UNK_TYPE1","",0x1), 0x809EE170:("Boss_04_InitVars","UNK_TYPE1","",0x1), 0x809EE190:("D_809EE190","UNK_TYPE1","",0x1), diff --git a/tools/namefixer.py b/tools/namefixer.py index 7abb9b282..3a1fc4683 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -1111,8 +1111,10 @@ wordReplace = { "player->unk_AA0": "player->closestSecretDistSq", "player->unk_AAC": "player->headLimbRot", "player->unk_AB2": "player->upperLimbRot", - "player->unk_AE7": "player->actionVar1", - "player->unk_AE8": "player->actionVar2", + "player->unk_AE7": "player->av1.actionVar1", + "player->unk_AE8": "player->av2.actionVar2", + "player->actionVar1": "player->av1.actionVar1", + "player->actionVar2": "player->av2.actionVar2", "player->unk_B2A": "player->getItemDrawIdPlusOne", "player->getItemDrawId": "player->getItemDrawIdPlusOne", "player->unk_B68": "player->fallStartHeight", diff --git a/undefined_syms.txt b/undefined_syms.txt index e9a6ed592..aceea5684 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -196,42 +196,6 @@ D_060005C4 = 0x060005C4; D_06000A20 = 0x06000A20; D_06000040 = 0x06000040; -// ovl_Boss_01 - -D_06000C44 = 0x06000C44; -D_06001884 = 0x06001884; -D_0600C338 = 0x0600C338; -D_0600C498 = 0x0600C498; -D_0600C5E0 = 0x0600C5E0; -D_0600C7A8 = 0x0600C7A8; -D_0600C7C8 = 0x0600C7C8; -D_0600C7F8 = 0x0600C7F8; -D_0600E3E8 = 0x0600E3E8; -D_0600F0A8 = 0x0600F0A8; -D_0600FDEC = 0x0600FDEC; -D_0600FF94 = 0x0600FF94; -D_06010150 = 0x06010150; -D_06010980 = 0x06010980; -D_060124CC = 0x060124CC; -D_06012B70 = 0x06012B70; -D_06012D10 = 0x06012D10; -D_06012EBC = 0x06012EBC; -D_06013480 = 0x06013480; -D_0601407C = 0x0601407C; -D_06014F14 = 0x06014F14; -D_06015A30 = 0x06015A30; -D_06016168 = 0x06016168; -D_060164CC = 0x060164CC; -D_06018438 = 0x06018438; -D_06019C10 = 0x06019C10; -D_0601F6A4 = 0x0601F6A4; -D_060204AC = 0x060204AC; -D_060213A8 = 0x060213A8; -D_060220A0 = 0x060220A0; -D_06022118 = 0x06022118; -D_060222D0 = 0x060222D0; -D_06022550 = 0x06022550; - // ovl_Boss_05 D_060006A4 = 0x060006A4;