aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie/evolution.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
committerdannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
commitca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch)
tree209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/movie/evolution.asm
parentUse more ldpikacry (diff)
parentRequire RGBDS 0.9.3 for its DMG palette specs (#513) (diff)
downloadpokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie/evolution.asm')
-rw-r--r--engine/movie/evolution.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm
index 99f14322..9d24c0d5 100644
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
@@ -141,7 +141,7 @@ Evolution_CheckForCancel:
call JoypadLowSensitivity
ldh a, [hJoy5]
pop bc
- and B_BUTTON
+ and PAD_B
jr nz, .pressedB
.notAllowedToCancel
dec c