fix PokedexText

This commit is contained in:
Bryan Bishop
2012-05-23 17:56:34 -05:00
parent 1663472cf6
commit 38eae01fcd

View File

@@ -2325,7 +2325,7 @@ class MainText(TextCommand):
offset = self.address offset = self.address
# the code below assumes we're jumping past a $0 byte # the code below assumes we're jumping past a $0 byte
if use_zero == False: if self.use_zero == False:
offset = offset -1 offset = offset -1
# read until $50, $57 or $58 (not sure about $58...) # read until $50, $57 or $58 (not sure about $58...)
@@ -2356,10 +2356,10 @@ class MainText(TextCommand):
if self.size < 2 or len(self.bytes) < 1: if self.size < 2 or len(self.bytes) < 1:
raise Exception, "$0 text command can't end itself with no follow-on bytes" raise Exception, "$0 text command can't end itself with no follow-on bytes"
if use_zero: if self.use_zero:
output = "db $0" output = "db $0"
else: else:
output += "db " output = ""
# db $0, $57 or db $0, $50 or w/e # db $0, $57 or db $0, $50 or w/e
if self.size == 2 and len(self.bytes) == 1: if self.size == 2 and len(self.bytes) == 1:
@@ -2379,6 +2379,10 @@ class MainText(TextCommand):
# has a $50 or $57 been passed yet? # has a $50 or $57 been passed yet?
end = False end = False
if not self.use_zero:
new_line = True
was_comma = False
for byte in self.bytes: for byte in self.bytes:
if end: if end:
raise Exception, "the text ended due to a $50 or $57 but there are more bytes?" raise Exception, "the text ended due to a $50 or $57 but there are more bytes?"