mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-28 16:53:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

restore enemy visibility in mermaid statue cave

Browse Source 
https://github.com/daid/LADXR/pull/155
This commit is contained in:
Alex Nordstrom
2024-08-20 11:09:23 -04:00
parent 6f3e7b711e
commit b71a7f6f0b
1 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
worlds/ladx/LADXR/patches/tradeSequence.py
View File

@@ -330,7 +330,47 @@ def patchVarious(rom, settings):
jp z, $3F8D ; UnloadEntity
"""), fill_nop=True)
# Mimic invisibility
rom.patch(0x18, 0x2AC8, 0x2ACE, "", fill_nop=True)
rom.patch(0x19, 0x2AC0, ASM("""
cp $97
jr z, mermaidStatueCave
cp $98
jr nz, visible
mermaidStatueCave:
ld a, [$DB7F]
and a
jr nz, 6
visible:
"""), ASM("""
dec a ; save one byte by only doing one cp
or $01
cp $97
jr nz, visible
mermaidStatueCave:
ld a, [wTradeSequenceItem2]
and $20 ; MAGNIFYING_GLASS
jr z, 6
visible:
"""))
# Zol invisibility
rom.patch(0x06, 0x3BE9, ASM("""
cp $97
jr z, mermaidStatueCave
cp $98
ret nz ; visible
mermaidStatueCave:
ld a, [$DB7F]
and a
ret z
"""), ASM("""
dec a ; save one byte by only doing one cp
or $01
cp $97
ret nz ; visible
mermaidStatueCave:
ld a, [wTradeSequenceItem2]
and $20 ; MAGNIFYING_GLASS
ret nz
"""))
# Ignore trade quest state for marin at beach
rom.patch(0x18, 0x219E, 0x21A6, "", fill_nop=True)
# Shift the magnifier 8 pixels