From 7d9a050a4d45b738f26bf375ca07ceb42f59650a Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Thu, 20 Oct 2022 09:33:45 -0400 Subject: [PATCH] Fix better debug warp menu grottos (#1799) --- soh/src/overlays/gamestates/ovl_select/z_select.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c index cd801a21a..8a63ff025 100644 --- a/soh/src/overlays/gamestates/ovl_select/z_select.c +++ b/soh/src/overlays/gamestates/ovl_select/z_select.c @@ -65,7 +65,10 @@ void Select_Grotto_LoadGame(SelectContext* this, s32 grottoIndex) { } gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0; Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP); + // Entrance index and grotto content data to load the correct grotto and actors gSaveContext.entranceIndex = this->betterGrottos[grottoIndex].entranceIndex; + gSaveContext.respawn[RESPAWN_MODE_RETURN].data = this->betterGrottos[grottoIndex].data; + // Infomation to return to the correct grotto exit gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = this->betterGrottos[grottoIndex].returnEntranceIndex; gSaveContext.respawn[RESPAWN_MODE_RETURN].roomIndex = this->betterGrottos[grottoIndex].roomIndex; gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x4ff; @@ -563,8 +566,9 @@ static BetterSceneSelectEntry sBetterScenes[] = { { "Goron City Shop", 0x037C }, { "Zora Shop", 0x0380 }, }}, - { "46:Great Fairies", Select_LoadGame, 5, { - { "Hyrule Castle", 0x04C2 }, + { "46:Great Fairies", Select_LoadGame, 6, { + { "Hyrule Castle (Child)", 0x0578 }, + { "Hyrule Castle (Adult)", 0x04C2 }, { "Death Mountain Trail", 0x0315 }, { "Death Mountain Crater", 0x04BE }, { "Zoras Fountain", 0x0371 },