diff options
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/battle/core.asm b/battle/core.asm index 926b7681c..aa656652e 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2871,13 +2871,13 @@ AskUseNextPokemon: ; 3d1f8 .loop lb bc, 1, 7 call PlaceYesNoBox - ld a, [MenuSelection2] + ld a, [wMenuCursorY] jr c, .pressed_b and a ret .pressed_b - ld a, [MenuSelection2] + ld a, [wMenuCursorY] cp $1 ; YES jr z, .loop ld hl, PartyMon1Speed @@ -3698,7 +3698,7 @@ OfferSwitch: ; 3d74b call StdBattleTextBox lb bc, 1, 7 call PlaceYesNoBox - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a jr nz, .said_no call Function3d2f7 @@ -5303,7 +5303,7 @@ BattleMenu_Pack: ; 3e1c7 .tutorial2 call GetMonFrontpic ld a, $1 - ld [MenuSelection2], a + ld [wMenuCursorY], a call ExitMenu call UpdateBattleHUDs call WaitBGMap @@ -5343,7 +5343,7 @@ BattleMenuPKMN_Loop: call .GetMenu jr c, .PressedB call Function1bee - ld a, [MenuSelection2] + ld a, [wMenuCursorY] cp $1 ; SWITCH jp z, TryPlayerSwitch cp $2 ; STATS @@ -5545,7 +5545,7 @@ BattleMonEntrance: ; 3e40b call SetPlayerTurn call SpikesDamage ld a, $2 - ld [MenuSelection2], a + ld [wMenuCursorY], a ret ; 3e459 @@ -5575,7 +5575,7 @@ PassedBattleMonEntrance: ; 3e459 BattleMenu_Run: ; 3e489 call Call_LoadTempTileMapToTileMap ld a, $3 - ld [MenuSelection2], a + ld [wMenuCursorY], a ld hl, BattleMonSpeed ld de, EnemyMonSpeed call TryToRunAwayFromBattle @@ -5671,9 +5671,9 @@ MoveSelectionScreen: ; 3e4bc inc a .skip_inc - ld [MenuSelection2], a + ld [wMenuCursorY], a ld a, $1 - ld [wcfaa], a + ld [wMenuCursorX], a ld a, [wNumMoves] inc a ld [wcfa3], a @@ -5726,7 +5726,7 @@ MoveSelectionScreen: ; 3e4bc .interpret_joypad ld a, $1 ld [hBGMapMode], a - call Function1bd3 + call ScrollingMenuJoypad bit D_UP_F, a jp nz, .pressed_up bit D_DOWN_F, a @@ -5738,9 +5738,9 @@ MoveSelectionScreen: ; 3e4bc xor a ld [wMoveSwapBuffer], a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a - ld [MenuSelection2], a + ld [wMenuCursorY], a ld b, a ld a, [wMoveSelectionMenuType] dec a @@ -5763,7 +5763,7 @@ MoveSelectionScreen: ; 3e4bc ret nz ld hl, BattleMonPP - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld c, a ld b, 0 add hl, bc @@ -5779,7 +5779,7 @@ MoveSelectionScreen: ; 3e4bc ld a, [wc6e1] and a jr nz, .skip2 - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld hl, BattleMonMoves ld c, a ld b, 0 @@ -5809,17 +5809,17 @@ MoveSelectionScreen: ; 3e4bc ; 3e61d .pressed_up - ld a, [MenuSelection2] + ld a, [wMenuCursorY] and a jp nz, .menu_loop ld a, [wNumMoves] inc a - ld [MenuSelection2], a + ld [wMenuCursorY], a jp .menu_loop ; 3e62e .pressed_down ; 3e62e - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld b, a ld a, [wNumMoves] rept 2 @@ -5828,7 +5828,7 @@ endr cp b jp nz, .menu_loop ld a, $1 - ld [MenuSelection2], a + ld [wMenuCursorY], a jp .menu_loop ; 3e643 @@ -5845,7 +5845,7 @@ endr swap a and $f ld b, a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] cp b jr nz, .not_swapping_disabled_move ld a, [hl] @@ -5864,7 +5864,7 @@ endr ld a, [hl] and $f ld b, a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] swap a add b ld [hl], a @@ -5899,7 +5899,7 @@ endr ld d, h ld e, l pop hl - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a ld c, a ld b, 0 @@ -5912,7 +5912,7 @@ endr ret .start_swap - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld [wMoveSwapBuffer], a jp MoveSelectionScreen ; 3e6c8 @@ -5934,7 +5934,7 @@ MoveInfoBox: ; 3e6c8 swap a and $f ld b, a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] cp b jr nz, .not_disabled @@ -5944,11 +5944,11 @@ MoveInfoBox: ; 3e6c8 jr .done .not_disabled - ld hl, MenuSelection2 + ld hl, wMenuCursorY dec [hl] call SetPlayerTurn ld hl, BattleMonMoves - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld c, a ld b, 0 add hl, bc @@ -5961,7 +5961,7 @@ MoveInfoBox: ; 3e6c8 ld [MonType], a callab GetMaxPPOfMove - ld hl, MenuSelection2 + ld hl, wMenuCursorY ld c, [hl] inc [hl] ld b, 0 |