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

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