From afc4ce2dc55ac8d303ea05188bf00cb55e3fb693 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 7 Nov 2020 21:07:07 -0600 Subject: [PATCH] Use more joypad constants --- engine/battle/core.asm | 14 +++++++------- 1 file 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