diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2023-01-17 15:20:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 15:20:21 -0500 |
| commit | 6eef813e5d94209abc7ea9713d64fa17699ad24f (patch) | |
| tree | 69ff4668f91c5127b5a227047aae1c8aa2630836 | |
| parent | 76c9895432de6612c73c4088b47e4812265d8595 (diff) | |
fix wrong entrances in epona check handler (#2352)
| -rw-r--r-- | soh/soh/Enhancements/randomizer/randomizer_entrance.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c index 18ae387c7..14c8e4fb0 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c @@ -433,6 +433,10 @@ void Entrance_HandleEponaState(void) { //If Link is riding Epona but he's about to go through an entrance where she can't spawn, //unset the Epona flag to avoid Master glitch, and restore temp B. if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES) && (player->stateFlags1 & PLAYER_STATE1_23)) { + // Allow Master glitch to be performed on the Thieves Hideout entrance + if (entrance == Entrance_GetOverride(0x0496)) { // Gerudo Fortress -> Theives Hideout + return; + } static const s16 validEponaEntrances[] = { 0x0102, // Hyrule Field -> Lake Hylia @@ -444,12 +448,11 @@ void Entrance_HandleEponaState(void) { 0x0157, // Hyrule Field -> Lon Lon Ranch 0x01F9, // Lon Lon Ranch -> Hyrule Field 0x01FD, // Market Entrance -> Hyrule Field - 0x00EA, // ZR Front -> Hyrule Field - 0x0181, // LW Bridge -> Hyrule Field + 0x0181, // ZR Front -> Hyrule Field + 0x0185, // LW Bridge -> Hyrule Field 0x0129, // GV Fortress Side -> Gerudo Fortress 0x022D, // Gerudo Fortress -> GV Fortress Side 0x03D0, // GV Carpenter Tent -> GV Fortress Side - 0x0496, // Gerudo Fortress -> Thieves Hideout 0x042F, // LLR Stables -> Lon Lon Ranch 0x05D4, // LLR Tower -> Lon Lon Ranch 0x0378, // LLR Talons House -> Lon Lon Ranch |