diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
| commit | 7574e186e7505e237efc3ab0969fed60bec6eb9d (patch) | |
| tree | 527ec48412989e98cca7827c5e31d89cdf742b05 /engine/pokemon | |
| parent | Identify starter pikachu happiness boost medicine check (#72) (diff) | |
| parent | Use ~X instead of $ff ^ X (diff) | |
| download | pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.gz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.xz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.zip | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 6 | ||||
| -rw-r--r-- | engine/pokemon/learn_move.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 13ad1b20..6901ef46 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -168,8 +168,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 @@ -456,7 +456,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 9f4ac2d2..03f17bcc 100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -154,7 +154,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] |