Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use combined joypad masks

Browse Source
This commit is contained in:
Rangi42
2025-06-29 16:18:42 -04:00
committed by Rangi
parent 5abf8d01fb
commit de396249e1
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/items/tmhm.asm
View File

@@ -206,7 +206,7 @@ TMHM_PocketLoop:
ld [w2DMenuFlags2], a ld [w2DMenuFlags2], a
ld a, $20 ld a, $20
ld [w2DMenuCursorOffsets], a ld [w2DMenuCursorOffsets], a
ld a, PAD_A | PAD_B | PAD_UP | PAD_DOWN | PAD_LEFT | PAD_RIGHT ld a, PAD_A | PAD_B | PAD_CTRL_PAD
ld [wMenuJoypadFilter], a ld [wMenuJoypadFilter], a
ld a, [wTMHMPocketCursor] ld a, [wTMHMPocketCursor]
inc a inc a

2
engine/pokegear/pokegear.asm
View File

@@ -463,7 +463,7 @@ PokegearClock_Joypad:
call .UpdateClock call .UpdateClock
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]
and PAD_A | PAD_B | PAD_START | PAD_SELECT and PAD_BUTTONS
jr nz, .quit jr nz, .quit
ld a, [hl] ld a, [hl]
and PAD_RIGHT and PAD_RIGHT

2
engine/pokemon/mon_menu.asm
View File

@@ -1084,7 +1084,7 @@ MoveScreen2DMenuData:
db _2DMENU_ENABLE_SPRITE_ANIMS ; flags 1 db _2DMENU_ENABLE_SPRITE_ANIMS ; flags 1
db 0 ; flags 2 db 0 ; flags 2
dn 2, 0 ; cursor offsets dn 2, 0 ; cursor offsets
db PAD_UP | PAD_DOWN | PAD_LEFT | PAD_RIGHT | PAD_A | PAD_B ; accepted buttons db PAD_CTRL_PAD | PAD_A | PAD_B ; accepted buttons
String_MoveWhere: String_MoveWhere:
db "Where?@" db "Where?@"

2
engine/pokemon/stats_screen.asm
View File

@@ -253,7 +253,7 @@ MonStatsJoypad:
ret ret
.next .next
and PAD_DOWN | PAD_UP | PAD_LEFT | PAD_RIGHT | PAD_A | PAD_B and PAD_CTRL_PAD | PAD_A | PAD_B
jp StatsScreen_JoypadAction jp StatsScreen_JoypadAction
StatsScreenWaitCry: StatsScreenWaitCry:

4
home/joypad.asm
View File

@@ -97,8 +97,8 @@ endr
; Now that we have the input, we can do stuff with it. ; Now that we have the input, we can do stuff with it.
; For example, soft reset: ; For example, soft reset:
and PAD_A | PAD_B | PAD_SELECT | PAD_START and PAD_BUTTONS
cp PAD_A | PAD_B | PAD_SELECT | PAD_START cp PAD_BUTTONS
jp z, Reset jp z, Reset
ret ret

4
home/scrolling_menu.asm
View File

@@ -52,10 +52,10 @@ JoyTextDelay_ForcehJoyDown::
ldh [hInMenu], a ldh [hInMenu], a
ldh a, [hJoyLast] ldh a, [hJoyLast]
and PAD_RIGHT + PAD_LEFT + PAD_UP + PAD_DOWN and PAD_CTRL_PAD
ld c, a ld c, a
ldh a, [hJoyPressed] ldh a, [hJoyPressed]
and PAD_A + PAD_B + PAD_SELECT + PAD_START and PAD_BUTTONS
or c or c
ld c, a ld c, a
ret ret