diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /include/constants/battle.h | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
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 |