alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Check for headered roms before passing to enemizer.

Browse Source
This commit is contained in:
compiling
2021-07-25 18:15:51 +10:00
parent c981b362d2
commit 4d8bfe0e22
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Rom.py
View File

@@ -86,10 +86,12 @@ class LocalRom(object):
self.name = name self.name = name
self.hash = hash self.hash = hash
self.orig_buffer = None self.orig_buffer = None
self.file = file
self.has_smc_header = False
if not os.path.isfile(file): if not os.path.isfile(file):
raise RuntimeError("Could not find valid local base rom for patching at expected path %s." % file) raise RuntimeError("Could not find valid local base rom for patching at expected path %s." % file)
with open(file, 'rb') as stream: with open(file, 'rb') as stream:
self.buffer = read_rom(stream) self.buffer, self.has_smc_header = read_rom(stream)
if patch: if patch:
self.patch_base_rom() self.patch_base_rom()
self.orig_buffer = self.buffer.copy() self.orig_buffer = self.buffer.copy()
@@ -187,12 +189,21 @@ def write_int32s(rom, startaddress, values):
def read_rom(stream): def read_rom(stream):
"Reads rom into bytearray and strips off any smc header" "Reads rom into bytearray and strips off any smc header"
buffer = bytearray(stream.read()) buffer = bytearray(stream.read())
has_smc_header = False
if len(buffer)%0x400 == 0x200: if len(buffer)%0x400 == 0x200:
buffer = buffer[0x200:] buffer = buffer[0x200:]
return buffer has_smc_header = True
return buffer, has_smc_header
def patch_enemizer(world, player, rom, baserom_path, enemizercli, random_sprite_on_hit): def patch_enemizer(world, player, rom, local_rom, enemizercli, random_sprite_on_hit):
baserom_path = os.path.abspath(baserom_path) baserom_path = os.path.abspath(local_rom.file)
unheadered_path = None
if local_rom.has_smc_header:
headered_path = baserom_path
unheadered_path = baserom_path = os.path.abspath(output_path('unheadered_rom.sfc'))
with open(headered_path, 'rb') as headered:
with open(baserom_path, 'wb') as unheadered:
unheadered.write(headered.read()[0x200:])
basepatch_path = os.path.abspath(local_path(os.path.join("data","base2current.json"))) basepatch_path = os.path.abspath(local_path(os.path.join("data","base2current.json")))
enemizer_basepatch_path = os.path.join(os.path.dirname(enemizercli), "enemizerBasePatch.json") enemizer_basepatch_path = os.path.join(os.path.dirname(enemizercli), "enemizerBasePatch.json")
randopatch_path = os.path.abspath(output_path('enemizer_randopatch.json')) randopatch_path = os.path.abspath(output_path('enemizer_randopatch.json'))
@@ -336,6 +347,12 @@ def patch_enemizer(world, player, rom, baserom_path, enemizercli, random_sprite_
rom.write_bytes(0x307000 + (i * 0x8000), sprite.palette) rom.write_bytes(0x307000 + (i * 0x8000), sprite.palette)
rom.write_bytes(0x307078 + (i * 0x8000), sprite.glove_palette) rom.write_bytes(0x307078 + (i * 0x8000), sprite.glove_palette)
if local_rom.has_smc_header:
try:
os.remove(unheadered_path)
except OSError:
pass
try: try:
os.remove(randopatch_path) os.remove(randopatch_path)
except OSError: except OSError: