From 5a5242ff1a650bf8bd425daab5946aec32677b70 Mon Sep 17 00:00:00 2001 From: Anthony Stewart Date: Thu, 17 Apr 2025 20:15:12 -0500 Subject: [PATCH] Discover spawns when pulling/placing the master sword. --- .../Enhancements/randomizer/randomizer_check_tracker.cpp | 4 ---- soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index 9c3d2cc8a..213e5b56d 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -591,10 +591,6 @@ void CheckTrackerLoadGame(int32_t fileNum) { Randomizer_EntranceDiscovered(entranceIndex, false); } } - - // RANDOTODO: This is needed because using the master sword does not discover the spawn entrance. - Entrance_SetEntranceDiscovered(ENTR_LINKS_HOUSE_CHILD_SPAWN, false); - Entrance_SetEntranceDiscovered(ENTR_HYRULE_FIELD_10, false); } RecalculateAvailableChecks(); diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 81542eaad..a11180a7b 100644 --- a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -131,8 +131,14 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) { Item_Give(play, ITEM_SWORD_MASTER); } play->csCtx.segment = D_808BB2F0; + + // Discover adult spawn + Entrance_SetEntranceDiscovered(ENTR_HYRULE_FIELD_10, false); } else { play->csCtx.segment = D_808BB7A0; + + // Discover child spawn + Entrance_SetEntranceDiscovered(ENTR_LINKS_HOUSE_CHILD_SPAWN, false); } Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP); Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_MASTER_SWORD);