diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-03 18:11:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 18:11:57 -0400 |
| commit | 7ea0d462c49360351006f246f0a300aaa765a843 (patch) | |
| tree | c930fe4733b8ae2bc02940ae6a35fbf73f933aca /include/battle.h | |
| parent | cbe13acff18405e99827df7c4a772d20b851f33b (diff) | |
| parent | 5afd2d5bfb1ec117d80898d9ad1c2529d28a091c (diff) | |
Merge pull request #22 from DizzyEggg/clean_up
bring pokeemerald to usable state
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 741e821e9..d5c5dd489 100644 --- a/include/battle.h +++ b/include/battle.h @@ -7,7 +7,7 @@ #define BATTLE_TYPE_TRAINER 0x0008 #define BATTLE_TYPE_FIRST_BATTLE 0x0010 #define BATTLE_TYPE_20 0x0020 -#define BATTLE_TYPE_40 0x0040 +#define BATTLE_TYPE_MULTI 0x0040 #define BATTLE_TYPE_SAFARI 0x0080 #define BATTLE_TYPE_BATTLE_TOWER 0x0100 #define BATTLE_TYPE_WALLY_TUTORIAL 0x0200 @@ -16,6 +16,11 @@ #define BATTLE_TYPE_KYOGRE_GROUDON 0x1000 #define BATTLE_TYPE_LEGENDARY 0x2000 #define BATTLE_TYPE_REGI 0x4000 +#define BATTLE_TYPE_TWO_VS_ONE 0x8000 +#define BATTLE_TYPE_RECORDED 0x1000000 +#define BATTLE_TYPE_GROUDON 0x10000000 +#define BATTLE_TYPE_KYORGE 0x20000000 +#define BATTLE_TYPE_RAYQUAZA 0x40000000 #define AI_ACTION_UNK1 0x0001 #define AI_ACTION_UNK2 0x0002 |