diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-18 13:36:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 13:36:34 -0600 |
| commit | 963989d760a09eab46607efe1cbc1029f00e1842 (patch) | |
| tree | 736036a1a493ad2d10b9418996350a247c0ff637 /include | |
| parent | 0bbe03f17030c8009508714fc2b41703f1a1310a (diff) | |
| parent | f58cc47e173900537200c796501386f4e3a1f0d6 (diff) | |
Merge pull request #389 from DizzyEggg/num_stats
Use PARTY_SIZE and rename BATTLE_STATS_NO to NUM_BATTLE_STATS
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/pokemon.h | 7 | ||||
| -rw-r--r-- | include/pokemon.h | 5 |
2 files changed, 6 insertions, 6 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 diff --git a/include/pokemon.h b/include/pokemon.h index 7cf043ba3..3e69845e6 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -151,7 +151,6 @@ #define STATUS_PRIMARY_FAINTED 0x7 #define MAX_TOTAL_EVS 510 -#define NUM_STATS 6 #define UNOWN_FORM_COUNT 28 struct PokemonSubstruct0 @@ -293,8 +292,6 @@ struct Unknown_806F160_Struct struct SpriteFrameImage *frameImages; }; -#define BATTLE_STATS_NO 8 - struct BattlePokemon { /*0x00*/ u16 species; @@ -312,7 +309,7 @@ struct BattlePokemon /*0x17*/ u32 spDefenseIV:5; /*0x17*/ u32 isEgg:1; /*0x17*/ u32 altAbility:1; - /*0x18*/ s8 statStages[BATTLE_STATS_NO]; + /*0x18*/ s8 statStages[NUM_BATTLE_STATS]; /*0x20*/ u8 ability; /*0x21*/ u8 type1; /*0x22*/ u8 type2; |