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

Merge commit '92152c9' into master

Browse Source 
Fix some script commands for the preprocessor and script parsers.
This commit is contained in:
Bryan Bishop 2013-08-12 15:33:06 -05:00
commit e545f0c1ea
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/crystal.py
View File

@ -2811,7 +2811,7 @@ pksv_crystal_more = {
0x8F: ["ptpriorityjump", ["pointer", ScriptPointerLabelParam]],
0x90: ["return"],
0x91: ["end"],
0x92: ["reloadandreturn"],
0x92: ["reloadandreturn", ["which_method", SingleByteParam]],
0x93: ["resetfuncs"],
0x94: ["pokemart", ["dialog_id", SingleByteParam], ["mart_id", MultiByteParam]], # maybe it should be a pokemark constant id/label?
0x95: ["elevator", ["floor_list_pointer", PointerLabelParam]],

7
extras/pksv.py
View File

@ -293,11 +293,8 @@ pksv_crystal = {
}
#these cause the script to end; used in create_command_classes
pksv_crystal_more_enders = [0x03, 0x04, 0x05, 0x0C, 0x51, 0x52,
0x53, 0x8D, 0x8F, 0x90, 0x91, 0x92,
0x9B,
0xB2, #maybe?
0xCC, #maybe?
pksv_crystal_more_enders = [0x03, 0x04, 0x05, 0x0C, 0x51, 0x52, 0x53,
0x65, 0x8D, 0x8F, 0x90, 0x91, 0x92, 0x9B,
0x9A, # describedecoration
]