Fix loading wrong day/night scene after blue warp in rando (#6350)
When entering a dungeon like well at night, defeating a boss that changes time to day, Kakariko Village would load with daylight but act like it's night Skipping the blue warp cutscene meant dayTime and nightFlag weren't properly in sync. Clear `gSaveContext.nightFlag` when adjusting time of day
This commit is contained in:
@@ -140,6 +140,7 @@ void RegisterShouldPlayBlueWarp() {
|
||||
gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) {
|
||||
// Normally set in the blue warp cutscene
|
||||
gSaveContext.dayTime = gSaveContext.skyboxTime = 0x4800;
|
||||
gSaveContext.nightFlag = 0;
|
||||
Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER);
|
||||
|
||||
gSaveContext.entranceIndex = ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP;
|
||||
@@ -160,6 +161,7 @@ void RegisterShouldPlayBlueWarp() {
|
||||
if (gSaveContext.entranceIndex != ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP) {
|
||||
// Normally set in the blue warp cutscene
|
||||
gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;
|
||||
gSaveContext.nightFlag = 0;
|
||||
}
|
||||
|
||||
*should = false;
|
||||
|
||||
Reference in New Issue
Block a user