Fixed AI_WhoStrikesFirst considering status priority moves when it shouldn't (#3064)

This commit is contained in:
ghoulslash 2023-06-24 13:26:59 -04:00 committed by GitHub
commit 5f147925a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1096,10 +1096,11 @@ u8 AI_WhoStrikesFirst(u8 battlerAI, u8 battler2, u16 moveConsidered)
prioAI = GetMovePriority(battlerAI, moveConsidered);
for (i = 0; i < MAX_MON_MOVES; i++)
{
if (battler2Moves[i] == 0 || battler2Moves[i] == 0xFFFF)
prioBattler2 = GetMovePriority(battler2, battler2Moves[i]);
if (battler2Moves[i] == 0 || battler2Moves[i] == 0xFFFF
|| (prioBattler2 > prioAI && !CanIndexMoveFaintTarget(battler2, battlerAI, i , 2)))
continue;
prioBattler2 = GetMovePriority(battler2, battler2Moves[i]);
if (prioAI > prioBattler2)
fasterAI++;
else if (prioBattler2 > prioAI)