diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
| commit | beeb673ba16e02cacadb2de0ee3608d2106ed14a (patch) | |
| tree | 8924e783fc8af67286cf45abcef95c065a3fd223 /src/battle_main.c | |
| parent | 2ed1f7c6f92abe93d86b921709576b82970f0848 (diff) | |
| parent | ebade7affb31d5bcdc17cdcd3895758010ee6f66 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
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; |