summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-06-19 23:59:49 -0500
committerBryan Bishop <kanzure@gmail.com>2012-06-19 23:59:49 -0500
commite2babd69fb94781df54f2e4ded5efcc2aa7d0f8d (patch)
tree5a47eb12f5804b54b898e59803b125bcfda83dfd
parent96596c6944562360c7cd16a2c4a9ea1948cb9870 (diff)
use romstr.py as the new disassembler
-rw-r--r--extras/romstr.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/extras/romstr.py b/extras/romstr.py
index 0827efdf6..7e4c9039c 100644
--- a/extras/romstr.py
+++ b/extras/romstr.py
@@ -1,3 +1,4 @@
+import sys
from gbz80disasm import opt_table
from ctypes import c_int8
from copy import copy, deepcopy
@@ -73,7 +74,11 @@ class RomStr(str):
that will be parsed, so that large patches of data aren't parsed as
code.
"""
+ if "0x" in address:
+ address = int(address, 16)
+
start_address = address
+
if start_address == None:
raise Exception, "address must be given"
@@ -421,3 +426,7 @@ class AsmList(list):
"""
return "AsmList(too long)"
+if __name__ == "__main__":
+ cryrom = RomStr(open("../pokecrystal.gbc", "r").read());
+ asm = cryrom.to_asm(sys.argv[1])
+ print asm