diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-12-29 00:57:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 00:57:37 -0500 |
| commit | 4192a40adf85e4825775f16a33df6e84d6ec0bcb (patch) | |
| tree | 276dec6b4672931232c9ec6e1134b463cc773abd /include/constants/pokemon.h | |
| parent | f554f09aedeea7478e650d263a40a9949bc898d6 (diff) | |
| parent | aadab8b0167f1f74a28d4234509faffd8dca7bc2 (diff) | |
Merge pull request #1583 from GriffinRichards/renametilemaps
Give less generic names to some tilemaps, some misc fixes
Diffstat (limited to 'include/constants/pokemon.h')
| -rw-r--r-- | include/constants/pokemon.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 9fa023cd5..0a74e751e 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -78,11 +78,13 @@ #define STAT_SPEED 3 #define STAT_SPATK 4 #define STAT_SPDEF 5 +#define NUM_STATS 6 + #define STAT_ACC 6 // Only in battles. #define STAT_EVASION 7 // Only in battles. -#define NUM_NATURE_STATS NUM_STATS - 1 // excludes HP -#define NUM_BATTLE_STATS NUM_STATS + 2 // includes Accuracy and Evasion +#define NUM_NATURE_STATS (NUM_STATS - 1) // excludes HP +#define NUM_BATTLE_STATS (NUM_STATS + 2) // includes Accuracy and Evasion #define MIN_STAT_STAGE 0 #define DEFAULT_STAT_STAGE 6 |