From 699c96afa334ceef7794f5930ffc021b88d136ef Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:36:09 +0200 Subject: [PATCH] Remove SetBattlerData from AI_CalcDamage Since #4156 SetBattlerData and RestoreBattlerData were moved out of `AI_CalcDamage`. I assume this was a bad merge somewhere --- src/battle_ai_util.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 64b2f3074b..83d2995b72 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -512,9 +512,6 @@ struct SimulatedDamage AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u struct AiLogicData *aiData = AI_DATA; gBattleStruct->aiCalcInProgress = TRUE; - SetBattlerData(battlerAtk); - SetBattlerData(battlerDef); - // Temporarily enable gimmicks for damage calcs if planned if (gBattleStruct->gimmick.usableGimmick[battlerAtk] && GetActiveGimmick(battlerAtk) == GIMMICK_NONE && !(gBattleStruct->gimmick.usableGimmick[battlerAtk] == GIMMICK_Z_MOVE && !considerZPower))