summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-07 21:07:07 -0600
committerdannye <33dannye@gmail.com>2020-11-07 21:07:07 -0600
commitafc4ce2dc55ac8d303ea05188bf00cb55e3fb693 (patch)
tree213de0b679b949be9cc7760fbff9e16a4356c9b5
parent0da16c162580dd9677dc9407775f4d37d9403b94 (diff)
Use more joypad constants
-rwxr-xr-xengine/battle/core.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index c524d111..d944424e 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2602,13 +2602,13 @@ SelectMenuItem:
call HandleMenuInput
ld hl, hFlagsFFF6
res 1, [hl]
- bit 6, a
- jp nz, SelectMenuItem_CursorUp ; up
- bit 7, a
- jp nz, SelectMenuItem_CursorDown ; down
- bit 2, a
- jp nz, SwapMovesInMenu ; select
- bit 1, a ; B, but was it reset above?
+ bit BIT_D_UP, a
+ jp nz, SelectMenuItem_CursorUp
+ bit BIT_D_DOWN, a
+ jp nz, SelectMenuItem_CursorDown
+ bit BIT_SELECT, a
+ jp nz, SwapMovesInMenu
+ bit BIT_B_BUTTON, a
push af
xor a
ld [wMenuItemToSwap], a