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

gbz80disasm: clean up $ff00+x handling

This commit is contained in:
yenatch 2013-05-14 21:21:26 -04:00
parent 1bdcac1fe1
commit 82d723840b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extras/gbz80disasm.py
View File

@ -723,19 +723,20 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000, include_last_add
opstr = opstr[:opstr.find("x")].lower() + insertion + opstr[opstr.find("x")+1:].lower() opstr = opstr[:opstr.find("x")].lower() + insertion + opstr[opstr.find("x")+1:].lower()
# because the $ff00+$ff syntax is silly # because the $ff00+$ff syntax is silly
if opstr.count("$") > 0 and "+" in opstr: if opstr.count("$") > 1 and "+" in opstr:
first_orig = opstr.split("$")[1].split("+")[0] first_orig = opstr[opstr.find("$"):opstr.find("+")]
first_num = "0x"+first_orig first_val = eval(first_orig.replace("$","0x"))
first_val = int(first_num, 16)
second_orig = opstr.split("+$")[1].split("]")[0] second_orig = opstr[opstr.find("+$")+1:opstr.find("]")]
second_num = "0x"+second_orig second_val = eval(second_orig.replace("$","0x"))
second_val = int(second_num, 16)
combined_val = "$" + hex(first_val + second_val)[2:] combined_val = "$%.4x" % (first_val + second_val)
result = find_label(combined_val, bank_id) result = find_label(combined_val, bank_id)
if result != None: if result != None:
combined_val = result combined_val = result
replacetron = "[$"+first_orig+"+$"+second_orig+"]"
opstr = opstr.replace(replacetron, "["+combined_val+"]") replacetron = "[%s+%s]" % (first_orig, second_orig)
opstr = opstr.replace(replacetron, "[%s]" % combined_val)
output += spacing + opstr output += spacing + opstr
if include_comment: if include_comment: