From 4903d9d90b554fcd1adcf9b9a6527eab752e9378 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sun, 6 Oct 2024 14:06:59 -0400 Subject: [PATCH 1/2] fix AI mirror move check viability call --- src/battle_ai_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 903b0c7d9f8..164859f7488 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -3316,7 +3316,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) break; case EFFECT_MIRROR_MOVE: if (predictedMove != MOVE_NONE) - return AI_CheckViability(battlerAtk, battlerDef, gLastMoves[battlerDef], score); + return AI_CheckViability(battlerAtk, battlerDef, predictedMove, score); break; case EFFECT_ATTACK_UP: case EFFECT_ATTACK_UP_USER_ALLY: From 17ba6b0433efad2a5c4d18b17de3ecd5f150b7ec Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sun, 6 Oct 2024 14:19:42 -0400 Subject: [PATCH 2/2] fix EFFECT_ABSORB missing break in AI_CalcMoveEffectScore --- src/battle_ai_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 164859f7488..e41be6971c9 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -3302,6 +3302,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) case EFFECT_ABSORB: if (aiData->holdEffects[battlerAtk] == HOLD_EFFECT_BIG_ROOT && effectiveness >= AI_EFFECTIVENESS_x1) ADJUST_SCORE(DECENT_EFFECT); + break; case EFFECT_EXPLOSION: case EFFECT_MEMENTO: if (AI_THINKING_STRUCT->aiFlags[battlerAtk] & AI_FLAG_WILL_SUICIDE && gBattleMons[battlerDef].statStages[STAT_EVASION] < 7)