mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Use input constants
This commit is contained in:
parent
f01434f2c0
commit
b40181db41
@ -875,10 +875,10 @@ CheckMenuOW: ; 96b30
|
||||
ld [hMenuReturn + 1], a
|
||||
ld a, [hJoyPressed]
|
||||
|
||||
bit 2, a ; SELECT
|
||||
bit SELECT_F, a
|
||||
jr nz, .Select
|
||||
|
||||
bit 3, a ; START
|
||||
bit START_F, a
|
||||
jr z, .NoMenu
|
||||
|
||||
ld a, BANK(StartMenuScript)
|
||||
|
@ -89,9 +89,9 @@ MonMenuLoop: ; 24d59
|
||||
ld de, SFX_READ_TEXT_2
|
||||
call PlaySFX
|
||||
ld a, [hJoyPressed]
|
||||
bit 0, a ; A
|
||||
bit A_BUTTON_F, a
|
||||
jr nz, .select
|
||||
bit 1, a ; B
|
||||
bit B_BUTTON_F, a
|
||||
jr nz, .cancel
|
||||
jr .loop
|
||||
|
||||
|
@ -65,21 +65,21 @@ ScrollingMenuJoyAction: ; 24609
|
||||
ld a, [hJoyPressed]
|
||||
and BUTTONS
|
||||
or b
|
||||
bit 0, a ; A
|
||||
bit A_BUTTON_F, a
|
||||
jp nz, .a_button
|
||||
bit 1, a ; B
|
||||
bit B_BUTTON_F, a
|
||||
jp nz, .b_button
|
||||
bit 2, a ; Select
|
||||
bit SELECT_F, a
|
||||
jp nz, .select
|
||||
bit 3, a ; Start
|
||||
bit START_F, a
|
||||
jp nz, .start
|
||||
bit 4, a ; Right
|
||||
bit D_RIGHT_F, a
|
||||
jp nz, .d_right
|
||||
bit 5, a ; Left
|
||||
bit D_LEFT_F, a
|
||||
jp nz, .d_left
|
||||
bit 6, a ; Up
|
||||
bit D_UP_F, a
|
||||
jp nz, .d_up
|
||||
bit 7, a ; Down
|
||||
bit D_DOWN_F, a
|
||||
jp nz, .d_down
|
||||
jr .loop
|
||||
; 24640
|
||||
|
6
home.asm
6
home.asm
@ -332,7 +332,7 @@ PrintLetterDelay:: ; 313d
|
||||
jr .updatedelay
|
||||
|
||||
.fast
|
||||
ld a, 1
|
||||
ld a, TEXT_DELAY_FAST
|
||||
|
||||
.updatedelay
|
||||
ld [TextDelayFrames], a
|
||||
@ -347,11 +347,11 @@ PrintLetterDelay:: ; 313d
|
||||
|
||||
; Wait one frame if holding A or B.
|
||||
ld a, [hJoyDown]
|
||||
bit 0, a ; A_BUTTON
|
||||
bit A_BUTTON_F, a
|
||||
jr z, .checkb
|
||||
jr .delay
|
||||
.checkb
|
||||
bit 1, a ; B_BUTTON
|
||||
bit B_BUTTON_F, a
|
||||
jr z, .wait
|
||||
|
||||
.delay
|
||||
|
Loading…
Reference in New Issue
Block a user