Better Save Menu: hard code Return to Spawn in vanilla (#7273)

Unconditionally using rando's entrance overrides could load zero,
ie ENTR_DEKU_TREE_ENTRANCE
This commit is contained in:
Philip Dubé
2026-09-28 05:34:14 +00:00
committed by GitHub
parent faed544b22
commit 576b30c64a
+4 -1
View File
@@ -167,7 +167,10 @@ void HandleSaveMenu(bool* should, PlayState* play) {
gSaveContext.natureAmbienceId = 0xFF;
GameInteractor_ExecuteOnLoadGame(gSaveContext.fileNum);
if (gSaveContext.ship.resetToSpawn) {
if (LINK_IS_CHILD) {
if (!IS_RANDO) {
gSaveContext.entranceIndex =
LINK_IS_CHILD ? ENTR_LINKS_HOUSE_CHILD_SPAWN : ENTR_TEMPLE_OF_TIME_WARP_PAD;
} else if (LINK_IS_CHILD) {
gSaveContext.entranceIndex =
Entrance_OverrideNextIndex(ENTR_LINKS_HOUSE_CHILD_SPAWN); // Child Overworld Spawn
} else {