From e1afd4374feb407f1da9abb2a18a3921e1f07fe0 Mon Sep 17 00:00:00 2001 From: cassidy Date: Wed, 22 Dec 2021 23:20:28 -0500 Subject: [PATCH] Remove HC escape exit barriers in glitched modes and vanilla shuffle Unlock Aga Tower door during escape in glitched modes --- BaseClasses.py | 3 ++- Rom.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 1316a99f..c558f6cb 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -51,7 +51,8 @@ class World(object): self.clock_mode = 'off' self.rupoor_cost = 10 self.aga_randomness = True - self.lock_aga_door_in_escape = False + self.lock_aga_door_in_escape = True if logic == 'noglitches' else False + self.block_side_exits_escape = True if logic == 'noglitches' and shuffle != 'vanilla' else False self.fix_trock_doors = self.shuffle != 'vanilla' or self.mode == 'inverted' self.save_and_quit_from_boss = True self.accessibility = accessibility diff --git a/Rom.py b/Rom.py index 60f08efb..e10c2028 100644 --- a/Rom.py +++ b/Rom.py @@ -913,7 +913,7 @@ def patch_rom(world, player, rom): rom.write_byte(0x18005E, world.crystals_needed_for_gt) rom.write_byte(0x18005F, world.crystals_needed_for_ganon) - rom.write_byte(0x18008A, 0x01 if world.mode == "standard" else 0x00) # block HC upstairs doors in rain state in standard mode + rom.write_byte(0x18008A, 0x01 if world.block_side_exits_escape else 0x00) # block HC upstairs doors in rain state in standard mode # Bitfield - enable text box to show with free roaming items #