From 47bf5b2840d1a024bb27a1b7753598fe544103c6 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 12 Jan 2021 22:45:02 -0700 Subject: [PATCH] a few tweaks --- src/battle_ai_main.c | 9 ++++----- src/battle_ai_util.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 0b60efb6a8..2df626d2d7 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -363,7 +363,7 @@ static u8 ChooseMoveOrAction_Doubles(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) BattleAI_SetupAIData(gBattleStruct->palaceFlags >> 4); else - BattleAI_SetupAIData((1 << MAX_MON_MOVES) - 1); + BattleAI_SetupAIData(0xF); gBattlerTarget = i; GetAiLogicData(sBattler_AI, gBattlerTarget); @@ -1741,18 +1741,17 @@ static s16 AI_CheckBadMove(u8 battlerAtk, u8 battlerDef, u16 move, s16 score) if (decreased) break; - if (gBattleMons[battlerDef].status2 & STATUS2_RECHARGE) + if (IsBattlerIncapacitated(battlerDef, AI_DATA->defAbility)) { score -= 10; break; } - if (gBattleMoves[gLastResultingMoves[battlerAtk]].effect == EFFECT_PROTECT - && move != MOVE_QUICK_GUARD + if (move != MOVE_QUICK_GUARD && move != MOVE_WIDE_GUARD && move != MOVE_CRAFTY_SHIELD) //These moves have infinite usage { - if (GetBattlerSecondaryDamage(battlerAtk) + if (GetBattlerSecondaryDamage(battlerAtk) >= gBattleMons[battlerAtk].hp && AI_DATA->defAbility != ABILITY_MOXIE && AI_DATA->defAbility != ABILITY_BEAST_BOOST) { diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 71563b665f..676091675e 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -2643,7 +2643,7 @@ bool32 AI_CanBeInfatuated(u8 battlerAtk, u8 battlerDef, u16 defAbility, u8 atkGe || atkGender == defGender || atkGender == MON_GENDERLESS || defGender == MON_GENDERLESS - || !IsAbilityOnSide(battlerDef, ABILITY_AROMA_VEIL)) + || IsAbilityOnSide(battlerDef, ABILITY_AROMA_VEIL)) return FALSE; return TRUE; }