1 files changed, 15 insertions, 23 deletions

diff --git a/src/contest.c b/src/contest.c
index e5bf62e75..fbd42a007 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -999,8 +999,6 @@ void ResetLinkContestBoolean(void)
 
 static void SetupContestGpuRegs(void)
 {
-    u16 savedIme;
-
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0);
@@ -2789,7 +2787,7 @@ void CreateContestMonFromParty(u8 partyIndex)
         gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_BRENDAN;
     else
         gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_MAY;
-    gContestMons[gContestPlayerMonIndex].aiChecks = 0;
+    gContestMons[gContestPlayerMonIndex].aiFlags = 0;
     gContestMons[gContestPlayerMonIndex].highestRank = 0;
     gContestMons[gContestPlayerMonIndex].species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES);
     GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, name);
@@ -3410,8 +3408,7 @@ static void GetAllChosenMoves(void)
 
 static void RankContestants(void)
 {
-    s32 i;
-    s32 j;
+    s32 i, j;
     s16 arr[CONTESTANT_COUNT];
 
     for (i = 0; i < CONTESTANT_COUNT; i++)
@@ -3486,11 +3483,10 @@ static bool8 ContestantCanUseTurn(u8 contestant)
 {
     if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns)
         return FALSE;
-    else
-        return TRUE;
+    return TRUE;
 }
 
-static void ResetContestantStatuses(void)
+static void SetContestantStatusesForNextRound(void)
 {
     s32 i;
 
@@ -3541,8 +3537,7 @@ bool8 Contest_IsMonsTurnDisabled(u8 contestant)
 {
     if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns)
         return TRUE;
-    else
-        return FALSE;
+    return FALSE;
 }
 
 static void CalculateTotalPointsForContestant(u8 contestant)
@@ -4483,19 +4478,16 @@ static void CalculateAppealMoveImpact(u8 contestant)
             eContestantStatus[contestant].usedComboMove = TRUE;
             eContestantStatus[contestant].hasJudgesAttention = FALSE;
             eContestantStatus[contestant].comboAppealBonus = eContestantStatus[contestant].baseAppeal * eContestantStatus[contestant].completedCombo;
-            eContestantStatus[contestant].unk15_3 = TRUE;
+            eContestantStatus[contestant].completedComboFlag = TRUE; // Redundant with completedCombo, used by AI
+        }
+        else if (gContestMoves[eContestantStatus[contestant].currMove].comboStarterId != 0)
+        {
+            eContestantStatus[contestant].hasJudgesAttention = TRUE;
+            eContestantStatus[contestant].usedComboMove = TRUE;
         }
         else
         {
-            if (gContestMoves[eContestantStatus[contestant].currMove].comboStarterId != 0)
-            {
-                eContestantStatus[contestant].hasJudgesAttention = TRUE;
-                eContestantStatus[contestant].usedComboMove = TRUE;
-            }
-            else
-            {
-                eContestantStatus[contestant].hasJudgesAttention = FALSE;
-            }
+            eContestantStatus[contestant].hasJudgesAttention = FALSE;
         }
     }
     if (eContestantStatus[contestant].repeatedMove)
@@ -5172,7 +5164,7 @@ static void Task_ResetForNextRound(u8 taskId)
 
             eContest.waitForLink = TRUE;
             if (IsPlayerLinkLeader())
-                ResetContestantStatuses();
+                SetContestantStatusesForNextRound();
             taskId2 = CreateTask(Task_LinkContest_CommunicateAppealsState, 0);
             SetTaskFuncWithFollowupFunc(taskId2, Task_LinkContest_CommunicateAppealsState, Task_EndWaitForLink);
             ContestPrintLinkStandby();
@@ -5180,7 +5172,7 @@ static void Task_ResetForNextRound(u8 taskId)
         }
         else
         {
-            ResetContestantStatuses();
+            SetContestantStatusesForNextRound();
             gTasks[taskId].data[0] = 3;
         }
         break;
@@ -5620,7 +5612,7 @@ void ClearContestWinnerPicsInContestHall(void)
     s32 i;
 
     for (i = 0; i < 8; i++)
-        gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i];
+        gSaveBlock1Ptr->contestWinners[i] = gDefaultContestWinners[i];
 }
 
 static void SetContestLiveUpdateFlags(u8 contestant)