diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-11-03 09:28:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 09:28:45 -0500 |
| commit | 99dd461befcfe3bef3ce188fea2fb372c2f21b98 (patch) | |
| tree | 2b0198d394186c371987f018677d12f929a66a44 /src/battle_tower.c | |
| parent | 9e55ae22b19d58eca8fc0cdd2fcea9f2cca14319 (diff) | |
| parent | ca950a8daf6dd95ab5dacc51f250fea7b605361c (diff) | |
Merge pull request #1189 from aaaaaa123456789/reverts
Undo PokeCodec's PRs and port changes
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 046362105..b7d03a5bc 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1446,7 +1446,7 @@ u8 GetFrontierOpponentClass(u16 trainerId) } else if (trainerId == TRAINER_FRONTIER_BRAIN) { - return GetFrontierBrainTrainerClass(); // This sticks out like a sore thumb, but this is the only other way that matches. Maybe it SHOULD be assigned to ret, or all early returns. I don't know. + return GetFrontierBrainTrainerClass(); } else if (trainerId == TRAINER_STEVEN_PARTNER) { |