shithub: pokecrystal

Download patch

ref: 96ca472fc922ef0d235a0c2e7104265de42893af
parent: 9a4158462b45197631cc30b30bbbe31d900a38ec
author: Bryan Bishop <kanzure@gmail.com>
date: Tue Jun 19 18:54:20 EDT 2012

implement a formatted-with-labels version of the opcode line

--- a/extras/romstr.py
+++ b/extras/romstr.py
@@ -222,6 +222,8 @@
                 asm_command["format"] = opstr
                 asm_command["opnumberthing"] = optype
 
+                opstr2 = None
+
                 if "x" in opstr:
                     for x in range(0, opstr.count("x")):
                         insertion = ord(rom[offset + 1])
@@ -248,7 +250,17 @@
                         # be shown during asm output.
                         insertion = "$%.4x" % (number)
 
+                        base_opstr = copy(opstr)
+
                         opstr = opstr[:opstr.find("?")].lower() + insertion + opstr[opstr.find("?")+1:].lower()
+
+                        # This version of the formatted string has labels. In
+                        # the future, the actual labels should be parsed
+                        # straight out of the "main.asm" file.
+                        target_address = number % 0x4000
+                        insertion = "asm_" + hex(target_address)
+                        opstr2 = base_opstr[:base_opstr.find("?")].lower() + insertion + base_opstr[base_opstr.find("?")+1:].lower()
+                        asm_command["formatted_with_labels"] = opstr2
 
                         current_byte_number += 2
                         offset += 2
--