diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:33:06 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:33:06 -0500 |
| commit | e545f0c1eaa6f922228dffd9ed12197c5a037469 (patch) | |
| tree | a98f58016798bfda7e290d4ac1495595407d9934 | |
| parent | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (diff) | |
| parent | 92152c98fc0cd319f5fff1b0e7ee76dc2c0520d2 (diff) | |
Merge commit '92152c9' into master
Fix some script commands for the preprocessor and script parsers.
| -rw-r--r-- | extras/crystal.py | 2 | ||||
| -rw-r--r-- | extras/pksv.py | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/extras/crystal.py b/extras/crystal.py index c54ade01b..66eac4770 100644 --- 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]], diff --git a/extras/pksv.py b/extras/pksv.py index f30ab9294..8965c9c63 100644 --- a/extras/pksv.py +++ b/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 ] |