diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle.h | 2 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index e7c9d9d17..9489e8d52 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -49,7 +49,7 @@ #define BATTLE_TYPE_IS_MASTER 0x0004 // In not-link battles, it's always set. #define BATTLE_TYPE_TRAINER 0x0008 #define BATTLE_TYPE_FIRST_BATTLE 0x0010 -#define BATTLE_TYPE_20 0x0020 +#define BATTLE_TYPE_LINK_ESTABLISHED 0x0020 // Set when the link battle setup callback finishes. #define BATTLE_TYPE_MULTI 0x0040 #define BATTLE_TYPE_SAFARI 0x0080 #define BATTLE_TYPE_BATTLE_TOWER 0x0100 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1b4c6ef53..d58c51d72 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -219,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 |