dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

More usage of DISPLAY constants

Browse Source
This commit is contained in:
GriffinR
2021-04-15 02:04:01 -04:00
parent c4ef45c161
commit 62abcecc54
47 changed files with 232 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/contest.c
View File

@@ -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;