diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2020-10-25 23:55:38 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2020-10-25 23:55:38 -0400 |
| commit | 4c10f3f4651d6ac523eaabf34c20614b3cf03df8 (patch) | |
| tree | e7f7855f191cdcb4259f70889edef3ea1ce48fa7 | |
| parent | c7d624edeb396d8f7aaff0448f57ca8b1ca7f228 (diff) | |
port GetFrontierOpponentClass fakematch fix
| -rw-r--r-- | src/battle_tower.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 0333c4397..9d632b444 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1447,7 +1447,7 @@ u8 GetFrontierOpponentClass(u16 trainerId) } else if (trainerId == TRAINER_FRONTIER_BRAIN) { - trainerClass = GetFrontierBrainTrainerClass(); + return GetFrontierBrainTrainerClass(); } else if (trainerId == TRAINER_STEVEN_PARTNER) { @@ -1466,9 +1466,6 @@ u8 GetFrontierOpponentClass(u16 trainerId) else { trainerClass = gFacilityClassToTrainerClass[gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass]; - #ifndef NONMATCHING - asm(""); - #endif } } else @@ -1480,9 +1477,6 @@ u8 GetFrontierOpponentClass(u16 trainerId) else { trainerClass = gFacilityClassToTrainerClass[gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass]; - #ifndef NONMATCHING - asm(""); - #endif } } |