mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 21:02:18 -05:00
Code Issues Projects Releases Wiki Activity

Fix better debug warp menu grottos (#1799)

Browse Source
This commit is contained in:
Adam Bird 2022-10-20 09:33:45 -04:00 committed by GitHub
parent 30c66439a4
commit 7d9a050a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/gamestates/ovl_select/z_select.c
View File

@ -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; gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0;
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP); 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.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].entranceIndex = this->betterGrottos[grottoIndex].returnEntranceIndex;
gSaveContext.respawn[RESPAWN_MODE_RETURN].roomIndex = this->betterGrottos[grottoIndex].roomIndex; gSaveContext.respawn[RESPAWN_MODE_RETURN].roomIndex = this->betterGrottos[grottoIndex].roomIndex;
gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x4ff; gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x4ff;
@ -563,8 +566,9 @@ static BetterSceneSelectEntry sBetterScenes[] = {
{ "Goron City Shop", 0x037C }, { "Goron City Shop", 0x037C },
{ "Zora Shop", 0x0380 }, { "Zora Shop", 0x0380 },
}}, }},
{ "46:Great Fairies", Select_LoadGame, 5, { { "46:Great Fairies", Select_LoadGame, 6, {
{ "Hyrule Castle", 0x04C2 }, { "Hyrule Castle (Child)", 0x0578 },
{ "Hyrule Castle (Adult)", 0x04C2 },
{ "Death Mountain Trail", 0x0315 }, { "Death Mountain Trail", 0x0315 },
{ "Death Mountain Crater", 0x04BE }, { "Death Mountain Crater", 0x04BE },
{ "Zoras Fountain", 0x0371 }, { "Zoras Fountain", 0x0371 },