Document remaining contest.c functions

5 files changed, 68 insertions, 68 deletions

diff --git a/include/contest_internal.h b/include/contest_internal.h
index dd81a624c..ad984d599 100644
--- a/include/contest_internal.h
+++ b/include/contest_internal.h
@@ -1,55 +1,55 @@
 #ifndef GUARD_CONTEST_INTERNAL_H
 #define GUARD_CONTEST_INTERNAL_H
 
-void sub_80AB350(void);
-void sub_80AB5D4(u8);
-void sub_80AB604(u8);
-void sub_80AB678(u8);
-void sub_80AB694(u8);
-void sub_80AB6B4(u8);
-u8 sub_80AB70C(u8 *);
-void sub_80AB960(u8);
-void sub_80AB9A0(u8);
+void InitContestResources(void);
+void Task_StartContestWaitFade(u8 taskId);
+void Task_TryStartLinkContest(u8 taskId);
+void Task_CommunicateMonIdxs(u8 taskId);
+void Task_EndCommunicateMonIdxs(u8 taskId);
+void Task_ReadyStartLinkContest(u8 taskId);
+u8 SetupContestGraphics(u8 *a);
+void Task_WaitToRaiseCurtainAtStart(u8 taskId);
+void Task_RaiseCurtainAtStart(u8 taskId);
 void ContestMainCallback2(void);
 void ContestVBlankCallback(void);
-void sub_80ABB70(u8);
+void Task_DisplayAppealNumberText(u8 taskId);
 void sub_80ABC3C(u8);
-void sub_80ABC70(u8);
-void sub_80ABCDC(u8);
-void sub_80ABEA0(u8);
-void sub_80AC0AC(s8);
-void nullsub_17(s8);
-void sub_80AC0C8(u8);
-void sub_80AC15C(u8);
-void sub_80AC188(u8);
-void sub_80AC204(u8);
-void sub_80AC250(u8);
-void sub_80AC284(u8);
-void sub_80AC2CC(u8);
+void Task_TryShowMoveSelectScreen(u8 taskId);
+void Task_ShowMoveSelectScreen(u8 taskId);
+void Task_HandleMoveSelectInput(u8 taskId);
+void DrawMoveSelectArrow(s8 a);
+void EraseMoveSelectArrow(s8 a); // nullsub
+void Task_SelectedMove(u8 taskId);
+void Task_EndCommunicateMoveSelections(u8 taskId);
+void Task_HideMoveSelectScreen(u8 taskId);
+void Task_HideApplauseMeterForAppealStart(u8 taskId);
+void Task_WaitHideApplauseMeterForAppealStart(u8 taskId);
+void Task_AppealSetup(u8 taskId);
+void Task_DoAppeals(u8 taskId);
 void Task_EndWaitForLink(u8 taskId);
-void sub_80AD8FC(struct Sprite *);
-void sub_80AD92C(struct Sprite *);
-void sub_80AD960(u8);
-void sub_80ADA1C(u8);
-void sub_80ADA4C(u8);
-void sub_80ADAD8(u8);
-void sub_80ADB04(u8);
-void sub_80ADB48(u8);
-void sub_80ADB88(u8);
-void sub_80ADC10(u8);
-void sub_80ADC4C(u8);
-void sub_80ADC84(u8);
-void sub_80ADCB4(u8);
-void sub_80ADD04(u8);
-void sub_80ADD74(u8);
-void sub_80ADDA4(u8);
-void sub_80ADE54(u8);
-void sub_80ADEAC(u8);
-void sub_80ADEEC(u8);
-void sub_80ADF4C(u8);
-void sub_80ADF98(u8);
-void sub_80ADFD8(u8);
-void sub_80AE010(void);
+void SpriteCB_MonSlideIn(struct Sprite *sprite);
+void SpriteCB_MonSlideOut(struct Sprite *sprite);
+void Task_FinishRoundOfAppeals(u8 taskId);
+void Task_ReadyUpdateHeartSliders(u8 taskId);
+void Task_UpdateHeartSliders(u8 taskId);
+void Task_WaitForHeartSliders(u8 taskId);
+void sub_80ADB04(u8 taskId);
+void Task_WaitBeforePrintRoundResult(u8 taskId);
+void Task_PrintRoundResultText(u8 taskId);
+void Task_WaitPrintRoundResultText(u8 taskId);
+void Task_ReUpdateHeartSliders(u8 taskId);
+void Task_WaitForHeartSlidersAgain(u8 taskId);
+void Task_DropCurtainAtRoundEnd(u8 taskId);
+void Task_TryStartNextRoundOfAppeals(u8 taskId);
+void Task_StartNewRoundOfAppeals(u8 taskId);
+void Task_EndAppeals(u8 taskId);
+void Task_WaitForOutOfTimeMsg(u8 taskId);
+void Task_DropCurtainAtAppealsEnd(u8 taskId);
+void Task_TryCommunicateFinalStandings(u8 taskId);
+void Task_CommunicateFinalStandings(u8 taskId);
+void Task_EndCommunicateFinalStandings(u8 taskId);
+void Task_ContestReturnToField(u8 taskId);
+void FieldCB_ContestReturnToField(void);
 void InsertStringDigit(u8 *, s32);
 bool8 IsPlayerLinkLeader(void);
 void __copy_tilemap(void *);
@@ -62,7 +62,7 @@ u8 CreateJudgeSpeechBubbleSprite(void);
 u8 CreateContestantSprite(u16, u32, u32);
 void SwapMoveDescAndContestTilemaps(void);
 void PrintContestMoveDescription(u16);
-void sub_80AED58(void);
+void Contest_ClearMoveDescriptionBox(void);
 bool8 UpdateConditionStars(u8, u8);
 bool8 DrawStatusSymbol(u8);
 void DrawStatusSymbols(void);
@@ -83,27 +83,27 @@ s8 GetNumHeartsFromAppealPoints(s16 a);
 u8 UpdateAppealHearts(s16 startAppeal, s16 appealDelta, u8 contestant);
 void Task_UpdateAppealHearts(u8 taskId);
 void CreateSliderHeartSprites(void);
-void sub_80AFF10(void);
-bool8 sub_80AFF28(void);
+void UpdateHeartSliders(void);
+bool8 SlidersDoneUpdating(void);
 void sub_80AFF60(struct Sprite *);
-void sub_80AFFE0(bool8);
-void sub_80B0034(void);
+void SetBottomSliderHeartsInvisibility(bool8);
+void CreateNextTurnSprites(void);
 void CreateApplauseMeterSprite(void);
 void nullsub_18(s8);
 void sub_80B0238(struct Sprite *);
 void sub_80B0280(struct Sprite *);
 void sub_80B02A8(struct Sprite *);
 void sub_80B02F4(struct Sprite *);
-void sub_80B0324(void);
+void CreateJudgeAttentionEyeTask(void);
 void sub_80B03A8(u8);
 void sub_80B03D8(u8);
 void sub_80B0458(u8);
-void sub_80B0518(void);
-void sub_80B0548(u8);
-void sub_80B05A4(u8);
+void CreateUnusedBlendTask(void);
+void InitUnusedBlendTaskData(u8 contestant);
+void UpdateBlendTaskContestantData(u8 contestant);
 void nullsub_19(int);
-void sub_80B05FC(u8);
-void Task_UnusedBlend(u8);
+void Task_UnusedBlend(u8 taskId);
+void Task_UnusedBrokenBlend(u8 taskId);
 void StartStopFlashJudgeAttentionEye(u8);
 u8 CreateContestantBoxBlinkSprites(u8);
 void BlinkContestantBox(u8, bool8);
diff --git a/include/contest_link.h b/include/contest_link.h
index c86eb0988..3bd5fa2bb 100644
--- a/include/contest_link.h
+++ b/include/contest_link.h
@@ -1,12 +1,12 @@
 #ifndef GUARD_CONTEST_LINK_H
 #define GUARD_CONTEST_LINK_H
 
-void sub_80C8734(u8);
-void Task_LinkContest_CommunicateRng(u8);
-void sub_80C89DC(u8);
-void Task_LinkContest_CommunicateLeaderIds(u8);
-void Task_LinkContest_CommunicateRound1Points(u8);
-void Task_LinkContest_CommunicateTurnOrder(u8);
+void sub_80C8734(u8 taskId);
+void Task_LinkContest_CommunicateRng(u8 taskId);
+void Task_LinkContest_CommunicateMonIdxs(u8 taskId);
+void Task_LinkContest_CommunicateLeaderIds(u8 taskId);
+void Task_LinkContest_CommunicateRound1Points(u8 taskId);
+void Task_LinkContest_CommunicateTurnOrder(u8 taskId);
 u8 GetStringLanguage(const u8 *string);
 void Task_LinkContest_Init(u8 taskId);
 void Task_LinkContest_CommunicateCategory(u8 taskId);
diff --git a/include/ewram.h b/include/ewram.h
index cf3f53417..6c9039713 100644
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -86,11 +86,11 @@ extern u8 gSharedMem[];
 #define EWRAM_15000                     ((u8 *)(gSharedMem + 0x15000))
 #define ewram15000                      (&gSharedMem[0x15000])
 #define ewram15000arr(i, data)          (gSharedMem[0x15000 + data + i])
-#define ewram15800                      (&gSharedMem[0x15800])
 
 #define ewram16000_2                    (&gSharedMem[0x16000])
 
 // Contest
+#define eUnzippedContestAudience_Gfx    (&gSharedMem[0x15800]) // overlaps other contest vars
 #define eCurContestWinnerSaveIdx        (gSharedMem[0x15DDE])
 #define eCurContestWinnerIsForArtist    (gSharedMem[0x15DDF])
 #define eCurContestWinner               ((*(struct ContestWinner*)(gSharedMem + 0x15DE0)))
diff --git a/include/graphics.h b/include/graphics.h
index 66ef9a028..dfd3affe2 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -35,9 +35,9 @@ extern const u8 gInterfaceGfx_PremierBall[];
 extern const u8 gInterfacePal_PremierBall[];
 extern const u8 gUnknown_08D030D0[];
 
-extern const u8 gUnknown_08D17144[];
-extern const u8 gUnknown_08D1725C[];
-extern const u8 gUnknown_08D17424[];
+extern const u8 gContestPalette[];
+extern const u8 gContestGfx[];
+extern const u8 gContestBgmap[];
 extern const u8 gUnknown_08D17C3C[];
 extern const u8 gContestMiscGfx[];
 extern const u8 gContestAudienceGfx[];
diff --git a/include/text.h b/include/text.h
index 1d79eeb46..dba242fe3 100644
--- a/include/text.h
+++ b/include/text.h
@@ -255,7 +255,7 @@ void Text_InitWindowWithTemplate(struct Window *win, const struct WindowTemplate
 void Text_InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
 void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6);
 void Text_SetWindowText(struct Window *win, const u8 *text);
-void Text_InitWindow8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
+void Contest_StartTextPrinter(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
 u8 Text_PrintWindow8002F44(struct Window *win);
 u8 Text_PrintWindowSimple(struct Window *win);
 u8 Text_InitWindowAndPrintText(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
@@ -267,7 +267,7 @@ u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType);
 u8 Text_UpdateWindow(struct Window *win);
 u8 Text_UpdateWindowInBattle(struct Window *win);
 u8 Text_UpdateWindowAutoscroll(struct Window *win);
-u8 Text_UpdateWindowInContest(struct Window *win);
+u8 Contest_RunTextPrinter(struct Window *win);
 u32 Text_UpdateWindowOverrideLineLength(struct Window *win, u8 lineLength);
 void Text_ClearWindow(struct Window *win);
 u16 Text_GetWindowTilemapEntry(struct Window *win, u8 x, u8 y);