izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

cs state cleanup (#1229)

Browse Source
This commit is contained in:
engineer124
2023-04-21 15:54:47 -04:00
committed by GitHub
parent 40846f3d3a
commit 24454b2277
37 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_800E8EA0.c
+4 -4
View File
@@ -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;
src/code/z_parameter.c
+1 -1
View File
@@ -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)
src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
+1 -1
View File
@@ -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);
}
src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_Dm_Al/z_dm_al.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_Dm_An/z_dm_an.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c
+3 -3
View File
@@ -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;
src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
+2 -2
View File
@@ -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) {
src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
+4 -4
View File
@@ -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;
}
src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c
+2 -2
View File
@@ -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,
src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+8 -8
View File
@@ -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 =
src/overlays/actors/ovl_En_Dnk/z_en_dnk.c
+1 -1
View File
@@ -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);
}
src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_En_Dns/z_en_dns.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_En_Elf/z_en_elf.c
+2 -2
View File
@@ -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;
}
}
src/overlays/actors/ovl_En_Fall/z_en_fall.c
+2 -2
View File
@@ -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);
}
}
src/overlays/actors/ovl_En_Gg/z_en_gg.c
+4 -4
View File
@@ -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;

Some files were not shown because too many files have changed in this diff Show More