ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicate non-user check

Browse Source
This commit is contained in:
Evan 2021-01-27 08:33:43 -07:00
parent 18f5d9f0a3
commit b9e425252d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/battle_ai_main.c
View File

@ -546,21 +546,19 @@ static s16 AI_CheckBadMove(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score -= 10; score -= 10;
} }
// check if negates type // check off screen
if (!(gBattleMoves[move].target & MOVE_TARGET_USER)) if (gStatuses3[battlerDef] & STATUS3_SEMI_INVULNERABLE && GetWhoStrikesFirst(battlerAtk, battlerDef, TRUE) != 1)
{ RETURN_SCORE_MINUS(20); // if target off screen and we go first, don't use move
if (gStatuses3[battlerDef] & STATUS3_SEMI_INVULNERABLE && GetWhoStrikesFirst(battlerAtk, battlerDef, TRUE) != 1)
RETURN_SCORE_MINUS(20); // if target off screen and we go first, don't use move
switch (effectiveness) // check if negates type
{ switch (effectiveness)
case AI_EFFECTIVENESS_x0: {
RETURN_SCORE_MINUS(20); case AI_EFFECTIVENESS_x0:
break; RETURN_SCORE_MINUS(20);
case AI_EFFECTIVENESS_x0_25: break;
RETURN_SCORE_MINUS(10); case AI_EFFECTIVENESS_x0_25:
break; RETURN_SCORE_MINUS(10);
} break;
} }
// target ability checks // target ability checks
@ -2422,7 +2420,7 @@ static s16 AI_TryToFaint(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
{ {
// this move can faint the target // this move can faint the target
if (GetWhoStrikesFirst(battlerAtk, battlerDef, TRUE) == 0 || GetMovePriority(battlerAtk, move) > 0) if (GetWhoStrikesFirst(battlerAtk, battlerDef, TRUE) == 0 || GetMovePriority(battlerAtk, move) > 0)
score += 4; score += 4; // we go first or we're using priority move
else else
score += 2; score += 2;
} }