through sub_80C2340

6 files changed, 47 insertions, 38 deletions

diff --git a/src/battle/contest_link_80C2020.c b/src/battle/contest_link_80C2020.c
index 5e3cc3cce..27f3f8ea3 100644
--- a/src/battle/contest_link_80C2020.c
+++ b/src/battle/contest_link_80C2020.c
@@ -3,6 +3,7 @@
 #include "palette.h"
 #include "graphics.h"
 #include "text.h"
+#include "string_util.h"
 #include "menu.h"
 #include "battle.h"
 #include "contest.h"
@@ -14,6 +15,9 @@ void sub_80C37E4(void);
 u8 sub_80C3990(u8 a0, u8 a5);
 s8 sub_80C39E4(u8 a0, u8 a5);
 
+extern const u8 gUnknown_083D17DC[];
+extern const u8 gUnknown_083D17E0[];
+
 void sub_80C2020(void)
 {
     REG_DISPCNT = DISPCNT_OBJ_1D_MAP;
@@ -95,3 +99,36 @@ void sub_80C2144(void)
         }
     }
 }
+
+void sub_80C226C(u8 a0)
+{
+    u8 *strbuf;
+
+    if (a0 == gContestPlayerMonIndex)
+        strbuf = StringCopy(gDisplayedStringBattle, gUnknown_083D17DC);
+    else
+        strbuf = gDisplayedStringBattle;
+    strbuf[0] = EXT_CTRL_CODE_BEGIN;
+    strbuf[1] = 0x06;
+    strbuf[2] = 0x04;
+    strbuf += 3;
+    strbuf = StringCopy(strbuf, gContestMons[a0].nickname);
+    strbuf[0] = EXT_CTRL_CODE_BEGIN;
+    strbuf[1] = 0x13;
+    strbuf[2] = 0x32;
+    strbuf += 3;
+    strbuf = StringCopy(strbuf, gUnknown_083D17E0);
+    if (gIsLinkContest & 1)
+        StringCopy(strbuf, gLinkPlayers[a0].name);
+    else
+        StringCopy(strbuf, gContestMons[a0].trainerName);
+    Text_InitWindowAndPrintText(&gMenuWindow, gDisplayedStringBattle, a0 * 36 + 770, 7, a0 * 3 + 4);
+}
+
+void sub_80C2340(void)
+{
+    int i;
+
+    for (i = 0; i < 4; i++)
+        sub_80C226C(i);
+}
diff --git a/src/contest.c b/src/contest.c
index e690488fb..9c115840e 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -47,7 +47,7 @@ extern u8 gBankTarget;
 extern u8 gBanksBySide[];
 extern u8 gObjectBankIDs[];
 extern struct Window gUnknown_03004210;
-extern u32 gUnknown_03005D28;  // saved RNG value
+extern u32 gContestRngValue;  // saved RNG value
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
@@ -483,7 +483,7 @@ void sub_80AB6B4(u8 taskId)
         GetMultiplayerId();  // unused return value
         DestroyTask(taskId);
         gTasks[sContest.mainTaskId].func = sub_80AB960;
-        gRngValue = gUnknown_03005D28;
+        gRngValue = gContestRngValue;
     }
 }
 
@@ -1799,7 +1799,7 @@ void sub_80ADDA4(u8 taskId)
     sub_80AF668();
     sub_80AF138();
     sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove);
-    gUnknown_03005D28 = gRngValue;
+    gContestRngValue = gRngValue;
     StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C);
     Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
     gTasks[taskId].data[2] = 0;
diff --git a/src/contest_ai.c b/src/contest_ai.c
index 66b387270..932f9fb8a 100644
--- a/src/contest_ai.c
+++ b/src/contest_ai.c
@@ -8,7 +8,6 @@ extern u8 AreMovesContestCombo(u16, u16);
 extern bool8 sub_80B214C(u8);
 extern bool8 Contest_IsMonsTurnDisabled(u8);
 
-extern s16 gUnknown_02038670[];
 extern u16 gSpecialVar_ContestCategory;
 
 extern u8 *gAIScriptPtr;
@@ -1119,7 +1118,7 @@ static void ContestAICmd_check_would_finish_combo(void)
 
     if(sContestantStatus[eContestAI->unk41].prevMove)
         result = AreMovesContestCombo(sContestantStatus[eContestAI->unk41].prevMove, move);
-    
+
     if(result)
         result = 1;
 
@@ -1727,7 +1726,7 @@ static void ContestAICmd_unk_85(void)
     int result = 0;
     int i;
     u16 arg = T1_READ_16(gAIScriptPtr + 1);
-    
+
     for(i = 0; i < 4; i++)
     {
         u16 move = gContestMons[eContestAI->unk41].moves[i];
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index da1937adb..62d49fc62 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "matsuda_debug_menu.h"
+#include "battle.h"
 #include "contest.h"
 #include "contest_link_80C2020.h"
 #include "contest_link_80C857C.h"
@@ -18,30 +19,12 @@
 #include "ewram.h"
 
 extern u8 gUnknown_0203856C;
-extern s16 gUnknown_02038670[];
-extern s16 gUnknown_02038678[];
-extern s16 gUnknown_02038680[];
-extern u8 gContestFinalStandings[];
 extern u8 gUnknown_02038694;
-extern u8 gIsLinkContest;
-extern u8 gUnknown_0203869B;
-extern u8 gContestPlayerMonIndex;
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
 
-extern u16 gBattle_BG0_X;
-extern u16 gBattle_BG0_Y;
-extern u16 gBattle_BG1_X;
-extern u16 gBattle_BG1_Y;
-extern u16 gBattle_BG2_X;
-extern u16 gBattle_BG2_Y;
-extern u16 gBattle_BG3_X;
-extern u16 gBattle_BG3_Y;
-
 extern u8 (*gMenuCallback)(void);
 
-extern bool8 gReceivedRemoteLinkPlayers;
-
 static bool8 sub_80A9B78(void);
 static void sub_80A9BE4(u8 taskId);
 static void sub_80A9C98(u8);
diff --git a/src/pokemon/pokemon_size_record.c b/src/pokemon/pokemon_size_record.c
index f92a95bfb..2ba4e57cc 100644
--- a/src/pokemon/pokemon_size_record.c
+++ b/src/pokemon/pokemon_size_record.c
@@ -8,6 +8,8 @@
 #include "strings2.h"
 #include "text.h"
 
+const u16 Unknown_083D17EC[] = INCBIN_U16("graphics/unknown/unknown_3D17EC.gbapal");
+
 struct UnknownStruct
 {
     u16 unk0;
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index f991297ab..22fce174a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -32,26 +32,14 @@ extern void sub_80C4698(u8 *, u8);
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
-extern u8 gContestPlayerMonIndex;
-extern u8 gIsLinkContest;
-extern u8 gPlayerPartyCount;
 extern u8 gSelectedOrderFromParty[];
 
-extern u16 gSpecialVar_0x8004;
-extern u16 gSpecialVar_0x8005;
-extern u16 gSpecialVar_0x8006;
 
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
-extern u16 gSpecialVar_Result;
-
-extern u32 gUnknown_03005D28;
 
 extern u8 gUnknown_02038694;
 extern u8 gUnknown_0203856C;
-extern u8 gContestFinalStandings[];
-extern s16 gUnknown_02038670[];
-extern s16 gUnknown_02038678[];
 
 void SetContestTrainerGfxIds(void)
 {
@@ -373,8 +361,8 @@ void ScriptRandom(void)
 
     if(gIsLinkContest & 1)
     {
-        gUnknown_03005D28 = 1103515245 * gUnknown_03005D28 + 24691;
-        random = gUnknown_03005D28 >> 16;
+        gContestRngValue = 1103515245 * gContestRngValue + 24691;
+        random = gContestRngValue >> 16;
         scriptPtr = &gSpecialVar_Result;
     }
     else