diff options
| -rwxr-xr-x | engine/battle/core.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 3957795b..415b287c 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2704,12 +2704,12 @@ SelectMenuItem: call HandleMenuInput ld hl, hFlagsFFFA 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 BIT_D_UP, a + jp nz, SelectMenuItem_CursorUp + bit BIT_D_DOWN, a + jp nz, SelectMenuItem_CursorDown + bit BIT_SELECT, a + jp nz, SwapMovesInMenu IF DEF(_DEBUG) bit BIT_START, a jp nz, Func_3d4f5 @@ -2718,7 +2718,7 @@ IF DEF(_DEBUG) bit BIT_D_LEFT, a jp nz, Func_3d523 ENDC - bit 1, a ; B, but was it reset above? + bit BIT_B_BUTTON, a push af xor a ld [wMenuItemToSwap], a |