diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-07 22:16:52 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 22:16:52 -0600 |
| commit | 6b38db228befa044a2cfe31ed78555e3f0bd3935 (patch) | |
| tree | 4aafddc91df76b5674c47a2be3bb1b3a42a0b519 /include/pokemon.h | |
| parent | 17d5ba39acb897e07e6842cbff5b1172cc6f7951 (diff) | |
| parent | be36c506387648a11afe51b0f4209386947feb37 (diff) | |
Merge pull request #515 from huderlem/battle_2
Decompile battle_2 and battle_util
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index a1c30f1f3..71b35e65c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -363,6 +363,16 @@ enum STAT_STAGE_EVASION, // 7 }; +enum +{ + STAT_HP, // 0 + STAT_ATK, // 1 + STAT_DEF, // 2 + STAT_SPD, // 3 + STAT_SPATK, // 4 + STAT_SPDEF, // 5 +}; + struct BaseStats { /*0x00*/ u8 baseHP; @@ -405,7 +415,7 @@ struct BattleMove u8 pp; u8 secondaryEffectChance; u8 target; - u8 priority; + s8 priority; u8 flags; u8 pad[3]; }; @@ -613,6 +623,8 @@ bool8 IsPokeSpriteNotFlipped(u16); u8 GetLevelUpMovesBySpecies(u16, u16 *); u8 TryIncrementMonLevel(struct Pokemon *); bool8 IsShiny(struct Pokemon *mon); +void RandomlyGivePartyPokerus(struct Pokemon *party); +void PartySpreadPokerus(struct Pokemon *party); struct Sprite *sub_80F7920(u16, u16, const u16 *); |