From e178df3e0ce323ff63847d039ebbb743da863a94 Mon Sep 17 00:00:00 2001 From: Malkierian Date: Wed, 16 Oct 2024 16:39:35 -0700 Subject: [PATCH] Change SkipIntro to check any entrance shuffle rather than just overworld spawns. (#4428) --- .../TimeSavers/SkipCutscene/SkipIntro.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp index aca290f79..0b7efd267 100644 --- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp +++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp @@ -15,10 +15,9 @@ void SkipIntro_Register() { // If we're playing rando and if starting age is adult and/or overworld spawns are shuffled we need to skip // the cutscene regardless of the enhancement being on. bool adultStart = gSaveContext.linkAge == LINK_AGE_ADULT; - bool shuffleOverworldSpawns = - OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true); + bool shuffleEntrances = OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_ENTRANCES).Is(true); if ((CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) || - (IS_RANDO && (adultStart || shuffleOverworldSpawns))) && + (IS_RANDO && (adultStart || shuffleEntrances))) && gSaveContext.cutsceneIndex == 0xFFF1) { // Calculate spawn location. Start with vanilla, Link's house. int32_t spawnEntrance = ENTR_LINKS_HOUSE_0; @@ -28,9 +27,9 @@ void SkipIntro_Register() { if (adultStart) { spawnEntrance = ENTR_TEMPLE_OF_TIME_7; } - // If we're shuffling overworld spawns we'll need to get the Entrance Override - if (shuffleOverworldSpawns) { - // If we're shuffling overworld spawns the adult spawn is ENTR_HYRULE_FIELD_10 instead of + // If we're shuffling any entrances we'll need to get the Entrance Override + if (shuffleEntrances) { + // If we're shuffling any entrances, the adult spawn is ENTR_HYRULE_FIELD_10 instead of // ENTR_TEMPLE_OF_TIME_7, so that spawn and Prelude don't share an entrance. if (adultStart) { spawnEntrance = ENTR_HYRULE_FIELD_10;