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

Fix Wonder Guard potential double switching (#6737)

Browse Source
This commit is contained in:
Pawkkie 2025-04-30 18:16:48 -04:00 committed by GitHub
parent 55f9f6adea
commit 4b1789ab1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/battle_ai_switch_items.c
View File

@ -411,7 +411,7 @@ static bool32 ShouldSwitchIfAllMovesBad(u32 battler)
return FALSE;
}
static bool32 FindMonThatHitsWonderGuard(u32 battler)
static bool32 ShouldSwitchIfWonderGuard(u32 battler)
{
u32 opposingBattler = GetOppositeBattler(battler);
u32 i, move;
@ -434,7 +434,12 @@ static bool32 FindMonThatHitsWonderGuard(u32 battler)
}
if (RandomPercentage(RNG_AI_SWITCH_WONDER_GUARD, GetSwitchChance(SHOULD_SWITCH_WONDER_GUARD)))
return FindMonWithMoveOfEffectiveness(battler, opposingBattler, UQ_4_12(2.0));
{
if (AI_DATA->mostSuitableMonId[battler] == PARTY_SIZE) // No good candidate mons, find any one that can deal damage
return FindMonWithMoveOfEffectiveness(battler, opposingBattler, UQ_4_12(2.0));
else // Good candidate mon, send that in
return SetSwitchinAndSwitch(battler, PARTY_SIZE);
}
return FALSE;
}
@ -1145,7 +1150,7 @@ bool32 ShouldSwitch(u32 battler)
// FindMon functions can prompt a switch to specific party members that override GetMostSuitableMonToSwitchInto
// The rest can prompt a switch to party member returned by GetMostSuitableMonToSwitchInto
if (FindMonThatHitsWonderGuard(battler))
if (ShouldSwitchIfWonderGuard(battler))
return TRUE;
if ((AI_THINKING_STRUCT->aiFlags[GetThinkingBattler(battler)] & AI_FLAG_SMART_SWITCHING) && (CanMonSurviveHazardSwitchin(battler) == FALSE))
return FALSE;