diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
| commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
| tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /include/pokemon.h | |
| parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
| parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 8e216e04a..ae02de8ca 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -117,6 +117,7 @@ #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 #define NUM_STATS 6 +#define UNOWN_FORM_COUNT 28 enum { NATURE_HARDY, |