diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-09-01 15:15:57 -0500 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-01 15:16:01 -0500 |
commit | 58e8718616a4a3d8733c6760feb8184ff46592c1 (patch) | |
tree | f154111ae7e611983a129cbf41ef9d1ce4be255c /pokemontools/crystal.py | |
parent | 48f6b8a8fa0faf62e5c74bf8e62715303e9bc536 (diff) |
fix import item_constants syntax
Diffstat (limited to 'pokemontools/crystal.py')
-rw-r--r-- | pokemontools/crystal.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index 69905d6..ca7e9b8 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -56,6 +56,7 @@ import pointers import interval_map import trainers import pokemon_constants +import item_constants import wram # ---- script_parse_table explanation ---- @@ -223,12 +224,6 @@ def get_pokemon_constant_by_id(id): else: return pokemon_constants.pokemon_constants[id] -from item_constants import ( - item_constants, - find_item_label_by_id, - generate_item_constants, -) - def command_debug_information(command_byte=None, map_group=None, map_id=None, address=0, info=None, long_info=None, pksv_name=None): "used to help debug in parse_script_engine_script_at" info1 = "parsing command byte " + hex(command_byte) + " for map " + \ @@ -1287,7 +1282,7 @@ HexByte=DollarSignByte class ItemLabelByte(DollarSignByte): def to_asm(self): - label = find_item_label_by_id(self.byte) + label = item_constants.item_constants.find_item_label_by_id(self.byte) if label: return label elif not label: |