diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-27 23:41:35 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-27 23:41:35 -0400 |
commit | 1da42d0c0ba0499203e60523f9cfd4cb3abc75eb (patch) | |
tree | 2e7be4a2d4351e4136fa3d76b27117ebae08bd83 /include/pokemon.h | |
parent | 1c2a815d7b31bc9f43c26e4ea0bf346487b958ac (diff) | |
parent | d783f420001b67c19f8d81bbc94d266af98e89ad (diff) |
Merge branch 'master' into secret_base_data_fix
Diffstat (limited to 'include/pokemon.h')
-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 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 |