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/contest.c | |
| parent | 52495e889fcc5a0045a77234ab28e06fd957f542 (diff) | |
| parent | c1da6b29bc853df1a42f08adb9b141de747dae55 (diff) | |
Merge branch 'master' into doc-pokemonstorage
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/contest.c b/src/contest.c index f5326663f..246fc1e50 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1393,7 +1393,7 @@ static void Task_RaiseCurtainAtStart(u8 taskId) break; case 1: *(s16*)&gBattle_BG1_Y += 7; - if ((s16)gBattle_BG1_Y <= 160) + if ((s16)gBattle_BG1_Y <= DISPLAY_HEIGHT) break; gTasks[taskId].data[0]++; break; @@ -1513,8 +1513,8 @@ static void Task_ShowMoveSelectScreen(u8 taskId) u8 i; u8 moveName[32]; - gBattle_BG0_Y = 160; - gBattle_BG2_Y = 160; + gBattle_BG0_Y = DISPLAY_HEIGHT; + gBattle_BG2_Y = DISPLAY_HEIGHT; for (i = 0; i < MAX_MON_MOVES; i++) { @@ -2681,7 +2681,7 @@ static void Task_WaitForOutOfTimeMsg(u8 taskId) { SetBgForCurtainDrop(); gBattle_BG1_X = 0; - gBattle_BG1_Y = 160; + gBattle_BG1_Y = DISPLAY_HEIGHT; PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].func = Task_DropCurtainAtAppealsEnd; |