Merged in DR v1.2.0.11

This commit is contained in:
codemann8
2023-03-07 18:58:08 -06:00
7 changed files with 34 additions and 18 deletions

8
Rom.py
View File

@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '7043e64e74b2452367de7cc146873524'
RANDOMIZERBASEHASH = '9ea9fca9e2c9a2cc37287368a860105b'
class JsonRom(object):
@@ -1695,6 +1695,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
raise Exception('Pot table is too big for current area')
world.pot_contents[player].write_pot_data_to_rom(rom, colorize_pots)
write_enemizer_tweaks(rom, world, player)
write_strings(rom, world, player, team)
# write initial sram
@@ -1785,6 +1786,11 @@ def write_custom_shops(rom, world, player):
rom.write_bytes(0x184900, items_data)
def write_enemizer_tweaks(rom, world, player):
if world.enemy_shuffle[player] != 'none':
rom.write_byte(snes_to_pc(0x1DF6D8, 0)) # lets enemies walk on water instead of clipping into infinity?
rom.write_byte(snes_to_pc(0x0DB6B3, 0x82)) # hovers don't need water necessarily?
def hud_format_text(text):
output = bytes()
for char in text.lower():