diff options
| author | Philip Dubé <159546+serprex@users.noreply.github.com> | 2026-10-05 01:58:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-05 01:58:58 +0000 |
| commit | b69cb6607e493f3a8f347dbf4bf32ae852fc9142 (patch) | |
| tree | 0b600f949e6b6931525b2141c0fc64ee0bc2226a | |
| parent | 5508cf3633cea5971955a8868ebaa9089bb44f94 (diff) | |
Fix "return to spawn" from boss room inside grotto (#7314)
| -rw-r--r-- | soh/soh/Enhancements/QoL/BetterSaveMenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp b/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp index 77c3f48f5..56816610e 100644 --- a/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp +++ b/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp @@ -167,6 +167,7 @@ void HandleSaveMenu(bool* should, PlayState* play) { gSaveContext.natureAmbienceId = 0xFF; GameInteractor_ExecuteOnLoadGame(gSaveContext.fileNum); if (gSaveContext.ship.resetToSpawn) { + gSaveContext.respawnFlag = 0; if (!IS_RANDO) { gSaveContext.entranceIndex = LINK_IS_CHILD ? ENTR_LINKS_HOUSE_CHILD_SPAWN : ENTR_TEMPLE_OF_TIME_WARP_PAD; @@ -175,8 +176,7 @@ void HandleSaveMenu(bool* should, PlayState* play) { Entrance_OverrideNextIndex(ENTR_LINKS_HOUSE_CHILD_SPAWN); // Child Overworld Spawn } else { // Adult Overworld Spawn. Normally 0x5F4 (ENTR_TEMPLE_OF_TIME_WARP_PAD), but 0x282 - // (ENTR_HYRULE_FIELD_10) has been repurposed to differentiate from Prelude which also uses - // 0x5F4 + // (ENTR_HYRULE_FIELD_10) repurposed to differentiate from Prelude which also uses 0x5F4 gSaveContext.entranceIndex = Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_10); } gSaveContext.ship.resetToSpawn = 0; |