ref: e545f0c1eaa6f922228dffd9ed12197c5a037469
parent: 1cb19a03a3c57c85d27495f95483b30ae37f0976
parent: 92152c98fc0cd319f5fff1b0e7ee76dc2c0520d2
author: Bryan Bishop <[email protected]>
date: Mon Aug 12 11:33:06 EDT 2013
Merge commit '92152c9' into master Fix some script commands for the preprocessor and script parsers.
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -2811,7 +2811,7 @@
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]],
--- a/extras/pksv.py
+++ b/extras/pksv.py
@@ -293,11 +293,8 @@
}
#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
]