From 360a61a65c3e59a4e28e278a10ec43f0a6c1524d Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 22 Jul 2022 10:57:28 -0500 Subject: [PATCH] Fixed issue with pre-opened pyramid when it shouldn't be --- Rom.py | 2 +- Rules.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index add74a53..b614e730 100644 --- a/Rom.py +++ b/Rom.py @@ -1390,7 +1390,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): rom.write_bytes(0x50563, [0x3F, 0x14]) # disable below ganon chest rom.write_byte(0x50599, 0x00) # disable below ganon chest rom.write_bytes(0xE9A5, [0x7E, 0x00, 0x24]) # disable below ganon chest - if world.open_pyramid[player]: + if world.is_pyramid_open(player): rom.initial_sram.pre_open_pyramid_hole() if world.crystals_needed_for_gt[player] == 0: rom.initial_sram.pre_open_ganons_tower() diff --git a/Rules.py b/Rules.py index c83f1733..45aa6ba6 100644 --- a/Rules.py +++ b/Rules.py @@ -1109,7 +1109,7 @@ def ow_rules(world, player): if not world.is_tile_swapped(0x1b, player): set_rule(world.get_entrance('Inverted Pyramid Hole', player), lambda state: False) set_rule(world.get_entrance('Inverted Pyramid Entrance', player), lambda state: False) - set_rule(world.get_entrance('Pyramid Hole', player), lambda state: world.open_pyramid[player] or state.has('Beat Agahnim 2', player)) + set_rule(world.get_entrance('Pyramid Hole', player), lambda state: world.is_pyramid_open(player) or state.has('Beat Agahnim 2', player)) set_rule(world.get_entrance('HC Area Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('HC Ledge Mirror Spot', player), lambda state: state.has_Mirror(player))