Another round of fixes for skip intro and grotto rando (HarbourMaster…

…s#4253)
Malkierian · Jul 26, 2024 · b81a3dd · b81a3dd
1 parent e66dada
commit b81a3dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -18,7 +18,8 @@ void SkipIntro_Register() {
         bool shuffleOverworldSpawns =
             OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_OVERWORLD_SPAWNS).Is(true);
         if ((CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Intro"), IS_RANDO) ||
-             (IS_RANDO && (adultStart || shuffleOverworldSpawns)) && gSaveContext.cutsceneIndex == 0xFFF1)) {
+             (IS_RANDO && (adultStart || shuffleOverworldSpawns))) &&
+            gSaveContext.cutsceneIndex == 0xFFF1) {
             // Calculate spawn location. Start with vanilla, Link's house.
             int32_t spawnEntrance = ENTR_LINKS_HOUSE_0;
             // If we're not in rando, we can skip all of the below.

diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.c b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
@@ -142,12 +142,12 @@ s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
         nextEntranceIndex = grottoExitList[grottoId];
     }
 
-    // Get the new grotto id from the next entrance
-    grottoId = nextEntranceIndex & 0x00FF;
+    // Get the new grotto id from the next entrance, temp value to override modifying the static one
+    s8 tempGrottoId = nextEntranceIndex & 0x00FF;
 
     // Grotto Returns
     if (nextEntranceIndex >= ENTRANCE_RANDO_GROTTO_EXIT_START && nextEntranceIndex < ENTRANCE_RANDO_GROTTO_EXIT_START + NUM_GROTTOS) {
-        GrottoReturnInfo grotto = grottoReturnTable[grottoId];
+        GrottoReturnInfo grotto = grottoReturnTable[tempGrottoId];
 
         // When the nextEntranceIndex is determined by a dynamic exit,
         // or set by Entrance_OverrideBlueWarp to mark a blue warp entrance,
@@ -162,7 +162,7 @@ s16 Grotto_GetEntranceValueHandlingGrottoRando(s16 nextEntranceIndex) {
         }
     // Grotto Loads
     } else if (nextEntranceIndex >= ENTRANCE_RANDO_GROTTO_LOAD_START && nextEntranceIndex < ENTRANCE_RANDO_GROTTO_EXIT_START) {
-        GrottoLoadInfo grotto = grottoLoadTable[grottoId];
+        GrottoLoadInfo grotto = grottoLoadTable[tempGrottoId];
         nextEntranceIndex = grotto.entranceIndex;
     }