From d80147d30a0e23c37f28c9921c9d736722d879af Mon Sep 17 00:00:00 2001
From: Alex Nordstrom <alex@3and3.dev>
Date: Wed, 21 Aug 2024 12:34:33 -0400
Subject: [PATCH] fixes to magnifying lens changes

---
 worlds/ladx/LADXR/generator.py             | 2 --
 worlds/ladx/LADXR/patches/tradeSequence.py | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index af0ef8e48a..4f9b663b1c 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -181,8 +181,6 @@ def generateRom(args, world: "LinksAwakeningWorld"):
     if world.ladxr_settings.tradequest:
         patches.tradeSequence.patchTradeSequence(rom, world.ladxr_settings)
     else:
-        # Monkey bridge patch, always have the bridge there.
-        rom.patch(0x00, 0x333D, assembler.ASM("bit 4, e\njr Z, $05"), b"", fill_nop=True)
         patches.tradeSequence.unrequiredTradeSequence(rom)
     patches.bowwow.fixBowwow(rom, everywhere=world.ladxr_settings.bowwow != 'normal')
     if world.ladxr_settings.bowwow != 'normal':
diff --git a/worlds/ladx/LADXR/patches/tradeSequence.py b/worlds/ladx/LADXR/patches/tradeSequence.py
index ba3cc49dfa..f6c5d8676a 100644
--- a/worlds/ladx/LADXR/patches/tradeSequence.py
+++ b/worlds/ladx/LADXR/patches/tradeSequence.py
@@ -394,7 +394,7 @@ def patchVarious(rom, settings):
         # Always have the boomerang trade guy enabled (magnifier not needed)
         rom.patch(0x19, 0x05EC, ASM("ld a, [wTradeSequenceItem]\ncp $0E"), ASM("ld a, $0E\ncp $0E"), fill_nop=True)  # show the guy
         rom.patch(0x00, 0x3199, ASM("ld a, [wTradeSequenceItem]\ncp $0E"), ASM("ld a, $0E\ncp $0E"), fill_nop=True)  # load the proper room layout
-        rom.patch(0x19, 0x05F4, ASM("ld a, [wTradeSequenceItem2]\nand a"), ASM("xor a"), fill_nop=True)
+    rom.patch(0x19, 0x05F4, ASM("ld a, [wTradeSequenceItem2]\nand a"), ASM("xor a"), fill_nop=True)
 
 
 def unrequiredTradeSequence(rom):