diff options
author | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-21 16:54:31 +0200 |
---|---|---|
committer | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-21 16:54:31 +0200 |
commit | 6ae0842c048610ee1c72f85c6a0e1c4d801ebe9a (patch) | |
tree | d30f4c8e0e2c055f860accda7a1efdd7b2dcddbf /include/pokemon.h | |
parent | 6421c90f26aeb1b31daf4acebbb48d546bfc2884 (diff) | |
parent | e81986cd20dbe0d8a98da646d964310a066f1af5 (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into pokenav
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 { |