diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
| commit | 431c60c92c59ba0c2d5a658e0c490f46162bb5d2 (patch) | |
| tree | 7f03009ed9475a0f8e7aac6ed6ca2ab89a527577 /src/battle_controller_link_opponent.c | |
| parent | 8b462f3f6c30de55767808136861e892fc3f0356 (diff) | |
| parent | 8b80b417e2172a44098a22473717da20585bd15d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
Diffstat (limited to 'src/battle_controller_link_opponent.c')
| -rw-r--r-- | src/battle_controller_link_opponent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 6604fa142..ce22c605f 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1267,9 +1267,9 @@ static void LinkOpponentHandleDrawTrainerPic(void) else { xPos = 176; - if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) + if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) { - trainerPicId = sub_8068B48(); + trainerPicId = GetUnionRoomTrainerPic(); } else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN) |