Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up AsmSection and line_has_comment_address

This commit is contained in:
Bryan Bishop 2012-05-29 14:50:35 -05:00
parent 0edf9eb8b8
commit d174c8b7c6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extras/crystal.py
View File

@ -7188,6 +7188,14 @@ class AsmSection:
self.parse() self.parse()
def parse(self): def parse(self):
line = self.line line = self.line
if not "bank" in line:
self.bank_id = -1
self.address = -1
self.last_address = None
self.end_address = None
return
bank_id = int(line.split("\"")[1].split("bank")[1], 16) bank_id = int(line.split("\"")[1].split("bank")[1], 16)
self.bank_id = bank_id self.bank_id = bank_id
start_address = bank_id * 0x4000 start_address = bank_id * 0x4000
@ -7827,6 +7835,8 @@ def line_has_comment_address(line, returnable={}, bank=None):
for c in offset_piece.replace("x", ""): for c in offset_piece.replace("x", ""):
if c not in valid: if c not in valid:
return False return False
if len(offset_piece) == 0:
return None
offset = int(offset_piece, 16) offset = int(offset_piece, 16)
#filter out blanks/duds #filter out blanks/duds
elif token in ["$", "0x", "x"]: elif token in ["$", "0x", "x"]: