summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorIdain <luiscarlosholguinperez@outlook.com>2022-01-24 21:48:21 -0400
committerGitHub <noreply@github.com>2022-01-24 20:48:21 -0500
commite9494770894c0504a21e1e130ef51f1d97accaf8 (patch)
tree6bedec8fd85af6e5896be6c2aa607a0f8aed6ffc /engine
parent1dc88cb5854a15337997c6236aed01021a9d46f7 (diff)
Document Return/Frustration bug and its fix (#872)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/move_effects/frustration.asm5
1 files changed, 2 insertions, 3 deletions
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