From 845838bbc0281ab2ca7b69c92b6576e649c22bd5 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri, 25 Jul 2025 15:32:45 +0200 Subject: [PATCH] Fixes bug for affectionScore in doubles for spread moves (#7395) --- src/battle_script_commands.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index fcd325305c..eb0738a24e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2177,7 +2177,7 @@ static void Cmd_adjustdamage(void) u8 param; u32 battlerDef; u32 rand = Random() % 100; - u32 affectionScore = GetBattlerAffectionHearts(gBattlerTarget); + u32 affectionScore; u32 moveTarget = GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove); enum BattleMoveEffects moveEffect = GetMoveEffect(gCurrentMove); bool32 calcSpreadMoveDamage = IsSpreadMove(moveTarget) && !IsBattleMoveStatus(gCurrentMove); @@ -2221,7 +2221,8 @@ static void Cmd_adjustdamage(void) holdEffect = GetBattlerHoldEffect(battlerDef, TRUE); param = GetBattlerHoldEffectParam(battlerDef); - + affectionScore = GetBattlerAffectionHearts(battlerDef); + gPotentialItemEffectBattler = battlerDef; if (moveEffect == EFFECT_FALSE_SWIPE)