pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

rename BUTTON_A and BUTTON_B constants to A_BUTTON and B_BUTTON

Browse Source
This commit is contained in:
yenatch
2013-09-07 23:49:20 -04:00
parent 9f53825ce2
commit 847843d866
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/joypad.asm
View File

@@ -101,8 +101,8 @@ Joypad: ; 935
; Now that we have the input, we can do stuff with it.
; For example, soft reset:
and BUTTON_A | BUTTON_B | SELECT | START
cp BUTTON_A | BUTTON_B | SELECT | START
and A_BUTTON | B_BUTTON | SELECT | START
cp A_BUTTON | B_BUTTON | SELECT | START
jp z, Reset
ret
@@ -283,11 +283,11 @@ Functiona1b: ; a1b
pop bc
ld a, [hJoyDown]
cp D_UP | SELECT | BUTTON_B
cp D_UP | SELECT | B_BUTTON
jr z, .asm_a34
ld a, [$ffa9]
and START | BUTTON_A
and START | A_BUTTON
jr nz, .asm_a34
dec c
@@ -306,7 +306,7 @@ Functiona36: ; a36
call DelayFrame
call GetJoypadPublic
ld a, [hJoyPressed]
and BUTTON_A | BUTTON_B
and A_BUTTON | B_BUTTON
ret nz
call RTC
jr Functiona36
@@ -382,7 +382,7 @@ Functiona80: ; a80
Functionaa5: ; aa5
call Functiona57
ld a, [$ffa9]
and BUTTON_A | BUTTON_B
and A_BUTTON | B_BUTTON
jr z, Functionaa5
ret
; aaf

4
common/text.asm
View File

@@ -1054,7 +1054,7 @@ Text_0A: ; 14ed
push bc
call GetJoypadPublic
ld a, [hJoyDown]
and BUTTON_A | BUTTON_B
and A_BUTTON | B_BUTTON
jr nz, .asm_14fd
ld c, 30
call DelayFrames
@@ -1136,7 +1136,7 @@ Text_0C: ; 1543
ld [hli], a
call GetJoypadPublic
ld a, [hJoyDown]
and BUTTON_A | BUTTON_B
and A_BUTTON | B_BUTTON
jr nz, .asm_155a
ld c, 10
call DelayFrames