diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:37 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:37 -0500 |
| commit | 46c1cb5af0f808f56cbb2288dd5741ec6e476998 (patch) | |
| tree | b9ab5e60b66e5a600afc90b41e35ae26ae5cd432 /include | |
| parent | 32153295edc1e93bd27894f75f2ab01f9140bed5 (diff) | |
| parent | f546ea4f0bf95ddd4f4a07f7f83b1abc37cf57ea (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 8f7141803..f05c7369d 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 |