Identify some wMenuJoypad-related button constants

This commit is contained in:
Rangi 2022-03-09 19:42:26 -05:00
parent 1a6b051119
commit 3a562f9896
5 changed files with 11 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -2136,9 +2136,9 @@ Function89dab:
ld hl, wMenuJoypadFilter
and [hl]
ret z
bit 0, a
bit A_BUTTON_F, a
jr nz, .asm_89dc7
bit 1, a
bit B_BUTTON_F, a
jr nz, .asm_89dd9
xor a
ret
@ -2943,9 +2943,9 @@ Function8a383:
ld hl, wMenuJoypadFilter
and [hl]
ret z
bit 0, a
bit A_BUTTON_F, a
jr nz, .asm_8a399
bit 1, a
bit B_BUTTON_F, a
jr nz, .asm_8a39e
xor a
ret
@ -3664,7 +3664,7 @@ Function8a930:
.asm_8a943
call Function8b7bd
ld a, [wMenuJoypad]
and $1
and A_BUTTON
jr nz, .asm_8a953
ld a, c
and a

View File

@ -800,15 +800,15 @@ Function8b7bd:
call ScrollingMenu
call Mobile_DisableSpriteUpdates
ld a, [wMenuJoypad]
cp $2
cp B_BUTTON
jr z, .asm_8b823
cp $20
cp D_LEFT
jr nz, .asm_8b813
call Function8b832
jr .asm_8b7ea
.asm_8b813
cp $10
cp D_RIGHT
jr nz, .asm_8b81c
call Function8b83e
jr .asm_8b7ea