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

Update hardware.inc to 5.1.0

Browse Source
This commit is contained in:
Rangi42
2025-06-29 15:53:34 -04:00
committed by Rangi
parent 8f5a8c5b5b
commit 5abf8d01fb
84 changed files with 845 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/menus/menu.asm
View File

@@ -71,7 +71,7 @@ Mobile_GetMenuSelection:
bit STATICMENU_ENABLE_SELECT_F, a
jr z, .skip
call GetMenuJoypad
bit SELECT_F, a
bit B_PAD_SELECT, a
jr nz, .quit1
.skip
@@ -79,7 +79,7 @@ Mobile_GetMenuSelection:
bit STATICMENU_DISABLE_B_F, a
jr nz, .skip2
call GetMenuJoypad
bit B_BUTTON_F, a
bit B_PAD_B, a
jr nz, .quit2
.skip2
@@ -232,14 +232,14 @@ Init2DMenuCursorPosition:
.InitFlags_c:
ld hl, wMenuDataFlags
ld a, A_BUTTON
ld a, PAD_A
bit STATICMENU_DISABLE_B_F, [hl]
jr nz, .skip
or B_BUTTON
or PAD_B
.skip
bit STATICMENU_ENABLE_SELECT_F, [hl]
jr z, .skip2
or SELECT
or PAD_SELECT
.skip2
ld [wMenuJoypadFilter], a
ret
@@ -369,21 +369,21 @@ Menu_WasButtonPressed:
_2DMenuInterpretJoypad:
call GetMenuJoypad
bit A_BUTTON_F, a
bit B_PAD_A, a
jp nz, .a_b_start_select
bit B_BUTTON_F, a
bit B_PAD_B, a
jp nz, .a_b_start_select
bit SELECT_F, a
bit B_PAD_SELECT, a
jp nz, .a_b_start_select
bit START_F, a
bit B_PAD_START, a
jp nz, .a_b_start_select
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr nz, .d_right
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .d_left
bit D_UP_F, a
bit B_PAD_UP, a
jr nz, .d_up
bit D_DOWN_F, a
bit B_PAD_DOWN, a
jr nz, .d_down
and a
ret
@@ -776,10 +776,10 @@ _InitVerticalMenuCursor::
ln a, 2, 0
ld [hli], a
; wMenuJoypadFilter
ld a, A_BUTTON
ld a, PAD_A
bit STATICMENU_DISABLE_B_F, b
jr nz, .skip_bit_1
add B_BUTTON
add PAD_B
.skip_bit_1
ld [hli], a
; wMenuCursorY