diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-11-07 21:28:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 21:28:20 -0600 |
| commit | edf375aff14e54bd54e7a25780fe8b714691ccc7 (patch) | |
| tree | 015c63e79e4a245c28f72b18954f2a845d30271c /engine/battle/core.asm | |
| parent | 338f1276b48ce1394cb9de52b7646e9f8618b1b9 (diff) | |
| parent | ead36b7ba24413fe0f4423ee1efa6fe88bab0a3c (diff) | |
Merge pull request #63 from dannye/debug
Debug Yellow
Diffstat (limited to 'engine/battle/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 01074b74..415b287c 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2704,13 +2704,21 @@ 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 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 +IF DEF(_DEBUG) + bit BIT_START, a + jp nz, Func_3d4f5 + bit BIT_D_RIGHT, a + jp nz, Func_3d529 + bit BIT_D_LEFT, a + jp nz, Func_3d523 +ENDC + bit BIT_B_BUTTON, a push af xor a ld [wMenuItemToSwap], a @@ -2904,6 +2912,11 @@ NoMovesLeftText: text_end SwapMovesInMenu: +IF DEF(_DEBUG) + ld a, [wFlags_D733] + bit BIT_TEST_BATTLE, a + jp nz, Func_3d4f5 +ENDC ld a, [wPlayerBattleStatus3] bit TRANSFORMED, a jp nz, MoveSelectionMenu |