From 7b9103c6a6a63fcd7a29afcbbe9ec9e30bd40a5f Mon Sep 17 00:00:00 2001 From: CaitSith2 Date: Thu, 27 Aug 2020 02:06:26 -0700 Subject: [PATCH] Fixes to blind restore code New enemizer version is required to fully restore the blind escort mission. --- Rom.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Rom.py b/Rom.py index 6e57a7f1..23e923d4 100644 --- a/Rom.py +++ b/Rom.py @@ -287,9 +287,6 @@ def patch_enemizer(world, player: int, rom: LocalRom, enemizercli, random_sprite } } - blindmaiden = rom.read_byte(0x04DE81) - blindspawncode = rom.read_bytes(0xEA081, 15) - rom.write_to_file(randopatch_path) with open(options_path, 'w') as f: @@ -331,9 +328,9 @@ def patch_enemizer(world, player: int, rom: LocalRom, enemizercli, random_sprite rom.read_from_file(enemizer_output_path) os.remove(enemizer_output_path) - if world.get_dungeon("Thieves Town", player).boss.enemizer_name == "Blind": - rom.write_byte(0x04DE81, blindmaiden) - rom.write_bytes(0xEA081, blindspawncode) + if world.get_dungeon("Thieves Town", player).boss.enemizer_name == "Blind" \ + and rom.read_byte(0xEA081) != 0xEA: # new enemizer required for blind escort mission + rom.write_byte(0x04DE81, 6) rom.write_byte(0x200101, 0) # Do not close boss room door on entry. if random_sprite_on_hit: