diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-01 15:13:24 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-01 15:13:26 -0500 |
| commit | e8eaeefda846e49286150caef7e4355193af1084 (patch) | |
| tree | 900e8ad8ac9768301fbf21e70526cebb8168ec5c | |
| parent | cc93281530464e8ca15e77e46c4b97bd8b83627b (diff) | |
fix import pokemon_constants syntax
| -rw-r--r-- | pokemontools/crystal.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py index 55cf1a9..0d0bd1e 100644 --- a/pokemontools/crystal.py +++ b/pokemontools/crystal.py @@ -55,6 +55,7 @@ import move_constants import pointers import interval_map import trainers +import pokemon_constants # ---- script_parse_table explanation ---- # This is an IntervalMap that keeps track of previously parsed scripts, texts @@ -215,13 +216,11 @@ def clean_up_long_info(long_info): long_info = "\n".join(new_lines) return long_info -from pokemon_constants import pokemon_constants - def get_pokemon_constant_by_id(id): if id == 0: return None else: - return pokemon_constants[id] + return pokemon_constants.pokemon_constants[id] from item_constants import ( item_constants, @@ -6678,8 +6677,8 @@ class PokedexEntry: self.address = address self.dependencies = None #label = self.make_label() - if pokemon_id in pokemon_constants: - pokename = string.capwords(pokemon_constants[pokemon_id].replace("__", " ").replace("_", " ")).replace(" ", "") + if pokemon_id in pokemon_constants.pokemon_constants: + pokename = string.capwords(pokemon_constants.pokemon_constants[pokemon_id].replace("__", " ").replace("_", " ")).replace(" ", "") else: pokename = "Pokemon{0}".format(pokemon_id) self.label = Label(name=pokename+"PokedexEntry", address=self.address, object=self) |