github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Discover spawns when pulling/placing the master sword.

Browse source
This commit is contained in:
Anthony Stewart 2025-04-17 20:15:12 -05:00
commit 5a5242ff1a
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -591,10 +591,6 @@ void CheckTrackerLoadGame(int32_t fileNum) {
Randomizer_EntranceDiscovered(entranceIndex, false); 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(); RecalculateAvailableChecks();

6
soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
View file

@ -131,8 +131,14 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) {
Item_Give(play, ITEM_SWORD_MASTER); Item_Give(play, ITEM_SWORD_MASTER);
} }
play->csCtx.segment = D_808BB2F0; play->csCtx.segment = D_808BB2F0;
// Discover adult spawn
Entrance_SetEntranceDiscovered(ENTR_HYRULE_FIELD_10, false);
} else { } else {
play->csCtx.segment = D_808BB7A0; 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_STOP);
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_MASTER_SWORD); Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_MASTER_SWORD);