From 2be7de56dfddfb3caca5ea0aa922308d87f6ed73 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 16 Oct 2021 13:51:51 -0500 Subject: [PATCH] Fixed issue with Flute Shuffle menu cancel now working when no OWR is enabled --- Rom.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Rom.py b/Rom.py index c9e4ffa5..e1acf138 100644 --- a/Rom.py +++ b/Rom.py @@ -646,8 +646,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): # patch overworld edges inverted_buffer = [0] * 0x82 + owMode = 0 if world.owShuffle[player] != 'vanilla' or world.owCrossed[player] not in ['none', 'polar'] or world.owMixed[player]: - owMode = 0 if world.owShuffle[player] == 'parallel': owMode = 1 elif world.owShuffle[player] == 'full': @@ -660,10 +660,6 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): world.fix_fake_world[player] = True if world.owMixed[player]: owMode |= 0x400 - - write_int16(rom, 0x150002, owMode) - - write_int16(rom, 0x150004, owFlags) rom.write_byte(0x18004C, 0x01) # patch for allowing Frogsmith to enter multi-entrance caves @@ -692,6 +688,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): write_int16(rom, edge.getAddress() + 0x0a, edge.vramLoc) write_int16(rom, edge.getAddress() + 0x0e, edge.getTarget()) + write_int16(rom, 0x150002, owMode) + write_int16(rom, 0x150004, owFlags) # patch entrance/exits/holes for region in world.regions: