fix build

3 files changed, 15 insertions, 30 deletions

diff --git a/src/contest.c b/src/contest.c
index 2159ec68f..5f7bae53f 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -99,7 +99,7 @@ struct UnknownContestStruct1
     u8 filler12;
     u8 unk13;
     u8 unk14;
-    u8 unk15_0:1;
+    u8 unk15_0:1;  // Is this a bitfield or not? sub_80ABCDC says no.
     u8 unk15_1:3;
     u8 unk15_4:1;
     u8 unk15_5:1;
@@ -850,14 +850,6 @@ void sub_80ABC70(u8 taskId)
     }
 }
 
-
-struct UnknownContestStruct2
-{
-    u16 unk0[4];
-    u8 filler8[56];
-};
-extern struct UnknownContestStruct2 gUnknown_0203858E[];
-
 extern const u8 gUnknown_083CA340[][4];
 
 #ifdef NONMATCHING
@@ -878,14 +870,13 @@ void sub_80ABCDC(u8 taskId)
 
     for (i = 0; i < 4; i++)
     {
-        u32 offset = i * 2 + gContestPlayerMonIndex * 64;
-        u16 r4 = *(u16 *)((u8 *)gUnknown_0203858E + offset);
+        u16 r4 = gContestMons[gContestPlayerMonIndex].moves[i];
         u8 *r5 = sp8;
 
         if (shared19260.unk19260[gContestPlayerMonIndex].unk8 != 0
          && sub_80B214C(gContestPlayerMonIndex) != 0
          && AreMovesContestCombo(shared19260.unk19260[gContestPlayerMonIndex].unk8, r4)
-         && shared19260.unk19260[gContestPlayerMonIndex].unk15 & 0x10)
+         && shared19260.unk19260[gContestPlayerMonIndex].unk15_4)
         {
             r5 = StringCopy(sp8, gUnknownText_UnknownFormatting2);
         }
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index b99dfb831..b351784ba 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -18,7 +18,6 @@
 #include "ewram.h"
 
 extern u8 gUnknown_0203856C;
-extern u8 gUnknown_0203857D[][64];  // TODO: This is actually part of gContestMons
 extern u16 gUnknown_02038670[];
 extern u16 gUnknown_02038678[];
 extern u16 gUnknown_02038680[];
@@ -576,19 +575,14 @@ void sub_80AA280(u8 var) // no?
 
     FillWindowRect_DefaultPalette(&gMenuWindow, 0, 0, 0, 0x1E, 3);
     StringCopy(gSharedMem, gMatsudaDebugMenu_StartText);
-    StringAppend(gSharedMem, &gUnknown_0203857D[var][0]);
+    StringAppend(gSharedMem, gContestMons[var].trainerName);
 
     for (i = 0; i < 4; i++)
     {
         if (var == i)
-        {
-            sub_8003460(&gMenuWindow, gSharedMem, (10 * i + 2), gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
-        }
+            sub_8003460(&gMenuWindow, gSharedMem, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
         else
-        {
-            u8 *ptr = gUnknown_0203857D[i];
-            sub_8003460(&gMenuWindow, ptr, (10 * i + 2), gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
-        }
+            sub_8003460(&gMenuWindow, gContestMons[i].trainerName, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]);
     }
 }
 
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 9d1aaa125..31065cb58 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -51,9 +51,9 @@ extern u16 gUnknown_02038678[];
 
 void sub_80C4BF0(void)
 {
-    gSaveBlock1.vars[0x10] = gContestMons[0].unk16;
-    gSaveBlock1.vars[0x11] = gContestMons[1].unk16;
-    gSaveBlock1.vars[0x12] = gContestMons[2].unk16;
+    gSaveBlock1.vars[0x10] = gContestMons[0].unk15;
+    gSaveBlock1.vars[0x11] = gContestMons[1].unk15;
+    gSaveBlock1.vars[0x12] = gContestMons[2].unk15;
 }
 
 void sub_80C4C28(void)
@@ -376,10 +376,10 @@ void ShowContestWinner(void)
 
 void sub_80C4F70(void)
 {
-    VarSet(0x4010, gContestMons[0].unk16);
-    VarSet(0x4011, gContestMons[1].unk16);
-    VarSet(0x4012, gContestMons[2].unk16);
-    VarSet(0x4013, gContestMons[3].unk16);
+    VarSet(0x4010, gContestMons[0].unk15);
+    VarSet(0x4011, gContestMons[1].unk15);
+    VarSet(0x4012, gContestMons[2].unk15);
+    VarSet(0x4013, gContestMons[3].unk15);
 }
 
 bool8 GiveMonArtistRibbon(void)
@@ -421,8 +421,8 @@ void ShowContestEntryMonPic(void)
 
         MenuDrawTextWindow(left, top, 19, 13);
         species = gContestMons[gSpecialVar_0x8006].species;
-        var1 = gContestMons[gSpecialVar_0x8006].unk38; // v2
-        var2 = gContestMons[gSpecialVar_0x8006].unk3C; // v3
+        var1 = gContestMons[gSpecialVar_0x8006].personality;
+        var2 = gContestMons[gSpecialVar_0x8006].otId;
         taskId = CreateTask(sub_80C5190, 0x50);
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].data[1] = species;