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 /extras/crystal.py | |
| parent | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (diff) | |
| parent | 92152c98fc0cd319f5fff1b0e7ee76dc2c0520d2 (diff) | |
Merge commit '92152c9' into master
Fix some script commands for the preprocessor and script parsers.
Diffstat (limited to 'extras/crystal.py')
| -rw-r--r-- | extras/crystal.py | 2 |
1 files changed, 1 insertions, 1 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]], |