mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 20:05:02 +00:00
Code Issues Projects Releases Wiki Activity

apply a PR suggestion

Browse source 
https://github.com/zeldaret/oot/pull/2286#discussion_r1829219841
This commit is contained in:
feacur 2024-11-05 13:10:20 +01:00
parent b8953fd0b9
commit 32a2dd0ae2
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/db_camera.c
View file

@ -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;

8
src/code/z_demo.c
View file

@ -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)) {

2
src/code/z_play.c
View file

@ -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;
}