diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
commit | 0352a72d2ef5f820d6e8c4ad1806f5a8128b6d2f (patch) | |
tree | 1cda7283e7e7ac4678a14843a30d2519a37d3b34 /include/constants/battle.h | |
parent | e3993e2b34282933f149b85a4cfe7f45e051b504 (diff) | |
parent | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (diff) |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'include/constants/battle.h')
-rw-r--r-- | include/constants/battle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index 074c0d0cd..f886f560b 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -59,8 +59,8 @@ #define BATTLE_TYPE_KYOGRE_GROUDON 0x1000 #define BATTLE_TYPE_LEGENDARY 0x2000 #define BATTLE_TYPE_REGI 0x4000 -#define BATTLE_TYPE_TWO_OPPONENTS 0x8000 -#define BATTLE_TYPE_DOME 0x10000 +#define BATTLE_TYPE_GHOST 0x8000 +#define BATTLE_TYPE_POKEDUDE 0x10000 #define BATTLE_TYPE_PALACE 0x20000 #define BATTLE_TYPE_ARENA 0x40000 #define BATTLE_TYPE_FACTORY 0x80000 |