From 5f1c08920feb86201d9bb84f91bab891723ca375 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Mon, 25 May 2026 00:17:48 -0500 Subject: [PATCH] Update baserom --- Rom.py | 2 +- Rules.py | 5 ++--- data/base2current.bps | Bin 157522 -> 157515 bytes 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Rom.py b/Rom.py index f4393283..b476ba23 100644 --- a/Rom.py +++ b/Rom.py @@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc from Versions import DRVersion, GKVersion, ORVersion JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '2ef2af81254cf2ee22295a12f82a7ce2' +RANDOMIZERBASEHASH = '100c3e1da68680a0f3d8e1fc94568de6' class JsonRom(object): diff --git a/Rules.py b/Rules.py index 1c9ba3f6..32802638 100644 --- a/Rules.py +++ b/Rules.py @@ -505,7 +505,7 @@ def global_rules(world, player): set_rule(world.get_entrance('Skull Woods Rock (West)', player), lambda state: state.can_lift_rocks(player)) set_rule(world.get_entrance('Skull Woods Rock (East)', player), lambda state: state.can_lift_rocks(player)) # this more like an ohko rule - dependent on bird being present too - so enemizer could turn this off? - set_rule(world.get_entrance('Bumper Cave Ledge Drop', player), lambda state: world.can_take_damage or state.has('Cape', player) or state.has('Cane of Byrna', player) or state.has_sword(player)) + set_rule(world.get_entrance('Bumper Cave Ledge Drop', player), lambda state: state.has('Cape', player) or state.has('Cane of Byrna', player) or state.has_sword(player)) set_rule(world.get_entrance('Bumper Cave Rock (Outer)', player), lambda state: state.can_lift_rocks(player)) set_rule(world.get_entrance('Bumper Cave Rock (Inner)', player), lambda state: state.can_lift_rocks(player)) set_rule(world.get_entrance('Skull Woods Pass Rock (North)', player), lambda state: state.can_lift_heavy_rocks(player)) @@ -1404,8 +1404,7 @@ def ow_bunny_rules(world, player): add_bunny_rule(world.get_entrance('Skull Woods Forgotten Bush (East)', player), player) add_bunny_rule(world.get_entrance('Skull Woods Second Section Hole', player), player) add_bunny_rule(world.get_entrance('East Dark Death Mountain Bushes', player), player) - if not world.can_take_damage: - add_bunny_rule(world.get_entrance('Bumper Cave Ledge Drop', player), player) + add_bunny_rule(world.get_entrance('Bumper Cave Ledge Drop', player), player) add_bunny_rule(world.get_entrance('Bumper Cave Rock (Outer)', player), player) add_bunny_rule(world.get_entrance('Bumper Cave Rock (Inner)', player), player) add_bunny_rule(world.get_entrance('Skull Woods Pass Bush Row (West)', player), player) diff --git a/data/base2current.bps b/data/base2current.bps index b00557da919bc9b9a0ef79e083cdf0e5b7ee5507..40f9a6fd5ab4aa8cf85a585d073e84e03f13e632 100644 GIT binary patch delta 6575 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