Leahnaya/pokemon-reverse-engineering-tools
1
0
Fork 0
mirror of https://github.com/pret/pokemon-reverse-engineering-tools.git synced 2026-09-07 01:35:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make wram.py compatible with unions

Browse Source
This commit is contained in:
xCrystal
2018-02-08 21:48:20 +01:00
parent 5431b400d9
commit e47842bdb1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pokemontools/wram.py
View File

@@ -53,12 +53,12 @@ class BSSReader:
def __init__(self, *args, **kwargs):
self.__dict__.update(kwargs)
def read_bss_line(self, l):
def read_bss_line(self, l, union_ignore_space):
parts = l.strip().split(' ')
token = parts[0].strip()
params = ' '.join(parts[1:]).split(',')
if token in ['ds', 'db', 'dw']:
if token in ['ds', 'db', 'dw'] and not union_ignore_space:
if any(params):
length = eval(rgbasm_to_py(params[0]), self.constants.copy())
else:
@@ -100,6 +100,7 @@ class BSSReader:
macro = False
macro_name = None
union_ignore_space = False
for line in bss:
line = line.lstrip()
line, comment = separate_comment(line)
@@ -110,6 +111,12 @@ class BSSReader:
if not line:
pass
elif line[-5:].upper() == 'NEXTU':
union_ignore_space = True
elif line[-4:].upper() == 'ENDU':
union_ignore_space = False
elif line[-4:].upper() == 'ENDM':
macro = False
macro_name = None
@@ -168,7 +175,7 @@ class BSSReader:
'length': 0,
}
self.section['labels'] += [section_label]
self.read_bss_line(line.split(':')[-1])
self.read_bss_line(line.split(':')[-1], union_ignore_space)
elif any(x in split_line_upper for x in ['EQU', '=', 'SET']): # TODO: refactor
for x in ['EQU', '=', 'SET']:
@@ -191,7 +198,7 @@ class BSSReader:
self.constants[name] = eval(value, self.constants.copy())
else:
self.read_bss_line(line)
self.read_bss_line(line, union_ignore_space)
self.sections += [self.section]
return self.sections