diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:13:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 11:13:58 -0500 |
| commit | 1d006c26616889c7f53ba418c34d0cb151d5ba86 (patch) | |
| tree | c5a81e833e822125212ae676fbd0cfae4bd1daae /include/constants/battle.h | |
| parent | 4ab216f309fe2db2cd2abfa775fa235f59178791 (diff) | |
| parent | 04130a97d9ff799c9f1b439d091c0116adb31bfb (diff) | |
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'include/constants/battle.h')
| -rw-r--r-- | include/constants/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h index 63be37936..a80038f2c 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -71,7 +71,7 @@ #define BATTLE_TYPE_x800000 0x800000 #define BATTLE_TYPE_RECORDED 0x1000000 #define BATTLE_TYPE_x2000000 0x2000000 -#define BATTLE_TYPE_TRAINER_HILL 0x4000000 +#define BATTLE_TYPE_x4000000 0x4000000 #define BATTLE_TYPE_SECRET_BASE 0x8000000 #define BATTLE_TYPE_GROUDON 0x10000000 #define BATTLE_TYPE_KYOGRE 0x20000000 |