diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp index d17d6ccee..31f14a073 100644 --- a/libultraship/libultraship/SohImGuiImpl.cpp +++ b/libultraship/libultraship/SohImGuiImpl.cpp @@ -679,6 +679,8 @@ namespace SohImGui { Tooltip("Allows equiping the tunic and boots to c-buttons"); EnhancementCheckbox("MM Bunny Hood", "gMMBunnyHood"); Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask"); + EnhancementCheckbox("Load Save Entrance", "gSaveEntrance"); + Tooltip("Instead of going to Link's House or the Temple of Time when you load your save, go to where you saved your game."); ImGui::EndMenu(); } diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index a774636f7..9e7600bc4 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -362,14 +362,22 @@ void Sram_OpenSave(SramContext* sramCtx) { case SCENE_GANON_DEMO: gSaveContext.entranceIndex = 0x41B; break; - - default: + case SCENE_KAKUSIANA: if (gSaveContext.savedSceneNum != SCENE_LINK_HOME) { gSaveContext.entranceIndex = (LINK_AGE_IN_YEARS == YEARS_CHILD) ? 0xBB : 0x5F4; } else { gSaveContext.entranceIndex = 0xBB; } break; + + default: + if (!CVar_GetS32("gSaveEntrance", true)) + if (gSaveContext.savedSceneNum != SCENE_LINK_HOME) { + gSaveContext.entranceIndex = (LINK_AGE_IN_YEARS == YEARS_CHILD) ? 0xBB : 0x5F4; + } else { + gSaveContext.entranceIndex = 0xBB; + } + break; } osSyncPrintf("scene_no = %d\n", gSaveContext.entranceIndex);