diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 10:53:17 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 10:53:17 -0500 |
| commit | 5e66419093bee938c4b58b87da2ddfb00361fe7a (patch) | |
| tree | 88438f9731bc440f7cff2b680c2b647de9561bbc /pokemontools/crystal.py | |
| parent | 967de1cf3c16eb7806a745acc65ceb222ad5d6dc (diff) | |
| parent | f0ef450967fa00377fb8d39211741e7d7a596396 (diff) | |
Merge branch 'from-yenatch' into master
These commits (roughly) represent the changes made against extras/ by
yenatch. These are not cherrypicked and this isn't repeatable, sorry.
Diffstat (limited to 'pokemontools/crystal.py')
| -rw-r--r-- | pokemontools/crystal.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index dcd95d9..2630991 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -1993,7 +1993,7 @@ movement_command_bases = { 0x45: "accelerate_last", 0x46: ["step_sleep", ["duration", DecimalParam]], 0x47: "step_end", - 0x49: "hide_person", + 0x49: "remove_person", # do these next two have any params ?? 0x4C: "teleport_from", @@ -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]], @@ -7360,13 +7360,17 @@ def write_all_labels(all_labels, filename="labels.json"): from wram import wram_labels def get_ram_label(address): - """returns a label assigned to a particular ram address""" + """ + returns a label assigned to a particular ram address + """ if address in wram_labels.keys(): return wram_labels[address][-1] return None def get_label_for(address): - """returns a label assigned to a particular rom address""" + """ + returns a label assigned to a particular address + """ global all_labels if address == None: |