From e9494770894c0504a21e1e130ef51f1d97accaf8 Mon Sep 17 00:00:00 2001 From: Idain Date: Mon, 24 Jan 2022 21:48:21 -0400 Subject: Document Return/Frustration bug and its fix (#872) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com> --- engine/battle/move_effects/frustration.asm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'engine') diff --git a/engine/battle/move_effects/frustration.asm b/engine/battle/move_effects/frustration.asm index b07942c76..b8f5529a2 100644 --- a/engine/battle/move_effects/frustration.asm +++ b/engine/battle/move_effects/frustration.asm @@ -1,13 +1,12 @@ BattleCommand_FrustrationPower: ; frustrationpower - push bc ld hl, wBattleMonHappiness ldh a, [hBattleTurn] and a - jr z, .got_happiness + jr z, .ok ld hl, wEnemyMonHappiness -.got_happiness +.ok ld a, $ff sub [hl] ldh [hMultiplicand + 2], a -- cgit v1.2.3