ref: e9547816187c8df17f8da0e7f3c786bc5145708d
parent: 0526702a5ee907b47df237f44eaf9fb6a6d56a1b
author: Bryan Bishop <kanzure@gmail.com>
date: Tue May 29 11:04:19 EDT 2012
hooray PrintNumber_PrintLeadingZero is also shared
--- a/extras/comparator.py
+++ b/extras/comparator.py
@@ -110,7 +110,11 @@
r += "label=\""+self.label+"\", "
r += "start_address="+hex(self.start_address)+", "
r += "size="+str(self.end_address - self.start_address)+", "
- r += "located="+str(len(self.locations) > 0)
+ locnum = len(self.locations)
+ if locnum == 1:
+ r += "located="+hex(self.locations[0])
+ else:
+ r += "located="+str(locnum)
r += ")"
return r
@@ -170,9 +174,9 @@
current_bank = 0
current_label = None
- latest_label = None
+ latest_label = "ignore me"
current_start_address = None
- latest_start_address = None
+ latest_start_address = 0
latest_line = ""
for line in redsrc:
@@ -192,8 +196,9 @@
current_start_address = get_address_from_line_comment(line, \
bank=current_bank)
- if current_label != None and current_start_address != None and \
- current_start_address != 0 and current_start_address != latest_start_address:
+ if current_label != None and current_start_address != None and latest_start_address != None \
+ and current_start_address != 0 and current_start_address != latest_start_address \
+ and (current_start_address - latest_start_address) > 1:
if latest_label != None:
if latest_label not in ["Char52", "PokeCenterSignText", "DefaultNamesPlayer", "Unnamed_6a12"]:
blob = BinaryBlob(label=latest_label, \
@@ -225,4 +230,6 @@
print blob
print "Found " + str(len(found_blobs)) + " possibly copied functions."
+
+print [hex(x) for x in found_blobs[10].locations]
--- a/main.asm
+++ b/main.asm
@@ -342,7 +342,16 @@
dbw $24,$4a88
dbw $03,$4224
-INCBIN "baserom.gbc",$c224,$ffff - $c224
+INCBIN "baserom.gbc",$c224,$c644 - $c224
+
+; prints a leading zero unless they are turned off in the flags
+PrintNumber_PrintLeadingZero: ; c644
+ bit 7,d ; print leading zeroes?
+ ret z
+ ld [hl],"0"
+ ret
+
+INCBIN "baserom.gbc",$c64a,$ffff - $c64a
;UnknownText_0xffff: ; 0xffff
; db $0, $21, "ふまひ?へKぷへ", $57
--
⑨