diff options
| author | Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> | 2026-03-26 22:39:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-26 22:39:17 +0000 |
| commit | 5f139ef3115a31dd069575d83bd8738736b796b0 (patch) | |
| tree | f6e4f88d7a731246824033b652fa28224f02a9e5 | |
| parent | 99c1f23d5b2b881681a0b01e35a1ccd1aa41333b (diff) | |
Hookshot ladder fixes (#6417)
| -rw-r--r-- | soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp | 4 | ||||
| -rw-r--r-- | soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp index 43bb878d8..d0e78f824 100644 --- a/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp @@ -70,7 +70,9 @@ void RegionTable_Init_KokiriForest() { }, { //Exits ENTRANCE(RR_KF_BOULDER_LOOP, logic->CanUse(RG_CRAWL)), - ENTRANCE(RR_KF_LINKS_PORCH, logic->IsChild ? logic->CanClimbLadder() : logic->HasItem(RG_CLIMB) || logic->CanUse(RG_HOVER_BOOTS)), + //The Deku Baba blocks the setup as Adult, and stunning doesn't last long enough to perform it. + ENTRANCE(RR_KF_LINKS_PORCH, logic->HasItem(RG_CLIMB) || logic->CanUse(RG_HOVER_BOOTS) || + ((logic->IsChild || logic->CanKillEnemy(RE_DEKU_BABA) || logic->Get(LOGIC_FOREST_TEMPLE_CLEAR)) && logic->CanClimbLadder())), ENTRANCE(RR_KF_MIDOS_HOUSE, true), ENTRANCE(RR_KF_SARIAS_HOUSE, true), ENTRANCE(RR_KF_HOUSE_OF_TWINS, true), diff --git a/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp index e20cf5ea6..6eea34727 100644 --- a/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp @@ -59,7 +59,7 @@ void RegionTable_Init_ZoraRiver() { }, { //Exits ENTRANCE(RR_ZR_FRONT, logic->IsAdult || logic->HasItem(RG_BRONZE_SCALE) || logic->HasItem(RG_POWER_BRACELET) || logic->BlastOrSmash() || logic->HasItem(RG_HOVER_BOOTS)), - ENTRANCE(RR_ZR_ATOP_LADDER, (logic->IsAdult || logic->HasItem(RG_POWER_BRACELET)) && (logic->CanClimbLadder() || CanPlantBean(RR_ZORAS_RIVER, RG_ZORAS_RIVER_BEAN_SOUL))), + ENTRANCE(RR_ZR_ATOP_LADDER, ((logic->IsAdult || logic->HasItem(RG_POWER_BRACELET)) && logic->CanClimbLadder()) || (logic->IsAdult && CanPlantBean(RR_ZORAS_RIVER, RG_ZORAS_RIVER_BEAN_SOUL))), ENTRANCE(RR_ZR_PILLAR, (logic->IsChild && logic->HasItem(RG_POWER_BRACELET)) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_ZR_LOWER))), ENTRANCE(RR_ZR_FROM_SHORTCUT, logic->HasItem(RG_SILVER_SCALE) || logic->CanUse(RG_IRON_BOOTS)), ENTRANCE(RR_ZR_STORMS_GROTTO, logic->CanOpenStormsGrotto()), |