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

32
home/menu.asm
View File

@@ -36,10 +36,10 @@ GetMenuJoypad::
push bc
push af
ldh a, [hJoyLast]
and D_PAD
and PAD_CTRL_PAD
ld b, a
ldh a, [hJoyPressed]
and BUTTONS
and PAD_BUTTONS
or b
ld b, a
pop af
@@ -379,7 +379,7 @@ VerticalMenu::
call InitVerticalMenuCursor
call StaticMenuJoypad
call MenuClickSound
bit B_BUTTON_F, a
bit B_PAD_B, a
jr z, .okay
.cancel
scf
@@ -623,14 +623,14 @@ InitMenuCursorAndButtonPermissions::
ld a, [wMenuDataFlags]
bit STATICMENU_ENABLE_START_F, a
jr z, .disallow_start
set START_F, [hl]
set B_PAD_START, [hl]
.disallow_start
ld a, [wMenuDataFlags]
bit STATICMENU_ENABLE_LEFT_RIGHT_F, a
jr z, .disallow_left_right
set D_LEFT_F, [hl]
set D_RIGHT_F, [hl]
set B_PAD_LEFT, [hl]
set B_PAD_RIGHT, [hl]
.disallow_left_right
ret
@@ -647,32 +647,32 @@ GetStaticMenuJoypad::
call StaticMenuJoypad
ContinueGettingMenuJoypad:
bit A_BUTTON_F, a
bit B_PAD_A, a
jr nz, .a_button
bit B_BUTTON_F, a
bit B_PAD_B, a
jr nz, .b_start
bit START_F, a
bit B_PAD_START, a
jr nz, .b_start
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
xor a
ld [wMenuJoypad], a
jr .done
.d_right
ld a, D_RIGHT
ld a, PAD_RIGHT
ld [wMenuJoypad], a
jr .done
.d_left
ld a, D_LEFT
ld a, PAD_LEFT
ld [wMenuJoypad], a
jr .done
.a_button
ld a, A_BUTTON
ld a, PAD_A
ld [wMenuJoypad], a
.done
@@ -689,7 +689,7 @@ ContinueGettingMenuJoypad:
ret
.b_start
ld a, B_BUTTON
ld a, PAD_B
ld [wMenuJoypad], a
ld a, -1
ld [wMenuSelection], a
@@ -792,7 +792,7 @@ ClearWindowData::
MenuClickSound::
push af
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr z, .nosound
ld hl, wMenuFlags
bit MENU_NO_CLICK_SFX_F, [hl]