morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LADX: fix local lvl 2 sword on the beach turning into a lvl 0 shield #5334

Browse Source 
e3e49b16d6
This commit is contained in:
threeandthreee
2025-09-30 12:31:49 -04:00
committed by GitHub
parent a30b43821f
commit 516ebc53ce
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
worlds/ladx/LADXR/locations/beachSword.py
View File

@@ -11,19 +11,18 @@ class BeachSword(DroppedKey):
super().__init__(0x0F2) super().__init__(0x0F2)
def patch(self, rom: ROM, option: str, *, multiworld: Optional[int] = None) -> None: def patch(self, rom: ROM, option: str, *, multiworld: Optional[int] = None) -> None:
if option != SWORD or multiworld is not None: # Set the heart piece data
# Set the heart piece data super().patch(rom, option, multiworld=multiworld)
super().patch(rom, option, multiworld=multiworld)
# Patch the room to contain a heart piece instead of the sword on the beach # Patch the room to contain a heart piece instead of the sword on the beach
re = RoomEditor(rom, 0x0F2) re = RoomEditor(rom, 0x0F2)
re.removeEntities(0x31) # remove sword re.removeEntities(0x31) # remove sword
re.addEntity(5, 5, 0x35) # add heart piece re.addEntity(5, 5, 0x35) # add heart piece
re.store(rom) re.store(rom)
# Prevent shield drops from the like-like from turning into swords. # Prevent shield drops from the like-like from turning into swords.
rom.patch(0x03, 0x1B9C, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True) rom.patch(0x03, 0x1B9C, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True)
rom.patch(0x03, 0x244D, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True) rom.patch(0x03, 0x244D, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True)
def read(self, rom: ROM) -> str: def read(self, rom: ROM) -> str:
re = RoomEditor(rom, 0x0F2) re = RoomEditor(rom, 0x0F2)