summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2022-03-09 19:42:31 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2022-03-09 19:42:31 -0500
commitfddd1c132bd526cc9b15c14896becfc30288a049 (patch)
treec96497e4f6a9b99f90c3d7c8b14622a7331fa0b2
parent9a97c99f382477a8a17230519333222015dd2ae6 (diff)
Identify some wMenuJoypad-related button constants
-rw-r--r--engine/items/tmhm.asm2
-rw-r--r--engine/overworld/decorations.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index f8986c17..b9a4ec9e 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -288,7 +288,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 813cc1ed..01691382 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