Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continue to fix off-by-one error in TextScript

Browse Source
This commit is contained in:
Bryan Bishop
2012-04-26 15:04:09 -05:00
parent 806687bf69
commit 8cc5597b0b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extras/crystal.py
View File

@@ -529,9 +529,9 @@ class TextScript:
#whichever command comes first #whichever command comes first
jump = min([jump57, jump50, jump58]) jump = min([jump57, jump50, jump58])
end_address = offset + jump - 1 #we want the address before $57 end_address = offset + jump #we want the address before $57
lines = process_00_subcommands(offset+1, end_address+1, debug=debug) lines = process_00_subcommands(offset+1, end_address, debug=debug)
if show and debug: if show and debug:
text = parse_text_at2(offset+1, end_address-offset+1, debug=debug) text = parse_text_at2(offset+1, end_address-offset+1, debug=debug)
@@ -648,9 +648,9 @@ class TextScript:
#whichever command comes first #whichever command comes first
jump = min([jump57, jump50, jump58]) jump = min([jump57, jump50, jump58])
end_address = offset + jump - 1 #we want the address before $57 end_address = offset + jump #we want the address before $57
lines = process_00_subcommands(offset+1, end_address+1, debug=debug) lines = process_00_subcommands(offset+1, end_address, debug=debug)
if show and debug: if show and debug:
text = parse_text_at2(offset+1, end_address-offset+1, debug=debug) text = parse_text_at2(offset+1, end_address-offset+1, debug=debug)
@@ -709,8 +709,8 @@ class TextScript:
# sys.exit() # sys.exit()
self.commands = commands self.commands = commands
self.last_address = offset - 1 #why -1?? self.last_address = offset
script_parse_table[original_address:offset-1] = self script_parse_table[original_address:offset] = self
self.size = self.byte_count = self.last_address - original_address self.size = self.byte_count = self.last_address - original_address
return commands return commands