shithub: pokecrystal

Download patch

ref: c79db81d43ad6ba993cac3c6e6f0e3e6b6ef86b5
parent: 48b2237b820fdf0347ad65d31305eeffdea97696
author: Bryan Bishop <kanzure@gmail.com>
date: Wed Jun 6 17:00:30 EDT 2012

remove more code cruft

--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -534,14 +534,6 @@
   [ "E", 0x100, -1 ],
 ]
 
-#find conflicts
-conflict_table = {}
-for line in temp_opt_table:
-    if line[1] in conflict_table.keys():
-        print "CONFLICT: " + line[0] + " ($" + hex(line[1])[2:] + ") .... " + conflict_table[line[1]]
-    else:
-        conflict_table[line[1]] = line[0]
-
 #construct real opt_table
 opt_table = {}
 for line in temp_opt_table:
@@ -831,19 +823,6 @@
         if line["definition"] == False:
             if not label_id < offset: return False
     return True
-
-def text_asm_pretty_printer(label, address_of_08, include_08=True):
-    """returns (output, end_address)"""
-    output = label + ": ; " + hex(address_of_08) + "\n"
-    if include_08:
-        output += spacing + "db $08 ; asm\n"
-        results = output_bank_opcodes(address_of_08 + 1)
-    else:
-        results = output_bank_opcodes(address_of_08)
-    output += results[0]
-    end_address = results[1]
-
-    return (output, end_address)
 
 if __name__ == "__main__":
     load_rom()