diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
| commit | cb229f56e8951e3f9efc35516447a54e18e8fef0 (patch) | |
| tree | 656599caae716c6cc8e81121f2b1cd061927b99e /src/recorded_battle.c | |
| parent | c3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff) | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
fix pokeblock conflicts
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; |