pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Identify some wMenuJoypad-related button constants

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/events/buena.asm
View File

@ -234,7 +234,7 @@ Buena_PrizeMenu:
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld [wMenuSelection], a ld [wMenuSelection], a
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp $2 cp B_BUTTON
jr z, .cancel jr z, .cancel
ld a, c ld a, c
and a and a

2
engine/items/tmhm.asm
View File

@ -290,7 +290,7 @@ TMHM_CheckHoveringOverCancel:
TMHM_ExitPack: TMHM_ExitPack:
call TMHM_PlaySFX_ReadText2 call TMHM_PlaySFX_ReadText2
_TMHM_ExitPack: _TMHM_ExitPack:
ld a, $2 ld a, B_BUTTON
ld [wMenuJoypad], a ld [wMenuJoypad], a
and a and a
ret ret

2
engine/overworld/decorations.asm
View File

@ -376,7 +376,7 @@ PopulateDecoCategoryMenu:
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
call ScrollingMenu call ScrollingMenu
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp 2 cp B_BUTTON
jr z, .no_action_2 jr z, .no_action_2
call DoDecorationAction2 call DoDecorationAction2

10
mobile/mobile_22.asm
View File

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

6
mobile/mobile_22_2.asm
View File

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