diff options
| author | yenatch <yenatch@gmail.com> | 2013-09-07 23:49:20 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-09-07 23:49:20 -0400 |
| commit | 847843d866aa79727f7d1dd98c2b212e8b5053ef (patch) | |
| tree | b9d03208d86c76fa09f72b53a10888fed0754665 /common | |
| parent | 9f53825ce2701f94470a98b3decd8013fbeba91a (diff) | |
rename BUTTON_A and BUTTON_B constants to A_BUTTON and B_BUTTON
Diffstat (limited to 'common')
| -rw-r--r-- | common/joypad.asm | 12 | ||||
| -rw-r--r-- | common/text.asm | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/common/joypad.asm b/common/joypad.asm index 388c84e22..198e1c47b 100644 --- a/common/joypad.asm +++ b/common/joypad.asm @@ -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 diff --git a/common/text.asm b/common/text.asm index 4f39a95df..e010de6d4 100644 --- a/common/text.asm +++ b/common/text.asm @@ -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 |