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_wally.c | |
| parent | 52495e889fcc5a0045a77234ab28e06fd957f542 (diff) | |
| parent | c1da6b29bc853df1a42f08adb9b141de747dae55 (diff) | |
Merge branch 'master' into doc-pokemonstorage
Diffstat (limited to 'src/battle_controller_wally.c')
| -rw-r--r-- | src/battle_controller_wally.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 0d1515213..b35ffa692 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1195,7 +1195,7 @@ static void HandleChooseActionAfterDma3(void) if (!IsDma3ManagerBusyWithBgCopy()) { gBattle_BG0_X = 0; - gBattle_BG0_Y = 160; + gBattle_BG0_Y = DISPLAY_HEIGHT; gBattlerControllerFuncs[gActiveBattler] = WallyHandleActions; } } @@ -1233,7 +1233,7 @@ static void WallyHandleChooseMove(void) if (!IsDma3ManagerBusyWithBgCopy()) { gBattle_BG0_X = 0; - gBattle_BG0_Y = 0x140; + gBattle_BG0_Y = DISPLAY_HEIGHT * 2; gBattleStruct->wallyMovesState++; } break; |