Some documentation of contest_link_80C2020

10 files changed, 82 insertions, 83 deletions

diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index b9297628a..8b098ed64 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -68,7 +68,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
 
 LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80C4858
+	special ScrSpecial_GetContestWinnerNick
 	applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E
 	waitmovement 0
 	playse SE_PIN
@@ -240,7 +240,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
 
 LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80C4858
+	special ScrSpecial_GetContestWinnerNick
 	applymovement 11, LilycoveCity_ContestLobby_Movement_158B78
 	waitmovement 0
 	playse SE_PIN
@@ -360,7 +360,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
 	choosecontestmon
 	compare VAR_SPECIAL_4, 255
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA
-	special sub_80C43F4
+	special ScrSpecial_CheckSelectedMonAndInitContest
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96
 	compare RESULT, 1
@@ -466,7 +466,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
-	special sub_80C496C
+	special ScrSpecial_GetContestPlayerMonIdx
 	addvar VAR_SPECIAL_4, 1
 	buffernumberstring 1, 32772
 	messageautoscroll LilycoveCity_ContestLobby_Text_188845
@@ -478,7 +478,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
 LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
 	call LilycoveCity_ContestLobby_EventScript_158E0B
 	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
-	special sub_80C4F70
+	special ScrSpecial_SetLinkContestTrainerGfxIdx
 	setvar VAR_CONTEST_LOCATION, 5
 	setvar CONTEST_RANK, 3
 	call LilycoveCity_ContestLobby_EventScript_158F08
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index c5b4cf660..165cc4409 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -120,7 +120,7 @@ FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048
 	choosecontestmon
 	compare VAR_SPECIAL_4, 255
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097
-	special sub_80C43F4
+	special ScrSpecial_CheckSelectedMonAndInitContest
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A50C8
 	compare RESULT, 1
@@ -428,7 +428,7 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5
 	return
 
 LinkContestRoom1_EventScript_1A5455:: @ 81A5455
-	special sub_80C47A0
+	special ScrSpecial_GetMonCondition
 	compare VAR_CONTEST_LOCATION, 1
 	call_if_eq LinkContestRoom1_EventScript_1A555A
 	compare VAR_CONTEST_LOCATION, 2
@@ -855,7 +855,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2
 	return
 
 LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC
-	special sub_80C47C0
+	special ScrSpecial_GetContestWinnerIdx
 	switch VAR_SPECIAL_5
 	case 0, LinkContestRoom1_EventScript_1A5A31
 	case 1, LinkContestRoom1_EventScript_1A5A37
@@ -880,8 +880,8 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43
 	return
 
 LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49
-	special sub_80C47F0
-	special sub_80C4858
+	special ScrSpecial_GetContestWinnerTrainerName
+	special ScrSpecial_GetContestWinnerNick
 	addvar VAR_SPECIAL_5, 1
 	buffernumberstring 1, VAR_SPECIAL_5
 	addvar VAR_SPECIAL_5, -1
@@ -1018,13 +1018,13 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6
 	return
 
 LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12
-	specialvar RESULT, sub_80C4440
+	specialvar RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest
 	compare RESULT, 1
 	goto_if_eq LinkContestRoom1_EventScript_1A5C23
 	return
 
 LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23
-	special sub_80C47C0
+	special ScrSpecial_GetContestWinnerIdx
 	compare VAR_SPECIAL_5, 3
 	goto_if_eq LinkContestRoom1_EventScript_1A5C32
 	return
@@ -1060,8 +1060,8 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64
 	return
 
 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A
-	special sub_80C496C
-	special sub_80C47C0
+	special ScrSpecial_GetContestPlayerMonIdx
+	special ScrSpecial_GetContestWinnerIdx
 	compare VAR_SPECIAL_4, VAR_SPECIAL_5
 	goto_if_eq LinkContestRoom1_EventScript_1A5C7C
 	return
@@ -1107,7 +1107,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8
 	return
 
 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5
-	special sub_80C47C0
+	special ScrSpecial_GetContestWinnerIdx
 	compare VAR_SPECIAL_5, 3
 	goto_if_eq LinkContestRoom1_EventScript_1A5CFC
 	msgbox LinkContestRoom1_Text_1A6DF1, 3
@@ -1117,7 +1117,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC
 	compare VAR_CONTEST_LOCATION, 2
 	call_if_eq LinkContestRoom1_EventScript_1A5C42
 	incrementgamestat GAME_STAT_WON_CONTEST
-	specialvar RESULT, sub_80C4440
+	specialvar RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest
 	compare RESULT, 0
 	goto_if_eq LinkContestRoom1_EventScript_1A5D5B
 	compare CONTEST_RANK, 3
@@ -1138,7 +1138,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
 	return
 
 LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
-	special sub_80C44C0
+	special ScrSpecial_GiveContestRibbon
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
 	lockall
@@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	playfanfare MUS_FANFA4
 	msgbox LinkContestRoom1_Text_1A6D96, 4
 	waitfanfare
-	special sub_80C4858
+	special ScrSpecial_GetContestWinnerNick
 	msgbox LinkContestRoom1_Text_1A6DAC, 4
 	releaseall
 	return
diff --git a/data/specials.inc b/data/specials.inc
index db77f74a9..a59cae339 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -84,20 +84,20 @@ gSpecials::
 	def_special CheckForBigMovieOrEmergencyNewsOnTV
 	def_special GetMomOrDadStringForTVMessage
 	def_special ResetTVShowState
-	def_special sub_80C47C0
-	def_special sub_80C496C
+	def_special ScrSpecial_GetContestWinnerIdx
+	def_special ScrSpecial_GetContestPlayerMonIdx
 	def_special sub_80C4C28
-	def_special sub_80C47F0
-	def_special sub_80C4858
+	def_special ScrSpecial_GetContestWinnerTrainerName
+	def_special ScrSpecial_GetContestWinnerNick
 	def_special sub_80C4C64
-	def_special sub_80C4758
+	def_special ScrSpecial_CountContestMonsWithBetterCondition
 	def_special SetContestTrainerGfxIds
-	def_special sub_80C43F4
+	def_special ScrSpecial_CheckSelectedMonAndInitContest
 	def_special sub_80C4D80
-	def_special sub_80C4F70
-	def_special sub_80C47A0
-	def_special sub_80C4440
-	def_special sub_80C44C0
+	def_special ScrSpecial_SetLinkContestTrainerGfxIdx
+	def_special ScrSpecial_GetMonCondition
+	def_special ScrSpecial_CanMonParticipateInSelectedLinkContest
+	def_special ScrSpecial_GiveContestRibbon
 	def_special sub_80C5044
 	def_special GiveMonArtistRibbon
 	def_special sub_808363C
diff --git a/include/contest.h b/include/contest.h
index eb40cdb62..bf2613fe3 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -262,9 +262,9 @@ void LoadContestBgAfterMoveAnim(void);
 void CB2_StartContest(void);
 void Contest_CreatePlayerMon(u8);
 void Contest_InitAllPokemon(u8, u8);
-u8 sub_80AE47C(struct Pokemon *party);
-u16 sub_80AE770(u8, u8);
-void sub_80AE82C(u8);
+u8 CanMonParticipateInContest(struct Pokemon *party);
+u16 InitContestMonConditionI(u8, u8);
+void InitContestMonConditions(u8);
 u8 IsSpeciesNotUnown(u16);
 void sub_80AF668(void);
 void sub_80B0F28(u8);
diff --git a/include/contest_link_80C2020.h b/include/contest_link_80C2020.h
index 0b49d188c..5b1390ce1 100644
--- a/include/contest_link_80C2020.h
+++ b/include/contest_link_80C2020.h
@@ -2,12 +2,14 @@
 #define GUARD_CONTEST_LINK_80C2020_H
 
 void sub_80C2358(void);
-void sub_80C46EC(void);
-void sub_80C4740(void);
+void Contest_GetTrainerNameI_StringVar1(void);
+void Contest_GetNicknameI_StringVar1(void);
 void sub_80C48C8(void);
 void sub_80C48F4(void);
 void sub_80C4940(void);
 void sub_80C4980(u8);
 u8 sub_80C4B34(u8 *);
+void Contest_CopyAndConvertTrainerName_Intl(u8 *, const u8 *);
+void Contest_CopyAndConvertNicknameI_Intl(u8 *, u8);
 
 #endif // GUARD_CONTEST_LINK_80C2020_H
diff --git a/src/battle/contest_link_80C2020.c b/src/battle/contest_link_80C2020.c
index 38c1d30d2..2dde3895c 100644
--- a/src/battle/contest_link_80C2020.c
+++ b/src/battle/contest_link_80C2020.c
@@ -2562,18 +2562,18 @@ void sub_80C42C0(u8 taskId /*r12*/)
     }
 }
 
-void sub_80C43F4(void)
+void ScrSpecial_CheckSelectedMonAndInitContest(void)
 {
-    u8 result = sub_80AE47C(&gPlayerParty[gContestMonPartyIndex]);
+    u8 result = CanMonParticipateInContest(&gPlayerParty[gContestMonPartyIndex]);
     if (result != 0)
     {
         Contest_InitAllPokemon(gSpecialVar_ContestCategory, gSpecialVar_ContestRank);
-        sub_80AE82C(gSpecialVar_ContestCategory);
+        InitContestMonConditions(gSpecialVar_ContestCategory);
     }
     gSpecialVar_Result = result;
 }
 
-u16 sub_80C4440(void)
+u16 ScrSpecial_CanMonParticipateInSelectedLinkContest(void)
 {
     u16 result = 0;
     struct Pokemon *mon = &gPlayerParty[gContestMonPartyIndex];
@@ -2605,7 +2605,7 @@ u16 sub_80C4440(void)
 }
 
 
-void sub_80C44C0(void)
+void ScrSpecial_GiveContestRibbon(void)
 {
     u8 ribbonData;
 
@@ -2657,14 +2657,14 @@ void sub_80C44C0(void)
     }
 }
 
-void sub_80C4674(u8 * dest, const u8 * src)
+void Contest_CopyAndConvertTrainerName_Intl(u8 * dest, const u8 * src)
 {
     StringCopy(dest, src);
     if (dest[0] == EXT_CTRL_CODE_BEGIN && dest[1] == 0x15)
         ConvertInternationalString(dest, LANGUAGE_JAPANESE);
 }
 
-void sub_80C4698(u8 * dest, u8 idx)
+void Contest_CopyAndConvertNicknameI_Intl(u8 * dest, u8 idx)
 {
     StringCopy(dest, gContestMons[idx].nickname);
     if (gIsLinkContest & 1)
@@ -2676,24 +2676,24 @@ void sub_80C4698(u8 * dest, u8 idx)
     }
 }
 
-void sub_80C46EC(void)
+void Contest_GetTrainerNameI_StringVar1(void)
 {
     if (gIsLinkContest & 1)
     {
-        sub_80C4674(gStringVar1, gLinkPlayers[gSpecialVar_0x8006].name);
+        Contest_CopyAndConvertTrainerName_Intl(gStringVar1, gLinkPlayers[gSpecialVar_0x8006].name);
     }
     else
     {
-        sub_80C4674(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName);
+        Contest_CopyAndConvertTrainerName_Intl(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName);
     }
 }
 
-void sub_80C4740(void)
+void Contest_GetNicknameI_StringVar1(void)
 {
-    sub_80C4698(gStringVar3, gSpecialVar_0x8006);
+    Contest_CopyAndConvertNicknameI_Intl(gStringVar3, gSpecialVar_0x8006);
 }
 
-void sub_80C4758(void)
+void ScrSpecial_CountContestMonsWithBetterCondition(void)
 {
     u8 i;
     u8 count;
@@ -2707,12 +2707,12 @@ void sub_80C4758(void)
     gSpecialVar_0x8004 = count;
 }
 
-void sub_80C47A0(void)
+void ScrSpecial_GetMonCondition(void)
 {
     gSpecialVar_0x8004 = gContestMonConditions[gSpecialVar_0x8006];
 }
 
-void sub_80C47C0(void)
+void ScrSpecial_GetContestWinnerIdx(void)
 {
     u8 i;
 
@@ -2722,7 +2722,7 @@ void sub_80C47C0(void)
     gSpecialVar_0x8005 = i;
 }
 
-void sub_80C47F0(void)
+void ScrSpecial_GetContestWinnerTrainerName(void)
 {
     u8 i;
 
@@ -2731,22 +2731,22 @@ void sub_80C47F0(void)
 
     if (gIsLinkContest & 1)
     {
-        sub_80C4674(gStringVar3, gLinkPlayers[i].name);
+        Contest_CopyAndConvertTrainerName_Intl(gStringVar3, gLinkPlayers[i].name);
     }
     else
     {
-        sub_80C4674(gStringVar3, gContestMons[i].trainerName);
+        Contest_CopyAndConvertTrainerName_Intl(gStringVar3, gContestMons[i].trainerName);
     }
 }
 
-void sub_80C4858(void)
+void ScrSpecial_GetContestWinnerNick(void)
 {
     u8 i;
 
     for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
         ;
 
-    sub_80C4698(gStringVar1, i);
+    Contest_CopyAndConvertNicknameI_Intl(gStringVar1, i);
 }
 
 void sub_80C488C(void)
@@ -2791,7 +2791,7 @@ void sub_80C4940(void)
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
 }
 
-void sub_80C496C(void)
+void ScrSpecial_GetContestPlayerMonIdx(void)
 {
     gSpecialVar_0x8004 = gContestPlayerMonIndex;
 }
@@ -2850,7 +2850,7 @@ void sub_80C4A44(u8 taskId)
         sp4[i] = gTasks[taskId].data[i + 5];
 
     gUnknown_0203869B = sub_80C4B34(sp4);
-    sub_80AE82C(gSpecialVar_ContestCategory);
+    InitContestMonConditions(gSpecialVar_ContestCategory);
     SetTaskFuncWithFollowupFunc(taskId, sub_80C8EBC, sub_80C4B0C);
 }
 
diff --git a/src/contest.c b/src/contest.c
index 4efe18cce..9652e999e 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -2246,7 +2246,7 @@ void Contest_InitAllPokemon(u8 contestType, u8 rank)
 }
 
 // GetContestAvailability?
-u8 sub_80AE47C(struct Pokemon *pkmn)
+u8 CanMonParticipateInContest(struct Pokemon *pkmn)
 {
     u8 ribbon;
     u8 retVal;
@@ -2380,7 +2380,7 @@ void sub_80AE6E4(u8 a, u8 b)
       1);
 }
 
-u16 sub_80AE770(u8 a, u8 b)
+u16 InitContestMonConditionI(u8 a, u8 b)
 {
     u8 r5;
     u8 r4;
@@ -2388,27 +2388,27 @@ u16 sub_80AE770(u8 a, u8 b)
 
     switch (b)
     {
-    case 0:
+    case CONTEST_CATEGORY_COOL:
         r5 = gContestMons[a].cool;
         r4 = gContestMons[a].tough;
         r3 = gContestMons[a].beauty;
         break;
-    case 1:
+    case CONTEST_CATEGORY_BEAUTY:
         r5 = gContestMons[a].beauty;
         r4 = gContestMons[a].cool;
         r3 = gContestMons[a].cute;
         break;
-    case 2:
+    case CONTEST_CATEGORY_CUTE:
         r5 = gContestMons[a].cute;
         r4 = gContestMons[a].beauty;
         r3 = gContestMons[a].smart;
         break;
-    case 3:
+    case CONTEST_CATEGORY_SMART:
         r5 = gContestMons[a].smart;
         r4 = gContestMons[a].cute;
         r3 = gContestMons[a].tough;
         break;
-    case 4:
+    case CONTEST_CATEGORY_TOUGH:
     default:
         r5 = gContestMons[a].tough;
         r4 = gContestMons[a].smart;
@@ -2418,12 +2418,12 @@ u16 sub_80AE770(u8 a, u8 b)
     return r5 + (r4 + r3 + gContestMons[a].sheen) / 2;
 }
 
-void sub_80AE82C(u8 a)
+void InitContestMonConditions(u8 a)
 {
     u8 i;
 
     for (i = 0; i < 4; i++)
-        gContestMonConditions[i] = sub_80AE770(i, a);
+        gContestMonConditions[i] = InitContestMonConditionI(i, a);
 }
 
 u8 CreateJudgeSprite(void)
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index b0fc9b45d..1d2879661 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -182,7 +182,7 @@ static void sub_80A9D58(u8 taskId)
        dest[i] = gTasks[taskId].data[5 + i];
 
    gUnknown_0203869B = sub_80C4B34(dest);
-   sub_80AE82C((u8)gSpecialVar_ContestCategory);
+   InitContestMonConditions((u8)gSpecialVar_ContestCategory);
    sub_80B0F28(0);
    SetTaskFuncWithFollowupFunc(taskId, sub_80C8EBC, sub_80A9DBC);
 }
@@ -607,7 +607,7 @@ void sub_80AA5E8(u8 var)
 
 static void sub_80AA614(u8 var1, u8 var2)
 {
-    u16 var = sub_80AE770(var1, var2);
+    u16 var = InitContestMonConditionI(var1, var2);
 
     ConvertIntToDecimalStringN(gSharedMem, var, STR_CONV_MODE_RIGHT_ALIGN, 3);
     Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0xE2, 3, 0xC);
@@ -859,7 +859,7 @@ void sub_80AACC4(void)
     {
         SetDebugMonForContest();
         if (!(gIsLinkContest & 1))
-            sub_80AE82C(eMatsudaDebugVar);
+            InitContestMonConditions(eMatsudaDebugVar);
         SetMainCallback2(CB2_StartContest);
     }
 }
@@ -882,7 +882,7 @@ void sub_80AAD44(struct Sprite *sprite, s8 var2)
 
         SetDebugMonForContest();
         for (i = 0; i < 4; i++)
-            gContestMonConditions[i] = sub_80AE770(i, gSpecialVar_ContestCategory);
+            gContestMonConditions[i] = InitContestMonConditionI(i, gSpecialVar_ContestCategory);
         SetMainCallback2(c2_exit_to_overworld_1_sub_8080DEC);
     }
 }
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index cf6da2cda..f6cb8ae0a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -24,9 +24,6 @@
 #include "task.h"
 #include "ewram.h"
 
-extern void sub_80C4674();
-extern void sub_80C4698(u8 *, u8);
-
 #define CONTEST_ENTRY_PIC_LEFT 10
 #define CONTEST_ENTRY_PIC_TOP 3
 
@@ -72,8 +69,8 @@ void sub_80C4C28(void)
 
 void sub_80C4C64(void)
 {
-    sub_80C46EC();
-    sub_80C4740();
+    Contest_GetTrainerNameI_StringVar1();
+    Contest_GetNicknameI_StringVar1();
     sub_80C48F4();
 }
 
@@ -84,19 +81,19 @@ void sub_80C4C78(void)
 
     switch(gSpecialVar_ContestCategory)
     {
-    case 0:
+    case CONTEST_CATEGORY_COOL:
         var = 8;
         break;
-    case 1:
+    case CONTEST_CATEGORY_BEAUTY:
         var = 9;
         break;
-    case 2:
+    case CONTEST_CATEGORY_CUTE:
         var = 10;
         break;
-    case 3:
+    case CONTEST_CATEGORY_SMART:
         var = 11;
         break;
-    case 4:
+    case CONTEST_CATEGORY_TOUGH:
     default:
         var = 12;
         break;
@@ -202,12 +199,12 @@ void sub_80C4D80(void)
         }
     }
 
-    sub_80C4698(gStringVar1, i);
+    Contest_CopyAndConvertNicknameI_Intl(gStringVar1, i);
 
     if (gIsLinkContest & 1)
-        sub_80C4674(gStringVar2, gLinkPlayers[i].name);
+        Contest_CopyAndConvertTrainerName_Intl(gStringVar2, gLinkPlayers[i].name);
     else
-        sub_80C4674(gStringVar2, gContestMons[i].trainerName);
+        Contest_CopyAndConvertTrainerName_Intl(gStringVar2, gContestMons[i].trainerName);
 
     if (r10 == 1 || r7 == r10)
         gSpecialVar_0x8006 = r4_;
@@ -234,7 +231,7 @@ void ShowContestWinner(void)
     gMain.savedCallback = ShowContestWinnerCleanup;
 }
 
-void sub_80C4F70(void)
+void ScrSpecial_SetLinkContestTrainerGfxIdx(void)
 {
     VarSet(VAR_OBJ_GFX_ID_0, gContestMons[0].trainerGfxId);
     VarSet(VAR_OBJ_GFX_ID_1, gContestMons[1].trainerGfxId);
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index ebdcbf5fd..27cd8992f 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -139,7 +139,7 @@ void sub_80F9C00(void)
 
     for (i = 0; i < gPlayerPartyCount; i++)
     {
-        switch (sub_80AE47C(&gPlayerParty[i]))
+        switch (CanMonParticipateInContest(&gPlayerParty[i]))
         {
         case 0:
         case 3: