morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

handle merge conflicts after plando update

Browse Source
This commit is contained in:
Fabian Dill
2021-01-17 06:54:38 +01:00
parent 514cd19367
commit 7333a15f1f
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/alttp/Rom.py
View File

@@ -124,7 +124,7 @@ class LocalRom(object):
return
if os.path.isfile(local_path('data', 'basepatch.apbp')):
_, target, buffer = Patch.create_rom_bytes(local_path('data', 'basepatch.apbp'))
_, target, buffer = Patch.create_rom_bytes(local_path('data', 'basepatch.apbp'), ignore_version=True)
if self.verify(buffer):
self.buffer = bytearray(buffer)
with open(local_path('basepatch.sfc'), 'wb') as stream: