mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-10-13 15:33:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix "return to spawn" from boss room inside grotto (#7314)

Browse Source
This commit is contained in:
Philip Dubé
2026-10-05 01:58:58 +00:00
committed by GitHub
parent 5508cf3633
commit b69cb6607e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/QoL/BetterSaveMenu.cpp
+2 -2
View File
@@ -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;