diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-18 01:49:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-18 01:49:09 -0400 |
| commit | 342ebbf406ca9623bc53ac00317835237099ce35 (patch) | |
| tree | 9f9373c29dc27b5bb59ab90525820e5fcf81dc3e /src/battle_controller_player.c | |
| parent | 52495e889fcc5a0045a77234ab28e06fd957f542 (diff) | |
| parent | c1da6b29bc853df1a42f08adb9b141de747dae55 (diff) | |
Merge branch 'master' into doc-pokemonstorage
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e7801d0e4..34fcb82f6 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -630,7 +630,7 @@ static u32 HandleMoveInputUnused(void) { PlaySE(SE_SELECT); gBattle_BG0_X = 0; - gBattle_BG0_Y = 0x140; + gBattle_BG0_Y = DISPLAY_HEIGHT * 2; var = 0xFF; } if (JOY_NEW(DPAD_LEFT) && gMoveSelectionCursor[gActiveBattler] & 1) @@ -2568,7 +2568,7 @@ static void HandleChooseActionAfterDma3(void) if (!IsDma3ManagerBusyWithBgCopy()) { gBattle_BG0_X = 0; - gBattle_BG0_Y = 160; + gBattle_BG0_Y = DISPLAY_HEIGHT; gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseAction; } } @@ -2610,7 +2610,7 @@ static void HandleChooseMoveAfterDma3(void) if (!IsDma3ManagerBusyWithBgCopy()) { gBattle_BG0_X = 0; - gBattle_BG0_Y = 320; + gBattle_BG0_Y = DISPLAY_HEIGHT * 2; gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove; } } |