diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 18:44:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 18:44:01 -0500 |
| commit | 5891cedc1bf4c9c95d60e5118c2809895d6191a5 (patch) | |
| tree | a37133a5c3be531d63b1e2a171c0264a62cd62cc /include/pokemon.h | |
| parent | 5e80a12ec9fcf2201c070712d8e2dcefe2a0e364 (diff) | |
| parent | 959f78fe146e75f9ce02b318eb6a8d97652a9996 (diff) | |
Merge pull request #372 from DizzyEggg/master
decompile battle_4
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index c69fb87e0..9dd7ba06c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -392,9 +392,14 @@ struct BattleMove u8 secondaryEffectChance; u8 target; u8 priority; - u32 flags; + u8 flags; + u8 pad[3]; }; +#define FLAG_PROTECT_AFFECTED 0x2 +#define FLAG_MAGICCOAT_AFFECTED 0x4 +#define FLAG_SNATCH_AFFECTED 0x8 + struct PokemonStorage { /*0x00*/ u8 currentBox; |