diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-12 19:49:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 19:49:55 -0400 |
| commit | ade49de329fc5e936e9ea6ddcd1c6f8ec8fa62b8 (patch) | |
| tree | 9fb5636bf236ee8847c545c751539c892de3f1dd /include/constants | |
| parent | f6efbe38bfd7365ffdace6e82f5160563473efd7 (diff) | |
| parent | b3c4cd8a3297c918608450e5ba1fdd37ca0ce867 (diff) | |
Merge branch 'master' into doc-pblock
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/coins.h | 1 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 4 | ||||
| -rw-r--r-- | include/constants/roulette.h | 7 |
3 files changed, 12 insertions, 0 deletions
diff --git a/include/constants/coins.h b/include/constants/coins.h index 3ae3bb23f..e65e981d6 100644 --- a/include/constants/coins.h +++ b/include/constants/coins.h @@ -2,5 +2,6 @@ #define GUARD_CONSTANTS_COINS_H #define MAX_COINS 9999 +#define MAX_COIN_DIGITS 4 #endif // GUARD_CONSTANTS_COINS_H 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/constants/roulette.h b/include/constants/roulette.h new file mode 100644 index 000000000..2ab17e476 --- /dev/null +++ b/include/constants/roulette.h @@ -0,0 +1,7 @@ +#ifndef GUARD_CONSTANTS_ROULETTE_H +#define GUARD_CONSTANTS_ROULETTE_H + +// Flag set in gSpecialVar_0x8004 when playing Roulette on a Game Corner service day +#define ROULETTE_SPECIAL_RATE (1 << 7) + +#endif // GUARD_CONSTANTS_ROULETTE_H |