From a8da5fbda9be62bc1786954f9e62f3957c1764ed Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Fri, 20 Apr 2012 17:57:59 -0500 Subject: [PATCH] improvements to global to_asm --- extras/crystal.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/extras/crystal.py b/extras/crystal.py index 30d73cc3c..dae8dc348 100644 --- a/extras/crystal.py +++ b/extras/crystal.py @@ -4036,11 +4036,18 @@ incbin_lines = [] processed_incbins = {} def to_asm(some_object): - """shows asm with labels and ending comments""" - #label: ; 0x10101 + """shows an object's asm with a label and an ending comment + showing the next byte address""" + if isinstance(some_object, int): + some_object = script_parse_table[some_object] + #add one to the last_address to show where the next byte is in the file + last_address = some_object.last_address + 1 + #create a line like "label: ; 0x10101" asm = some_object.label + ": ; " + hex(some_object.address) + "\n" + #now add the inner/actual asm asm += spacing + some_object.to_asm().replace("\n", "\n"+spacing).replace("\n"+spacing+"\n"+spacing, "\n\n"+spacing) - asm += "\n; " + hex(some_object.last_address) + #show the address of the next byte below this + asm += "\n; " + hex(last_address) return asm def isolate_incbins():