1 files changed, 9 insertions, 10 deletions
diff --git a/src/contest.c b/src/contest.c
index 3d74109cb..949be7941 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -217,7 +217,6 @@ extern const u8 gText_0827D597[];
 extern const struct ContestPokemon gContestOpponents[96];
 extern const u8 gUnknown_085898A4[96];
 extern const struct CompressedSpriteSheet gUnknown_08587C00;
-extern const u8 gContest2Pal[];
 extern const struct SpriteTemplate gSpriteTemplate_8587BE8;
 extern const struct CompressedSpriteSheet gUnknown_08587C08;
 extern const struct CompressedSpritePalette gUnknown_08587C10;
@@ -271,7 +270,7 @@ void LoadContestBgAfterMoveAnim(void)
     CopyBgTilemapBufferToVram(3);
     LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200);
     sub_80D782C();
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < MAX_MON_MOVES; i++)
     {
         u32 var = 5 + i;
 
@@ -285,7 +284,7 @@ void sub_80D779C(void)
 
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, gUnknown_08587F34, ARRAY_COUNT(gUnknown_08587F34));
-    SetBgAttribute(3, BG_CTRL_ATTR_PRIORITY, 1);
+    SetBgAttribute(3, BG_ATTR_WRAPAROUND, 1);
     for (i = 0; i < 4; i++)
     {
         SetBgTilemapBuffer(i, gContestResources->field_24[i]);
@@ -474,14 +473,14 @@ void sub_80D7CB4(u8 taskId)
                     gTasks[taskId].data[0]++;
                     // fallthrough
                 case 1:
-                    if (sub_800A520())
+                    if (IsLinkTaskFinished())
                     {
                         sub_800ADF8();
                         gTasks[taskId].data[0]++;
                     }
                     return;
                 case 2:
-                    if (sub_800A520() != TRUE)
+                    if (IsLinkTaskFinished() != TRUE)
                         return;
                     gTasks[taskId].data[0]++;
                     break;
@@ -747,7 +746,7 @@ void sub_80D8490(u8 taskId)
     gBattle_BG0_Y = 0xA0;
     gBattle_BG2_Y = 0xA0;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < MAX_MON_MOVES; i++)
     {
         u16 move = gContestMons[gContestPlayerMonIndex].moves[i];
         u8 *r5 = sp8;
@@ -782,7 +781,7 @@ void sub_80D8610(u8 taskId)
     u8 numMoves = 0;
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < MAX_MON_MOVES; i++)
     {
         if (gContestMons[gContestPlayerMonIndex].moves[i] != MOVE_NONE)
             numMoves++;
@@ -2484,7 +2483,7 @@ u8 sub_80DB0C4(void)
 {
     u8 spriteId;
 
-    LoadCompressedObjectPic(&gUnknown_08587C00);
+    LoadCompressedSpriteSheet(&gUnknown_08587C00);
     LoadCompressedPalette(gContest2Pal, 0x110, 32);
     spriteId = CreateSprite(&gSpriteTemplate_8587BE8, 112, 36, 30);
     gSprites[spriteId].oam.paletteNum = 1;
@@ -2496,8 +2495,8 @@ u8 sub_80DB120(void)
 {
     u8 spriteId;
 
-    LoadCompressedObjectPic(&gUnknown_08587C08);
-    LoadCompressedObjectPalette(&gUnknown_08587C10);
+    LoadCompressedSpriteSheet(&gUnknown_08587C08);
+    LoadCompressedSpritePalette(&gUnknown_08587C10);
     spriteId = CreateSprite(&gSpriteTemplate_8587C18, 96, 10, 29);
     gSprites[spriteId].invisible = TRUE;
     gSprites[spriteId].data[0] = gSprites[spriteId].oam.tileNum;