Fixed flute working in both worlds instead of just dark

This commit is contained in:
pepperpow 2021-01-31 21:42:44 -06:00
parent 6b737775a2
commit 99468e6d46
2 changed files with 5 additions and 5 deletions

10
Rom.py
View File

@ -1,7 +1,7 @@
from __future__ import annotations
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '1d23f2fd409c9b71bc741dadc0f87344'
RANDOMIZERBASEHASH = '5c5b130ce039295f2c4f43c9c6eb5d3b'
import io
import json
@ -839,10 +839,6 @@ def patch_rom(world, rom, player, team, enemized):
rom.write_byte(0x180032, 0x01) # open mode
if world.mode[player] == 'inverted':
set_inverted_mode(world, player, rom)
rom.write_byte(0xDC21D, 0x6B) # inverted mode (skip weathervane overlay)
rom.write_bytes(0x48DB3, [0xF8, 0x01]) # inverted mode (bird X)
rom.write_byte(0x48D5E, 0x01) # inverted mode (rock X)
rom.write_bytes(0x48CC1+36, bytes([0xF8]*12))
elif world.mode[player] == 'standard':
rom.write_byte(0x180032, 0x00) # standard mode
@ -2319,6 +2315,10 @@ def set_inverted_mode(world, player, rom):
rom.write_byte(snes_to_pc(0x05AF79), 0xF0)
rom.write_byte(snes_to_pc(0x0DB3C5), 0xC6)
rom.write_byte(snes_to_pc(0x07A3F4), 0xF0) # duck
rom.write_byte(0xDC21D, 0x6B) # inverted mode flute activation (skip weathervane overlay)
rom.write_bytes(0x48DB3, [0xF8, 0x01]) # inverted mode (bird X)
rom.write_byte(0x48D5E, 0x01) # inverted mode (rock X)
rom.write_bytes(0x48CC1+36, bytes([0xF8]*12)) # (rock X)
rom.write_int16s(snes_to_pc(0x02E849),
[0x0043, 0x0056, 0x0058, 0x006C, 0x006F, 0x0070, 0x007B, 0x007F, 0x001B]) # dw flute
rom.write_int16(snes_to_pc(0x02E8D5), 0x07C8)

Binary file not shown.