diff --git a/include/overlay096/struct_ov96_0223B450_sub1.h b/include/overlay096/struct_ov96_0223B450_sub1.h
index 340a6eb6e5..bf823c26af 100644
--- a/include/overlay096/struct_ov96_0223B450_sub1.h
+++ b/include/overlay096/struct_ov96_0223B450_sub1.h
@@ -1,26 +1,30 @@
 #ifndef POKEPLATINUM_STRUCT_OV96_0223B450_SUB1_H
 #define POKEPLATINUM_STRUCT_OV96_0223B450_SUB1_H
 
+#include "constants/string.h"
+
 #include "struct_defs/struct_0202D314.h"
 
+#include "charcode.h"
+
 typedef struct {
     UnkStruct_0202D314 unk_00[3];
-    u16 unk_A8[8];
-    u8 unk_B8;
+    charcode_t name[TRAINER_NAME_LEN + 1];
+    u8 version;
     u8 language;
-    u8 unk_BA;
-    u8 unk_BB;
-    u8 unk_BC[4];
+    u8 country;
+    u8 region;
+    u8 trainerInfoId[4];
     s8 unk_C0[8];
     union {
         struct {
-            u8 unk_C8_val1_0 : 1;
-            u8 unk_C8_val1_1 : 1;
+            u8 unused1 : 1;
+            u8 gender : 1;
             u8 : 6;
         };
-        u8 unk_C8_val2;
+        u8 unused2;
     };
-    u8 unk_C9;
+    u8 appearance;
     s8 unk_CA[24];
     u16 unk_E2;
 } UnkStruct_ov96_0223B450_sub1;
diff --git a/include/struct_defs/struct_0209C194_1.h b/include/struct_defs/struct_0209C194_1.h
index f62c57b8c3..e3c114c6aa 100644
--- a/include/struct_defs/struct_0209C194_1.h
+++ b/include/struct_defs/struct_0209C194_1.h
@@ -17,7 +17,7 @@ typedef struct {
     UnkStruct_0205C22C *unk_0C;
     Options *options;
     GameRecords *records;
-    JournalEntry *unk_18;
+    JournalEntry *journalEntry;
     FieldSystem *fieldSystem;
 } UnkStruct_0209C194_1;
 
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index affac8d29a..0a06bf37d2 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -1335,7 +1335,7 @@ static int ov109_021D1A14(UnkStruct_ov109_021D0F70 *param0)
 {
     void *journalEntryOnlineEvent = JournalEntry_CreateEventMisc(95, ONLINE_EVENT_SPIN_TRADE);
 
-    JournalEntry_SaveData(param0->unk_CC->unk_14.unk_18, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
+    JournalEntry_SaveData(param0->unk_CC->unk_14.journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
     GameRecords_IncrementRecordValue(param0->unk_CC->unk_14.records, RECORD_UNK_119);
     GameRecords_IncrementTrainerScore(param0->unk_CC->unk_14.records, TRAINER_SCORE_EVENT_UNK_45);
     ov109_021D2634(param0, 11);
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 684b10f286..d577b1bb7c 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -1041,15 +1041,13 @@ static int ov109_021D4CA8(UnkStruct_ov109_021D5140 *param0, int param1)
 
 static int ov109_021D4CC8(UnkStruct_ov109_021D5140 *param0, int param1)
 {
-    void *journalEntryOnlineEvent;
-
     gSystem.inhibitReset = 1;
 
-    journalEntryOnlineEvent = JournalEntry_CreateEventMixedRecords(95);
-    JournalEntry_SaveData(param0->unk_0C->unk_14.unk_18, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
+    void *journalEntryOnlineEvent = JournalEntry_CreateEventMixedRecords(95);
+    JournalEntry_SaveData(param0->unk_0C->unk_14.journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
 
     journalEntryOnlineEvent = JournalEntry_CreateEventMisc(95, ONLINE_EVENT_SPIN_TRADE);
-    JournalEntry_SaveData(param0->unk_0C->unk_14.unk_18, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
+    JournalEntry_SaveData(param0->unk_0C->unk_14.journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
     GameRecords_IncrementTrainerScore(param0->unk_0C->unk_14.records, TRAINER_SCORE_EVENT_UNK_20);
     sub_02038ED4(&param0->unk_414);
     param0->unk_3B8 = 28;
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index ebe0f0ef5e..62d985d371 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -35,10 +35,7 @@ BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 *param0);
 
 UnkStruct_ov111_021D33F4 *ov111_021D33F4(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7)
 {
-    UnkStruct_ov111_021D33F4 *v0;
-    VecFx32 v1;
-
-    v0 = Heap_Alloc(HEAP_ID_115, sizeof(UnkStruct_ov111_021D33F4));
+    UnkStruct_ov111_021D33F4 *v0 = Heap_Alloc(HEAP_ID_115, sizeof(UnkStruct_ov111_021D33F4));
     memset(v0, 0, sizeof(UnkStruct_ov111_021D33F4));
     v0->unk_0C = ov111_021D3280(param0, param1, param2, param6, param7, param5);
     v0->unk_02 = param5;
@@ -58,13 +55,11 @@ void *ov111_021D3448(UnkStruct_ov111_021D33F4 *param0)
 void ov111_021D345C(UnkStruct_ov111_021D33F4 *param0, int param1)
 {
     Sprite_SetDrawFlag(param0->unk_0C, param1);
-    return;
 }
 
 void ov111_021D3468(UnkStruct_ov111_021D33F4 *param0, u32 param1)
 {
     Sprite_SetPriority(param0->unk_0C, param1);
-    return;
 }
 
 void ov111_021D3474(UnkStruct_ov111_021D33F4 *param0, int param1, int param2)
@@ -79,7 +74,6 @@ void ov111_021D3474(UnkStruct_ov111_021D33F4 *param0, int param1, int param2)
     }
 
     Sprite_SetPosition(param0->unk_0C, &v0);
-    return;
 }
 
 void ov111_021D349C(UnkStruct_ov111_021D33F4 *param0, int *param1, int *param2)
@@ -88,16 +82,12 @@ void ov111_021D349C(UnkStruct_ov111_021D33F4 *param0, int *param1, int *param2)
 
     *param1 = (v0->x / FX32_ONE);
     *param2 = (v0->y / FX32_ONE);
-
-    return;
 }
 
 void ov111_021D34C4(UnkStruct_ov111_021D33F4 *param0, u32 param1)
 {
     Sprite_SetAnimSpeed(param0->unk_0C, FX32_ONE);
     Sprite_SetAnimNoRestart(param0->unk_0C, param1);
-
-    return;
 }
 
 static const VecFx32 Unk_ov111_021D3834[] = {
@@ -116,24 +106,17 @@ static const VecFx32 Unk_ov111_021D3834[] = {
 
 void ov111_021D34E0(UnkStruct_ov111_021D33F4 *param0, u32 param1)
 {
-    u8 v0;
-    v0 = param1;
-
     Sprite_SetAffineScaleEx(param0->unk_0C, &Unk_ov111_021D3834[0], 1);
-
-    return;
 }
 
 void ov111_021D34F4(UnkStruct_ov111_021D33F4 *param0, VecFx32 *param1)
 {
     Sprite_SetAffineScaleEx(param0->unk_0C, param1, 2);
-    return;
 }
 
 void ov111_021D3500(UnkStruct_ov111_021D33F4 *param0, u32 param1)
 {
     Sprite_SetExplicitPaletteWithOffset(param0->unk_0C, param1);
-    return;
 }
 
 void ov111_021D350C(UnkStruct_ov111_021D33F4 *param0, int param1)
@@ -141,13 +124,11 @@ void ov111_021D350C(UnkStruct_ov111_021D33F4 *param0, int param1)
     Sprite_SetAnimateFlag(param0->unk_0C, param1);
     Sprite_SetAnimSpeed(param0->unk_0C, FX32_ONE);
     Sprite_SetAnim(param0->unk_0C, Sprite_GetActiveAnim(param0->unk_0C));
-    return;
 }
 
 void ov111_021D3530(UnkStruct_ov111_021D33F4 *param0, BOOL param1)
 {
     Sprite_SetMosaicFlag(param0->unk_0C, param1);
-    return;
 }
 
 BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 *param0)
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index 8cc37cc4de..218d0a4ff9 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -69,8 +69,6 @@ static volatile int sWirelessDriverStatus;
 
 void CommServerClient_Init(TrainerInfo *trainerInfo, BOOL param1)
 {
-    int v0;
-
     if (sCommServerClient != NULL) {
         return;
     }
@@ -105,11 +103,10 @@ BOOL sub_020332D0(void)
 
 static BOOL sub_020332E4(const u8 *param0, const u8 *param1, int param2)
 {
-    int v0;
     const u8 *v1 = param0;
     const u8 *v2 = param1;
 
-    for (v0 = 0; v0 < param2; v0++) {
+    for (int i = 0; i < param2; i++) {
         if (*v1 != *v2) {
             return 0;
         }
@@ -123,7 +120,6 @@ static BOOL sub_020332E4(const u8 *param0, const u8 *param1, int param2)
 
 static void sub_0203330C(WMBssDesc *param0)
 {
-    int v0;
     UnkStruct_0203330C *v1;
     int v2 = sub_0203895C();
     int v3 = sub_02038974();
@@ -134,13 +130,13 @@ static void sub_0203330C(WMBssDesc *param0)
         (void)0;
     } else if (sub_020326C4(v1->unk_04) && sub_020326C4(v2)) {
         (void)0;
-    } else if (v1->unk_54 && (v1->unk_04 == 10)) {
+    } else if (v1->unk_54 && v1->unk_04 == 10) {
         return;
     } else if (v1->unk_04 != v2) {
         return;
     }
 
-    if ((v2 != 14) && (v1->unk_05 != v3)) {
+    if (v2 != 14 && v1->unk_05 != v3) {
         return;
     }
 
@@ -151,13 +147,13 @@ static void sub_0203330C(WMBssDesc *param0)
 static void sub_02033380(void)
 {
     WMBssDesc *v0 = &sCommServerClient->unk_54;
-    int v1;
 
     if (!sCommServerClient->unk_1519_6) {
         return;
     }
 
     sCommServerClient->unk_1519_6 = 0;
+    int v1;
 
     for (v1 = 0; v1 < 16; ++v1) {
         if (sCommServerClient->unk_14C8[v1] == 0) {
@@ -234,13 +230,10 @@ void WirelessDriver_Shutdown(void)
 static void sub_020334DC(BOOL param0)
 {
     sCommServerClient->unk_14F4 = 0;
+    u32 v0 = (u32)sCommServerClient->unk_14E8;
 
-    {
-        u32 v0 = (u32)sCommServerClient->unk_14E8;
-
-        v0 = 32 - (v0 % 32) + v0;
-        (void)sub_02031BC4((void *)v0, param0);
-    }
+    v0 = 32 - (v0 % 32) + v0;
+    (void)sub_02031BC4((void *)v0, param0);
 
     sub_020318D0(sCommServerClient->unk_1504);
 }
@@ -270,7 +263,6 @@ static void sub_02033578(void)
     sCommServerClient->unk_1519_4 = 0;
     sCommServerClient->unk_1518 = 0;
     sCommServerClient->unk_1517 = 0;
-    return;
 }
 
 BOOL CommServerClient_InitServer(BOOL param0, BOOL param1, BOOL param2)
@@ -331,7 +323,8 @@ BOOL sub_020336D4(void)
             sub_020314C0();
             sCommServerClient->unk_1518 = 1;
             break;
-        } else if (sub_02031FD8()) {
+        }
+        if (sub_02031FD8()) {
             (void)0;
         } else {
             sub_02031EF4();
@@ -397,16 +390,14 @@ static void sub_020337C0(void)
 
 int sub_02033808(void)
 {
-    int v0, v1;
-
     if (!CommSys_IsInitialized()) {
         return 0;
     }
 
-    v1 = 0;
+    int v1 = 0;
 
-    for (v0 = 0; v0 < 16; ++v0) {
-        if (sCommServerClient->unk_14C8[v0] != 0) {
+    for (int i = 0; i < 16; ++i) {
+        if (sCommServerClient->unk_14C8[i] != 0) {
             v1++;
         }
     }
@@ -416,12 +407,12 @@ int sub_02033808(void)
 
 int sub_0203383C(int param0)
 {
-    int v0, v1 = 0;
+    int i, v1 = 0;
 
-    for (v0 = 0; v0 < 16; v0++) {
-        if (sCommServerClient->unk_14C8[v0] != 0) {
+    for (i = 0; i < 16; i++) {
+        if (sCommServerClient->unk_14C8[i] != 0) {
             if (v1 == param0) {
-                return v0;
+                return i;
             }
 
             v1++;
@@ -444,13 +435,8 @@ void sub_02033884(void)
 
 int sub_02033898(int param0)
 {
-    int v0;
-    UnkStruct_0203330C *v1;
-
-    v0 = 0;
-
     if (sCommServerClient->unk_14C8[param0] != 0) {
-        v1 = (UnkStruct_0203330C *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo;
+        UnkStruct_0203330C *v1 = (UnkStruct_0203330C *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo;
 
         if (v1->unk_06 == 0) {
             return 1;
@@ -464,13 +450,11 @@ int sub_02033898(int param0)
 
 static int sub_020338C8(int param0)
 {
-    int v0, v1;
+    for (int i = 16 - 1; i >= 0; i--) {
+        int v1 = sub_02033898(i);
 
-    for (v0 = 16 - 1; v0 >= 0; v0--) {
-        v1 = sub_02033898(v0);
-
-        if ((v1 > param0) && (v1 < (7 + 1))) {
-            return v0;
+        if (v1 > param0 && v1 < (7 + 1)) {
+            return i;
         }
     }
 
@@ -479,19 +463,17 @@ static int sub_020338C8(int param0)
 
 int sub_020338EC(void)
 {
-    int v0, v1;
-
     if (sub_02033808() == 0) {
         return -1;
     }
 
-    for (v0 = 16 - 1; v0 >= 0; v0--) {
-        if (sCommServerClient->unk_14C8[v0] != 0) {
-            if (sub_02034014(&sCommServerClient->unk_188[v0].bssid[0])) {
-                v1 = sub_02033898(v0);
+    for (int i = 16 - 1; i >= 0; i--) {
+        if (sCommServerClient->unk_14C8[i] != 0) {
+            if (sub_02034014(&sCommServerClient->unk_188[i].bssid[0])) {
+                int v1 = sub_02033898(i);
 
-                if ((v1 > 1) && (v1 < (7 + 1))) {
-                    return v0;
+                if (v1 > 1 && v1 < (7 + 1)) {
+                    return i;
                 }
             }
         }
@@ -502,12 +484,12 @@ int sub_020338EC(void)
 
 int sub_0203394C(void)
 {
-    int v0;
-
     if (sub_02033808() == 0) {
         return -1;
     }
 
+    int v0;
+
     for (v0 = 16 - 1; v0 >= 0; v0--) {
         if (sCommServerClient->unk_14C8[v0] != 0) {
             if (sub_02034014(&sCommServerClient->unk_188[v0].bssid[0])) {
@@ -533,15 +515,12 @@ int sub_0203394C(void)
 
 void sub_020339AC(int param0, TrainerInfo *param1)
 {
-    int v0, v1;
-    UnkStruct_0203330C *v2;
+    int i, v1 = 0;
 
-    v1 = 0;
-
-    for (v0 = 0; v0 < 16; ++v0) {
-        if (sCommServerClient->unk_14C8[v0] != 0) {
+    for (i = 0; i < 16; ++i) {
+        if (sCommServerClient->unk_14C8[i] != 0) {
             if (param0 == v1) {
-                TrainerInfo_Copy(sub_02033FB0(v0), param1);
+                TrainerInfo_Copy(sub_02033FB0(i), param1);
                 return;
             }
 
@@ -552,21 +531,19 @@ void sub_020339AC(int param0, TrainerInfo *param1)
 
 BOOL sub_020339E8(u16 param0)
 {
-    int v0;
-
     if (sub_02031934() == 2) {
         (void)sub_020314C0();
         return 0;
     }
 
     if (sub_02031934() == 1) {
-        v0 = sub_0203895C();
+        int v0 = sub_0203895C();
         sCommServerClient->unk_1514 = sCommServerClient->unk_188[param0].channel;
 
         if (sub_020326C4(v0)) {
             sub_02031220(1, sCommServerClient->unk_188[param0].bssid, 0);
         } else {
-            sub_02031DD8(1, &(sCommServerClient->unk_188[param0]));
+            sub_02031DD8(1, &sCommServerClient->unk_188[param0]);
         }
 
         return 1;
@@ -577,19 +554,17 @@ BOOL sub_020339E8(u16 param0)
 
 void sub_02033A5C(void)
 {
-    int v0;
-
     sub_02033380();
 
-    for (v0 = 0; v0 < 16; v0++) {
-        if (sCommServerClient->unk_14C8[v0] == 0) {
+    for (int i = 0; i < 16; i++) {
+        if (sCommServerClient->unk_14C8[i] == 0) {
             continue;
         }
 
-        if (sCommServerClient->unk_14C8[v0] > 0) {
-            sCommServerClient->unk_14C8[v0]--;
+        if (sCommServerClient->unk_14C8[i] > 0) {
+            sCommServerClient->unk_14C8[i]--;
 
-            if (sCommServerClient->unk_14C8[v0] == 0) {
+            if (sCommServerClient->unk_14C8[i] == 0) {
                 sCommServerClient->unk_14F8 = 1;
             }
         }
@@ -598,16 +573,12 @@ void sub_02033A5C(void)
 
 static void sub_02033AA8(void)
 {
-    u8 v0[6];
-    TrainerInfo *v1;
-    UnkStruct_0203330C *v2;
-    UnkStruct_02034168 *v3;
     int v4 = sub_0203895C();
 
-    v1 = sub_02033F9C();
+    TrainerInfo *v1 = sub_02033F9C();
 
     if (v4 != 15) {
-        v2 = (UnkStruct_0203330C *)sCommServerClient->unk_150C;
+        UnkStruct_0203330C *v2 = (UnkStruct_0203330C *)sCommServerClient->unk_150C;
 
         GF_ASSERT(32 >= BattleRegulation_Size());
         GF_ASSERT(32 == TrainerInfo_Size());
@@ -624,7 +595,7 @@ static void sub_02033AA8(void)
 
         v2->unk_54 = sub_0203214C();
     } else {
-        v3 = (UnkStruct_02034168 *)sCommServerClient->unk_150C;
+        UnkStruct_02034168 *v3 = (UnkStruct_02034168 *)sCommServerClient->unk_150C;
 
         v3->unk_00 = TrainerInfo_ID(v1);
         v3->unk_04 = sub_0203895C();
@@ -656,7 +627,7 @@ static void sub_02033BDC(u16 param0)
 
     sub_02033B88();
 
-    if ((sub_02031F90() == 0) && (!CommServerClient_IsClientConnecting())) {
+    if (sub_02031F90() == 0 && !CommServerClient_IsClientConnecting()) {
         if (sCommServerClient->unk_1519_2) {
             sCommServerClient->unk_1519_0 = 1;
         }
@@ -855,7 +826,7 @@ u16 sub_02033F0C(u16 param0)
         return v0 / 4;
     }
 
-    if ((9 == param0) || (13 == param0)) {
+    if (9 == param0 || 13 == param0) {
         return v0 / 4;
     }
 
@@ -873,7 +844,7 @@ WMBssDesc *sub_02033F3C(int param0)
 
 UnkStruct_0203330C *sub_02033F6C(int param0)
 {
-    if (sCommServerClient && (sCommServerClient->unk_14C8[param0] != 0)) {
+    if (sCommServerClient && sCommServerClient->unk_14C8[param0] != 0) {
         return (UnkStruct_0203330C *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo;
     }
 
@@ -887,15 +858,12 @@ TrainerInfo *sub_02033F9C(void)
 
 TrainerInfo *sub_02033FB0(int param0)
 {
-    TrainerInfo *v0;
-    UnkStruct_0203330C *v1;
-
     if (sCommServerClient->unk_14C8[param0] == 0) {
         return NULL;
     }
 
-    v1 = (UnkStruct_0203330C *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo;
-    v0 = (TrainerInfo *)&v1->unk_10[0];
+    UnkStruct_0203330C *v1 = (UnkStruct_0203330C *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo;
+    TrainerInfo *v0 = (TrainerInfo *)&v1->unk_10[0];
 
     return v0;
 }
@@ -910,10 +878,8 @@ void sub_02033FDC(u8 *param0, int param1)
 
 static BOOL sub_02034014(u8 *param0)
 {
-    int v0;
-
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (WM_IsBssidEqual(sCommServerClient->unk_1498[v0], param0)) {
+    for (int i = 0; i < (7 + 1); i++) {
+        if (WM_IsBssidEqual(sCommServerClient->unk_1498[i], param0)) {
             return 1;
         }
     }
@@ -960,10 +926,10 @@ void sub_020340FC(void)
 
 int sub_02034120(int param0)
 {
-    int v0, v1 = 0;
+    int i, v1 = 0;
 
-    for (v0 = 0; v0 < 16; v0++) {
-        UnkStruct_0203330C *v2 = sub_02033F6C(v0);
+    for (i = 0; i < 16; i++) {
+        UnkStruct_0203330C *v2 = sub_02033F6C(i);
 
         if (v2) {
             if (v2->unk_04 == param0) {
@@ -988,10 +954,8 @@ void sub_02034150(void *param0)
 
 const void *sub_02034168(int param0)
 {
-    if (sCommServerClient && (sCommServerClient->unk_14C8[param0] != 0)) {
-        UnkStruct_02034168 *v0;
-
-        v0 = (UnkStruct_02034168 *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo;
+    if (sCommServerClient && sCommServerClient->unk_14C8[param0] != 0) {
+        UnkStruct_02034168 *v0 = (UnkStruct_02034168 *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo;
         return v0->unk_08;
     }
 
diff --git a/src/unk_02073700.c b/src/unk_02073700.c
index 9dad576dd3..3616a39876 100644
--- a/src/unk_02073700.c
+++ b/src/unk_02073700.c
@@ -16,24 +16,23 @@
 
 void sub_02073700(SaveData *saveData, int param1, UnkStruct_ov96_0223B450_sub1 *param2)
 {
-    int v0;
-    TrainerInfo *v1 = SaveData_GetTrainerInfo(saveData);
+    TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(saveData);
     WiFiHistory *wiFiHistory = SaveData_WiFiHistory(saveData);
     UnkStruct_0202D750 *v3 = sub_0202D750(saveData);
 
     MI_CpuClear8(param2, sizeof(UnkStruct_ov96_0223B450_sub1));
-    MI_CpuCopy8(TrainerInfo_Name(v1), param2->unk_A8, 8 * 2);
-    *((u32 *)param2->unk_BC) = TrainerInfo_ID(v1);
+    MI_CpuCopy8(TrainerInfo_Name(trainerInfo), param2->name, sizeof(param2->name));
+    *(u32 *)param2->trainerInfoId = TrainerInfo_ID(trainerInfo);
 
-    param2->unk_B8 = gGameVersion;
+    param2->version = gGameVersion;
     param2->language = gGameLanguage;
-    param2->unk_BA = (u8)WiFiHistory_GetCountry(wiFiHistory);
-    param2->unk_BB = (u8)WiFiHistory_GetRegion(wiFiHistory);
-    param2->unk_C8_val1_1 = TrainerInfo_Gender(v1);
-    param2->unk_C9 = Appearance_GetData(param2->unk_C8_val1_1, TrainerInfo_Appearance(v1), APPEARANCE_DATA_TRAINER_CLASS_2);
+    param2->country = (u8)WiFiHistory_GetCountry(wiFiHistory);
+    param2->region = (u8)WiFiHistory_GetRegion(wiFiHistory);
+    param2->gender = TrainerInfo_Gender(trainerInfo);
+    param2->appearance = Appearance_GetData(param2->gender, TrainerInfo_Appearance(trainerInfo), APPEARANCE_DATA_TRAINER_CLASS_2);
 
-    for (v0 = 0; v0 < 3; v0++) {
-        MI_CpuCopy8(sub_0202D498(saveData, 0 + v0), &(param2->unk_CA[8 * v0]), 8);
+    for (int i = 0; i < 3; i++) {
+        MI_CpuCopy8(sub_0202D498(saveData, 0 + i), &param2->unk_CA[8 * i], 8);
     }
 
     MI_CpuCopy8(sub_0202D498(saveData, 3), param2->unk_C0, 8);
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index f07093a743..730dfd508d 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -32,7 +32,7 @@ typedef struct {
     UnkStruct_0209C194 *unk_28;
     FieldSystem *fieldSystem;
     PartyMenu *partyMenu;
-    PokemonSummary *unk_34;
+    PokemonSummary *monSummary;
 } UnkStruct_0209C1EC;
 
 static BOOL (*const Unk_020F951C[6])(UnkStruct_0209C1EC *);
@@ -71,7 +71,7 @@ void *sub_0209C1EC(FieldSystem *fieldSystem)
     v0->unk_08.unk_0C = fieldSystem->unk_80;
     v0->unk_08.options = SaveData_GetOptions(fieldSystem->saveData);
     v0->unk_08.records = SaveData_GetGameRecords(fieldSystem->saveData);
-    v0->unk_08.unk_18 = SaveData_GetJournal(fieldSystem->saveData);
+    v0->unk_08.journalEntry = SaveData_GetJournal(fieldSystem->saveData);
     v0->unk_08.unk_04 = Options_Frame(v0->unk_08.options);
     v0->unk_08.fieldSystem = fieldSystem;
 
@@ -123,10 +123,10 @@ static BOOL sub_0209C2C0(UnkStruct_0209C1EC *param0)
         Heap_Free(param0->partyMenu);
 
         if (param0->partyMenu->menuSelectionResult == 1) {
-            param0->unk_34 = sub_0203D670(param0->fieldSystem, HEAP_ID_APPLICATION, SUMMARY_MODE_NORMAL);
+            param0->monSummary = sub_0203D670(param0->fieldSystem, HEAP_ID_APPLICATION, SUMMARY_MODE_NORMAL);
             param0->unk_04 = v0;
-            param0->unk_34->monIndex = v0;
-            FieldSystem_OpenSummaryScreen(param0->fieldSystem, param0->unk_34);
+            param0->monSummary->monIndex = v0;
+            FieldSystem_OpenSummaryScreen(param0->fieldSystem, param0->monSummary);
             param0->unk_00 = 3;
         } else {
             param0->unk_28->unk_04 = v0;
@@ -142,7 +142,7 @@ static BOOL sub_0209C2C0(UnkStruct_0209C1EC *param0)
 static BOOL sub_0209C324(UnkStruct_0209C1EC *param0)
 {
     if (FieldSystem_IsRunningApplication(param0->fieldSystem) == 0) {
-        Heap_Free(param0->unk_34);
+        Heap_Free(param0->monSummary);
         param0->partyMenu = FieldSystem_OpenPartyMenu_SelectForSpinTrade(param0->fieldSystem, param0->unk_04);
         param0->unk_00 = 2;
     }