atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port GetFrontierOpponentClass fakematch fix

Browse source
This commit is contained in:
Kurausukun 2020-10-25 23:55:38 -04:00
parent c7d624edeb
commit 4c10f3f465
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();
} }
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
} }
} }