diff --git a/include/z64cutscene.h b/include/z64cutscene.h index a9d52c6c55..d59c6d798a 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -371,10 +371,10 @@ typedef enum CutsceneIndex { CS_INDEX_7 = 0xFFF7, CS_INDEX_8 = 0xFFF8, CS_INDEX_9 = 0xFFF9, - CS_INDEX_A = 0xFFFA, // e.g. ENTR_TEMPLE_OF_TIME_0_14 - CS_INDEX_RESET = 0xFFFD, // a guess as per `z_play.c:333` - CS_INDEX_STOP = 0xFFFF, // a guess as per `z_demo.c:1369` and `z_demo.c:1372` - CS_INDEX_LAST = 0x8000 // unknown, `z_demo.c:747` for CS_DEST_DEATH_MOUNTAIN_TRAIL + CS_INDEX_A = 0xFFFA, // e.g. ENTR_TEMPLE_OF_TIME_0_14 + CS_INDEX_TRIGGERED = 0xFFFD, // a guess as per `z_play.c:333` + CS_INDEX_STOP = 0xFFFF, // a guess as per `z_demo.c:1369` and `z_demo.c:1372` + CS_INDEX_LAST = 0x8000 // unknown, `z_demo.c:747` for CS_DEST_DEATH_MOUNTAIN_TRAIL } CutsceneIndex; typedef union CsCmdCam { diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 8027d7c61d..87c9c85e92 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -2185,7 +2185,7 @@ s32 DebugCamera_UpdateDemoControl(DebugCam* debugCam, Camera* cam) { if (CHECK_BTN_ALL(sPlay->state.input[1].press.button, BTN_CRIGHT)) { gUseCutsceneCam = false; - gSaveContext.save.cutsceneIndex = CS_INDEX_RESET; + gSaveContext.save.cutsceneIndex = CS_INDEX_TRIGGERED; gSaveContext.cutsceneTrigger = 1; sDebugCamAnim.curFrame = 0.0f; sDebugCamAnim.keyframe = 0; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 3bac2ce2a4..dfac614dc2 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -189,14 +189,14 @@ void Cutscene_UpdateScripted(PlayState* play, CutsceneContext* csCtx) { if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT) && (csCtx->state == CS_STATE_IDLE) && IS_CUTSCENE_LAYER) { gUseCutsceneCam = false; - gSaveContext.save.cutsceneIndex = CS_INDEX_RESET; + gSaveContext.save.cutsceneIndex = CS_INDEX_TRIGGERED; gSaveContext.cutsceneTrigger = 1; } if (CHECK_BTN_ALL(input->press.button, BTN_DUP) && (csCtx->state == CS_STATE_IDLE) && IS_CUTSCENE_LAYER && !gDebugCamEnabled) { gUseCutsceneCam = true; - gSaveContext.save.cutsceneIndex = CS_INDEX_RESET; + gSaveContext.save.cutsceneIndex = CS_INDEX_TRIGGERED; gSaveContext.cutsceneTrigger = 1; } } @@ -208,7 +208,7 @@ void Cutscene_UpdateScripted(PlayState* play, CutsceneContext* csCtx) { if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE)) { PRINTF(T("\nデモ開始要求 発令!", "\nDemo start request issued!")); - gSaveContext.save.cutsceneIndex = CS_INDEX_RESET; + gSaveContext.save.cutsceneIndex = CS_INDEX_TRIGGERED; gSaveContext.cutsceneTrigger = 1; } @@ -2293,7 +2293,7 @@ void Cutscene_SetupScripted(PlayState* play, CutsceneContext* csCtx) { u8 i; if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE) && !Player_InCsMode(play)) { - gSaveContext.save.cutsceneIndex = CS_INDEX_RESET; + gSaveContext.save.cutsceneIndex = CS_INDEX_TRIGGERED; } if ((gSaveContext.save.cutsceneIndex >= CS_INDEX_0) && (csCtx->state == CS_STATE_IDLE)) { diff --git a/src/code/z_play.c b/src/code/z_play.c index 353252477d..7d18d4223a 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -329,7 +329,7 @@ void Play_Init(GameState* thisx) { gSaveContext.nextCutsceneIndex = CS_INDEX_NEXT_USED; } - if (gSaveContext.save.cutsceneIndex == CS_INDEX_RESET) { + if (gSaveContext.save.cutsceneIndex == CS_INDEX_TRIGGERED) { gSaveContext.save.cutsceneIndex = CS_INDEX_NONE; } diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 11df5e00d9..28a72de867 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -379,7 +379,7 @@ void EnSa_ChangeAnim(EnSa* this, s32 index) { } s32 func_80AF5DFC(EnSa* this, PlayState* play) { - if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0 && gSaveContext.save.cutsceneIndex != CS_INDEX_RESET) { + if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0 && gSaveContext.save.cutsceneIndex != CS_INDEX_TRIGGERED) { if (play->sceneId == SCENE_KOKIRI_FOREST) { return 4; }