diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-03 17:56:36 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-03 17:56:36 +0100 |
| commit | 0d122bc8311857329745c03d924e80ffe3853ff8 (patch) | |
| tree | e35a6bbb2b00db51da182d71e3f21471ffd16aa1 /src/battle_dome.c | |
| parent | e1829c40abf547830d72b857db19de135be77e67 (diff) | |
| parent | ffa8655f4cd2cb8d6b1bdacc0a5568259eb60a72 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/battle_dome.c')
| -rw-r--r-- | src/battle_dome.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index 152a11ae8..0f5721fb9 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -4791,7 +4791,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) i = 0; if (trainerId == TRAINER_PLAYER) - j = gFacilityClassToTrainerClass[FACILITY_CLASS_PKMN_TRAINER_BRENDAN]; + j = gFacilityClassToTrainerClass[FACILITY_CLASS_BRENDAN]; else if (trainerId == TRAINER_FRONTIER_BRAIN) j = GetDomeBrainTrainerClass(); else |