aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/effects.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-05-10 12:25:27 -0500
committerdannye <33dannye@gmail.com>2025-05-10 12:25:27 -0500
commit2c74f137fc42cf7eaffa0a6f9046e4aa89887f91 (patch)
treec52fc10a17597a1d04b63b79c6df78cc1b00de41 /engine/battle/effects.asm
parentFix hardcoded address in VC patch (diff)
parentUse features new to RGBDS 0.9.2 (#506) (diff)
downloadpokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.gz
pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.xz
pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle/effects.asm')
-rw-r--r--engine/battle/effects.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index 28e78c3d..d7c7b9cb 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -1388,7 +1388,7 @@ DisableEffect:
or [hl]
inc hl
or [hl]
- and $3f
+ and PP_MASK
pop hl ; wBattleMonPP or wEnemyMonPP
jr z, .moveMissedPopHL ; nothing to do if all moves have no PP left
add hl, bc