From 78713a633ed483da7d726808b998914d5478ca02 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 18 Dec 2023 16:05:57 -0700 Subject: [PATCH] fix: different door types with TR in door shuffle modes --- Rom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 7c7217b2..8fafcc98 100644 --- a/Rom.py +++ b/Rom.py @@ -1381,8 +1381,9 @@ def patch_rom(world, rom, player, team, is_mystery=False): world.get_room(0x23, player).change(0, DoorKind.CaveEntrance) if world.get_door('TR Eye Bridge SW', player).entranceFlag: world.get_room(0xd5, player).change(0, DoorKind.CaveEntrance) - # do this unconditionally - gets overwritten by RoomData in doorShufflemodes - rom.initial_sram.pre_open_tr_bomb_doors() # preopen bombable exits + # do this conditionally - don't mess with doors + if world.doorShuffle[player] == 'vanilla': + rom.initial_sram.pre_open_tr_bomb_doors() # preopen bombable exits if world.boss_shuffle[player] != 'none' or world.doorShuffle[player] != 'vanilla': rom.write_byte(snes_to_pc(0x30835A), 1) # fix Prize On The Eyes