diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 2 | ||||
| -rw-r--r-- | src/code/z_demo.c | 10 | ||||
| -rw-r--r-- | src/code/z_sram.c | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index ccf7fc004..7029834af 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -5266,7 +5266,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) { } else { retTextId = 0x2010; } - } else if (Flags_GetEventChkInf(EVENTCHKINF_40)) { + } else if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)) { retTextId = 0x200F; } else { retTextId = 0x200E; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 3979514bb..fb1f3645a 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -134,7 +134,7 @@ EntranceCutscene sEntranceCutsceneTable[] = { { ENTR_INSIDE_GANONS_CASTLE_6, 2, EVENTCHKINF_BF, gLightBarrierCs }, { ENTR_INSIDE_GANONS_CASTLE_7, 2, EVENTCHKINF_AD, gSpiritBarrierCs }, { ENTR_SPIRIT_TEMPLE_BOSS_0, 0, EVENTCHKINF_C0, gSpiritBossNabooruKnuckleIntroCs }, - { ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_C7, gGerudoFortressFirstCaptureCs }, + { ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_GERUDO_CAUGHT_TOWER_FALL, gGerudoFortressFirstCaptureCs }, { ENTR_DEATH_MOUNTAIN_CRATER_1, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs }, { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutPart3Cs }, }; @@ -672,8 +672,8 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti gSaveContext.save.info.fw.set = 0; gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0; - if (!GET_EVENTCHKINF(EVENTCHKINF_45)) { - SET_EVENTCHKINF(EVENTCHKINF_45); + if (!GET_EVENTCHKINF(EVENTCHKINF_OBTAINED_MASTER_SWORD)) { + SET_EVENTCHKINF(EVENTCHKINF_OBTAINED_MASTER_SWORD); play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.save.cutsceneIndex = CS_INDEX_3; @@ -2443,9 +2443,9 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) { Flags_SetEventChkInf(EVENTCHKINF_C4); gSaveContext.save.entranceIndex = ENTR_TEMPLE_OF_TIME_0; gSaveContext.save.cutsceneIndex = CS_INDEX_8; - } else if (!Flags_GetEventChkInf(EVENTCHKINF_C7) && + } else if (!Flags_GetEventChkInf(EVENTCHKINF_GERUDO_CAUGHT_TOWER_FALL) && (gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_GANON_BOSS)) { - Flags_SetEventChkInf(EVENTCHKINF_C7); + Flags_SetEventChkInf(EVENTCHKINF_GERUDO_CAUGHT_TOWER_FALL); gSaveContext.save.entranceIndex = ENTR_GANON_BOSS_0; gSaveContext.save.cutsceneIndex = CS_INDEX_0; } diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 84662ccc6..e4e530718 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -389,7 +389,7 @@ void Sram_InitDebugSave(void) { EVENTCHKINF_MASK(EVENTCHKINF_SARIA_WAS_TOLD_ABOUT_MIDO) | EVENTCHKINF_MASK(EVENTCHKINF_04) | EVENTCHKINF_MASK(EVENTCHKINF_05) | EVENTCHKINF_MASK(EVENTCHKINF_09) | EVENTCHKINF_MASK(EVENTCHKINF_0C); - SET_EVENTCHKINF(EVENTCHKINF_80); + SET_EVENTCHKINF(EVENTCHKINF_ZELDA_FLED_CASTLE); SET_EVENTCHKINF(EVENTCHKINF_C4); if (LINK_AGE_IN_YEARS == YEARS_CHILD) { @@ -562,10 +562,10 @@ void Sram_OpenSave(SramContext* sramCtx) { } // if zelda cutscene has been watched but lullaby was not obtained, restore cutscene and take away letter - if (GET_EVENTCHKINF(EVENTCHKINF_40) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) { - i = gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_40]; - i &= ~EVENTCHKINF_MASK(EVENTCHKINF_40); - gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_40] = i; + if (GET_EVENTCHKINF(EVENTCHKINF_OBTAINED_ZELDAS_LETTER) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) { + i = gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_OBTAINED_ZELDAS_LETTER]; + i &= ~EVENTCHKINF_MASK(EVENTCHKINF_OBTAINED_ZELDAS_LETTER); + gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_OBTAINED_ZELDAS_LETTER] = i; INV_CONTENT(ITEM_ZELDAS_LETTER) = ITEM_CHICKEN; |