Make changes

1 files changed, 14 insertions, 48 deletions

diff --git a/src/contest.c b/src/contest.c
index ccd8740a5..9b69df98b 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -3045,7 +3045,7 @@ void sub_80DBED4(void)
     if ((gIsLinkContest & 1))
     {
         gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] = 
-        ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 0x270F) ? 0x270F :
+        ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 9999) ? 9999 :
         (gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1);
         
     }
@@ -3218,7 +3218,9 @@ void sub_80DC0F4(u8 taskId)
             m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256);
         }
         else
+		{
             PlaySE(SE_BOO);
+		}
         
         if (!r11 && !r5 && !r6)
             gTasks[taskId].data[2] = -gTasks[taskId].data[2];
@@ -3328,10 +3330,7 @@ void sub_80DC4F0(void)
     for (i = 0; i < 4; i++)
     {
         LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]);
-        gContestResources->field_14[i].unk1 = CreateSprite(
-          &gSpriteTemplate_8587B18[i],
-          204, gUnknown_08587A70[gUnknown_02039F26[i]],
-          0);
+        gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i], 204, gUnknown_08587A70[gUnknown_02039F26[i]], 0);
         SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80);
         gSprites[gContestResources->field_14[i].unk1].invisible = TRUE;
     }
@@ -3444,18 +3443,9 @@ void sub_80DC87C(u8 a)
     sub_80DC81C(a);
 
     r0 = a + 5;
-    DmaCopy16Defvars(
-      3,
-      gPlttBufferUnfaded + r0 * 16 + 10,
-      gPlttBufferFaded   + r0 * 16 + 10,
-      2);
-
+    DmaCopy16Defvars(3, gPlttBufferUnfaded + r0 * 16 + 10, gPlttBufferFaded   + r0 * 16 + 10, 2);
     var = (a + 5) * 16 + 12 + a;
-    DmaCopy16Defvars(
-      3,
-      gPlttBufferUnfaded + var,
-      gPlttBufferFaded + var,
-      2);
+    DmaCopy16Defvars(3, gPlttBufferUnfaded + var, gPlttBufferFaded + var, 2);
 }
 
 void sub_80DC8D0(u8 taskId)
@@ -3718,8 +3708,8 @@ void sub_80DCB78(u8 spriteId)
 
 void sub_80DCBB4(void)
 {
-    SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40);
-    SetGpuReg(REG_OFFSET_BLDALPHA, 0x0907);
+    SetGpuReg(REG_OFFSET_BLDCNT, BLDALPHA_BLEND(BLDCNT_EFFECT_BLEND, BLDCNT_TGT1_ALL));
+    SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1| BLDCNT_TGT1_BG2, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG3));
 }
 
 void sub_80DCBD0(void)
@@ -3780,7 +3770,9 @@ void sub_80DCD08(void)
         sub_80DB2BC();
     }
     else
+	{
         sub_80DCD48();
+	}
 }
 
 #ifdef NONMATCHING
@@ -4781,8 +4773,8 @@ void sub_80DD940(void)
             src = gContestApplauseMeterGfx + 64;
         else
             src = gContestApplauseMeterGfx;
-        CpuSet(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 0x04000008);  
-        CpuSet(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 0x04000008); 
+        CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32);  
+        CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32); 
         
         if (sContest.applauseLevel > 4)
             sub_80DDA20();
@@ -5031,10 +5023,7 @@ void sub_80DE008(bool8 a)
     {
         if (sContestantStatus[i].turnOrderMod != 0 && a)
         {
-            CpuSet(
-              GetTurnOrderNumberGfx(i),
-              (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32),
-              0x04000008);
+            CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32);
             gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]];
             gSprites[gContestResources->field_14[i].unk1].invisible = FALSE;
         }
@@ -6167,27 +6156,4 @@ void ClearContestWinnerPicsInContestHall(void)
 
     for (i = 0; i < 8; i++)
         gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i];
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file