summaryrefslogtreecommitdiff
path: root/engine/pokemon
diff options
context:
space:
mode:
authorYoann Fievez <yoann.fievez@gmail.com>2021-11-05 20:40:15 +0100
committerGitHub <noreply@github.com>2021-11-05 15:40:15 -0400
commit8349bfd8e646002105dfd6a7f997c26cf0e0624b (patch)
tree8586363ba32075ec9c7ddf07e384507679658b11 /engine/pokemon
parentb44a10a43a1fa4a558b4c593d0a610571ecb3a50 (diff)
Refactorize check button pressed (#340)
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/bills_pc.asm6
-rw-r--r--engine/pokemon/learn_move.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 7aba8001..8684b761 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -171,8 +171,8 @@ BillsPCMenu:
ldh [hAutoBGTransferEnabled], a
call Delay3
call HandleMenuInput
- bit 1, a
- jp nz, ExitBillsPC ; b button
+ bit BIT_B_BUTTON, a
+ jp nz, ExitBillsPC
call PlaceUnfilledArrowMenuCursor
ld a, [wCurrentMenuItem]
ld [wParentMenuItem], a
@@ -416,7 +416,7 @@ DisplayDepositWithdrawMenu:
ld [wPartyAndBillsPCSavedMenuItem], a
.loop
call HandleMenuInput
- bit 1, a ; pressed B?
+ bit BIT_B_BUTTON, a
jr nz, .exit
ld a, [wCurrentMenuItem]
and a
diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm
index fd92ec57..0377caa4 100644
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
@@ -155,7 +155,7 @@ TryingToLearn:
call LoadScreenTilesFromBuffer1
pop af
pop hl
- bit 1, a ; pressed b
+ bit BIT_B_BUTTON, a
jr nz, .cancel
push hl
ld a, [wCurrentMenuItem]