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

Fix AI Sheer Force checks to allow Order Up’s Commander stat boost (#9250)

Browse Source
This commit is contained in:
GGbond 2026-02-18 22:39:55 +08:00 committed by GitHub
parent 56f22adc15
commit 33b89f227d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_ai_main.c
View File

@ -5694,8 +5694,11 @@ static s32 AI_CalcAdditionalEffectScore(u32 battlerAtk, u32 battlerDef, u32 move
u32 i;
u32 additionalEffectCount = GetMoveAdditionalEffectCount(move);
if (IsSheerForceAffected(move, aiData->abilities[battlerAtk]))
if (IsSheerForceAffected(move, aiData->abilities[battlerAtk])
&& !(GetMoveEffect(move) == EFFECT_ORDER_UP && gBattleStruct->battlerState[battlerAtk].commanderSpecies != SPECIES_NONE))
{
return score;
}
// check move additional effects that are likely to happen
for (i = 0; i < additionalEffectCount; i++)

5
src/battle_ai_util.c
View File

@ -1034,8 +1034,11 @@ static bool32 AI_IsMoveEffectInPlus(u32 battlerAtk, u32 battlerDef, u32 move, s3
enum Ability abilityDef = gAiLogicData->abilities[battlerDef];
enum Ability abilityAtk = gAiLogicData->abilities[battlerAtk];
if (IsSheerForceAffected(move, abilityAtk))
if (IsSheerForceAffected(move, abilityAtk)
&& !(GetMoveEffect(move) == EFFECT_ORDER_UP && gBattleStruct->battlerState[battlerAtk].commanderSpecies != SPECIES_NONE))
{
return FALSE;
}
switch (GetMoveEffect(move))
{