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

rename the flag for freeing nextCutsceneIndex

Browse source
This commit is contained in:
feacur 2024-11-05 17:00:42 +01:00
parent 2bd2ca20dd
commit 6eaaa8706c
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_common_data.c
View file

@ -16,7 +16,7 @@ void SaveContext_Init(void) {
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
gSaveContext.natureAmbienceId = NATURE_ID_DISABLED;
gSaveContext.forcedSeqId = NA_BGM_GENERAL_SFX;
gSaveContext.nextCutsceneIndex = CS_INDEX_NEXT_USED;
gSaveContext.nextCutsceneIndex = CS_INDEX_NEXT_EMPTY;
gSaveContext.cutsceneTrigger = 0;
gSaveContext.chamberCutsceneNum = CHAMBER_CS_FOREST;
gSaveContext.nextDayTime = NEXT_TIME_NONE;

4
src/code/z_play.c
View file

@ -324,9 +324,9 @@ void Play_Init(GameState* thisx) {
AnimTaskQueue_Reset(&this->animTaskQueue);
Cutscene_InitContext(this, &this->csCtx);
if (gSaveContext.nextCutsceneIndex != CS_INDEX_NEXT_USED) {
if (gSaveContext.nextCutsceneIndex != CS_INDEX_NEXT_EMPTY) {
gSaveContext.save.cutsceneIndex = gSaveContext.nextCutsceneIndex;
gSaveContext.nextCutsceneIndex = CS_INDEX_NEXT_USED;
gSaveContext.nextCutsceneIndex = CS_INDEX_NEXT_EMPTY;
}
if (gSaveContext.save.cutsceneIndex == CS_INDEX_TRIGGERED) {