diff options
author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /include/constants/pokemon.h | |
parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'include/constants/pokemon.h')
-rw-r--r-- | include/constants/pokemon.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 78c1583b4..1a4741574 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -74,7 +74,10 @@ #define STAT_SPEED 3 #define STAT_SPATK 4 #define STAT_SPDEF 5 -#define STAT_ACC 6 // only in battles -#define STAT_EVASION 7 // only in battles +#define STAT_ACC 6 // Only in battles. +#define STAT_EVASION 7 // Only in battles. + +#define NUM_STATS 6 +#define NUM_BATTLE_STATS 8 #endif // GUARD_CONSTANTS_POKEMON_H |