Epsilon_02/pokeemerald-modern
1
0
Fork 0
mirror of https://github.com/resetes12/pokeemerald synced 2025-10-06 00:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

EV and IV scaling doesn't get disabled after becoming champion, but doesn't apply to Frontier type battles

Browse Source
This commit is contained in:
resetes12
2025-08-25 10:13:15 +02:00
parent 2cff4b0ac1
commit 381f289131
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_main.c
View File

@@ -2419,7 +2419,9 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
gBattleTypeFlags |= gTrainers[trainerNum].doubleBattle;
//tx_randomizer_and_challenges
if (gSaveBlock1Ptr->tx_Challenges_TrainerScalingIVs && !FlagGet(FLAG_IS_CHAMPION))
if (gSaveBlock1Ptr->tx_Challenges_TrainerScalingIVs && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER
| BATTLE_TYPE_EREADER_TRAINER
| BATTLE_TYPE_TRAINER_HILL)))
{
u8 iv = GetCurrentTrainerIVs();
@@ -2433,7 +2435,9 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
CalculateMonStats(&party[i]);
}
}
if (gSaveBlock1Ptr->tx_Challenges_TrainerScalingEVs && !FlagGet(FLAG_IS_CHAMPION))
if (gSaveBlock1Ptr->tx_Challenges_TrainerScalingEVs && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER
| BATTLE_TYPE_EREADER_TRAINER
| BATTLE_TYPE_TRAINER_HILL)))
{
u8 ev = GetCurrentTrainerEVs();