diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-10 14:29:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 14:29:27 -0400 |
| commit | 078c341b2b86d743c202a3968dbb5dad106a2fac (patch) | |
| tree | 3094dec6062b03112a43280be23beaa229b3e313 /include | |
| parent | 4aed5b078a53291820cca641b2c3a7e41c9f56de (diff) | |
| parent | 5e8ffff62f6d4c7e4e2b62852eec14c086dc488e (diff) | |
Merge pull request #1122 from GriffinRichards/clean-battlemsg
Add stat stage constants, clean up misc battle msg data
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/pokemon.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 0d8fc6a57..286726838 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -84,6 +84,10 @@ #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 +#define MAX_STAT_STAGE 12 + // Shiny odds #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 diff --git a/include/pokemon.h b/include/pokemon.h index 69ef7a142..d75ec94f3 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -254,7 +254,7 @@ extern const u16 *const gLevelUpLearnsets[]; extern const u8 gPPUpGetMask[]; extern const u8 gPPUpSetMask[]; extern const u8 gPPUpAddMask[]; -extern const u8 gStatStageRatios[][2]; +extern const u8 gStatStageRatios[MAX_STAT_STAGE + 1][2]; extern const u16 gLinkPlayerFacilityClasses[]; extern const struct SpriteTemplate gUnknown_08329D98[]; extern const s8 gNatureStatTable[][5]; |