Merge commit '92152c9' into master

Fix some script commands for the preprocessor and script parsers.

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]],

extras/pksv.py

@@ -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
                            ]