Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-29 05:18:30 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes bug for affectionScore in doubles for spread moves (#7395)

Browse Source
This commit is contained in:
Alex
2025-07-25 15:32:45 +02:00
committed by GitHub
parent 219823f9a9
commit 845838bbc0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_script_commands.c
View File

@@ -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)