summaryrefslogtreecommitdiff
path: root/common/text.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-09-07 23:49:20 -0400
committeryenatch <yenatch@gmail.com>2013-09-07 23:49:20 -0400
commit847843d866aa79727f7d1dd98c2b212e8b5053ef (patch)
treeb9d03208d86c76fa09f72b53a10888fed0754665 /common/text.asm
parent9f53825ce2701f94470a98b3decd8013fbeba91a (diff)
rename BUTTON_A and BUTTON_B constants to A_BUTTON and B_BUTTON
Diffstat (limited to 'common/text.asm')
-rw-r--r--common/text.asm4
1 files changed, 2 insertions, 2 deletions
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