summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2022-03-09 19:42:26 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2022-03-09 19:42:26 -0500
commit3a562f9896959ff9dd257cac18ed9090bf2be990 (patch)
treebaf2adcd819b37875c9475563fffd432d0c05151 /engine
parent1a6b05111934a94a13145705c6f4be2a68412bf3 (diff)
Identify some wMenuJoypad-related button constants
Diffstat (limited to 'engine')
-rw-r--r--engine/events/buena.asm2
-rw-r--r--engine/items/tmhm.asm2
-rw-r--r--engine/overworld/decorations.asm2
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/events/buena.asm b/engine/events/buena.asm
index bc175d34f..91f73ca72 100644
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -234,7 +234,7 @@ Buena_PrizeMenu:
ld a, [wMenuCursorY]
ld [wMenuSelection], a
ld a, [wMenuJoypad]
- cp $2
+ cp B_BUTTON
jr z, .cancel
ld a, c
and a
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index 1db310486..d4d7d7bb3 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -290,7 +290,7 @@ TMHM_CheckHoveringOverCancel:
TMHM_ExitPack:
call TMHM_PlaySFX_ReadText2
_TMHM_ExitPack:
- ld a, $2
+ ld a, B_BUTTON
ld [wMenuJoypad], a
and a
ret
diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm
index 4acebba19..23978d049 100644
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -376,7 +376,7 @@ PopulateDecoCategoryMenu:
ld [wMenuScrollPosition], a
call ScrollingMenu
ld a, [wMenuJoypad]
- cp 2
+ cp B_BUTTON
jr z, .no_action_2
call DoDecorationAction2