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