summaryrefslogtreecommitdiff
path: root/extras/gbz80disasm.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-05-12 06:21:45 -0700
committerBryan Bishop <kanzure@gmail.com>2013-05-12 06:21:45 -0700
commitcf4ec47b153f59ec377bef48fb5ea442638c6421 (patch)
tree402f515a590ff4c5228a15aefad182a8fe6775c1 /extras/gbz80disasm.py
parent42df1ed844d3a9e5f5fbe2aceb48c59a4451dcbd (diff)
parentb3d8c2ec4938773e09c123ddda0df844f8008978 (diff)
Merge pull request #130 from Sanky/master
Menu stuff, battle text split & extras.
Diffstat (limited to 'extras/gbz80disasm.py')
-rw-r--r--extras/gbz80disasm.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index efb4689ab..d57a1905a 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -861,4 +861,10 @@ def all_outstanding_labels_are_reverse(byte_labels, offset):
if __name__ == "__main__":
- print output_bank_opcodes(int(sys.argv[1], 16))[0]
+ addr = sys.argv[1]
+ if ":" in addr:
+ addr = addr.split(":")
+ addr = int(addr[0], 16)*0x4000+(int(addr[1], 16)%0x4000)
+ else:
+ addr = int(addr, 16)
+ print output_bank_opcodes(addr)[0]