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

20
engine/menus/intro_menu.asm
View File

@@ -431,9 +431,9 @@ ConfirmContinue:
call DelayFrame
call GetJoypad
ld hl, hJoyPressed
bit A_BUTTON_F, [hl]
bit B_PAD_A, [hl]
jr nz, .PressA
bit B_BUTTON_F, [hl]
bit B_PAD_B, [hl]
jr z, .loop
scf
ret
@@ -1158,8 +1158,8 @@ TitleScreenMain:
call GetJoypad
ld hl, hJoyDown
ld a, [hl]
and D_UP + B_BUTTON + SELECT
cp D_UP + B_BUTTON + SELECT
and PAD_UP + PAD_B + PAD_SELECT
cp PAD_UP + PAD_B + PAD_SELECT
jr z, .delete_save_data
; To bring up the clock reset dialog:
@@ -1170,8 +1170,8 @@ TitleScreenMain:
jr z, .check_clock_reset
ld a, [hl]
and D_DOWN + B_BUTTON + SELECT
cp D_DOWN + B_BUTTON + SELECT
and PAD_DOWN + PAD_B + PAD_SELECT
cp PAD_DOWN + PAD_B + PAD_SELECT
jr nz, .check_start
ld a, $34
@@ -1181,21 +1181,21 @@ TitleScreenMain:
; Keep Select pressed, and hold Left + Up.
; Then let go of Select.
.check_clock_reset
bit SELECT_F, [hl]
bit B_PAD_SELECT, [hl]
jr nz, .check_start
xor a
ldh [hClockResetTrigger], a
ld a, [hl]
and D_LEFT + D_UP
cp D_LEFT + D_UP
and PAD_LEFT + PAD_UP
cp PAD_LEFT + PAD_UP
jr z, .reset_clock
; Press Start or A to start the game.
.check_start
ld a, [hl]
and START | A_BUTTON
and PAD_START | PAD_A
jr nz, .incave
ret

4
engine/menus/main_menu.asm
View File

@@ -246,9 +246,9 @@ MainMenuJoypadLoop:
ld [w2DMenuFlags1], a
call GetScrollingMenuJoypad
ld a, [wMenuJoypad]
cp B_BUTTON
cp PAD_B
jr z, .b_button
cp A_BUTTON
cp PAD_A
jr z, .a_button
jr .loop

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

32
engine/menus/naming_screen.asm
View File

@@ -398,16 +398,16 @@ NamingScreenJoypadLoop:
.ReadButtons:
ld hl, hJoyPressed
ld a, [hl]
and A_BUTTON
and PAD_A
jr nz, .a
ld a, [hl]
and B_BUTTON
and PAD_B
jr nz, .b
ld a, [hl]
and START
and PAD_START
jr nz, .start
ld a, [hl]
and SELECT
and PAD_SELECT
jr nz, .select
ret
@@ -553,16 +553,16 @@ NamingScreen_AnimateCursor:
.GetDPad:
ld hl, hJoyLast
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .up
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .down
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .left
ld a, [hl]
and D_RIGHT
and PAD_RIGHT
jr nz, .right
ret
@@ -1072,16 +1072,16 @@ INCBIN "gfx/naming_screen/mail.2bpp"
.process_joypad
ld hl, hJoyPressed
ld a, [hl]
and A_BUTTON
and PAD_A
jr nz, .a
ld a, [hl]
and B_BUTTON
and PAD_B
jr nz, .b
ld a, [hl]
and START
and PAD_START
jr nz, .start
ld a, [hl]
and SELECT
and PAD_SELECT
jr nz, .select
ret
@@ -1199,16 +1199,16 @@ ComposeMail_AnimateCursor:
.GetDPad:
ld hl, hJoyLast
ld a, [hl]
and D_UP
and PAD_UP
jr nz, .up
ld a, [hl]
and D_DOWN
and PAD_DOWN
jr nz, .down
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .left
ld a, [hl]
and D_RIGHT
and PAD_RIGHT
jr nz, .right
ret

36
engine/menus/options_menu.asm
View File

@@ -53,7 +53,7 @@ _Option:
.joypad_loop
call JoyTextDelay
ldh a, [hJoyPressed]
and START | B_BUTTON
and PAD_START | PAD_B
jr nz, .ExitOptions
call OptionsControl
jr c, .dpad
@@ -113,9 +113,9 @@ GetOptionPointer:
Options_TextSpeed:
call GetTextSpeed
ldh a, [hJoyPressed]
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr z, .NonePressed
ld a, c ; right pressed
cp OPT_TEXT_SPEED_SLOW
@@ -194,9 +194,9 @@ GetTextSpeed:
Options_BattleScene:
ld hl, wOptions
ldh a, [hJoyPressed]
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr z, .NonePressed
bit BATTLE_SCENE, [hl]
jr nz, .ToggleOn
@@ -233,9 +233,9 @@ Options_BattleScene:
Options_BattleStyle:
ld hl, wOptions
ldh a, [hJoyPressed]
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr z, .NonePressed
bit BATTLE_SHIFT, [hl]
jr nz, .ToggleShift
@@ -271,9 +271,9 @@ Options_BattleStyle:
Options_Sound:
ld hl, wOptions
ldh a, [hJoyPressed]
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr z, .NonePressed
bit STEREO, [hl]
jr nz, .SetMono
@@ -323,9 +323,9 @@ Options_Sound:
Options_Print:
call GetPrinterSetting
ldh a, [hJoyPressed]
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr z, .NonePressed
ld a, c
cp OPT_PRINT_DARKEST
@@ -418,9 +418,9 @@ GetPrinterSetting:
Options_MenuAccount:
ld hl, wOptions2
ldh a, [hJoyPressed]
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr z, .NonePressed
bit MENU_ACCOUNT, [hl]
jr nz, .ToggleOff
@@ -456,9 +456,9 @@ Options_MenuAccount:
Options_Frame:
ld hl, wTextboxFrame
ldh a, [hJoyPressed]
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .LeftPressed
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr nz, .RightPressed
and a
ret
@@ -486,7 +486,7 @@ UpdateFrame:
Options_Cancel:
ldh a, [hJoyPressed]
and A_BUTTON
and PAD_A
jr nz, .Exit
and a
ret
@@ -498,9 +498,9 @@ Options_Cancel:
OptionsControl:
ld hl, wJumptableIndex
ldh a, [hJoyLast]
cp D_DOWN
cp PAD_DOWN
jr z, .DownPressed
cp D_UP
cp PAD_UP
jr z, .UpPressed
and a
ret

38
engine/menus/scrolling_menu.asm
View File

@@ -55,26 +55,26 @@ ScrollingMenuJoyAction:
.loop
call ScrollingMenuJoypad
ldh a, [hJoyLast]
and D_PAD
and PAD_CTRL_PAD
ld b, a
ldh a, [hJoyPressed]
and BUTTONS
and PAD_BUTTONS
or b
bit A_BUTTON_F, a
bit B_PAD_A, a
jp nz, .a_button
bit B_BUTTON_F, a
bit B_PAD_B, a
jp nz, .b_button
bit SELECT_F, a
bit B_PAD_SELECT, a
jp nz, .select
bit START_F, a
bit B_PAD_START, a
jp nz, .start
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jp nz, .d_right
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jp nz, .d_left
bit D_UP_F, a
bit B_PAD_UP, a
jp nz, .d_up
bit D_DOWN_F, a
bit B_PAD_DOWN, a
jp nz, .d_down
jr .loop
@@ -99,12 +99,12 @@ ScrollingMenuJoyAction:
ld a, [wMenuSelection]
cp -1
jr z, .b_button
ld a, A_BUTTON
ld a, PAD_A
scf
ret
.b_button
ld a, B_BUTTON
ld a, PAD_B
scf
ret
@@ -121,7 +121,7 @@ ScrollingMenuJoyAction:
call ScrollingMenu_GetCursorPosition
dec a
ld [wScrollingMenuCursorPosition], a
ld a, SELECT
ld a, PAD_SELECT
scf
ret
@@ -129,7 +129,7 @@ ScrollingMenuJoyAction:
ld a, [wMenuDataFlags]
bit SCROLLINGMENU_ENABLE_START_F, a
jp z, xor_a_dec_a
ld a, START
ld a, PAD_START
scf
ret
@@ -140,7 +140,7 @@ ScrollingMenuJoyAction:
ld a, [wMenuDataFlags]
bit SCROLLINGMENU_ENABLE_LEFT_F, a
jp z, xor_a_dec_a
ld a, D_LEFT
ld a, PAD_LEFT
scf
ret
@@ -151,7 +151,7 @@ ScrollingMenuJoyAction:
ld a, [wMenuDataFlags]
bit SCROLLINGMENU_ENABLE_RIGHT_F, a
jp z, xor_a_dec_a
ld a, D_RIGHT
ld a, PAD_RIGHT
scf
ret
@@ -293,15 +293,15 @@ ScrollingMenu_InitFlags:
ld [w2DMenuFlags2], a
ld a, $20
ld [w2DMenuCursorOffsets], a
ld a, A_BUTTON | B_BUTTON | D_UP | D_DOWN
ld a, PAD_A | PAD_B | PAD_UP | PAD_DOWN
bit SCROLLINGMENU_ENABLE_SELECT_F, c
jr z, .disallow_select
add SELECT
add PAD_SELECT
.disallow_select
bit SCROLLINGMENU_ENABLE_START_F, c
jr z, .disallow_start
add START
add PAD_START
.disallow_start
ld [wMenuJoypadFilter], a

4
engine/menus/start_menu.asm
View File

@@ -104,9 +104,9 @@ StartMenu::
call .PrintMenuAccount
call GetScrollingMenuJoypad
ld a, [wMenuJoypad]
cp B_BUTTON
cp PAD_B
jr z, .b
cp A_BUTTON
cp PAD_A
jr z, .a
jr .loop
.a

12
engine/menus/trainer_card.asm
View File

@@ -25,7 +25,7 @@ TrainerCard:
bit JUMPTABLE_EXIT_F, a
jr nz, .quit
ldh a, [hJoyLast]
and B_BUTTON
and PAD_B
jr nz, .quit
call .RunJumptable
call DelayFrame
@@ -119,7 +119,7 @@ TrainerCard_Page1_Joypad:
call TrainerCard_Page1_PrintGameTime
ld hl, hJoyLast
ld a, [hl]
and D_RIGHT | A_BUTTON
and PAD_RIGHT | PAD_A
jr nz, .pressed_right_a
ret
@@ -159,10 +159,10 @@ TrainerCard_Page2_Joypad:
call TrainerCard_Page2_3_AnimateBadges
ld hl, hJoyLast
ld a, [hl]
and A_BUTTON
and PAD_A
jr nz, .Quit
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .d_left
ret
@@ -207,10 +207,10 @@ TrainerCard_Page3_Joypad:
call TrainerCard_Page2_3_AnimateBadges
ld hl, hJoyLast
ld a, [hl]
and D_LEFT
and PAD_LEFT
jr nz, .left
ld a, [hl]
and D_RIGHT
and PAD_RIGHT
jr nz, .right
ret