Leahnaya/pokemon-reverse-engineering-tools
1
0
Fork 0
mirror of https://github.com/pret/pokemon-reverse-engineering-tools.git synced 2026-09-30 21:36:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

manually apply crystal.py changes from upstream

Browse Source
This commit is contained in:
Bryan Bishop
2013-08-27 10:41:21 -05:00
parent 94dd0f6d63
commit 993162a6d7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pokemontools/crystal.py
View File

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