diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-17 22:03:37 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-17 22:03:37 -0500 |
| commit | b9fa18bdd4a44e219c7678c26d692b2be4baeea3 (patch) | |
| tree | e7466ec4ff6635202580e6a29d748d6101f59a9f /include/constants | |
| parent | c4f8f4d11aeb2255fb0e7ccaa1256be7a2a0f63b (diff) | |
| parent | ecb13cdbf722aacbceca1b7a2e7514e5dd1ec83a (diff) | |
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/pokemon.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 5b6b8cb5e..9fa023cd5 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -270,7 +270,9 @@ #define FRIENDSHIP_EVENT_FAINT_FIELD_PSN 7 #define FRIENDSHIP_EVENT_FAINT_LARGE 8 // If opponent was >= 30 levels higher. See AdjustFriendshipOnBattleFaint -#define MAX_FRIENDSHIP 0xFF +#define MAX_FRIENDSHIP 255 +#define MAX_SHEEN 255 +#define MAX_CONDITION 255 #define MAX_PER_STAT_IVS 31 #define MAX_IV_MASK 31 |