Finish porting contest data to C

4 files changed, 64 insertions, 64 deletions

diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index addedb088..e8f40f08e 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -851,7 +851,7 @@ static bool8 FishingPoints(void)
     ConvertIntToDecimalStringN(gStringVar1, FeebasDebug_GetTrueNumberOfWaterTilesInMapThird(2), STR_CONV_MODE_RIGHT_ALIGN, 5);
     Menu_PrintText(gStringVar1, 11, 7);
 
-    FeebasSeedRng(gSaveBlock1.easyChatPairs[0].excitementAppealBonus);
+    FeebasSeedRng(gSaveBlock1.easyChatPairs[0].unk2);
     nWaterTiles = FishingPoints_CountFishingTilesInMapThird(0) + FishingPoints_CountFishingTilesInMapThird(1) + FishingPoints_CountFishingTilesInMapThird(2);
     nFeebas = 0;
 
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index 1305bd819..9a997a566 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -221,7 +221,7 @@ bool8 TayaDebugMenu_Trend(void)
         *r4++ = CHAR_SPACE;
         r4 = ConvertIntToDecimalStringN(r4, pair->unk0_7, STR_CONV_MODE_RIGHT_ALIGN, 3);
         *r4++ = CHAR_SPACE;
-        ConvertIntToDecimalStringN(r4, pair->excitementAppealBonus, STR_CONV_MODE_RIGHT_ALIGN, 5);
+        ConvertIntToDecimalStringN(r4, pair->unk2, STR_CONV_MODE_RIGHT_ALIGN, 5);
         Menu_PrintText(sp00, 1, 2 * i + 1);
         pair++;
     }
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 81435c366..94b697954 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -4477,40 +4477,40 @@ static void PrepareDebugOverlayBeforeShowingContestPainting(u8 a0)
     switch (a0)
     {
         case 0:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 0;
-            contestEntry->contestType = sPicTest_ContestType - 1;
-            StringCopy(contestEntry->trainer_name, sDummyTrainerName);
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 0;
+            contestEntry->contestCategory = sPicTest_ContestType - 1;
+            StringCopy(contestEntry->trainerName, sDummyTrainerName);
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 1:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = sPicTest_MuseumArtTitleType - 1;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = sPicTest_MuseumArtTitleType - 1;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 2:
-            gBattleStruct->contestWinnerIsForArtist = 1;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = sPicTest_PreviewType - 1;
+            eCurContestWinnerIsForArtist = TRUE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = sPicTest_PreviewType - 1;
             break;
         case 3:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = 0;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = 0;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 4:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = 3;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = 3;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
         case 5:
-            gBattleStruct->contestWinnerIsForArtist = 0;
-            gBattleStruct->contestWinnerSaveIdx = 8;
-            contestEntry->contestType = 9;
-            StringCopy(contestEntry->pokemon_name, sDummyNickname);
+            eCurContestWinnerIsForArtist = FALSE;
+            eCurContestWinnerSaveIdx = 8;
+            contestEntry->contestCategory = 9;
+            StringCopy(contestEntry->nickname, sDummyNickname);
             break;
     }
 }
diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index dd23ccaea..47ba64c67 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -84,7 +84,7 @@ struct WatanabeEwram18000_2 {
     u8 random;
     u8 unk9;
     u8 unkA;
-    struct PlttData contestant;
+    struct PlttData unkC;
     u16 unk10[16];
 };
 
@@ -2712,10 +2712,10 @@ void debug_80C6EE8(u8 taskId)
     u16 hue;
     CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->unk10, 32);
     hue = gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81];
-    gUnknown_Debug_2038A20->contestant.r = hue & 0x1f;
-    gUnknown_Debug_2038A20->contestant.g = (hue & 0x3e0) >> 5;
-    gUnknown_Debug_2038A20->contestant.b = (hue & 0x7c00) >> 10;
-    gUnknown_Debug_2038A20->contestant.unused_15 = 0;
+    gUnknown_Debug_2038A20->unkC.r = hue & 0x1f;
+    gUnknown_Debug_2038A20->unkC.g = (hue & 0x3e0) >> 5;
+    gUnknown_Debug_2038A20->unkC.b = (hue & 0x7c00) >> 10;
+    gUnknown_Debug_2038A20->unkC.unused_15 = 0;
     debug_80C68CC(gUnknown_Debug_2038A20->unk7 + 1, 11, 10, 2);
     Menu_PrintText(gUnknown_Debug_083F8813, 13, 10);
     debug_80C68CC(hue, 14, 10, 4);
@@ -3129,18 +3129,18 @@ void debug_80C7294(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r < 31)
-                    gUnknown_Debug_2038A20->contestant.r++;
+                if (gUnknown_Debug_2038A20->unkC.r < 31)
+                    gUnknown_Debug_2038A20->unkC.r++;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g < 31)
-                    gUnknown_Debug_2038A20->contestant.g++;
+                if (gUnknown_Debug_2038A20->unkC.g < 31)
+                    gUnknown_Debug_2038A20->unkC.g++;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b < 31)
-                    gUnknown_Debug_2038A20->contestant.b++;
+                if (gUnknown_Debug_2038A20->unkC.b < 31)
+                    gUnknown_Debug_2038A20->unkC.b++;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
         }
@@ -3150,18 +3150,18 @@ void debug_80C7294(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r > 0)
-                    gUnknown_Debug_2038A20->contestant.r--;
+                if (gUnknown_Debug_2038A20->unkC.r > 0)
+                    gUnknown_Debug_2038A20->unkC.r--;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g > 0)
-                    gUnknown_Debug_2038A20->contestant.g--;
+                if (gUnknown_Debug_2038A20->unkC.g > 0)
+                    gUnknown_Debug_2038A20->unkC.g--;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b > 0)
-                    gUnknown_Debug_2038A20->contestant.b--;
+                if (gUnknown_Debug_2038A20->unkC.b > 0)
+                    gUnknown_Debug_2038A20->unkC.b--;
                 gTasks[taskId].func = debug_80C74E4;
                 break;
         }
@@ -3170,7 +3170,7 @@ void debug_80C7294(u8 taskId)
 
 void debug_80C74E4(u8 taskId)
 {
-    u16 pal = (gUnknown_Debug_2038A20->contestant.r & 0x001f) + ((gUnknown_Debug_2038A20->contestant.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->contestant.b << 10) & 0x7c00);
+    u16 pal = (gUnknown_Debug_2038A20->unkC.r & 0x001f) + ((gUnknown_Debug_2038A20->unkC.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->unkC.b << 10) & 0x7c00);
     gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferFaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferUnfaded[0x101 + gUnknown_Debug_2038A20->unk6 * 16 + gUnknown_Debug_2038A20->unk7] = pal;
@@ -3190,13 +3190,13 @@ void debug_80C7584(struct Sprite *sprite)
         {
             default:
             case 0:
-                shade = gUnknown_Debug_2038A20->contestant.r;
+                shade = gUnknown_Debug_2038A20->unkC.r;
                 break;
             case 1:
-                shade = gUnknown_Debug_2038A20->contestant.g;
+                shade = gUnknown_Debug_2038A20->unkC.g;
                 break;
             case 2:
-                shade = gUnknown_Debug_2038A20->contestant.b;
+                shade = gUnknown_Debug_2038A20->unkC.b;
                 break;
         }
         sprite->pos2.x = 4 * shade;
@@ -3320,10 +3320,10 @@ void debug_80C7A54(u8 taskId)
     u16 hue;
     CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->unk10, 32);
     hue = gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81];
-    gUnknown_Debug_2038A20->contestant.r = hue & 0x1f;
-    gUnknown_Debug_2038A20->contestant.g = (hue & 0x3e0) >> 5;
-    gUnknown_Debug_2038A20->contestant.b = (hue & 0x7c00) >> 10;
-    gUnknown_Debug_2038A20->contestant.unused_15 = 0;
+    gUnknown_Debug_2038A20->unkC.r = hue & 0x1f;
+    gUnknown_Debug_2038A20->unkC.g = (hue & 0x3e0) >> 5;
+    gUnknown_Debug_2038A20->unkC.b = (hue & 0x7c00) >> 10;
+    gUnknown_Debug_2038A20->unkC.unused_15 = 0;
     debug_80C68CC(gUnknown_Debug_2038A20->unk7 + 1, 11, 10, 2);
     Menu_PrintText(gUnknown_Debug_083F8813, 13, 10);
     debug_80C68CC(hue, 14, 10, 4);
@@ -3720,18 +3720,18 @@ void debug_80C7DDC(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r < 31)
-                    gUnknown_Debug_2038A20->contestant.r++;
+                if (gUnknown_Debug_2038A20->unkC.r < 31)
+                    gUnknown_Debug_2038A20->unkC.r++;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g < 31)
-                    gUnknown_Debug_2038A20->contestant.g++;
+                if (gUnknown_Debug_2038A20->unkC.g < 31)
+                    gUnknown_Debug_2038A20->unkC.g++;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b < 31)
-                    gUnknown_Debug_2038A20->contestant.b++;
+                if (gUnknown_Debug_2038A20->unkC.b < 31)
+                    gUnknown_Debug_2038A20->unkC.b++;
                 gTasks[taskId].func = debug_80C802C;
                 break;
         }
@@ -3741,18 +3741,18 @@ void debug_80C7DDC(u8 taskId)
         switch (gUnknown_Debug_2038A20->unkA)
         {
             case 0:
-                if (gUnknown_Debug_2038A20->contestant.r > 0)
-                    gUnknown_Debug_2038A20->contestant.r--;
+                if (gUnknown_Debug_2038A20->unkC.r > 0)
+                    gUnknown_Debug_2038A20->unkC.r--;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 1:
-                if (gUnknown_Debug_2038A20->contestant.g > 0)
-                    gUnknown_Debug_2038A20->contestant.g--;
+                if (gUnknown_Debug_2038A20->unkC.g > 0)
+                    gUnknown_Debug_2038A20->unkC.g--;
                 gTasks[taskId].func = debug_80C802C;
                 break;
             case 2:
-                if (gUnknown_Debug_2038A20->contestant.b > 0)
-                    gUnknown_Debug_2038A20->contestant.b--;
+                if (gUnknown_Debug_2038A20->unkC.b > 0)
+                    gUnknown_Debug_2038A20->unkC.b--;
                 gTasks[taskId].func = debug_80C802C;
                 break;
         }
@@ -3761,7 +3761,7 @@ void debug_80C7DDC(u8 taskId)
 
 void debug_80C802C(u8 taskId)
 {
-    u16 pal = (gUnknown_Debug_2038A20->contestant.r & 0x001f) + ((gUnknown_Debug_2038A20->contestant.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->contestant.b << 10) & 0x7c00);
+    u16 pal = (gUnknown_Debug_2038A20->unkC.r & 0x001f) + ((gUnknown_Debug_2038A20->unkC.g << 5) & 0x03e0) + ((gUnknown_Debug_2038A20->unkC.b << 10) & 0x7c00);
     gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferFaded[gUnknown_Debug_2038A20->unk7 + 0x81] = pal;
     gPlttBufferUnfaded[0x101 + gUnknown_Debug_2038A20->unk6 * 16 + gUnknown_Debug_2038A20->unk7] = pal;