From 576b30c64a2f1a5c534355a85b87152e3052eed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Mon, 28 Sep 2026 05:34:14 +0000
Subject: [PATCH] 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
---
 soh/soh/Enhancements/QoL/BetterSaveMenu.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp b/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp
index 32d7e74bf9..77c3f48f51 100644
--- a/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp
+++ b/soh/soh/Enhancements/QoL/BetterSaveMenu.cpp
@@ -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 {