From e2babd69fb94781df54f2e4ded5efcc2aa7d0f8d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 19 Jun 2012 23:59:49 -0500 Subject: [PATCH] use romstr.py as the new disassembler --- extras/romstr.py | 9 +++++++++ 1 file changed, 9 insertions(+) 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