hooray PrintNumber_PrintLeadingZero is also shared

This commit is contained in:
Bryan Bishop 2012-05-29 15:04:19 -05:00
parent 0526702a5e
commit e954781618
2 changed files with 22 additions and 6 deletions

View File

@ -110,7 +110,11 @@ class BinaryBlob(object):
r += "label=\""+self.label+"\", " r += "label=\""+self.label+"\", "
r += "start_address="+hex(self.start_address)+", " r += "start_address="+hex(self.start_address)+", "
r += "size="+str(self.end_address - 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 += ")" r += ")"
return r return r
@ -170,9 +174,9 @@ def scan_red_asm(bank_stop=3, debug=True):
current_bank = 0 current_bank = 0
current_label = None current_label = None
latest_label = None latest_label = "ignore me"
current_start_address = None current_start_address = None
latest_start_address = None latest_start_address = 0
latest_line = "" latest_line = ""
for line in redsrc: for line in redsrc:
@ -192,8 +196,9 @@ def scan_red_asm(bank_stop=3, debug=True):
current_start_address = get_address_from_line_comment(line, \ current_start_address = get_address_from_line_comment(line, \
bank=current_bank) bank=current_bank)
if current_label != None and current_start_address != None and \ if current_label != None and current_start_address != None and latest_start_address != None \
current_start_address != 0 and current_start_address != latest_start_address: 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 != None:
if latest_label not in ["Char52", "PokeCenterSignText", "DefaultNamesPlayer", "Unnamed_6a12"]: if latest_label not in ["Char52", "PokeCenterSignText", "DefaultNamesPlayer", "Unnamed_6a12"]:
blob = BinaryBlob(label=latest_label, \ blob = BinaryBlob(label=latest_label, \
@ -226,3 +231,5 @@ for blob in found_blobs:
print "Found " + str(len(found_blobs)) + " possibly copied functions." print "Found " + str(len(found_blobs)) + " possibly copied functions."
print [hex(x) for x in found_blobs[10].locations]

View File

@ -342,7 +342,16 @@ SpecialsPointers: ; 0xc029
dbw $24,$4a88 dbw $24,$4a88
dbw $03,$4224 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 ;UnknownText_0xffff: ; 0xffff
; db $0, $21, "ふまひ?へKぷへ", $57 ; db $0, $21, "ふまひ?へKぷへ", $57