Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Starting Status being passed on to future wild battles (#5248)

Browse Source
This commit is contained in:
PhallenTree 2024-08-24 13:28:24 +01:00 committed by GitHub
parent 4208da1e22
commit 85fe398b50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_main.c
View File

@ -3755,7 +3755,7 @@ static void DoBattleIntro(void)
gBattleStruct->startingStatus = GetTrainerStartingStatusFromId(gTrainerBattleOpponent_B);
gBattleStruct->startingStatusTimer = 0; // infinite
}
else if (GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A))
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A))
{
gBattleStruct->startingStatus = GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A);
gBattleStruct->startingStatusTimer = 0; // infinite