pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

more fixes (sort of)

Browse Source
This commit is contained in:
Bryan Bishop 2012-04-15 01:27:20 -05:00
parent 441cb01c39
commit 00ab26a8c4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extras/crystal.py
View File

@ -2843,7 +2843,10 @@ class Script():
asm_output = "" asm_output = ""
for command in commands: for command in commands:
asm_output += command.to_asm() + "\n" asm_output += command.to_asm() + "\n"
raise Exception, "no command found? id: " + hex(cur_byte) + " at " + hex(current_address) + " asm is:\n" + asm_output end = True
continue
#XXX maybe a bad idea to not die ?
#raise Exception, "no command found? id: " + hex(cur_byte) + " at " + hex(current_address) + " asm is:\n" + asm_output
#print "about to parse command(script@"+hex(start_address)+"): " + str(right_kls.macro_name) #print "about to parse command(script@"+hex(start_address)+"): " + str(right_kls.macro_name)
cls = right_kls(address=current_address, force=force, map_group=map_group, map_id=map_id) cls = right_kls(address=current_address, force=force, map_group=map_group, map_id=map_id)
#print cls.to_asm() #print cls.to_asm()
@ -5627,12 +5630,14 @@ class MapScriptHeader:
current_address = address + (self.trigger_count * ptr_line_size) + 1 current_address = address + (self.trigger_count * ptr_line_size) + 1
#[[Number2 of pointers] Number2 * [hook number][2byte pointer to script]] #[[Number2 of pointers] Number2 * [hook number][2byte pointer to script]]
callback_ptr_line_size = 3 callback_ptr_line_size = 3
self.callback_count = DecimalParam(current_address) self.callback_count = DecimalParam(address=current_address)
self.callbacks = [] self.callbacks = []
for index in range(callback_count): for index in range(self.callback_count.byte):
hook_byte = HexByte(current_address) hook_byte = HexByte(address=current_address)
callback = ScriptPointerLabelParam(address=current_address+1, map_group=map_group, map_id=map_id, debug=debug) callback = ScriptPointerLabelParam(address=current_address+1, map_group=map_group, map_id=map_id, debug=debug)
callbacks.append({"hook": hook_byte, "callback": callback}) self.callbacks.append({"hook": hook_byte, "callback": callback})
current_address += 3 #i think?
self.last_address = current_address
return True return True
def to_asm(self): def to_asm(self):
output = "" output = ""