summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-01 14:54:16 -0500
committerBryan Bishop <kanzure@gmail.com>2013-09-01 14:54:16 -0500
commitdd52b6900c47ad79d462d3d517ea0925db959eed (patch)
tree613f62eda986834eb77ac79e3a5dcc3d3403d3af
parentea83920d9212f08e8dac883b4960847a20875db3 (diff)
import move_constants syntax
-rw-r--r--pokemontools/crystal.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py
index fa68b53..969ec0f 100644
--- a/pokemontools/crystal.py
+++ b/pokemontools/crystal.py
@@ -53,8 +53,6 @@ from trainers import (
trainer_group_names,
)
-from move_constants import moves
-
# for fixing trainer_group_names
import re
@@ -64,6 +62,7 @@ import chars
import labels
import pksv
import romstr
+import move_constants
# ---- script_parse_table explanation ----
# This is an IntervalMap that keeps track of previously parsed scripts, texts
@@ -1663,8 +1662,8 @@ class TrainerGroupParam(SingleByteParam):
class MoveParam(SingleByteParam):
def to_asm(self):
- if self.byte in moves.keys():
- return moves[self.byte]
+ if self.byte in move_constants.moves.keys():
+ return move_constants.moves[self.byte]
else:
# this happens for move=0 (no move) in trainer headers
return str(self.byte)