From 048207eb7d83206b218d74a50e26fca928e24369 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Tue, 17 Jan 2023 15:18:59 -0500 Subject: [PATCH] Fix exiting courtyard at night not taking link to castle grounds in dungeon entrance randomizer (#2316) --- soh/soh/Enhancements/randomizer/randomizer_entrance.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c index a5a233612..18ae387c7 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c @@ -198,8 +198,8 @@ s16 Entrance_OverrideNextIndex(s16 nextEntranceIndex) { } // Exiting through the crawl space from Hyrule Castle courtyard is the same exit as leaving Ganon's castle - // If we came from the Castle courtyard, then don't override the entrance to keep Link in Hyrule Castle area - if (gPlayState != NULL && gPlayState->sceneNum == 69 && nextEntranceIndex == 0x023D) { + // Don't override the entrance if we came from the Castle courtyard (day and night scenes) + if (gPlayState != NULL && (gPlayState->sceneNum == 69 || gPlayState->sceneNum == 70) && nextEntranceIndex == 0x023D) { return nextEntranceIndex; }