diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 20:07:46 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 21:02:25 -0500 |
| commit | e7cd8c59f4ca0f6c56a3b3782c21e896c203694e (patch) | |
| tree | 2daf951fe8064f06c06f0a0ec88c015845f1377e /include/constants/battle.h | |
| parent | d084a5ca84ec7062b8e546293e67202f2d2f4732 (diff) | |
Remove unused BF battle types, clarify Ghost battle type flags
Diffstat (limited to 'include/constants/battle.h')
| -rw-r--r-- | include/constants/battle.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index c273b9a50..b28955210 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -58,14 +58,15 @@ #define BATTLE_TYPE_EREADER_TRAINER 0x0800 #define BATTLE_TYPE_KYOGRE_GROUDON 0x1000 #define BATTLE_TYPE_LEGENDARY 0x2000 +#define BATTLE_TYPE_GHOST_UNVEILED 0x2000 // Re-use of BATTLE_TYPE_LEGENDARY, when combined with BATTLE_TYPE_GHOST #define BATTLE_TYPE_REGI 0x4000 #define BATTLE_TYPE_GHOST 0x8000 #define BATTLE_TYPE_POKEDUDE 0x10000 -#define BATTLE_TYPE_PALACE 0x20000 // TODO: Update name -#define BATTLE_TYPE_ARENA 0x40000 // TOOD: Update name +#define BATTLE_TYPE_WILD_SCRIPTED 0x20000 +#define BATTLE_TYPE_LEGENDARY_FRLG 0x40000 #define BATTLE_TYPE_TRAINER_TOWER 0x80000 -#define BATTLE_TYPE_PIKE 0x100000 -#define BATTLE_TYPE_PYRAMID 0x200000 +#define BATTLE_TYPE_x100000 0x100000 +#define BATTLE_TYPE_x200000 0x200000 #define BATTLE_TYPE_INGAME_PARTNER 0x400000 #define BATTLE_TYPE_x800000 0x800000 #define BATTLE_TYPE_RECORDED 0x1000000 @@ -76,8 +77,9 @@ #define BATTLE_TYPE_KYOGRE 0x20000000 #define BATTLE_TYPE_RAYQUAZA 0x40000000 #define BATTLE_TYPE_x80000000 0x80000000 -#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID) -#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE) + +#define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED)) +#define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED) // Battle Outcome defines #define B_OUTCOME_WON 0x1 |