mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-16 23:30:15 -05:00
Code Issues Projects Releases Wiki Activity

fix wrong entrances in epona check handler (#2352)

Browse Source
This commit is contained in:
Adam Bird 2023-01-17 15:20:21 -05:00 committed by GitHub
parent 76c9895432
commit 6eef813e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/soh/Enhancements/randomizer/randomizer_entrance.c
View File

@ -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, //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. //unset the Epona flag to avoid Master glitch, and restore temp B.
if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES) && (player->stateFlags1 & PLAYER_STATE1_23)) { 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[] = { static const s16 validEponaEntrances[] = {
0x0102, // Hyrule Field -> Lake Hylia 0x0102, // Hyrule Field -> Lake Hylia
@ -444,12 +448,11 @@ void Entrance_HandleEponaState(void) {
0x0157, // Hyrule Field -> Lon Lon Ranch 0x0157, // Hyrule Field -> Lon Lon Ranch
0x01F9, // Lon Lon Ranch -> Hyrule Field 0x01F9, // Lon Lon Ranch -> Hyrule Field
0x01FD, // Market Entrance -> Hyrule Field 0x01FD, // Market Entrance -> Hyrule Field
0x00EA, // ZR Front -> Hyrule Field 0x0181, // ZR Front -> Hyrule Field
0x0181, // LW Bridge -> Hyrule Field 0x0185, // LW Bridge -> Hyrule Field
0x0129, // GV Fortress Side -> Gerudo Fortress 0x0129, // GV Fortress Side -> Gerudo Fortress
0x022D, // Gerudo Fortress -> GV Fortress Side 0x022D, // Gerudo Fortress -> GV Fortress Side
0x03D0, // GV Carpenter Tent -> GV Fortress Side 0x03D0, // GV Carpenter Tent -> GV Fortress Side
0x0496, // Gerudo Fortress -> Thieves Hideout
0x042F, // LLR Stables -> Lon Lon Ranch 0x042F, // LLR Stables -> Lon Lon Ranch
0x05D4, // LLR Tower -> Lon Lon Ranch 0x05D4, // LLR Tower -> Lon Lon Ranch
0x0378, // LLR Talons House -> Lon Lon Ranch 0x0378, // LLR Talons House -> Lon Lon Ranch