diff options
Diffstat (limited to 'include/constants/pokemon.h')
| -rw-r--r-- | include/constants/pokemon.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 8a32ef7d1..737eed4d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -198,15 +198,16 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 -#define FRIENDSHIP_EVENT_VITAMIN 0x1 -#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 -#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 -#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4 -#define FRIENDSHIP_EVENT_WALKING 0x5 -#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6 -#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7 -#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8 +#define FRIENDSHIP_EVENT_GROW_LEVEL 0 +#define FRIENDSHIP_EVENT_VITAMIN 1 +#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 4 +#define FRIENDSHIP_EVENT_WALKING 5 +#define FRIENDSHIP_EVENT_MASSAGE 6 +#define FRIENDSHIP_EVENT_FAINT_SMALL 7 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 8 +#define FRIENDSHIP_EVENT_FAINT_LARGE 9 #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 @@ -218,4 +219,9 @@ #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +// used by ShouldIgnoreDeoxysForm +#define DEOXYS_CHECK_BATTLE_SPRITE 1 +#define DEOXYS_CHECK_TRADE_MAIN 3 +#define DEOXYS_CHECK_BATTLE_ANIM 5 + #endif // GUARD_CONSTANTS_POKEMON_H |