diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:51:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:51:58 -0400 |
| commit | ebb6c4ee661758874972956a94eb06d38eaa18a8 (patch) | |
| tree | bccf414f4a854c2fd88290cbe5c221f56ba34f17 /src/battle_main.c | |
| parent | c0bc7e8f7b94ebab1e39b761aa194630e4c7bf6b (diff) | |
| parent | 9ff261ac2a249a669a42381509ef288287535b4f (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index e3eea60d0..dd31e12d5 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -995,7 +995,7 @@ static void CB2_HandleStartBattle(void) sub_8036A5C(); SetPlayerBerryDataInBattleStruct(); - if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) + if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) { gLinkPlayers[0].id = 0; gLinkPlayers[1].id = 1; |