pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix PokedexText?

Browse Source
This commit is contained in:
Bryan Bishop 2012-05-23 18:15:48 -05:00
parent 38eae01fcd
commit 4ec6dfc5fe
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extras/crystal.py
View File

@ -2326,7 +2326,9 @@ class MainText(TextCommand):
# the code below assumes we're jumping past a $0 byte # the code below assumes we're jumping past a $0 byte
if self.use_zero == False: if self.use_zero == False:
offset = offset -1 offset = offset
else:
offset = offset + 1
# read until $50, $57 or $58 (not sure about $58...) # read until $50, $57 or $58 (not sure about $58...)
jump57 = how_many_until(chr(0x57), offset) jump57 = how_many_until(chr(0x57), offset)
@ -2335,6 +2337,7 @@ class MainText(TextCommand):
# pick whichever one comes first # pick whichever one comes first
jump = min([jump57, jump50, jump58]) jump = min([jump57, jump50, jump58])
jump += 1
# if $57 appears first then this command is the last in this text script # if $57 appears first then this command is the last in this text script
if jump == jump57 or jump == jump58: if jump == jump57 or jump == jump58:
@ -2342,15 +2345,19 @@ class MainText(TextCommand):
# we want the address after the $57 # we want the address after the $57
# ("last_address" is misnamed everywhere) # ("last_address" is misnamed everywhere)
end_address = offset + 1 + jump end_address = offset + jump
self.last_address = self.end_address = end_address self.last_address = self.end_address = end_address
# read the text bytes into a structure # read the text bytes into a structure
# skip the first offset byte because that's the command byte # skip the first offset byte because that's the command byte
self.bytes = rom_interval(offset + 1, jump, strings=False) self.bytes = rom_interval(offset , jump, strings=False)
# include the original command in the size calculation # include the original command in the size calculation
self.size = jump + 1 self.size = jump
# TODO: this is possibly wrong
if self.use_zero:
self.size += 1
def to_asm(self): def to_asm(self):
if self.size < 2 or len(self.bytes) < 1: if self.size < 2 or len(self.bytes) < 1: