7 files changed, 64 insertions, 26 deletions
diff --git a/include/contest.h b/include/contest.h
index bf2613fe3..a9ef50e0c 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -13,6 +13,38 @@ enum
 
 enum
 {
+    CONTEST_WINNER_ARTIST,
+    CONTEST_WINNER_HALL_1,
+    CONTEST_WINNER_HALL_2,
+    CONTEST_WINNER_HALL_3,
+    CONTEST_WINNER_HALL_4,
+    CONTEST_WINNER_HALL_5,
+    CONTEST_WINNER_HALL_6,
+    NUM_CONTEST_HALL_WINNERS = CONTEST_WINNER_HALL_6,
+    CONTEST_WINNER_HALL_UNUSED_1 , // These two have data for gDefaultContestWinners
+    CONTEST_WINNER_HALL_UNUSED_2, // but there are only 6 paintings in the Contest Hall
+    MUSEUM_CONTEST_WINNERS_START = CONTEST_WINNER_HALL_UNUSED_2,
+    CONTEST_WINNER_MUSEUM_COOL,
+    CONTEST_WINNER_MUSEUM_BEAUTY,
+    CONTEST_WINNER_MUSEUM_CUTE,
+    CONTEST_WINNER_MUSEUM_SMART,
+    CONTEST_WINNER_MUSEUM_TOUGH,
+};
+
+enum
+{
+    CONTEST_RANK_NORMAL,
+    CONTEST_RANK_SUPER,
+    CONTEST_RANK_HYPER,
+    CONTEST_RANK_MASTER,
+    CONTEST_RANK_LINK
+};
+
+#define CONTEST_SAVE_FOR_MUSEUM ((u8)-1)
+#define CONTEST_SAVE_FOR_ARTIST ((u8)-2)
+
+enum
+{
     CONTEST_EFFECT_HIGHLY_APPEALING,
     CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
     CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
@@ -267,7 +299,7 @@ u16 InitContestMonConditionI(u8, u8);
 void InitContestMonConditions(u8);
 u8 IsSpeciesNotUnown(u16);
 void sub_80AF668(void);
-void sub_80B0F28(u8);
+void SortContestants(u8);
 bool8 Contest_SaveWinner(u8);
 u8 sub_80B2C4C(u8, u8);
 void Contest_ResetWinners(void);
@@ -432,13 +464,13 @@ extern u8 gContestPlayerMonIndex;
 extern u8 gIsLinkContest;
 extern u32 gContestRngValue;
 extern u8 gUnknown_02038696[4];
-extern s16 gContestMonConditions[4];
-extern s16 gUnknown_02038678[4];
+extern s16 gContestMonRound1Points[4];
+extern s16 gContestMonTotalPoints[4];
 extern s16 gUnknown_02038680[4];
 extern s16 gUnknown_02038688[4];
 extern u8 gContestFinalStandings[4];
 extern u8 gUnknown_02038696[4];
-extern u8 gUnknown_0203869B;
+extern u8 gContestLinkLeaderIndex;
 extern u16 gSpecialVar_ContestRank;
 extern u16 gSpecialVar_ContestCategory;
 extern u8 gContestMonPartyIndex;
diff --git a/include/contest_link.h b/include/contest_link.h
new file mode 100644
index 000000000..c86eb0988
--- /dev/null
+++ b/include/contest_link.h
@@ -0,0 +1,14 @@
+#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);
+u8 GetStringLanguage(const u8 *string);
+void Task_LinkContest_Init(u8 taskId);
+void Task_LinkContest_CommunicateCategory(u8 taskId);
+
+#endif // GUARD_CONTEST_LINK_H
diff --git a/include/contest_link_80C857C.h b/include/contest_link_80C857C.h
deleted file mode 100644
index 15f41fe7f..000000000
--- a/include/contest_link_80C857C.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef GUARD_CONTEST_LINK_80C857C_H
-#define GUARD_CONTEST_LINK_80C857C_H
-
-void sub_80C8734(u8);
-void sub_80C88AC(u8);
-void sub_80C89DC(u8);
-void sub_80C8E1C(u8);
-void sub_80C8EBC(u8);
-void sub_80C8F34(u8);
-u8 GetStringLanguage(const u8 *string);
-void sub_80C8604(u8 taskId);
-void sub_80C8938(u8 taskId);
-
-#endif // GUARD_CONTEST_LINK_80C857C_H
diff --git a/include/contest_link_80C2020.h b/include/contest_link_util.h
index 5b1390ce1..8c527f971 100644
--- a/include/contest_link_80C2020.h
+++ b/include/contest_link_util.h
@@ -1,15 +1,15 @@
-#ifndef GUARD_CONTEST_LINK_80C2020_H
-#define GUARD_CONTEST_LINK_80C2020_H
+#ifndef GUARD_CONTEST_LINK_UTIL_H
+#define GUARD_CONTEST_LINK_UTIL_H
 
 void sub_80C2358(void);
 void Contest_GetTrainerNameI_StringVar1(void);
 void Contest_GetNicknameI_StringVar1(void);
 void sub_80C48C8(void);
-void sub_80C48F4(void);
+void Contest_GetSpeciesNameI_StringVar1(void);
 void sub_80C4940(void);
-void sub_80C4980(u8);
-u8 sub_80C4B34(u8 *);
+void ContestLinkTransfer(u8 category);
+u8 LinkContest_GetLeaderIndex(u8 *a0);
 void Contest_CopyAndConvertTrainerName_Intl(u8 *, const u8 *);
 void Contest_CopyAndConvertNicknameI_Intl(u8 *, u8);
 
-#endif // GUARD_CONTEST_LINK_80C2020_H
+#endif // GUARD_CONTEST_LINK_UTIL_H
diff --git a/include/script_pokemon_80C4.h b/include/contest_util.h
index fab07994e..a22bd9548 100644
--- a/include/script_pokemon_80C4.h
+++ b/include/contest_util.h
@@ -6,7 +6,7 @@ void sub_80C5580(void);
 void SetBattleTowerPlayerParty(void);
 void ReducePlayerPartyToThree(void);
 
-u8 sub_80C4D50(void);
+u8 CountPlayerMuseumPaintings(void);
 void ShowContestWinner(void);
 void ScrSpecial_HealPlayerParty();
 u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
diff --git a/include/global.h b/include/global.h
index ed74fcf77..018db2725 100644
--- a/include/global.h
+++ b/include/global.h
@@ -36,6 +36,12 @@
 #define KANA(txt) _(txt)
 #endif
 
+#define SWAP(x,y,t) {\
+    t = x;           \
+    x = y;           \
+    y = t;           \
+}
+
 // Prevent cross-jump optimization.
 #define BLOCK_CROSS_JUMP asm("");
 
diff --git a/include/link.h b/include/link.h
index 6c9c25202..a4540b346 100644
--- a/include/link.h
+++ b/include/link.h
@@ -185,7 +185,7 @@ void sub_800826C(void);
 void sub_80082EC(void);
 u8 GetLinkPlayerCount_2(void);
 bool8 IsLinkMaster(void);
-void sub_800832C(void);
+void SetCloseLinkCallback(void);
 void sub_8008480(void);
 void sub_80084A4(void);
 void CB2_LinkError(void);