summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-10-26 13:43:08 -0500
committercamthesaxman <cameronghall@cox.net>2017-10-26 13:43:08 -0500
commit91f6d8118788d18b258873a062da1318569eaf0f (patch)
tree62ca326835734925a2373caecfe45444dced295a /include/pokemon.h
parent84bdf94074a114c4c5ff5ee34ae01040dd6c0eb1 (diff)
also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants
Diffstat (limited to 'include/pokemon.h')
-rw-r--r--include/pokemon.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index dabdff626..0fbc325c3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -32,7 +32,7 @@
#define MON_DATA_HP_EV 26
#define MON_DATA_ATK_EV 27
#define MON_DATA_DEF_EV 28
-#define MON_DATA_SPD_EV 29
+#define MON_DATA_SPEED_EV 29
#define MON_DATA_SPATK_EV 30
#define MON_DATA_SPDEF_EV 31
#define MON_DATA_FRIENDSHIP 32
@@ -45,7 +45,7 @@
#define MON_DATA_HP_IV 39
#define MON_DATA_ATK_IV 40
#define MON_DATA_DEF_IV 41
-#define MON_DATA_SPEED_IV 42
+#define MON_DATA_SPEED_IV 42
#define MON_DATA_SPATK_IV 43
#define MON_DATA_SPDEF_IV 44
#define MON_DATA_IS_EGG 45
@@ -64,7 +64,7 @@
#define MON_DATA_MAX_HP 58
#define MON_DATA_ATK 59
#define MON_DATA_DEF 60
-#define MON_DATA_SPEED 61
+#define MON_DATA_SPEED 61
#define MON_DATA_SPATK 62
#define MON_DATA_SPDEF 63
#define MON_DATA_MAIL 64
@@ -89,7 +89,7 @@
#define MON_DATA_83 83
#define MON_DATA_ATK2 84
#define MON_DATA_DEF2 85
-#define MON_DATA_SPD2 86
+#define MON_DATA_SPEED2 86
#define MON_DATA_SPATK2 87
#define MON_DATA_SPDEF2 88