diff --git a/extras/crystal.py b/extras/crystal.py
index 729ee3203..92d3375fa 100644
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -65,6 +65,8 @@ from chars import chars, jap_chars
 
 from trainers import *
 
+from move_constants import moves
+
 # for fixing trainer_group_names
 import re
 
@@ -1720,6 +1722,10 @@ class TrainerGroupParam(SingleByteParam):
         trainer_group_id = self.byte
         return trainer_group_names[trainer_group_id]["constant"]
 
+class MoveParam(SingleByteParam):
+    def to_asm(self):
+        return moves[self.byte]
+
 class MenuDataPointerParam(PointerLabelParam):
     #read menu data at the target site
     #raise NotImplementedError, bryan_message
@@ -3709,9 +3715,6 @@ class TrainerHeader:
         output += "\n; last_address="+hex(self.last_address)+" size="+str(self.size)
         return output
 
-# TODO: MoveParam should map to an actual attack
-MoveParam = SingleByteParam
-
 class TrainerPartyMonParser:
     """ Just a generic trainer party mon parser.
     Don't use this directly. Only use the child classes.