diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
commit | 6bd6cfcac7ae76806c8c9d940163dc3ece6a9acf (patch) | |
tree | f71ad889881572488c2a2be299c50fc09393e1a2 /src/recorded_battle.c | |
parent | 0e8d6645f84057a9eaf9e60ac9312bc259f15be1 (diff) | |
parent | 4554b546ef1699d4b3bde9ef27e7477e620d38d9 (diff) |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/recorded_battle.c')
-rw-r--r-- | src/recorded_battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 4f3fe4ab9..c88229c61 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -19,7 +19,7 @@ | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \ | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI \ | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE \ - | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA)) + | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA)) extern u32 gBattleTypeFlags; extern u16 gTrainerBattleOpponent_A; |