From 24454b2277713ece47510936ed84ffad715795c5 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Sat, 22 Apr 2023 05:54:47 +1000 Subject: [PATCH] cs state cleanup (#1229) --- src/code/code_800E8EA0.c | 8 ++++---- src/code/z_parameter.c | 2 +- .../actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c | 2 +- src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c | 2 +- src/overlays/actors/ovl_Dm_Al/z_dm_al.c | 2 +- src/overlays/actors/ovl_Dm_An/z_dm_an.c | 2 +- src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c | 6 +++--- src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c | 4 ++-- src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c | 4 ++-- src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c | 2 +- src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c | 2 +- src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c | 16 ++++++++-------- src/overlays/actors/ovl_En_Dnk/z_en_dnk.c | 2 +- src/overlays/actors/ovl_En_Dnp/z_en_dnp.c | 2 +- src/overlays/actors/ovl_En_Dnq/z_en_dnq.c | 2 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 4 ++-- src/overlays/actors/ovl_En_Fall/z_en_fall.c | 4 ++-- src/overlays/actors/ovl_En_Gg/z_en_gg.c | 8 ++++---- src/overlays/actors/ovl_En_Gk/z_en_gk.c | 5 +++-- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 2 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 4 ++-- src/overlays/actors/ovl_En_Hg/z_en_hg.c | 2 +- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 2 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 2 +- src/overlays/actors/ovl_En_Pamera/z_en_pamera.c | 2 +- src/overlays/actors/ovl_En_Pm/z_en_pm.c | 2 +- src/overlays/actors/ovl_En_Rg/z_en_rg.c | 2 +- .../actors/ovl_En_Weather_Tag/z_en_weather_tag.c | 2 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 2 +- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 4 ++-- src/overlays/actors/ovl_Obj_Um/z_obj_um.c | 2 +- .../actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c | 2 +- tools/namefixer.py | 1 + 37 files changed, 63 insertions(+), 61 deletions(-) diff --git a/src/code/code_800E8EA0.c b/src/code/code_800E8EA0.c index 93970cc6a2..4ab38fcbaf 100644 --- a/src/code/code_800E8EA0.c +++ b/src/code/code_800E8EA0.c @@ -85,7 +85,7 @@ s32 Actor_TrackPlayerSetFocusHeight(PlayState* play, Actor* actor, Vec3s* headRo actor->focus.pos = actor->world.pos; actor->focus.pos.y += focusHeight; - if (!((play->csCtx.state != 0) || gDbgCamEnabled)) { + if (!((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled)) { yaw = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y)); if (yaw >= 0x4300) { Actor_TrackNone(headRot, torsoRot); @@ -93,7 +93,7 @@ s32 Actor_TrackPlayerSetFocusHeight(PlayState* play, Actor* actor, Vec3s* headRo } } - if ((play->csCtx.state != 0) || gDbgCamEnabled) { + if ((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled) { target = play->view.eye; } else { target = player->actor.focus.pos; @@ -127,7 +127,7 @@ s32 Actor_TrackPlayer(PlayState* play, Actor* actor, Vec3s* headRot, Vec3s* tors actor->focus.pos = focusPos; - if (!((play->csCtx.state != 0) || gDbgCamEnabled)) { + if (!((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled)) { yaw = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y)); if (yaw >= 0x4300) { Actor_TrackNone(headRot, torsoRot); @@ -135,7 +135,7 @@ s32 Actor_TrackPlayer(PlayState* play, Actor* actor, Vec3s* headRot, Vec3s* tors } } - if ((play->csCtx.state != 0) || gDbgCamEnabled) { + if ((play->csCtx.state != CS_STATE_IDLE) || gDbgCamEnabled) { target = play->view.eye; } else { target = player->actor.focus.pos; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 88b8f14ccb..41441f3a28 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -4003,7 +4003,7 @@ void Interface_DrawItemButtons(PlayState* play) { } if (interfaceCtx->tatlCalling && (play->pauseCtx.state == PAUSE_STATE_OFF) && - (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && (play->csCtx.state == 0) && + (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && (play->csCtx.state == CS_STATE_IDLE) && (sPictoState == PICTO_BOX_STATE_OFF)) { if (sCUpInvisible == 0) { // C-Up Button Texture, Color & Label (Tatl Text) 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 1419c34661..cca6b17ee2 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 @@ -131,7 +131,7 @@ void BgIknvObj_UpdateWaterwheel(BgIknvObj* this, PlayState* play) { func_800B9010(&this->dyna.actor, NA_SE_EV_WOOD_WATER_WHEEL - SFX_FLAG); } - if ((play->csCtx.state != 0) && (gSaveContext.sceneLayer == 1) && (play->csCtx.scriptIndex == 4) && + if ((play->csCtx.state != CS_STATE_IDLE) && (gSaveContext.sceneLayer == 1) && (play->csCtx.scriptIndex == 4) && (play->csCtx.curFrame == 1495)) { func_8019F128(NA_SE_EV_DOOR_UNLOCK); } 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 b640b9ba46..12815a044c 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -127,7 +127,7 @@ void func_80C1D7FC(DmAh* this, PlayState* play) { u16 cueId; s32 cueChannel; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (!this->unk_29C) { this->cueId = 255; this->unk_29C = true; 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 d624f85ca0..43ca006f22 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -51,7 +51,7 @@ void func_80C1BDD8(DmAl* this, PlayState* play) { u16 cueId; s32 cueChannel; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (!this->unk_45C) { this->cueId = 255; this->unk_45C = true; 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 a9276d13b8..2d474d1113 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -198,7 +198,7 @@ void func_80C1CAB0(DmAn* this, PlayState* play) { u16 cueId; s32 cueChannel; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (this->unk_2D0 == 0) { this->cueId = 255; this->unk_2D0 = 1; 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 210f2ad373..8657a9dc96 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -448,7 +448,7 @@ void func_80AA5E2C(DmChar00* this, PlayState* play) { } void func_80AA5EBC(DmChar00* this, PlayState* play) { - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { switch (play->sceneId) { case SCENE_LOST_WOODS: if (gSaveContext.sceneLayer == 1) { @@ -853,7 +853,7 @@ void func_80AA62FC(DmChar00* this, PlayState* play) { void func_80AA67F8(DmChar00* this, PlayState* play) { Player* player = GET_PLAYER(play); - if ((play->csCtx.state == 0) && (gSaveContext.sceneLayer == 0) && (play->csCtx.scriptIndex == 1)) { + if ((play->csCtx.state == CS_STATE_IDLE) && (gSaveContext.sceneLayer == 0) && (play->csCtx.scriptIndex == 1)) { if (this->unk_261 != 42) { this->unk_261 = 42; func_80AA5580(&this->skelAnime, &sAnimationInfo[this->unk_261], 0); @@ -914,7 +914,7 @@ void DmChar00_Draw(Actor* thisx, PlayState* play2) { s32 pad; Gfx* gfx = GRAPH_ALLOC(play->state.gfxCtx, 4 * sizeof(Gfx)); - if ((play->csCtx.state == 0) && + if ((play->csCtx.state == CS_STATE_IDLE) && ((play->sceneId != SCENE_OPENINGDAN) || (gSaveContext.sceneLayer != 0) || (play->roomCtx.curRoom.num != 0) || (play->csCtx.scriptIndex != 1) || (DMCHAR00_GET(&this->actor) != DMCHAR00_0))) { return; 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 7841d22f50..ec1e12a8fc 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -75,7 +75,7 @@ void DmChar02_PlaySfxForDroppingOcarinaCutscene(DmChar02* this, PlayState* play) } void DmChar02_PlaySfxForCutscenes(DmChar02* this, PlayState* play) { - if ((play->csCtx.state != 0) && (play->sceneId == SCENE_OKUJOU) && (play->csCtx.scriptIndex == 1)) { + if ((play->csCtx.state != CS_STATE_IDLE) && (play->sceneId == SCENE_OKUJOU) && (play->csCtx.scriptIndex == 1)) { DmChar02_PlaySfxForDroppingOcarinaCutscene(this, play); } } @@ -172,7 +172,7 @@ void DmChar02_Draw(Actor* thisx, PlayState* play) { DmChar02* this = THIS; s32 shouldDraw = false; - if ((play->csCtx.state == 0) && (this->actor.world.pos.y < 100.0f)) { + if ((play->csCtx.state == CS_STATE_IDLE) && (this->actor.world.pos.y < 100.0f)) { shouldDraw = true; } else if (Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_107)) { switch (play->csCtx.actorCues[Cutscene_GetCueChannel(play, CS_CMD_ACTOR_CUE_107)]->id) { 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 1b6d667c2b..35611375bd 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -341,13 +341,13 @@ void func_80AAFA18(DmChar08* this, PlayState* play) { } void func_80AAFAC4(DmChar08* this, PlayState* play) { - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { this->actionFunc = func_80AAF8F4; } } void func_80AAFAE4(DmChar08* this, PlayState* play) { - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { this->actionFunc = func_80AAFB04; } } @@ -893,7 +893,7 @@ void func_80AB032C(DmChar08* this, PlayState* play) { } void func_80AB096C(DmChar08* this, PlayState* play) { - if ((play->csCtx.state != 0) && (play->sceneId == SCENE_31MISAKI) && (gSaveContext.sceneLayer == 0) && + if ((play->csCtx.state != CS_STATE_IDLE) && (play->sceneId == SCENE_31MISAKI) && (gSaveContext.sceneLayer == 0) && (play->csCtx.scriptIndex == 0)) { if ((play->csCtx.curFrame >= 890) && (play->csCtx.curFrame < 922)) { Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_EARTHQUAKE_LAST2 - SFX_FLAG); @@ -1002,7 +1002,7 @@ void DmChar08_Update(Actor* thisx, PlayState* play) { } s32 DmChar08_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { - if ((play->csCtx.state == 0) && (play->sceneId == SCENE_31MISAKI) && + if ((play->csCtx.state == CS_STATE_IDLE) && (play->sceneId == SCENE_31MISAKI) && (limbIndex == TURTLE_LIMB_FRONT_RIGHT_UPPER_FLIPPER)) { rot->z = -0x5E24; } 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 567b33685c..93fa0e94c7 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -202,7 +202,7 @@ void DmChar09_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); func_80AB2268(this, play); func_80AB24BC(this, play); - if ((play->csCtx.state != 0) && this->unk_22E && DMCHAR09_GET_100(thisx)) { + if ((play->csCtx.state != CS_STATE_IDLE) && this->unk_22E && DMCHAR09_GET_100(thisx)) { Actor_PlaySfx(&this->actor, NA_SE_EV_POSTMAN_WALK + SFX_FLAG); } } @@ -217,7 +217,7 @@ s32 DmChar09_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f void DmChar09_Draw(Actor* thisx, PlayState* play) { DmChar09* this = THIS; - if ((play->csCtx.state != 0) && this->unk_22E) { + if ((play->csCtx.state != CS_STATE_IDLE) && this->unk_22E) { func_8012C28C(play->state.gfxCtx); func_8012C2DC(play->state.gfxCtx); SkelAnime_DrawOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, DmChar09_OverrideLimbDraw, NULL, 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 f20c87cb4c..2cdddbf198 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -198,7 +198,7 @@ void func_80C24A00(DmGm* this, PlayState* play) { u16 cueId; s32 cueChannel; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (this->unk_2D0 == 0) { this->cueId = 255; this->unk_2D0 = 1; 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 da2bd225a4..c42ad3c2b5 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -46,7 +46,7 @@ void func_80C1DF18(DmNb* this, PlayState* play) { u16 cueId; s32 cueChannel; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (this->unk1F8 == 0) { this->cueId = 255; this->unk1F8 = 1; 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 164d6ea532..9a9e14dbc3 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -916,7 +916,7 @@ void DmStk_PlaySfxForMoonWarpCutsceneVersion2(DmStk* this, PlayState* play) { * Handles sound effects for all cutscenes. */ void DmStk_PlaySfxForCutscenes(DmStk* this, PlayState* play) { - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { switch (play->sceneId) { case SCENE_LOST_WOODS: if (gSaveContext.sceneLayer == 1) { @@ -1198,7 +1198,7 @@ void DmStk_ClockTower_StartIntroCutsceneVersion1(DmStk* this, PlayState* play) { } void DmStk_ClockTower_WaitForIntroCutsceneVersion1ToEnd(DmStk* this, PlayState* play) { - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { this->animIndex = SK_ANIM_CALL_DOWN_MOON_LOOP; this->handType = SK_HAND_TYPE_HOLDING_OCARINA; DmStk_ChangeAnim(this, play, &this->skelAnime, &sAnimationInfo[this->animIndex], 0); @@ -1216,7 +1216,7 @@ void DmStk_ClockTower_StartIntroCutsceneVersion2(DmStk* this, PlayState* play) { } void DmStk_ClockTower_WaitForIntroCutsceneVersion2ToEnd(DmStk* this, PlayState* play) { - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { this->animIndex = SK_ANIM_FLOATING_ARMS_CROSSED; DmStk_ChangeAnim(this, play, &this->skelAnime, &sAnimationInfo[this->animIndex], 0); this->actionFunc = DmStk_ClockTower_Idle; @@ -1238,7 +1238,7 @@ void DmStk_ClockTower_StartDropOcarinaCutscene(DmStk* this, PlayState* play) { } void DmStk_ClockTower_WaitForDropOcarinaCutsceneToEnd(DmStk* this, PlayState* play) { - if ((play->csCtx.state != 0) && (play->csCtx.curFrame > 20)) { + if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.curFrame > 20)) { this->actionFunc = DmStk_ClockTower_Idle; } } @@ -1714,7 +1714,7 @@ void DmStk_UpdateCollision(DmStk* this, PlayState* play) { void DmStk_ClockTower_IdleWithOcarina(DmStk* this, PlayState* play) { Player* player = GET_PLAYER(play); - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { DmStk_ClockTower_AdjustHeightAndRotation(this, play); this->actor.flags |= ACTOR_FLAG_1; this->tatlMessageTimer++; @@ -1739,7 +1739,7 @@ void DmStk_ClockTower_IdleWithOcarina(DmStk* this, PlayState* play) { * If he is hit in this state, he will just deflect the attack. */ void DmStk_ClockTower_Idle(DmStk* this, PlayState* play) { - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { DmStk_ClockTower_AdjustHeightAndRotation(this, play); this->actor.flags |= ACTOR_FLAG_1; @@ -1804,7 +1804,7 @@ void DmStk_Update(Actor* thisx, PlayState* play) { break; case SK_DEKU_PIPES_CS_STATE_START: - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { this->dekuPipesCutsceneState = SK_DEKU_PIPES_CS_STATE_END; } break; @@ -1815,7 +1815,7 @@ void DmStk_Update(Actor* thisx, PlayState* play) { if ((play->actorCtx.flags & ACTORCTX_FLAG_1) && (play->msgCtx.msgMode != 0) && (play->msgCtx.currentTextId == 0x5E6) && !FrameAdvance_IsEnabled(&play->state) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (CutsceneManager_GetCurrentCsId() == CS_ID_NONE) && - (play->csCtx.state == 0)) { + (play->csCtx.state == CS_STATE_IDLE)) { gSaveContext.save.time = ((void)0, gSaveContext.save.time) + (u16)R_TIME_SPEED; if (R_TIME_SPEED != 0) { gSaveContext.save.time = 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 427e206aa9..7d59ebeec4 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -447,7 +447,7 @@ void func_80A52074(EnDnk* this, PlayState* play) { } void func_80A52134(EnDnk* this, PlayState* play) { - if ((play->csCtx.state != 0) && (ENDNK_GET_3C(&this->actor) == 4) && (play->sceneId == SCENE_SPOT00) && + if ((play->csCtx.state != CS_STATE_IDLE) && (ENDNK_GET_3C(&this->actor) == 4) && (play->sceneId == SCENE_SPOT00) && (gSaveContext.sceneLayer == 2)) { func_80A52074(this, play); } 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 dedbe30b4f..fd1557e3f7 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -265,7 +265,7 @@ s32 func_80B3CF60(EnDnp* this, PlayState* play) { s32 func_80B3D044(EnDnp* this, PlayState* play) { s32 ret = false; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (!(this->unk_322 & 0x200)) { this->unk_322 |= (0x200 | 0x10); this->actor.flags &= ~ACTOR_FLAG_1; 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 ea5bd4e94e..c328b02d60 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -121,7 +121,7 @@ void func_80A52604(EnDnq* this, PlayState* play) { s32 func_80A52648(EnDnq* this, PlayState* play) { s32 ret = false; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (!(this->unk_37C & 0x20)) { this->picto.actor.flags &= ~ACTOR_FLAG_1; this->cueId = 255; 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 6837e5367e..1f754f1d53 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -249,7 +249,7 @@ s32 func_8092CAD0(EnDns* this, PlayState* play) { s32 func_8092CB98(EnDns* this, PlayState* play) { s32 phi_v1 = 0; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (!(this->unk_2C6 & 0x80)) { this->cueType = EnDns_GetCueType(this); this->actor.flags &= ~ACTOR_FLAG_1; 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 f70b60b579..615d59196c 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1105,7 +1105,7 @@ void func_8088F214(EnElf* this, PlayState* play) { Player* player = GET_PLAYER(play); s32 pad; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_201)) { switch (play->csCtx.actorCues[Cutscene_GetCueChannel(play, CS_CMD_ACTOR_CUE_201)]->id) { case 4: @@ -1526,7 +1526,7 @@ void func_8089010C(Actor* thisx, PlayState* play) { this->unk_269--; } - if (!this->unk_269 && (play->csCtx.state != 0)) { + if (!this->unk_269 && (play->csCtx.state != CS_STATE_IDLE)) { this->unk_269 = 1; } } 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 94087bfb15..a43d39c7c3 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -318,7 +318,7 @@ void EnFall_CrashingMoon_HandleGiantsCutscene(EnFall* this, PlayState* play) { if ((play->sceneId == SCENE_00KEIKOKU) && (gSaveContext.sceneLayer == 1) && (play->csCtx.scriptIndex == 0)) { switch (sGiantsCutsceneState) { case 0: - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { sGiantsCutsceneState += 2; } break; @@ -452,7 +452,7 @@ void EnFall_StoppedClosedMouthMoon_PerformCutsceneActions(EnFall* this, PlayStat } void EnFall_ClockTowerOrTitleScreenMoon_PerformCutsceneActions(EnFall* this, PlayState* play) { - if (play->csCtx.state != 0 && play->sceneId == SCENE_OKUJOU) { + if ((play->csCtx.state != CS_STATE_IDLE) && (play->sceneId == SCENE_OKUJOU)) { func_800B9010(&this->actor, NA_SE_EV_MOON_FALL - SFX_FLAG); } } 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 ed10fd51a2..81d1c6bb6d 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -226,7 +226,7 @@ void func_80B352A4(EnGg* this, PlayState* play) { } void func_80B35450(EnGg* this, PlayState* play) { - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_91_10) && (play->csCtx.state == 0)) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_91_10) && (play->csCtx.state == CS_STATE_IDLE)) { func_80B359DC(this, play); } @@ -692,14 +692,14 @@ void EnGg_Update(Actor* thisx, PlayState* play) { } if (CHECK_WEEKEVENTREG(WEEKEVENTREG_19_80)) { - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { this->actor.flags |= ACTOR_FLAG_1; } else { this->actor.flags &= ~ACTOR_FLAG_1; } } - if ((play->csCtx.state == 0) && + if ((play->csCtx.state == CS_STATE_IDLE) && ((this->unk_2DA != 14) && (this->unk_2DA != 11) && (this->unk_2DA != 12) && (this->unk_2DA != 13))) { func_80B364D4(&this->unk_344, play); } @@ -723,7 +723,7 @@ void EnGg_Update(Actor* thisx, PlayState* play) { Actor_MoveWithoutGravity(&this->actor); SkelAnime_Update(&this->skelAnime); - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { func_80B3584C(this); } else { this->unk_2E8 = 0; 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 38e6ad9763..40cf72a98c 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -842,7 +842,7 @@ void func_80B51FD0(EnGk* this, PlayState* play) { void func_80B5202C(EnGk* this, PlayState* play) { Player* player = GET_PLAYER(play); - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { func_80B51410(this, play); } @@ -860,7 +860,8 @@ void func_80B5202C(EnGk* this, PlayState* play) { } if (this->unk_1E4 & 2) { - if ((play->msgCtx.ocarinaMode != 1) && (play->msgCtx.ocarinaMode != 3) && (play->csCtx.state == 0)) { + if ((play->msgCtx.ocarinaMode != 1) && (play->msgCtx.ocarinaMode != 3) && + (play->csCtx.state == CS_STATE_IDLE)) { func_801A4748(&this->actor.projectedPos, NA_SE_EN_GOLON_KID_CRY - SFX_FLAG); } } else { 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 b76ed70662..f31dd7cd23 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -761,7 +761,7 @@ s32 func_8094EE84(EnGm* this, PlayState* play) { s32 func_8094EFC4(EnGm* this, PlayState* play) { s32 ret = false; - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { if (this->unk_3F8 == 0) { if ((play->sceneId == SCENE_MILK_BAR) && (gSaveContext.sceneLayer == 2)) { func_8094E054(this, play, 0); 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 12a98228f3..a0c7e31801 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -710,7 +710,7 @@ s32 func_80A12868(EnGo* this, PlayState* play) { } s32 func_80A12954(EnGo* this, PlayState* play) { - if ((ENGO_GET_F(&this->actor) == ENGO_F_4) && (play->csCtx.state != 0) && (this->actor.draw != NULL) && + if ((ENGO_GET_F(&this->actor) == ENGO_F_4) && (play->csCtx.state != CS_STATE_IDLE) && (this->actor.draw != NULL) && (play->sceneId == SCENE_10YUKIYAMANOMURA2) && (gSaveContext.sceneLayer == 1) && (play->csCtx.scriptIndex == 0)) { if (this->unk_3F0 == 0) { @@ -756,7 +756,7 @@ s32 func_80A12A64(EnGo* this, PlayState* play) { } s32 func_80A12B78(EnGo* this, PlayState* play) { - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { if (this->unk_3DC == 4) { if (Animation_OnFrame(&this->skelAnime, 2.0f)) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_CIRCLE); 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 b5ad5fa400..34e1d1e152 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -365,7 +365,7 @@ void EnHg_HandleCsAction(EnHg* this, PlayState* play) { Cutscene_ActorTranslateAndYaw(&this->actor, play, cueChannel); return; - } else if (play->csCtx.state == 0) { + } else if (play->csCtx.state == CS_STATE_IDLE) { EnHg_SetupWait(this); } 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 e2d4792ca9..096b92fdd2 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -220,7 +220,7 @@ void EnHoll_VisibleIdle(EnHoll* this, PlayState* play) { void EnHoll_TransparentIdle(EnHoll* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 useViewEye = gDbgCamEnabled || play->csCtx.state != 0; + s32 useViewEye = gDbgCamEnabled || (play->csCtx.state != CS_STATE_IDLE); Vec3f transformedPlayerPos; f32 enHollTop; f32 playerDistFromCentralPlane; 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 84ed7a6053..254c9ad679 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -386,7 +386,7 @@ void EnIshi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain[sp34]); - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { this->actor.uncullZoneForward += 1000.0f; } 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 b858fc5029..2af87ea905 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -366,7 +366,7 @@ void EnKusa_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { this->actor.uncullZoneForward += 1000.0f; } EnKusa_InitCollider(&this->actor, play); 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 616481d852..20f32028eb 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -372,7 +372,7 @@ void func_80959C94(EnMk* this, PlayState* play) { void func_80959D28(EnMk* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); - if ((play->csCtx.state == 0) && (this->actor.csId == CS_ID_NONE)) { + if ((play->csCtx.state == CS_STATE_IDLE) && (this->actor.csId == CS_ID_NONE)) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_20_40)) { this->unk_27A &= ~1; this->actionFunc = func_80959774; 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 a4158e2c70..dab8f591e1 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -732,7 +732,7 @@ s32 func_80BD9CB8(EnPamera* this, PlayState* play) { this->setupFunc(this, play); return 1; } - if ((play->csCtx.state == 0) && CHECK_WEEKEVENTREG(WEEKEVENTREG_75_20)) { + if ((play->csCtx.state == CS_STATE_IDLE) && CHECK_WEEKEVENTREG(WEEKEVENTREG_75_20)) { if ((this->actionFunc != func_80BD994C) && (this->actionFunc != EnPamera_HandleDialogue)) { this->actor.shape.rot.y = this->actor.world.rot.y; func_80BD9904(this); 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 d10f0884b5..088d5c8a4d 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -1019,7 +1019,7 @@ s32 func_80AF86F0(EnPm* this, PlayState* play) { s32 func_80AF87C4(EnPm* this, PlayState* play) { s32 ret = false; - if ((play->csCtx.state != 0) && (play->sceneId == SCENE_00KEIKOKU) && (gSaveContext.sceneLayer == 9) && + if ((play->csCtx.state != CS_STATE_IDLE) && (play->sceneId == SCENE_00KEIKOKU) && (gSaveContext.sceneLayer == 9) && (play->curSpawn == 1)) { if (!this->unk_380) { func_80AF7E98(this, 0); 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 79b8614778..d552c5605c 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -283,7 +283,7 @@ void func_80BF3FF8(EnRg* this) { } s32 func_80BF4024(EnRg* this, PlayState* play) { - if ((play->csCtx.state == 0) && (this->unk_334 == 1)) { + if ((play->csCtx.state == CS_STATE_IDLE) && (this->unk_334 == 1)) { if (Animation_OnFrame(&this->skelAnime, 2.0f)) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOLON_CIRCLE); } 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 e81b5dabc4..fb00fdae31 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 @@ -485,7 +485,7 @@ void EnWeatherTag_Update(Actor* thisx, PlayState* play) { if ((play->actorCtx.flags & ACTORCTX_FLAG_1) && (play->msgCtx.msgMode != 0) && (play->msgCtx.currentTextId == 0x5E6) && !FrameAdvance_IsEnabled(&play->state) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (CutsceneManager_GetCurrentCsId() == CS_ID_NONE) && - (play->csCtx.state == 0)) { + (play->csCtx.state == CS_STATE_IDLE)) { gSaveContext.save.time = ((void)0, gSaveContext.save.time) + (u16)R_TIME_SPEED; if (R_TIME_SPEED != 0) { 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 752b669cff..aef42693b1 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -165,7 +165,7 @@ void ObjHamishi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { this->actor.uncullZoneForward += 1000.0f; } diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 7dd00abc35..3b933157b6 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -689,7 +689,7 @@ void ObjTokeidai_TowerClock_Idle(ObjTokeidai* this, PlayState* play) { return; } - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { this->actor.home.rot.x = 1; this->clockTime += 3; this->actor.draw = ObjTokeidai_Clock_Draw; @@ -722,7 +722,7 @@ void ObjTokeidai_ExteriorGear_Idle(ObjTokeidai* this, PlayState* play) { if (ObjTokeidai_IsPostFirstCycleFinalHours(this, play)) { this->actor.draw = ObjTokeidai_ExteriorGear_Draw; } else { - if (play->csCtx.state != 0) { + if (play->csCtx.state != CS_STATE_IDLE) { this->actor.home.rot.x = 1; this->clockTime += 3; this->actor.draw = ObjTokeidai_ExteriorGear_Draw; 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 f80c447514..a924c9e068 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -1402,7 +1402,7 @@ void func_80B7A860(ObjUm* this, PlayState* play) { func_80B78DF0(this, play); } - if (play->csCtx.state == 0) { + if (play->csCtx.state == CS_STATE_IDLE) { CutsceneManager_Stop(this->dyna.actor.csId); ObjUm_SetupAction(this, func_80B7A7AC); } 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 7915551c22..93caeb33db 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -80,7 +80,7 @@ void OceffWipe5_Draw(Actor* thisx, PlayState* play) { if ((((OCEFF_WIPE5_GET_SONG_TYPE(thisx) == 2) && (play->sceneId == SCENE_LABO)) && ((play->csCtx.scriptIndex == 0) || (play->csCtx.scriptIndex == 1))) && - (play->csCtx.state != 0)) { + (play->csCtx.state != CS_STATE_IDLE)) { phi_fv1 = 1150.0f; } diff --git a/tools/namefixer.py b/tools/namefixer.py index d5493bbfc8..3d77dba9cb 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -1027,6 +1027,7 @@ wordReplace = { "COLPOLY_SURFACE_GROUND": "SURFACE_MATERIAL_DIRT", "COLPOLY_SURFACE_SAND": "SURFACE_MATERIAL_SAND", "COLPOLY_SURFACE_SNOW": "SURFACE_MATERIAL_SNOW", + "CS_STATE_0": "CS_STATE_IDLE", # Example of custom behaviour: # "PLAYER": ("GET_PLAYER(play)", {"ignore": (-1, '"PLAYER"')}), # ignore "PLAYER" in sSoundBankNames