ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match Battle Tower

Browse Source
This commit is contained in:
PokeCodec 2020-09-09 11:21:16 -04:00
parent a3a8c23e00
commit aa45c05a3e
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_tower.c
View File

@ -1447,7 +1447,7 @@ u8 GetFrontierOpponentClass(u16 trainerId)
} }
else if (trainerId == TRAINER_FRONTIER_BRAIN) else if (trainerId == TRAINER_FRONTIER_BRAIN)
{ {
trainerClass = GetFrontierBrainTrainerClass(); 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.
} }
else if (trainerId == TRAINER_STEVEN_PARTNER) else if (trainerId == TRAINER_STEVEN_PARTNER)
{ {
@ -1466,9 +1466,6 @@ u8 GetFrontierOpponentClass(u16 trainerId)
else else
{ {
trainerClass = gFacilityClassToTrainerClass[gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass]; trainerClass = gFacilityClassToTrainerClass[gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass];
#ifndef NONMATCHING
asm("");
#endif
} }
} }
else else
@ -1480,9 +1477,6 @@ u8 GetFrontierOpponentClass(u16 trainerId)
else else
{ {
trainerClass = gFacilityClassToTrainerClass[gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass]; trainerClass = gFacilityClassToTrainerClass[gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass];
#ifndef NONMATCHING
asm("");
#endif
} }
} }