diff options
author | Bryan Bishop <kanzure@gmail.com> | 2012-12-23 02:56:46 -0600 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2012-12-23 02:57:21 -0600 |
commit | 41e980acd26e06458aeae6673b6c0803f8b9d208 (patch) | |
tree | 55416a035710ae9171c744c2769b1cfba40a09ef | |
parent | e31127e33b763c5f022c0fa4d3ca8fc866895a84 (diff) | |
parent | 5db51c58f524c52d4f14a8d069d0b58bf2cfc5f3 (diff) |
Merge remote branch 'remotes/yenatch/master'
fixes #49
original-commit-id: 3b20ea29160760a85db9d84f61a92a957d14efb3
-rw-r--r-- | gbz80disasm.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gbz80disasm.py b/gbz80disasm.py index 385f890..48739e0 100644 --- a/gbz80disasm.py +++ b/gbz80disasm.py @@ -593,7 +593,7 @@ def asm_label(address): # why using a random value when you can use the address? return ".ASM_" + hex(address)[2:] -def output_bank_opcodes(original_offset, max_byte_count=0x4000): +def output_bank_opcodes(original_offset, max_byte_count=0x4000, debug = False): #fs = current_address #b = bank_byte #in = input_data -- rom @@ -601,11 +601,14 @@ def output_bank_opcodes(original_offset, max_byte_count=0x4000): #i = offset #ad = end_address #a, oa = current_byte_number - + + load_labels() + load_rom() + bank_id = 0 if original_offset > 0x8000: bank_id = original_offset / 0x4000 - print "bank id is: " + str(bank_id) + if debug: print "bank id is: " + str(bank_id) last_hl_address = None #for when we're scanning the main map script last_a_address = None @@ -843,7 +846,7 @@ def all_outstanding_labels_are_reverse(byte_labels, offset): if not label_id < offset: return False return True + + if __name__ == "__main__": - load_labels() - load_rom() print output_bank_opcodes(int(sys.argv[1], 16))[0] |