diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-10-26 13:47:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-10-26 13:47:14 -0500 |
| commit | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (patch) | |
| tree | e702c9204f8f6e11d5b6576bc6d0311c0fe6f73f /include | |
| parent | 1bb931245b5030746b7150e3965520954d0068a7 (diff) | |
also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokemon.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 6449c1998..4159a2f96 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -30,7 +30,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 @@ -43,7 +43,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 @@ -62,7 +62,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 @@ -87,7 +87,7 @@ #define MON_DATA_RIBBONS 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 |