Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

not sure why the scripts aren't working yet

This commit is contained in:
Bryan Bishop 2012-04-03 00:59:16 -05:00
parent 2c9c2424d8
commit 21081a08e1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extras/crystal.py
View File

@ -2592,7 +2592,8 @@ command_classes = create_command_classes()
def parse_script_with_command_classes(start_address): def parse_script_with_command_classes(start_address):
"""parses a script using the Command classes """parses a script using the Command classes
as an alternative to the old method using hard-coded commands""" as an alternative to the old method using hard-coded commands"""
global command_classes global command_classes, rom
load_rom()
current_address = start_address current_address = start_address
commands = [] commands = []
end = False end = False
@ -2604,6 +2605,9 @@ def parse_script_with_command_classes(start_address):
if kls.id == cur_byte: if kls.id == cur_byte:
right_kls = kls right_kls = kls
if right_kls == None: if right_kls == None:
print "current_address is: " + hex(current_address)
current_address += 1
continue
asm_output = "" asm_output = ""
for command in commands: for command in commands:
asm_output += command.to_asm() + "\n" asm_output += command.to_asm() + "\n"
@ -2611,7 +2615,10 @@ def parse_script_with_command_classes(start_address):
cls = right_kls(address=current_address) cls = right_kls(address=current_address)
end = cls.end end = cls.end
commands.append(cls) commands.append(cls)
current_address = cls.last_address + 1 #current_address = cls.last_address + 1
current_address += cls.size + 1
asm_output = "".join([command.to_asm()+"\n" for command in commands])
print asm_output
return commands return commands
#use this to keep track of commands without pksv names #use this to keep track of commands without pksv names
@ -2794,6 +2801,8 @@ class Script():
start_address = offset start_address = offset
last_byte_address = offset + size - 1 last_byte_address = offset + size - 1
pointer = calculate_pointer_from_bytes_at(start_address+1) pointer = calculate_pointer_from_bytes_at(start_address+1)
if pointer == None:
raise Exception, "pointer is None (shouldn't be None pointer on 0x0 script command"
command["pointer"] = pointer command["pointer"] = pointer
if debug: if debug:
print "in script starting at "+hex(original_start_address)+\ print "in script starting at "+hex(original_start_address)+\