diff options
| author | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 17:29:16 -0400 |
|---|---|---|
| committer | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 17:29:16 -0400 |
| commit | 7203edeeb6f2dc56cf123c9082998fc93e7dc160 (patch) | |
| tree | 47d19fd14f2073b0f95422ca54daee2b7bce0e96 /include/pokemon.h | |
| parent | e92408af0133974a769215a83500c965f8524724 (diff) | |
| parent | ea36898775f5e31c6a175251339da1ed60de218d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Update
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index be6ccfe74..21173d503 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -408,9 +408,11 @@ struct BattleMove u8 pad[3]; }; +#define FLAG_MAKES_CONTACT 0x1 #define FLAG_PROTECT_AFFECTED 0x2 #define FLAG_MAGICCOAT_AFFECTED 0x4 #define FLAG_SNATCH_AFFECTED 0x8 +#define FLAG_KINGSROCK_AFFECTED 0x20 struct PokemonStorage { |