Merge commit '92152c9' into master

Fix some script commands for the preprocessor and script parsers.
2013-08-12 15:33:06 -05:00
parent 1cb19a03a3 92152c98fc
commit e545f0c1ea
2 changed files with 3 additions and 6 deletions
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -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]],