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

Ability access cleanup for #6550 (#6565)

Browse Source
This commit is contained in:
Pawkkie 2025-04-09 09:37:59 -04:00 committed by GitHub
parent 3d68061f23
commit 89da80b9d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_ai_util.c
View File

@ -3132,9 +3132,9 @@ static inline bool32 DoesBattlerBenefitFromAllVolatileStatus(u32 battler, u32 ab
bool32 ShouldPoison(u32 battlerAtk, u32 battlerDef)
{
u32 defAbility = GetBattlerAbility(battlerDef);
u32 defAbility = AI_DATA->abilities[battlerDef];
// Battler can be poisoned and has move/ability that synergizes with being poisoned
if (CanBePoisoned(battlerAtk, battlerDef, GetBattlerAbility(battlerDef)) && (
if (CanBePoisoned(battlerAtk, battlerDef, defAbility) && (
DoesBattlerBenefitFromAllVolatileStatus(battlerDef, defAbility)
|| defAbility == ABILITY_POISON_HEAL
|| (defAbility == ABILITY_TOXIC_BOOST && HasMoveWithCategory(battlerDef, DAMAGE_CATEGORY_PHYSICAL))))
@ -3152,7 +3152,7 @@ bool32 ShouldPoison(u32 battlerAtk, u32 battlerDef)
bool32 ShouldBurn(u32 battlerAtk, u32 battlerDef)
{
u32 defAbility = GetBattlerAbility(battlerDef);
u32 defAbility = AI_DATA->abilities[battlerDef];
// Battler can be burned and has move/ability that synergizes with being burned
if (CanBeBurned(battlerDef, defAbility) && (
DoesBattlerBenefitFromAllVolatileStatus(battlerDef, defAbility)
@ -3186,7 +3186,7 @@ bool32 ShouldFreezeOrFrostbite(u32 battlerAtk, u32 battlerDef)
}
else
{
u32 defAbility = GetBattlerAbility(battlerDef);
u32 defAbility = AI_DATA->abilities[battlerDef];
// Battler can be frostbitten and has move/ability that synergizes with being frostbitten
if (CanBeFrozen(battlerDef) &&
DoesBattlerBenefitFromAllVolatileStatus(battlerDef, defAbility))
@ -3206,7 +3206,7 @@ bool32 ShouldFreezeOrFrostbite(u32 battlerAtk, u32 battlerDef)
bool32 ShouldParalyze(u32 battlerAtk, u32 battlerDef)
{
u32 defAbility = GetBattlerAbility(battlerDef);
u32 defAbility = AI_DATA->abilities[battlerDef];
// Battler can be paralyzed and has move/ability that synergizes with being paralyzed
if (CanBeParalyzed(battlerDef, defAbility) && (
DoesBattlerBenefitFromAllVolatileStatus(battlerDef, defAbility)))