From fddd1c132bd526cc9b15c14896becfc30288a049 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 9 Mar 2022 19:42:31 -0500 Subject: Identify some wMenuJoypad-related button constants --- engine/items/tmhm.asm | 2 +- engine/overworld/decorations.asm | 2 +- 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 -- cgit v1.2.3