From 24b2ef5e34986fb9f0b52815c04b5ce6240f15a3 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Sat, 2 May 2026 17:07:55 -0400
Subject: [PATCH 01/39] Add WirelessManagerState constants

---
 include/unk_02030EE0.h |  15 ++
 src/unk_02030EE0.c     | 466 ++++++++++++++++++++---------------------
 2 files changed, 248 insertions(+), 233 deletions(-)

diff --git a/include/unk_02030EE0.h b/include/unk_02030EE0.h
index 7be923e2ba5..63096819210 100644
--- a/include/unk_02030EE0.h
+++ b/include/unk_02030EE0.h
@@ -9,6 +9,21 @@
 #include "functypes/funcptr_020320FC.h"
 #include "functypes/funcptr_02032110.h"
 
+enum WirelessManagerState {
+    WIRELESS_STATE_STOP,
+    WIRELESS_STATE_IDLE,
+    WIRELESS_STATE_SCAN,
+    WIRELESS_STATE_BUSY,
+    WIRELESS_STATE_CONNECTED,
+    WIRELESS_STATE_TRANSMIT_DATA,
+    WIRELESS_STATE_TRANSMIT_KEY,
+    WIRELESS_STATE_CHECK_CHANNEL,
+    WIRELESS_STATE_BAD_CONNECTION,
+    WIRELESS_STATE_ERROR,
+    WIRELESS_STATE_FATAL_ERROR,
+    WIRELESS_STATE_COUNT
+};
+
 BOOL sub_02031220(int param0, const u8 *param1, u16 param2);
 BOOL sub_020312B8(UnkFuncPtr_020312B8 param0, const u8 *param1, u16 param2);
 BOOL sub_020314C0(void);
diff --git a/src/unk_02030EE0.c b/src/unk_02030EE0.c
index d9b6204766e..4eb70d677ec 100644
--- a/src/unk_02030EE0.c
+++ b/src/unk_02030EE0.c
@@ -28,7 +28,7 @@ typedef struct {
     s32 unk_137C;
     u16 unk_1380;
     u16 unk_1382;
-    int unk_1384;
+    int state;
     int unk_1388;
     UnkFuncPtr_02031E6C unk_138C;
 
@@ -52,7 +52,7 @@ typedef struct {
     u8 unk_13B7;
     u8 unk_13B8;
     u8 unk_13B9;
-} UnkStruct_021C07AC;
+} WirelessManager;
 
 void include_unk_021C07A8(void);
 static void sub_02031C58(void *param0);
@@ -92,7 +92,7 @@ static BOOL sub_020317A4(void);
 static void sub_020317C8(void *param0);
 static u16 sub_02031900(void);
 
-static UnkStruct_021C07AC *Unk_021C07AC;
+static WirelessManager *sWirelessManager;
 static void (*Unk_021C07A8)(const char *, ...) = NULL;
 
 void include_unk_021C07A8(void)
@@ -100,35 +100,35 @@ void include_unk_021C07A8(void)
     Unk_021C07A8;
 }
 
-static void sub_02030EE0(int param0)
+static void WirelessManager_SetState(int state)
 {
-    Unk_021C07AC->unk_1384 = param0;
+    sWirelessManager->state = state;
 }
 
 static void sub_02030EF4(int param0)
 {
-    if ((Unk_021C07AC->unk_1384 == 9) || (Unk_021C07AC->unk_1384 == 10)) {
+    if ((sWirelessManager->state == WIRELESS_STATE_ERROR) || (sWirelessManager->state == WIRELESS_STATE_FATAL_ERROR)) {
         return;
     }
 
-    Unk_021C07AC->unk_13A4 = param0;
+    sWirelessManager->unk_13A4 = param0;
 }
 
 static BOOL sub_02030F10(void)
 {
     WMErrCode v0;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    v0 = WM_SetParentParameter(sub_02030F40, &Unk_021C07AC->unk_00);
+    v0 = WM_SetParentParameter(sub_02030F40, &sWirelessManager->unk_00);
 
     if (v0 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v0);
-        sub_02030EE0(9);
-        return 0;
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
 static void sub_02030F40(void *param0)
@@ -137,13 +137,13 @@ static void sub_02030F40(void *param0)
 
     if (v0->errcode != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v0->errcode);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
     {
         if (!sub_02030F64()) {
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
     }
 }
@@ -152,8 +152,8 @@ static BOOL sub_02030F64(void)
 {
     WMErrCode v0;
 
-    if ((Unk_021C07AC->unk_1384 == 4) || (Unk_021C07AC->unk_1384 == 6) || (Unk_021C07AC->unk_1384 == 5)) {
-        return 1;
+    if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
+        return TRUE;
     }
 
     {
@@ -167,13 +167,13 @@ static BOOL sub_02030F64(void)
 
     if (v0 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v0);
-        return 0;
+        return FALSE;
     }
 
-    Unk_021C07AC->unk_13A0 = 0;
-    Unk_021C07AC->unk_13A2 = 1;
+    sWirelessManager->unk_13A0 = 0;
+    sWirelessManager->unk_13A2 = 1;
 
-    return 1;
+    return TRUE;
 }
 
 static void sub_02030FD0(void *param0)
@@ -183,45 +183,45 @@ static void sub_02030FD0(void *param0)
 
     if (v0->errcode != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v0->errcode);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
     switch (v0->state) {
     case WM_STATECODE_BEACON_SENT:
-        Unk_021C07AC->unk_13B9++;
+        sWirelessManager->unk_13B9++;
         break;
     case WM_STATECODE_CONNECTED: {
-        if ((Unk_021C07AC->unk_13B7 == 1) || (Unk_021C07AC->unk_13B6 == 1) || (sub_02031900() >= Unk_021C07AC->unk_13A8) || (v0->ssid[0] != sub_0203895C()) || (0 != memcmp("DP", &v0->ssid[1], sizeof("DP")))) {
+        if ((sWirelessManager->unk_13B7 == 1) || (sWirelessManager->unk_13B6 == 1) || (sub_02031900() >= sWirelessManager->unk_13A8) || (v0->ssid[0] != sub_0203895C()) || (0 != memcmp("DP", &v0->ssid[1], sizeof("DP")))) {
             WMErrCode v2;
 
             v2 = WM_Disconnect(NULL, v0->aid);
 
             if (v2 != WM_ERRCODE_OPERATING) {
                 sub_02030EF4(v2);
-                sub_02030EE0(9);
+                WirelessManager_SetState(WIRELESS_STATE_ERROR);
             }
             break;
         }
 
-        Unk_021C07AC->unk_13A2 |= v1;
+        sWirelessManager->unk_13A2 |= v1;
 
-        if (Unk_021C07AC->unk_139C) {
-            Unk_021C07AC->unk_139C(v0->aid);
+        if (sWirelessManager->unk_139C) {
+            sWirelessManager->unk_139C(v0->aid);
         }
     } break;
     case WM_STATECODE_DISCONNECTED: {
-        Unk_021C07AC->unk_13A2 &= ~v1;
+        sWirelessManager->unk_13A2 &= ~v1;
 
-        if (Unk_021C07AC->disconnectCallback) {
-            Unk_021C07AC->disconnectCallback(v0->aid);
+        if (sWirelessManager->disconnectCallback) {
+            sWirelessManager->disconnectCallback(v0->aid);
         }
     } break;
     case WM_STATECODE_DISCONNECTED_FROM_MYSELF:
         break;
     case WM_STATECODE_PARENT_START: {
         if (!sub_020310DC()) {
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
     } break;
     default:
@@ -233,13 +233,13 @@ static BOOL sub_020310DC(void)
 {
     WMErrCode v0;
 
-    if ((Unk_021C07AC->unk_1384 == 4) || (Unk_021C07AC->unk_1384 == 6) || (Unk_021C07AC->unk_1384 == 5)) {
+    if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
         return 1;
     }
 
-    sub_02030EE0(4);
+    WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
 
-    v0 = WM_StartMP(sub_0203114C, (u16 *)Unk_021C07AC->unk_1020, (u16)Unk_021C07AC->unk_137C, (u16 *)Unk_021C07AC->unk_F40, (u16)Unk_021C07AC->unk_1378, 1);
+    v0 = WM_StartMP(sub_0203114C, (u16 *)sWirelessManager->unk_1020, (u16)sWirelessManager->unk_137C, (u16 *)sWirelessManager->unk_F40, (u16)sWirelessManager->unk_1378, 1);
 
     if (v0 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v0);
@@ -255,23 +255,23 @@ static void sub_0203114C(void *param0)
 
     if (v0->errcode != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v0->errcode);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
     switch (v0->state) {
     case WM_STATECODE_MP_START:
-        if (Unk_021C07AC->unk_1388 == 2) {
-            if (Unk_021C07AC->unk_1384 == 4) {
+        if (sWirelessManager->unk_1388 == 2) {
+            if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
                 (void)0;
-            } else if (Unk_021C07AC->unk_1384 == 6) {
+            } else if (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) {
                 return;
             }
-        } else if (Unk_021C07AC->unk_1388 == 4) {
+        } else if (sWirelessManager->unk_1388 == WIRELESS_STATE_CONNECTED) {
             (void)0;
         }
 
-        sub_02030EE0(4);
+        WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
         break;
     case WM_STATECODE_MPEND_IND:
         break;
@@ -287,7 +287,7 @@ static BOOL sub_020311A8(void)
 {
     WMErrCode v0;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
     v0 = WM_EndMP(sub_020311CC);
 
@@ -338,30 +338,30 @@ static void sub_02031208(void *param0)
         return;
     }
 
-    sub_02030EE0(1);
+    WirelessManager_SetState(WIRELESS_STATE_IDLE);
 }
 
 BOOL sub_02031220(int param0, const u8 *param1, u16 param2)
 {
-    Unk_021C07AC->unk_137C = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
-    Unk_021C07AC->unk_1378 = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
+    sWirelessManager->unk_137C = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
+    sWirelessManager->unk_1378 = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
 
-    sub_02030EE0(2);
+    WirelessManager_SetState(WIRELESS_STATE_SCAN);
 
-    Unk_021C07AC->unk_1220.channel = 1;
-    *(u16 *)(&Unk_021C07AC->unk_1354.bssid[4]) = *(u16 *)(param1 + 4);
-    *(u16 *)(&Unk_021C07AC->unk_1354.bssid[2]) = *(u16 *)(param1 + 2);
-    *(u16 *)(&Unk_021C07AC->unk_1354.bssid[0]) = *(u16 *)(param1 + 0);
+    sWirelessManager->unk_1220.channel = 1;
+    *(u16 *)(&sWirelessManager->unk_1354.bssid[4]) = *(u16 *)(param1 + 4);
+    *(u16 *)(&sWirelessManager->unk_1354.bssid[2]) = *(u16 *)(param1 + 2);
+    *(u16 *)(&sWirelessManager->unk_1354.bssid[0]) = *(u16 *)(param1 + 0);
 
-    Unk_021C07AC->unk_1388 = param0;
+    sWirelessManager->unk_1388 = param0;
 
-    Unk_021C07AC->unk_1374 = NULL;
-    Unk_021C07AC->unk_1380 = param2;
-    Unk_021C07AC->unk_1354.channel = 0;
-    Unk_021C07AC->unk_1382 = 1;
+    sWirelessManager->unk_1374 = NULL;
+    sWirelessManager->unk_1380 = param2;
+    sWirelessManager->unk_1354.channel = 0;
+    sWirelessManager->unk_1382 = 1;
 
     if (!sub_02031320()) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return 0;
     }
 
@@ -370,19 +370,19 @@ BOOL sub_02031220(int param0, const u8 *param1, u16 param2)
 
 BOOL sub_020312B8(UnkFuncPtr_020312B8 param0, const u8 *param1, u16 param2)
 {
-    sub_02030EE0(2);
+    WirelessManager_SetState(WIRELESS_STATE_SCAN);
 
-    Unk_021C07AC->unk_1374 = param0;
-    Unk_021C07AC->unk_1380 = param2;
-    Unk_021C07AC->unk_1354.channel = 0;
-    Unk_021C07AC->unk_1382 = 0;
+    sWirelessManager->unk_1374 = param0;
+    sWirelessManager->unk_1380 = param2;
+    sWirelessManager->unk_1354.channel = 0;
+    sWirelessManager->unk_1382 = 0;
 
-    *(u16 *)(&Unk_021C07AC->unk_1354.bssid[4]) = *(u16 *)(param1 + 4);
-    *(u16 *)(&Unk_021C07AC->unk_1354.bssid[2]) = *(u16 *)(param1 + 2);
-    *(u16 *)(&Unk_021C07AC->unk_1354.bssid[0]) = *(u16 *)(param1);
+    *(u16 *)(&sWirelessManager->unk_1354.bssid[4]) = *(u16 *)(param1 + 4);
+    *(u16 *)(&sWirelessManager->unk_1354.bssid[2]) = *(u16 *)(param1 + 2);
+    *(u16 *)(&sWirelessManager->unk_1354.bssid[0]) = *(u16 *)(param1);
 
     if (!sub_02031320()) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return 0;
     }
 
@@ -406,26 +406,26 @@ static BOOL sub_02031320(void)
         return 0;
     }
 
-    if (Unk_021C07AC->unk_1380 == 0) {
+    if (sWirelessManager->unk_1380 == 0) {
         while (TRUE) {
-            Unk_021C07AC->unk_1354.channel++;
+            sWirelessManager->unk_1354.channel++;
 
-            if (Unk_021C07AC->unk_1354.channel > 16) {
-                Unk_021C07AC->unk_1354.channel = 1;
+            if (sWirelessManager->unk_1354.channel > 16) {
+                sWirelessManager->unk_1354.channel = 1;
             }
 
-            if (v1 & (0x1 << (Unk_021C07AC->unk_1354.channel - 1))) {
+            if (v1 & (0x1 << (sWirelessManager->unk_1354.channel - 1))) {
                 break;
             }
         }
     } else {
-        Unk_021C07AC->unk_1354.channel = (u16)Unk_021C07AC->unk_1380;
+        sWirelessManager->unk_1354.channel = (u16)sWirelessManager->unk_1380;
     }
 
-    Unk_021C07AC->unk_1354.maxChannelTime = WM_GetDispersionScanPeriod() / 3;
-    Unk_021C07AC->unk_1354.scanBuf = &Unk_021C07AC->unk_1220;
+    sWirelessManager->unk_1354.maxChannelTime = WM_GetDispersionScanPeriod() / 3;
+    sWirelessManager->unk_1354.scanBuf = &sWirelessManager->unk_1220;
 
-    v0 = WM_StartScan(sub_020313E8, &Unk_021C07AC->unk_1354);
+    v0 = WM_StartScan(sub_020313E8, &sWirelessManager->unk_1354);
 
     if (v0 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v0);
@@ -441,15 +441,15 @@ static void sub_020313E8(void *param0)
 
     if (v0->errcode != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v0->errcode);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
-    if (Unk_021C07AC->unk_1384 != 2) {
-        Unk_021C07AC->unk_1382 = 0;
+    if (sWirelessManager->state != WIRELESS_STATE_SCAN) {
+        sWirelessManager->unk_1382 = 0;
 
         if (!sub_020314E4()) {
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
 
         return;
@@ -462,15 +462,15 @@ static void sub_020313E8(void *param0)
         break;
     case WM_STATECODE_PARENT_FOUND:
 
-        DC_InvalidateRange(&Unk_021C07AC->unk_1220, sizeof(WMbssDesc));
+        DC_InvalidateRange(&sWirelessManager->unk_1220, sizeof(WMbssDesc));
 
-        if ((Unk_021C07AC->unk_1394 != NULL) && (v0->gameInfoLength >= 8)) {
+        if ((sWirelessManager->unk_1394 != NULL) && (v0->gameInfoLength >= 8)) {
             UnkStruct_0203330C *v1 = (UnkStruct_0203330C *)v0->gameInfo.userGameInfo;
 
-            Unk_021C07AC->unk_1394(v0->gameInfo.ggid, v1->unk_04);
+            sWirelessManager->unk_1394(v0->gameInfo.ggid, v1->unk_04);
         }
 
-        if ((v0->gameInfoLength < 8) || (v0->gameInfo.ggid != Unk_021C07AC->unk_00.ggid)) {
+        if ((v0->gameInfoLength < 8) || (v0->gameInfo.ggid != sWirelessManager->unk_00.ggid)) {
             break;
         }
 
@@ -478,13 +478,13 @@ static void sub_020313E8(void *param0)
             break;
         }
 
-        if (Unk_021C07AC->unk_1374 != NULL) {
-            Unk_021C07AC->unk_1374(&Unk_021C07AC->unk_1220);
+        if (sWirelessManager->unk_1374 != NULL) {
+            sWirelessManager->unk_1374(&sWirelessManager->unk_1220);
         }
 
-        if (Unk_021C07AC->unk_1382) {
+        if (sWirelessManager->unk_1382) {
             if (!sub_020314E4()) {
-                sub_02030EE0(9);
+                WirelessManager_SetState(WIRELESS_STATE_ERROR);
             }
 
             return;
@@ -493,17 +493,17 @@ static void sub_020313E8(void *param0)
     }
 
     if (!sub_02031320()) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
     }
 }
 
 BOOL sub_020314C0(void)
 {
-    if (Unk_021C07AC->unk_1384 != 2) {
+    if (sWirelessManager->state != WIRELESS_STATE_SCAN) {
         return 0;
     }
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
     return 1;
 }
 
@@ -530,15 +530,15 @@ static void sub_02031500(void *param0)
         return;
     }
 
-    sub_02030EE0(1);
+    WirelessManager_SetState(WIRELESS_STATE_IDLE);
 
-    if (!Unk_021C07AC->unk_1382) {
+    if (!sWirelessManager->unk_1382) {
         return;
     }
 
     {
         if (!sub_02031538()) {
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
     }
 }
@@ -548,15 +548,15 @@ static BOOL sub_02031538(void)
     u8 v0[32];
     WMErrCode v1;
 
-    if ((Unk_021C07AC->unk_1384 == 4) || (Unk_021C07AC->unk_1384 == 6) || (Unk_021C07AC->unk_1384 == 5)) {
+    if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
         return 1;
     }
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
     MI_CpuCopy8("DP", &v0[1], sizeof("DP"));
 
     v0[0] = sub_0203895C();
-    v1 = WM_StartConnectEx(sub_020315A8, &Unk_021C07AC->unk_1220, v0, 1, WM_AUTHMODE_OPEN_SYSTEM);
+    v1 = WM_StartConnectEx(sub_020315A8, &sWirelessManager->unk_1220, v0, 1, WM_AUTHMODE_OPEN_SYSTEM);
 
     if (v1 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v1);
@@ -574,21 +574,21 @@ static void sub_020315A8(void *param0)
         sub_02030EF4(v0->errcode);
 
         if (v0->errcode == WM_ERRCODE_OVER_MAX_ENTRY) {
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
             return;
         } else if (v0->errcode == WM_ERRCODE_NO_ENTRY) {
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
             return;
         } else if (v0->errcode == WM_ERRCODE_FAILED) {
             if (sub_02038938()) {
-                sub_02030EE0(9);
+                WirelessManager_SetState(WIRELESS_STATE_ERROR);
             } else {
-                sub_02030EE0(8);
+                WirelessManager_SetState(WIRELESS_STATE_BAD_CONNECTION);
             }
 
             return;
         } else {
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
 
         return;
@@ -599,39 +599,39 @@ static void sub_020315A8(void *param0)
     }
 
     if (v0->state == WM_STATECODE_CONNECTED) {
-        if (Unk_021C07AC->unk_13A9) {
+        if (sWirelessManager->unk_13A9) {
             sub_02030EF4(20);
-            sub_02030EE0(9);
+            WirelessManager_SetState(WIRELESS_STATE_ERROR);
             return;
         } else {
-            sub_02030EE0(4);
+            WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
 
             if (!sub_02031668()) {
-                sub_02030EE0(3);
+                WirelessManager_SetState(WIRELESS_STATE_BUSY);
                 return;
             }
 
-            Unk_021C07AC->unk_13A0 = v0->aid;
+            sWirelessManager->unk_13A0 = v0->aid;
             return;
         }
     } else if (v0->state == WM_STATECODE_CONNECT_START) {
         return;
     } else if (v0->state == WM_STATECODE_DISCONNECTED) {
         sub_02030EF4(20);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     } else if (v0->state == WM_STATECODE_DISCONNECTED_FROM_MYSELF) {
         return;
     }
 
-    sub_02030EE0(9);
+    WirelessManager_SetState(WIRELESS_STATE_ERROR);
 }
 
 static BOOL sub_02031668(void)
 {
     WMErrCode v0;
 
-    v0 = WM_StartMP(sub_020316B8, (u16 *)Unk_021C07AC->unk_1020, (u16)Unk_021C07AC->unk_137C, (u16 *)Unk_021C07AC->unk_F40, (u16)Unk_021C07AC->unk_1378, 1);
+    v0 = WM_StartMP(sub_020316B8, (u16 *)sWirelessManager->unk_1020, (u16)sWirelessManager->unk_137C, (u16 *)sWirelessManager->unk_F40, (u16)sWirelessManager->unk_1378, 1);
 
     if (v0 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v0);
@@ -655,26 +655,26 @@ static void sub_020316B8(void *param0)
         }
 
         sub_02030EF4(v0->errcode);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
 
         return;
     }
 
     switch (v0->state) {
     case WM_STATECODE_MP_START:
-        if (Unk_021C07AC->unk_1388 == 3) {
-            if (Unk_021C07AC->unk_1384 == 6) {
+        if (sWirelessManager->unk_1388 == 3) {
+            if (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) {
                 return;
             }
 
-            if (Unk_021C07AC->unk_1384 == 4) {
+            if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
                 (void)0;
             }
-        } else if (Unk_021C07AC->unk_1388 == 5) {
+        } else if (sWirelessManager->unk_1388 == WIRELESS_STATE_TRANSMIT_DATA) {
             (void)0;
         }
 
-        sub_02030EE0(4);
+        WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
         break;
     case WM_STATECODE_MP_IND:
         break;
@@ -691,7 +691,7 @@ static BOOL sub_0203171C(void)
 {
     WMErrCode v0;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
     v0 = WM_EndMP(sub_02031740);
 
     if (v0 != WM_ERRCODE_OPERATING) {
@@ -713,7 +713,7 @@ static void sub_02031740(void *param0)
     }
 
     if (!sub_02031764()) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
     }
 }
 
@@ -721,7 +721,7 @@ static BOOL sub_02031764(void)
 {
     WMErrCode v0;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
     v0 = WM_Disconnect(sub_0203178C, 0);
 
@@ -743,14 +743,14 @@ static void sub_0203178C(void *param0)
         return;
     }
 
-    sub_02030EE0(1);
+    WirelessManager_SetState(WIRELESS_STATE_IDLE);
 }
 
 static BOOL sub_020317A4(void)
 {
     WMErrCode v0;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
     v0 = WM_Reset(sub_020317C8);
 
     if (v0 != WM_ERRCODE_OPERATING) {
@@ -766,20 +766,20 @@ static void sub_020317C8(void *param0)
     WMCallback *v0 = (WMCallback *)param0;
 
     if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         sub_02030EF4(v0->errcode);
 
         return;
     }
 
-    sub_02030EE0(1);
+    WirelessManager_SetState(WIRELESS_STATE_IDLE);
 }
 
 static BOOL sub_020317E8(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3)
 {
     WMErrCode v0;
 
-    DC_FlushRange(Unk_021C07AC->unk_F40, (u32)Unk_021C07AC->unk_1378);
+    DC_FlushRange(sWirelessManager->unk_F40, (u32)sWirelessManager->unk_1378);
 
     v0 = WM_SetMPDataToPortEx(sub_02031840, (void *)param3, param0, param1, 0xffff, param2, WM_PRIORITY_NORMAL);
 
@@ -812,13 +812,13 @@ static void sub_02031868(void *param0)
 
     if (v0->errcode != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v0->errcode);
-    } else if (Unk_021C07AC->unk_138C != NULL) {
+    } else if (sWirelessManager->unk_138C != NULL) {
         if (v0->state == WM_STATECODE_PORT_INIT) {
             (void)0;
         } else if (v0->state == WM_STATECODE_PORT_RECV) {
-            (*Unk_021C07AC->unk_138C)(v0->aid, v0->data, v0->length);
+            (*sWirelessManager->unk_138C)(v0->aid, v0->data, v0->length);
         } else if (v0->state == WM_STATECODE_DISCONNECTED) {
-            (*Unk_021C07AC->unk_138C)(v0->aid, NULL, 0);
+            (*sWirelessManager->unk_138C)(v0->aid, NULL, 0);
         } else if (v0->state == WM_STATECODE_DISCONNECTED_FROM_MYSELF) {
             (void)0;
         } else if (v0->state == WM_STATECODE_CONNECTED) {
@@ -832,34 +832,34 @@ static void sub_020318B0(void *param0)
     WMCallback *v0 = (WMCallback *)param0;
 
     if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EE0(10);
+        WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
         return;
     }
 
     WVR_TerminateAsync(NULL, NULL);
-    sub_02030EE0(0);
+    WirelessManager_SetState(WIRELESS_STATE_STOP);
 }
 
 void sub_020318D0(u32 param0)
 {
-    Unk_021C07AC->unk_00.ggid = param0;
+    sWirelessManager->unk_00.ggid = param0;
 }
 
 void sub_020318DC(u16 *param0, u16 param1)
 {
-    Unk_021C07AC->unk_00.userGameInfo = param0;
-    Unk_021C07AC->unk_00.userGameInfoLength = param1;
+    sWirelessManager->unk_00.userGameInfo = param0;
+    sWirelessManager->unk_00.userGameInfoLength = param1;
 }
 
 u16 sub_020318EC(void)
 {
-    return Unk_021C07AC->unk_13A2;
+    return sWirelessManager->unk_13A2;
 }
 
 static u16 sub_02031900(void)
 {
     int v0 = 0, v1;
-    u16 v2 = Unk_021C07AC->unk_13A2;
+    u16 v2 = sWirelessManager->unk_13A2;
 
     for (v1 = 0; v1 < 16; v1++) {
         if (v2 & 0x1) {
@@ -874,12 +874,12 @@ static u16 sub_02031900(void)
 
 int sub_02031934(void)
 {
-    return Unk_021C07AC->unk_1384;
+    return sWirelessManager->state;
 }
 
 int sub_02031948(void)
 {
-    return Unk_021C07AC->unk_13A4;
+    return sWirelessManager->unk_13A4;
 }
 
 BOOL sub_0203195C(void)
@@ -889,25 +889,25 @@ BOOL sub_0203195C(void)
 
     OS_GetMacAddress(v1);
 
-    Unk_021C07AC->unk_13AC = (u32)(OS_GetVBlankCount() + *(u16 *)&v1[0] + *(u16 *)&v1[2] + *(u16 *)&v1[4]);
-    Unk_021C07AC->unk_13AC = Unk_021C07AC->unk_13AC * 69069UL + 12345;
-    Unk_021C07AC->unk_13B0 = 0;
-    Unk_021C07AC->unk_13B2 = 100 + 1;
+    sWirelessManager->unk_13AC = (u32)(OS_GetVBlankCount() + *(u16 *)&v1[0] + *(u16 *)&v1[2] + *(u16 *)&v1[4]);
+    sWirelessManager->unk_13AC = sWirelessManager->unk_13AC * 69069UL + 12345;
+    sWirelessManager->unk_13B0 = 0;
+    sWirelessManager->unk_13B2 = 100 + 1;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
     v0 = sub_020319F8(1);
 
     if (v0 == 24) {
         sub_02030EF4(24);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
         return 0;
     }
 
     if (v0 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v0);
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return 0;
     }
 
@@ -924,7 +924,7 @@ static u16 sub_020319F8(u16 param0)
     if (v0 == 0x8000) {
         sub_02030EF4(WM_ERRCODE_ILLEGAL_STATE);
 
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
 
         return WM_ERRCODE_ILLEGAL_STATE;
@@ -933,7 +933,7 @@ static u16 sub_020319F8(u16 param0)
     if (v0 == 0) {
         sub_02030EF4(22);
 
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
 
         return 24;
@@ -965,7 +965,7 @@ static void sub_02031A74(void *param0)
     if (v2->errcode != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v2->errcode);
 
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
 
         return;
@@ -973,22 +973,22 @@ static void sub_02031A74(void *param0)
 
     v1 = v2->channel;
 
-    if (Unk_021C07AC->unk_13B2 > v2->ccaBusyRatio) {
-        Unk_021C07AC->unk_13B2 = v2->ccaBusyRatio;
-        Unk_021C07AC->unk_13B4 = (u16)(1 << (v1 - 1));
-    } else if (Unk_021C07AC->unk_13B2 == v2->ccaBusyRatio) {
-        Unk_021C07AC->unk_13B4 |= 1 << (v1 - 1);
+    if (sWirelessManager->unk_13B2 > v2->ccaBusyRatio) {
+        sWirelessManager->unk_13B2 = v2->ccaBusyRatio;
+        sWirelessManager->unk_13B4 = (u16)(1 << (v1 - 1));
+    } else if (sWirelessManager->unk_13B2 == v2->ccaBusyRatio) {
+        sWirelessManager->unk_13B4 |= 1 << (v1 - 1);
     }
 
     v0 = sub_020319F8(++v1);
 
     if (v0 == 24) {
-        sub_02030EE0(7);
+        WirelessManager_SetState(WIRELESS_STATE_CHECK_CHANNEL);
         return;
     }
 
     if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 }
@@ -1000,10 +1000,10 @@ static WMErrCode sub_02031AF0(WMCallbackFunc param0, u16 param1)
 
 u16 sub_02031B04(void)
 {
-    sub_02030EE0(1);
-    Unk_021C07AC->unk_13B0 = (u16)sub_02031B30(Unk_021C07AC->unk_13B4);
+    WirelessManager_SetState(WIRELESS_STATE_IDLE);
+    sWirelessManager->unk_13B0 = (u16)sub_02031B30(sWirelessManager->unk_13B4);
 
-    return Unk_021C07AC->unk_13B0;
+    return sWirelessManager->unk_13B0;
 }
 
 static s16 sub_02031B30(u16 param0)
@@ -1024,7 +1024,7 @@ static s16 sub_02031B30(u16 param0)
         return v1;
     }
 
-    v3 = (u16)((((Unk_021C07AC->unk_13AC = Unk_021C07AC->unk_13AC * 69069UL + 12345) & 0xFF) * v2) / 0x100);
+    v3 = (u16)((((sWirelessManager->unk_13AC = sWirelessManager->unk_13AC * 69069UL + 12345) & 0xFF) * v2) / 0x100);
     v1 = 1;
 
     for (v0 = 0; v0 < 16; v0++) {
@@ -1050,20 +1050,20 @@ BOOL sub_02031BC4(void *param0, BOOL param1)
         v0 += 32 - (v0 % 32);
     }
 
-    Unk_021C07AC = (UnkStruct_021C07AC *)v0;
-    Unk_021C07AC->unk_137C = 0;
-    Unk_021C07AC->unk_1378 = 0;
-    Unk_021C07AC->unk_138C = NULL;
-    Unk_021C07AC->unk_13A0 = 0;
-    Unk_021C07AC->unk_13A2 = 1;
-    Unk_021C07AC->unk_13A4 = WM_ERRCODE_SUCCESS;
-    Unk_021C07AC->unk_1384 = 0;
-    Unk_021C07AC->unk_00.userGameInfo = NULL;
-    Unk_021C07AC->unk_00.userGameInfoLength = 0;
-    Unk_021C07AC->unk_1390 = NULL;
-    Unk_021C07AC->unk_13A8 = (7 + 1);
-    Unk_021C07AC->unk_13A9 = 0;
-    Unk_021C07AC->unk_13B6 = 0;
+    sWirelessManager = (WirelessManager *)v0;
+    sWirelessManager->unk_137C = 0;
+    sWirelessManager->unk_1378 = 0;
+    sWirelessManager->unk_138C = NULL;
+    sWirelessManager->unk_13A0 = 0;
+    sWirelessManager->unk_13A2 = 1;
+    sWirelessManager->unk_13A4 = WM_ERRCODE_SUCCESS;
+    sWirelessManager->state = WIRELESS_STATE_STOP;
+    sWirelessManager->unk_00.userGameInfo = NULL;
+    sWirelessManager->unk_00.userGameInfoLength = 0;
+    sWirelessManager->unk_1390 = NULL;
+    sWirelessManager->unk_13A8 = (7 + 1);
+    sWirelessManager->unk_13A9 = 0;
+    sWirelessManager->unk_13B6 = 0;
 
     if (!sub_02031C70(param1)) {
         return 0;
@@ -1074,7 +1074,7 @@ BOOL sub_02031BC4(void *param0, BOOL param1)
 
 int sub_02031C50(void)
 {
-    return sizeof(UnkStruct_021C07AC) + 32;
+    return sizeof(WirelessManager) + 32;
 }
 
 static void sub_02031C58(void *param0)
@@ -1082,7 +1082,7 @@ static void sub_02031C58(void *param0)
     WMindCallback *v0 = (WMindCallback *)param0;
 
     if (v0->errcode == WM_ERRCODE_FIFO_ERROR) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
         sub_02030EF4(25);
     }
 }
@@ -1091,17 +1091,17 @@ static BOOL sub_02031C70(BOOL param0)
 {
     WMErrCode v0;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
     if (param0 == 1) {
-        v0 = WM_Initialize(&Unk_021C07AC->unk_40, sub_02031CBC, 2);
+        v0 = WM_Initialize(&sWirelessManager->unk_40, sub_02031CBC, 2);
     } else {
-        v0 = WM_InitializeForListening(&Unk_021C07AC->unk_40, sub_02031CBC, 2, 0);
+        v0 = WM_InitializeForListening(&sWirelessManager->unk_40, sub_02031CBC, 2, 0);
     }
 
     if (v0 != WM_ERRCODE_OPERATING) {
         sub_02030EF4(v0);
-        sub_02030EE0(10);
+        WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
         return 0;
     }
 
@@ -1116,7 +1116,7 @@ static void sub_02031CBC(void *param0)
     if (v1->errcode != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v1->errcode);
 
-        sub_02030EE0(10);
+        WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
         Link_SetErrorState(1);
 
         return;
@@ -1127,13 +1127,13 @@ static void sub_02031CBC(void *param0)
     if (v0 != WM_ERRCODE_SUCCESS) {
         sub_02030EF4(v0);
 
-        sub_02030EE0(10);
+        WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
         Link_SetErrorState(1);
 
         return;
     }
 
-    sub_02030EE0(1);
+    WirelessManager_SetState(1);
 }
 
 static void sub_02031D00(void *param0)
@@ -1147,38 +1147,38 @@ BOOL sub_02031D04(int param0, u16 param1, u16 param2, u16 param3, u16 param4, BO
         WM_SetLifeTime(sub_02031D00, 0xffff, 100, 5, 100);
     }
 
-    Unk_021C07AC->unk_137C = MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), WM_SIZE_MP_PARENT_RECEIVE_BUFFER(38, (5 - 1), 0)));
-    Unk_021C07AC->unk_1378 = WM_SIZE_MP_PARENT_SEND_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
+    sWirelessManager->unk_137C = MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), WM_SIZE_MP_PARENT_RECEIVE_BUFFER(38, (5 - 1), 0)));
+    sWirelessManager->unk_1378 = WM_SIZE_MP_PARENT_SEND_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
 
-    Unk_021C07AC->unk_1388 = param0;
-    sub_02030EE0(3);
+    sWirelessManager->unk_1388 = param0;
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    Unk_021C07AC->unk_00.tgid = param1;
-    Unk_021C07AC->unk_00.channel = param2;
-    Unk_021C07AC->unk_00.beaconPeriod = param4;
+    sWirelessManager->unk_00.tgid = param1;
+    sWirelessManager->unk_00.channel = param2;
+    sWirelessManager->unk_00.beaconPeriod = param4;
 
     switch (param0) {
     case 0:
-        Unk_021C07AC->unk_00.parentMaxSize = 192;
+        sWirelessManager->unk_00.parentMaxSize = 192;
 
         if (param3 >= 5) {
-            Unk_021C07AC->unk_00.childMaxSize = 12;
+            sWirelessManager->unk_00.childMaxSize = 12;
         } else {
-            Unk_021C07AC->unk_00.childMaxSize = 38;
+            sWirelessManager->unk_00.childMaxSize = 38;
         }
 
         break;
     case 4:
-        Unk_021C07AC->unk_00.parentMaxSize = (12 * (1 + 7) + 4);
-        Unk_021C07AC->unk_00.childMaxSize = 12;
+        sWirelessManager->unk_00.parentMaxSize = (12 * (1 + 7) + 4);
+        sWirelessManager->unk_00.childMaxSize = 12;
         break;
     }
 
-    Unk_021C07AC->unk_00.maxEntry = param3;
-    Unk_021C07AC->unk_00.CS_Flag = 0;
-    Unk_021C07AC->unk_00.multiBootFlag = 0;
-    Unk_021C07AC->unk_00.entryFlag = param5;
-    Unk_021C07AC->unk_00.KS_Flag = (u16)((param0 == 2) ? 1 : 0);
+    sWirelessManager->unk_00.maxEntry = param3;
+    sWirelessManager->unk_00.CS_Flag = 0;
+    sWirelessManager->unk_00.multiBootFlag = 0;
+    sWirelessManager->unk_00.entryFlag = param5;
+    sWirelessManager->unk_00.KS_Flag = (u16)((param0 == 2) ? 1 : 0);
 
     switch (param0) {
     case 0:
@@ -1198,18 +1198,18 @@ BOOL sub_02031DD8(int param0, WMBssDesc *param1)
         WM_SetLifeTime(sub_02031D00, 0xffff, 100, 5, 100);
     }
 
-    Unk_021C07AC->unk_137C = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
-    Unk_021C07AC->unk_1378 = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
+    sWirelessManager->unk_137C = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
+    sWirelessManager->unk_1378 = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
 
-    Unk_021C07AC->unk_1388 = param0;
-    sub_02030EE0(3);
+    sWirelessManager->unk_1388 = param0;
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
     switch (param0) {
     case 1:
     case 3:
     case 5:
-        MI_CpuCopy8(param1, &Unk_021C07AC->unk_1220, sizeof(Unk_021C07AC->unk_1220));
-        DC_FlushRange(&Unk_021C07AC->unk_1220, sizeof(Unk_021C07AC->unk_1220));
+        MI_CpuCopy8(param1, &sWirelessManager->unk_1220, sizeof(sWirelessManager->unk_1220));
+        DC_FlushRange(&sWirelessManager->unk_1220, sizeof(sWirelessManager->unk_1220));
         DC_WaitWriteBufferEmpty();
         {
             return sub_02031538();
@@ -1223,10 +1223,10 @@ BOOL sub_02031DD8(int param0, WMBssDesc *param1)
 
 void sub_02031E6C(UnkFuncPtr_02031E6C param0, int param1)
 {
-    Unk_021C07AC->unk_138C = param0;
+    sWirelessManager->unk_138C = param0;
 
     if (WM_SetPortCallback(param1, sub_02031868, NULL) != WM_ERRCODE_SUCCESS) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
 
         while (TRUE) {
             (void)0;
@@ -1245,32 +1245,32 @@ BOOL sub_02031E9C(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C para
 
 void sub_02031ECC(void)
 {
-    if (2 == Unk_021C07AC->unk_1384) {
+    if (WIRELESS_STATE_SCAN == sWirelessManager->state) {
         while (TRUE) {
             (void)0;
         }
     }
 
     if (!sub_020317A4()) {
-        sub_02030EE0(10);
+        WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
     }
 }
 
 void sub_02031EF4(void)
 {
-    if (Unk_021C07AC->unk_1384 == 1) {
+    if (sWirelessManager->state == 1) {
         return;
     }
 
-    if ((Unk_021C07AC->unk_1384 != 6) && (Unk_021C07AC->unk_1384 != 5) && (Unk_021C07AC->unk_1384 != 4)) {
-        sub_02030EE0(3);
+    if ((sWirelessManager->state != WIRELESS_STATE_TRANSMIT_KEY) && (sWirelessManager->state != WIRELESS_STATE_TRANSMIT_DATA) && (sWirelessManager->state != WIRELESS_STATE_CONNECTED)) {
+        WirelessManager_SetState(WIRELESS_STATE_BUSY);
         sub_02031ECC();
         return;
     }
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    switch (Unk_021C07AC->unk_1388) {
+    switch (sWirelessManager->unk_1388) {
     case 3:
         break;
     case 5:
@@ -1293,11 +1293,11 @@ BOOL sub_02031F6C(void)
 {
     int v0;
 
-    sub_02030EE0(3);
+    WirelessManager_SetState(WIRELESS_STATE_BUSY);
     v0 = WM_End(sub_020318B0);
 
     if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EE0(9);
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
 
         return 0;
     }
@@ -1307,35 +1307,35 @@ BOOL sub_02031F6C(void)
 
 u16 sub_02031F90(void)
 {
-    return Unk_021C07AC->unk_13A0;
+    return sWirelessManager->unk_13A0;
 }
 
 void sub_02031FA4(int param0)
 {
-    if (Unk_021C07AC) {
-        Unk_021C07AC->unk_13A8 = param0;
+    if (sWirelessManager) {
+        sWirelessManager->unk_13A8 = param0;
     }
 }
 
 BOOL sub_02031FBC(void)
 {
-    return Unk_021C07AC->unk_1384 == 1;
+    return sWirelessManager->state == WIRELESS_STATE_IDLE;
 }
 
 BOOL sub_02031FD8(void)
 {
-    return Unk_021C07AC->unk_1384 == 3;
+    return sWirelessManager->state == WIRELESS_STATE_BUSY;
 }
 
 BOOL sub_02031FF4(void)
 {
-    return Unk_021C07AC->unk_1384 == 9;
+    return sWirelessManager->state == WIRELESS_STATE_ERROR;
 }
 
 BOOL sub_02032010(void)
 {
-    if (Unk_021C07AC) {
-        return Unk_021C07AC->unk_1384 == 2;
+    if (sWirelessManager) {
+        return sWirelessManager->state == WIRELESS_STATE_SCAN;
     }
 
     return 0;
@@ -1343,7 +1343,7 @@ BOOL sub_02032010(void)
 
 void sub_02032034(void *param0, int param1, int param2, int param3)
 {
-    if (Unk_021C07AC->unk_1384 == 4) {
+    if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
         WM_SetGameInfo(NULL, param0, param1, param2, param3, WM_ATTR_FLAG_ENTRY);
     } else {
         (void)0;
@@ -1355,15 +1355,15 @@ static void sub_02032070(void *param0)
     WMCallback *v0 = param0;
 
     if (v0->errcode == WM_ERRCODE_SUCCESS) {
-        Unk_021C07AC->unk_13B8 = 1;
+        sWirelessManager->unk_13B8 = 1;
     }
 }
 
 BOOL sub_0203208C(BOOL param0)
 {
-    Unk_021C07AC->unk_13B8 = 0;
+    sWirelessManager->unk_13B8 = 0;
 
-    if (Unk_021C07AC->unk_1384 == 4) {
+    if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
         if (WM_ERRCODE_OPERATING == WM_SetEntry(sub_02032070, param0)) {
             return 1;
         }
@@ -1374,8 +1374,8 @@ BOOL sub_0203208C(BOOL param0)
 
 BOOL sub_020320C4(void)
 {
-    if (Unk_021C07AC) {
-        return Unk_021C07AC->unk_13B9 >= 6;
+    if (sWirelessManager) {
+        return sWirelessManager->unk_13B9 >= 6;
     }
 
     return 0;
@@ -1383,40 +1383,40 @@ BOOL sub_020320C4(void)
 
 void sub_020320E8(void)
 {
-    Unk_021C07AC->unk_13B9 = 0;
+    sWirelessManager->unk_13B9 = 0;
 }
 
 void sub_020320FC(UnkFuncPtr_020320FC param0)
 {
-    Unk_021C07AC->unk_1394 = param0;
+    sWirelessManager->unk_1394 = param0;
 }
 
 void sub_SetDisconnectCallback(UnkFuncPtr_02032110 callback)
 {
-    Unk_021C07AC->disconnectCallback = callback;
+    sWirelessManager->disconnectCallback = callback;
 }
 
 void sub_02032124(UnkFuncPtr_02032110 param0)
 {
-    Unk_021C07AC->unk_139C = param0;
+    sWirelessManager->unk_139C = param0;
 }
 
 void sub_02032138(BOOL param0)
 {
-    Unk_021C07AC->unk_13B6 = param0;
+    sWirelessManager->unk_13B6 = param0;
 }
 
 BOOL sub_0203214C(void)
 {
-    return Unk_021C07AC->unk_13B6;
+    return sWirelessManager->unk_13B6;
 }
 
 void sub_02032160(BOOL param0)
 {
-    Unk_021C07AC->unk_13B7 = param0;
+    sWirelessManager->unk_13B7 = param0;
 }
 
 void sub_02032174(BOOL param0)
 {
-    Unk_021C07AC->unk_13A9 = param0;
+    sWirelessManager->unk_13A9 = param0;
 }

From cc1add5b07dd2fea697110ef5f94574c79a2a26c Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Sun, 3 May 2026 21:12:47 -0400
Subject: [PATCH 02/39] Document functions

---
 include/functypes/funcptr_020312B8.h |    2 +-
 include/functypes/funcptr_02031E6C.h |    2 +-
 include/functypes/funcptr_02031E9C.h |    2 +-
 include/unk_02030EE0.h               |   90 +-
 src/communication_system.c           |   26 +-
 src/main_menu/ov97_02238534.c        |    2 +-
 src/overlay005/field_control.c       |    2 +-
 src/overlay058/ov58_021D0D80.c       |   14 +-
 src/overlay059/ov59_021D0D80.c       |    4 +-
 src/overlay109/ov109_021D3D50.c      |    4 +-
 src/underground/secret_bases.c       |    8 +-
 src/unk_02030EE0.c                   | 1611 ++++++++++++++++----------
 src/unk_02033200.c                   |   86 +-
 src/unk_020366A0.c                   |   24 +-
 src/unk_02095E98.c                   |    4 +-
 src/unk_020961E8.c                   |    2 +-
 src/unk_0209BDF8.c                   |    2 +-
 17 files changed, 1139 insertions(+), 746 deletions(-)

diff --git a/include/functypes/funcptr_020312B8.h b/include/functypes/funcptr_020312B8.h
index b7e42257959..ce70580fca5 100644
--- a/include/functypes/funcptr_020312B8.h
+++ b/include/functypes/funcptr_020312B8.h
@@ -3,6 +3,6 @@
 
 #include <nitro/wm.h>
 
-typedef void (*UnkFuncPtr_020312B8)(WMBssDesc *);
+typedef void (*WirelessManagerScanFunc)(WMBssDesc *);
 
 #endif // POKEPLATINUM_FUNCPTR_020312B8_H
diff --git a/include/functypes/funcptr_02031E6C.h b/include/functypes/funcptr_02031E6C.h
index 3b0bda5e111..69f5140e1cd 100644
--- a/include/functypes/funcptr_02031E6C.h
+++ b/include/functypes/funcptr_02031E6C.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_FUNCPTR_02031E6C_H
 #define POKEPLATINUM_FUNCPTR_02031E6C_H
 
-typedef void (*UnkFuncPtr_02031E6C)(u16, u16 *, u16);
+typedef void (*WirelessManagerRecvFunc)(u16, u16 *, u16);
 
 #endif // POKEPLATINUM_FUNCPTR_02031E6C_H
diff --git a/include/functypes/funcptr_02031E9C.h b/include/functypes/funcptr_02031E9C.h
index e8e514fe0a1..67f783162e3 100644
--- a/include/functypes/funcptr_02031E9C.h
+++ b/include/functypes/funcptr_02031E9C.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_FUNCPTR_02031E9C_H
 #define POKEPLATINUM_FUNCPTR_02031E9C_H
 
-typedef void (*UnkFuncPtr_02031E9C)(BOOL);
+typedef void (*WirelessManagerSendFunc)(BOOL);
 
 #endif // POKEPLATINUM_FUNCPTR_02031E9C_H
diff --git a/include/unk_02030EE0.h b/include/unk_02030EE0.h
index 63096819210..5aa804af2a2 100644
--- a/include/unk_02030EE0.h
+++ b/include/unk_02030EE0.h
@@ -24,41 +24,61 @@ enum WirelessManagerState {
     WIRELESS_STATE_COUNT
 };
 
-BOOL sub_02031220(int param0, const u8 *param1, u16 param2);
-BOOL sub_020312B8(UnkFuncPtr_020312B8 param0, const u8 *param1, u16 param2);
-BOOL sub_020314C0(void);
-void sub_020318D0(u32 param0);
-void sub_020318DC(u16 *param0, u16 param1);
-u16 sub_020318EC(void);
-int sub_02031934(void);
-int sub_02031948(void);
-BOOL sub_0203195C(void);
-u16 sub_02031B04(void);
-BOOL sub_02031BC4(void *param0, BOOL param1);
-int sub_02031C50(void);
-BOOL sub_02031D04(int param0, u16 param1, u16 param2, u16 param3, u16 param4, BOOL param5);
-BOOL sub_02031DD8(int param0, WMBssDesc *param1);
-void sub_02031E6C(UnkFuncPtr_02031E6C param0, int param1);
-BOOL sub_02031E9C(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3);
-void sub_02031ECC(void);
-void sub_02031EF4(void);
-BOOL sub_02031F6C(void);
-u16 sub_02031F90(void);
-void sub_02031FA4(int param0);
-BOOL sub_02031FBC(void);
-BOOL sub_02031FD8(void);
-BOOL sub_02031FF4(void);
-BOOL sub_02032010(void);
-void sub_02032034(void *param0, int param1, int param2, int param3);
-BOOL sub_0203208C(BOOL param0);
-BOOL sub_020320C4(void);
-void sub_020320E8(void);
-void sub_020320FC(UnkFuncPtr_020320FC param0);
+enum WirelessConnectionType {
+    WIRELESS_CONNECTION_MP_SERVER,
+    WIRELESS_CONNECTION_MP_CLIENT,
+    WIRELESS_CONNECTION_TRANSMIT_KEY_SERVER,
+    WIRELESS_CONNECTION_TRANSMIT_KEY_CLIENT,
+    WIRELESS_CONNECTION_TRANSMIT_DATA_SERVER,
+    WIRELESS_CONNECTION_TRANSMIT_DATA_CLIENT,
+    WIRELESS_CONNECTION_COUNT
+};
+
+//Extention of the NitroSDK WMErrCode enum 
+enum ExtendedWMErrCode {
+    WM_ERRCODE_DISCONNECTED = WM_ERRCODE_MAX, //=20
+    WM_ERRCODE_NO_SERVER,
+    WM_ERRCODE_DISCONNECTED_SERVER,
+    WM_ERRCODE_NO_CHANNEL,
+    WM_ERRCODE_FATAL,
+    WM_ERRCODE_GF_MAX
+};
+
+BOOL WirelessManager_ConnectClientAuto(int param0, const u8 *param1, u16 param2);
+BOOL WirelessManager_ConnectClientScanCallback(WirelessManagerScanFunc param0, const u8 *param1, u16 param2);
+BOOL WirelessManager_StopScan(void);
+void WirelessManager_SetParentParamGGID(u32 param0);
+void WirelessManager_SetParentParamGameInfoAndLength(u16 *param0, u16 param1);
+u16 WirelessManager_GetConnectedBitmap(void);
+int WirelessManager_GetState(void);
+int WirelessManager_GetErrorCode(void);
+BOOL WirelessManager_StartMeasureChannel(void);
+u16 WirelessManager_GetMeasureChannel(void);
+BOOL WirelessManager_Initialize(void *param0, BOOL param1);
+int WirelessManager_GetHeapSize(void);
+BOOL WirelessManager_ConnectServer(int param0, u16 param1, u16 param2, u16 param3, u16 param4, BOOL param5);
+BOOL WirelessManager_ConnectClient(int param0, WMBssDesc *param1);
+void WirelessManager_SetRecvFunction(WirelessManagerRecvFunc param0, int param1);
+BOOL WirelessManager_SendMessage(void *param0, u16 param1, int param2, WirelessManagerSendFunc param3);
+void WirelessManager_Reset(void);
+void WirelessManager_Finalize(void);
+BOOL WirelessManager_End(void);
+u16 WirelessManager_GetAID(void);
+void WirelessManager_SetMaxNumConnections(int param0);
+BOOL WirelessManager_IsIdle(void);
+BOOL WirelessManager_IsBusy(void);
+BOOL WirelessManager_IsError(void);
+BOOL WirelessManager_IsScanning(void);
+void WirelessManager_SetGameInfo(void *param0, int param1, int param2, int param3);
+BOOL WirelessManager_SetEntry(BOOL param0);
+BOOL WirelessManager_ServerSentAllBeacons(void);
+void WirelessManager_ResetBeaconSentCount(void);
+void WirelessManager_SetGGIDScanCallback(UnkFuncPtr_020320FC param0);
 void sub_SetDisconnectCallback(UnkFuncPtr_02032110 param0);
-void sub_02032124(UnkFuncPtr_02032110 param0);
-void sub_02032138(BOOL param0);
-BOOL sub_0203214C(void);
-void sub_02032160(BOOL param0);
-void sub_02032174(BOOL param0);
+void WirelessManager_SetConnectCallback(UnkFuncPtr_02032110 param0);
+void WirelessManager_SetPauseConnection(BOOL param0);
+BOOL WirelessManager_GetPauseConnection(void);
+void WirelessManager_SetPauseConnectionSystem(BOOL param0);
+void WirelessManager_SetPauseClientConnection(BOOL param0);
 
 #endif // POKEPLATINUM_UNK_02030EE0_H
diff --git a/src/communication_system.c b/src/communication_system.c
index fee688c5ed2..6d6c5b8518a 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -340,7 +340,7 @@ BOOL CommSys_InitServer(BOOL param0, BOOL param1, int param2, BOOL param3)
 
     if (!CommLocal_IsWifiGroup(sub_0203895C())) {
         ret = CommServerClient_InitServer(param0, param1, param3);
-        sub_02032124(sub_02034770);
+        WirelessManager_SetConnectCallback(sub_02034770);
     }
 
     CommSys_Init(param0, param2);
@@ -663,7 +663,7 @@ static void sub_02034B50(void)
                 sCommunicationSystem->unk_660++;
             }
         }
-    } else if (((sub_02031934() == 4) && (CommSys_IsPlayerConnected(CommSys_CurNetId()))) || CommSys_IsAlone()) {
+    } else if (((WirelessManager_GetState() == 4) && (CommSys_IsPlayerConnected(CommSys_CurNetId()))) || CommSys_IsAlone()) {
         while (TRUE) {
             if (Unk_02100A1D != 4) {
                 break;
@@ -741,9 +741,9 @@ static void CommSys_UpdateServerClient(void)
             Unk_021C07C4 = 1;
         }
 
-        if (sub_02031934() == 4
+        if (WirelessManager_GetState() == 4
             && !CommSys_IsAlone()
-            && !sub_02031E9C(sCommunicationSystem->sendBufferServer[sCommunicationSystem->unk_6A8], 192, 14, sub_020353B0)) {
+            && !WirelessManager_SendMessage(sCommunicationSystem->sendBufferServer[sCommunicationSystem->unk_6A8], 192, 14, sub_020353B0)) {
             Unk_02100A1C--;
         }
 
@@ -762,7 +762,7 @@ static void CommSys_UpdateServerClient(void)
             sCommunicationSystem->unk_6A8 = 1 - sCommunicationSystem->unk_6A8;
         }
 
-        if ((sub_02031934() != 4) || CommSys_IsAlone()) {
+        if ((WirelessManager_GetState() != 4) || CommSys_IsAlone()) {
             Unk_02100A1C++;
         }
     }
@@ -821,7 +821,7 @@ static void sub_02034F68(void)
                 (void)0;
             }
         }
-    } else if ((sub_02031934() == 4) || (CommSys_IsAlone())) {
+    } else if ((WirelessManager_GetState() == 4) || (CommSys_IsAlone())) {
         if (Unk_02100A1C != 4) {
             return;
         }
@@ -1047,7 +1047,7 @@ static void sub_020353CC(void)
         }
     }
 
-    if (sub_02031934() == 4) {
+    if (WirelessManager_GetState() == 4) {
         if (!CommSys_IsPlayerConnected(CommSys_CurNetId())) {
             if (CommSys_CurNetId() == 1) {
                 (void)0;
@@ -1060,13 +1060,13 @@ static void sub_020353CC(void)
             if (CommSys_CurNetId() != 0) {
                 Unk_02100A1D++;
 
-                if (!sub_02031E9C(sCommunicationSystem->sendBuffer[sCommunicationSystem->unk_6A7], v3, 14, sub_02035394)) {
+                if (!WirelessManager_SendMessage(sCommunicationSystem->sendBuffer[sCommunicationSystem->unk_6A7], v3, 14, sub_02035394)) {
                     Unk_02100A1D--;
                 } else {
                     sCommunicationSystem->unk_6A7 = 1 - sCommunicationSystem->unk_6A7;
                     sCommunicationSystem->unk_660++;
                 }
-            } else if (sub_020318EC() & 0xfffe) {
+            } else if (WirelessManager_GetConnectedBitmap() & 0xfffe) {
                 Unk_02100A1D++;
                 sub_02035394(1);
                 sub_02035200(0, (u16 *)sCommunicationSystem->sendBuffer[sCommunicationSystem->unk_6A7], v3);
@@ -1268,7 +1268,7 @@ static void sub_020358C0(u8 *param0)
         param0[1] = 0x1;
     }
 
-    u16 v1 = sub_020318EC();
+    u16 v1 = WirelessManager_GetConnectedBitmap();
 
     param0[2] = v1 >> 8;
     param0[3] = v1 & 0xff;
@@ -1557,14 +1557,14 @@ BOOL CommSys_IsPlayerConnected(u16 param0)
         return FALSE;
     }
 
-    if (sub_02031934() != 4) {
+    if (WirelessManager_GetState() != 4) {
         return FALSE;
     }
 
     if (CommSys_CurNetId() == param0) {
         return TRUE;
     } else if (CommSys_CurNetId() == 0) {
-        u16 v1 = sub_020318EC();
+        u16 v1 = WirelessManager_GetConnectedBitmap();
 
         if (v1 & (1 << param0)) {
             return TRUE;
@@ -1740,7 +1740,7 @@ u16 CommSys_CurNetId(void)
         } else if (CommSys_IsAlone()) {
             return 0;
         } else {
-            return sub_02031F90();
+            return WirelessManager_GetAID();
         }
     }
 
diff --git a/src/main_menu/ov97_02238534.c b/src/main_menu/ov97_02238534.c
index 5fde0baa62c..c06d6965516 100644
--- a/src/main_menu/ov97_02238534.c
+++ b/src/main_menu/ov97_02238534.c
@@ -39,7 +39,7 @@ typedef struct {
     u8 unk_11F4[1261];
 } UnkStruct_ov97_022403F8;
 
-typedef void (*UnkFuncPtr_020312B8)(WMBssDesc *);
+typedef void (*WirelessManagerScanFunc)(WMBssDesc *);
 
 static void ov97_02238AB4(UnkStruct_ov97_02238AB4 *param0);
 static int ov97_02238B34(UnkStruct_ov97_02238AB4 *param0);
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index 31905ac350d..fea83f21dfc 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -445,7 +445,7 @@ static int Field_CheckTrainerInfo(void)
 
 BOOL FieldInput_Process_UnionRoom(const FieldInput *input, FieldSystem *fieldSystem)
 {
-    if (sub_020318EC() & 0xfe) {
+    if (WirelessManager_GetConnectedBitmap() & 0xfe) {
         if (Field_CheckTrainerInfo() && CommSys_ConnectedCount() > 1) {
             ScriptManager_Set(fieldSystem, 5, NULL);
             return TRUE;
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 05aedda0fa2..747ca72147d 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -236,7 +236,7 @@ int ov58_021D0F08(ApplicationManager *appMan, int *param1)
     UnkStruct_02095EAC *v0 = ApplicationManager_Data(appMan);
 
     if ((CommSys_CurNetId() == 0) && (v0->unk_9418 != 0)) {
-        v0->unk_9418 &= sub_020318EC();
+        v0->unk_9418 &= WirelessManager_GetConnectedBitmap();
     }
 
     v0->unk_364 = *param1;
@@ -339,7 +339,7 @@ int ov58_021D1018(ApplicationManager *appMan, int *param1)
         break;
     case 2:
         if (v0->unk_9464) {
-            if (sub_020318EC() == 1) {
+            if (WirelessManager_GetConnectedBitmap() == 1) {
                 (*param1)++;
             }
         } else {
@@ -526,7 +526,7 @@ static void ov58_021D12C4(UnkStruct_02095EAC *param0)
     param0->unk_9458 = 1;
     param0->unk_945C = 0;
     param0->unk_37C = 2;
-    param0->unk_380 = sub_020318EC();
+    param0->unk_380 = WirelessManager_GetConnectedBitmap();
     param0->unk_9460 = 0;
     param0->unk_9464 = 0;
     param0->unk_368 = 0;
@@ -817,7 +817,7 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
         case 8:
             if (param0->unk_368 == 4) {
                 if (CommSys_CurNetId() == 0) {
-                    if (param0->unk_380 != sub_020318EC()) {
+                    if (param0->unk_380 != WirelessManager_GetConnectedBitmap()) {
                         Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
                         break;
                     }
@@ -1758,7 +1758,7 @@ static int ov58_021D2B5C(UnkStruct_02095EAC *param0)
     switch (v0) {
     case 1:
         if (param0->unk_368 <= 14) {
-            if (sub_020318EC() != 1) {
+            if (WirelessManager_GetConnectedBitmap() != 1) {
                 param0->unk_9464 = 1;
             }
 
@@ -1793,7 +1793,7 @@ static int ov58_021D2B5C(UnkStruct_02095EAC *param0)
 
     if (v0 < param0->unk_378) {
         param0->unk_37C = CommSys_ConnectedCount();
-        param0->unk_380 = sub_020318EC();
+        param0->unk_380 = WirelessManager_GetConnectedBitmap();
 
         if (param0->unk_9468) {
             if (!(param0->unk_380 & param0->unk_946C)) {
@@ -1811,7 +1811,7 @@ static int ov58_021D2B5C(UnkStruct_02095EAC *param0)
     if (param0->unk_37C < CommSys_ConnectedCount()) {
         param0->unk_9458 = 2;
         param0->unk_9468 = 1;
-        param0->unk_946C = param0->unk_380 ^ sub_020318EC();
+        param0->unk_946C = param0->unk_380 ^ WirelessManager_GetConnectedBitmap();
         GF_ASSERT((param0->unk_946C == 2) || (param0->unk_946C == 4) || (param0->unk_946C == 8) || (param0->unk_946C == 16));
     }
 
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 738046b4280..b2072f7f2da 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -235,7 +235,7 @@ int ov59_021D0F00(ApplicationManager *appMan, int *param1)
     UnkStruct_020961E8 *v0 = ApplicationManager_Data(appMan);
 
     if ((CommSys_CurNetId() == 0) && (v0->unk_4AB4 != 0)) {
-        v0->unk_4AB4 &= sub_020318EC();
+        v0->unk_4AB4 &= WirelessManager_GetConnectedBitmap();
     }
 
     switch (*param1) {
@@ -1672,7 +1672,7 @@ static int ov59_021D292C(UnkStruct_020961E8 *param0, int param1)
 
     switch (v0) {
     case 1:
-        if ((CommSys_ConnectedCount() > 1) || (sub_020318EC() > 1)) {
+        if ((CommSys_ConnectedCount() > 1) || (WirelessManager_GetConnectedBitmap() > 1)) {
             return 1;
         }
 
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 684b10f2861..948f841d685 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -230,7 +230,7 @@ int ov109_021D3EB0(ApplicationManager *appMan, int *param1)
     UnkStruct_ov109_021D5140 *v0 = ApplicationManager_Data(appMan);
 
     if ((CommSys_CurNetId() == 0) && (v0->unk_10->unk_30 != 0)) {
-        v0->unk_10->unk_30 &= sub_020318EC();
+        v0->unk_10->unk_30 &= WirelessManager_GetConnectedBitmap();
     }
 
     switch (v0->unk_00) {
@@ -1724,7 +1724,7 @@ static int ov109_021D58AC(UnkStruct_ov109_021D5140 *param0, int param1)
 
     switch (v0) {
     case 1:
-        if ((CommSys_ConnectedCount() > 1) || (sub_020318EC() > 1)) {
+        if ((CommSys_ConnectedCount() > 1) || (WirelessManager_GetConnectedBitmap() > 1)) {
             return 1;
         }
 
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index 71be86be8ee..95aad3ea6ab 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -2759,16 +2759,16 @@ void SecretBases_SetEntranceGraphicsEnabled(BOOL enabled)
 
 static void ov23_0224DC08(void)
 {
-    sub_02032174(TRUE);
-    sub_02032138(TRUE);
+    WirelessManager_SetPauseClientConnection(TRUE);
+    WirelessManager_SetPauseConnection(TRUE);
     sub_02036814(TRUE);
     sub_020340FC();
 }
 
 static void ov23_0224DC24(void)
 {
-    sub_02032174(FALSE);
-    sub_02032138(FALSE);
+    WirelessManager_SetPauseClientConnection(FALSE);
+    WirelessManager_SetPauseConnection(FALSE);
     sub_02036814(FALSE);
     sub_020340FC();
 }
diff --git a/src/unk_02030EE0.c b/src/unk_02030EE0.c
index 4eb70d677ec..41525aa1029 100644
--- a/src/unk_02030EE0.c
+++ b/src/unk_02030EE0.c
@@ -16,81 +16,89 @@
 #include "unk_0203266C.h"
 #include "unk_020366A0.h"
 
-typedef struct {
-    WMpparam unk_00 ATTRIBUTE_ALIGN(32);
-    u8 unk_40[3840] ATTRIBUTE_ALIGN(32);
-    u8 unk_F40[224] ATTRIBUTE_ALIGN(32);
-    u8 unk_1020[512] ATTRIBUTE_ALIGN(32);
-    WMbssDesc unk_1220 ATTRIBUTE_ALIGN(32);
-    WMscanParam unk_1354 ATTRIBUTE_ALIGN(32);
-    UnkFuncPtr_020312B8 unk_1374;
-    s32 unk_1378;
-    s32 unk_137C;
-    u16 unk_1380;
-    u16 unk_1382;
+/**
+ * @struct WirelessManager
+ * @brief Wrapper struct for NitroSDK's wm.c 
+ *
+ * WirelessManager is treated as a static class and 
+ * serves as a wrapper for the NitroSDK's wireless manager 
+ * (shortened to wm.c). 
+ */
+typedef struct WirelessManager {
+    WMpparam parentParam ATTRIBUTE_ALIGN(32);
+    u8 nitroManagerBuffer[3840] ATTRIBUTE_ALIGN(32);
+    u8 sendBuffer[224] ATTRIBUTE_ALIGN(32);
+    u8 recvBuffer[512] ATTRIBUTE_ALIGN(32);
+    WMbssDesc bssDesc ATTRIBUTE_ALIGN(32);
+    WMscanParam scanParam ATTRIBUTE_ALIGN(32);
+    WirelessManagerScanFunc scanCallback;
+    s32 sendBufferSize;
+    s32 recvBufferSize;
+    u16 channel;
+    u16 autoConnect;
     int state;
-    int unk_1388;
-    UnkFuncPtr_02031E6C unk_138C;
+    int connectionType;
+    WirelessManagerRecvFunc recvFunc;
 
     // clang-format off
-    BOOL (* unk_1390)(WMStartParentCallback *);
+    BOOL (* unusedCallback_1390)(WMStartParentCallback *);
     // clang-format on
 
-    UnkFuncPtr_020320FC unk_1394;
+    UnkFuncPtr_020320FC ggidScanCallback;
     UnkFuncPtr_02032110 disconnectCallback;
-    UnkFuncPtr_02032110 unk_139C;
-    u16 unk_13A0;
-    u16 unk_13A2;
-    int unk_13A4;
-    u8 unk_13A8;
-    u8 unk_13A9;
-    u32 unk_13AC;
-    u16 unk_13B0;
-    u16 unk_13B2;
-    u16 unk_13B4;
-    u8 unk_13B6;
-    u8 unk_13B7;
-    u8 unk_13B8;
-    u8 unk_13B9;
+    UnkFuncPtr_02032110 connectCallback;
+    u16 aid; //machine id. 0 for the server, 1~7 for clients
+    u16 connectedBitmap; //bitmap of (1 << aid) for connected machines
+    int errorCode;
+    u8 numConnectionsMax;
+    u8 pauseConnectionClient; //if this WirelessManager is a Client that has disconnected
+    u32 rand;
+    u16 measureChannel;
+    u16 measureChannelBusyRatio;
+    u16 leastUsedChannelBitmap;
+    u8 pauseConnection;
+    u8 pauseConnectSystem;
+    u8 setEntry;
+    u8 sentBeaconCount;
 } WirelessManager;
 
 void include_unk_021C07A8(void);
-static void sub_02031C58(void *param0);
-static BOOL sub_02031C70(BOOL param0);
-static void sub_02031CBC(void *param0);
-static u16 sub_020319F8(u16 param0);
-static void sub_02031A74(void *param0);
-static WMErrCode sub_02031AF0(WMCallbackFunc param0, u16 param1);
-static s16 sub_02031B30(u16 param0);
-static BOOL sub_02030F10(void);
-static void sub_02030F40(void *param0);
-static BOOL sub_02030F64(void);
-static void sub_02030FD0(void *param0);
-static BOOL sub_020310DC(void);
-static void sub_0203114C(void *param0);
-static BOOL sub_02031320(void);
-static void sub_020313E8(void *param0);
-static BOOL sub_020314E4(void);
-static void sub_02031500(void *param0);
-static BOOL sub_02031538(void);
-static void sub_020315A8(void *param0);
-static BOOL sub_02031668(void);
-static void sub_020316B8(void *param0);
-static BOOL sub_020317E8(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3);
-static void sub_02031840(void *param0);
-static void sub_02031868(void *param0);
-static BOOL sub_020311A8(void);
-static void sub_020311CC(void *param0);
-static BOOL sub_020311EC(void);
-static void sub_02031208(void *param0);
-static BOOL sub_0203171C(void);
-static void sub_02031740(void *param0);
-static BOOL sub_02031764(void);
-static void sub_0203178C(void *param0);
-static void sub_020318B0(void *param0);
-static BOOL sub_020317A4(void);
-static void sub_020317C8(void *param0);
-static u16 sub_02031900(void);
+static void WirelessManager_InidcateCallback(void *param0);
+static BOOL WirelessManager_InitializeWM(BOOL param0);
+static void WirelessManager_FinishInitializeWM(void *param0);
+static u16 WirelessManager_MeasureChannel(u16 param0);
+static void WirelessManager_FinishMeasureChannel(void *param0);
+static WMErrCode WirelessManager_MeasureChannelInternal(WMCallbackFunc param0, u16 param1);
+static s16 WirelessManager_GetRandomChannel(u16 param0);
+static BOOL WirelessManager_SetParentParameter(void);
+static void WirelessManager_FinishSetParentParameter(void *param0);
+static BOOL WirelessManager_StartServer(void);
+static void WirelessManager_FinishStartServer(void *param0);
+static BOOL WirelessManager_StartMPServer(void);
+static void WirelessManager_FinishStartMPServer(void *param0);
+static BOOL WirelessManager_StartScan(void);
+static void WirelessManager_FinishStartScan(void *param0);
+static BOOL WirelessManager_EndScan(void);
+static void WirelessManager_FinishEndScan(void *param0);
+static BOOL WirelessManager_StartClient(void);
+static void WirelessManager_FinishStartClient(void *param0);
+static BOOL WirelessManager_StartMPClient(void);
+static void WirelessManager_FinishStartMPClient(void *param0);
+static BOOL WirelessManager_SendMPMessage(void *param0, u16 param1, int param2, WirelessManagerSendFunc param3);
+static void WirelessManager_FinishSendMPMessage(void *param0);
+static void WirelessManager_RecvMessageCallback(void *param0);
+static BOOL WirelessManager_EndMPServer(void);
+static void WirelessManager_FinishEndMPServer(void *param0);
+static BOOL WirelessManager_EndServer(void);
+static void WirelessManager_FinishEndServer(void *param0);
+static BOOL WirelessManager_EndMPClient(void);
+static void WirelessManager_FinishEndMPClient(void *param0);
+static BOOL WirelessManager_DisconnectClient(void);
+static void WirelessManager_FinishDisconnectClient(void *param0);
+static void WirelessManager_FinishEnd(void *param0);
+static BOOL WirelessManager_ResetInternal(void);
+static void WirelessManager_FinishResetInternal(void *param0);
+static u16 WirelessManager_GetNumConnected(void);
 
 static WirelessManager *sWirelessManager;
 static void (*Unk_021C07A8)(const char *, ...) = NULL;
@@ -100,30 +108,45 @@ void include_unk_021C07A8(void)
     Unk_021C07A8;
 }
 
+/**
+ * @param Sets WirelessManager's state to the given WirelessManagerState
+ *
+ * @param state
+ */
 static void WirelessManager_SetState(int state)
 {
     sWirelessManager->state = state;
 }
 
-static void sub_02030EF4(int param0)
+/**
+ * @brief Sets WirelessManager's errorCode to the given NitroSDK WMErrCode or Pokeplatinum ExtendedWMErrCode enum
+ *
+ * @param errorCode
+ */
+static void WirelessManager_SetErrorCode(int errorCode)
 {
     if ((sWirelessManager->state == WIRELESS_STATE_ERROR) || (sWirelessManager->state == WIRELESS_STATE_FATAL_ERROR)) {
         return;
     }
 
-    sWirelessManager->unk_13A4 = param0;
+    sWirelessManager->errorCode = errorCode;
 }
 
-static BOOL sub_02030F10(void)
+/**
+ * @brief Sets the internal WM parent parameter before WirelessManager gets started as a server.
+ *
+ * @return TRUE if there is no error while setting the parent parameter
+ */
+static BOOL WirelessManager_SetParentParameter(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    v0 = WM_SetParentParameter(sub_02030F40, &sWirelessManager->unk_00);
+    errorCode = WM_SetParentParameter(WirelessManager_FinishSetParentParameter, &sWirelessManager->parentParam);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return FALSE;
     }
@@ -131,145 +154,163 @@ static BOOL sub_02030F10(void)
     return TRUE;
 }
 
-static void sub_02030F40(void *param0)
+/**
+ * @brief Callback used when the WM_SetParentParameter asynchronous process completes
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishSetParentParameter(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
-    {
-        if (!sub_02030F64()) {
-            WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        }
+    if (!WirelessManager_StartServer()) {
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
     }
 }
 
-static BOOL sub_02030F64(void)
+/**
+ * @brief Starts the internal WM process as a parent/server
+ *
+ * @return TRUE if there is no issue starting the server
+ */
+static BOOL WirelessManager_StartServer(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
     if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
         return TRUE;
     }
 
-    {
-        WMStatus *v1 = (WMStatus *)WMi_GetStatusAddress();
+    WMStatus *status = (WMStatus *)WMi_GetStatusAddress();
 
-        DC_InvalidateRange(&v1->wep_flag, sizeof(v1->wep_flag));
-        v1->wep_flag = 0;
-        DC_FlushRange(&v1->wep_flag, sizeof(v1->wep_flag));
-    }
-    v0 = WM_StartParent(sub_02030FD0);
+    DC_InvalidateRange(&status->wep_flag, sizeof(status->wep_flag));
+    status->wep_flag = 0;
+    DC_FlushRange(&status->wep_flag, sizeof(status->wep_flag));
+
+    errorCode = WM_StartParent(WirelessManager_FinishStartServer);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
         return FALSE;
     }
 
-    sWirelessManager->unk_13A0 = 0;
-    sWirelessManager->unk_13A2 = 1;
+    sWirelessManager->aid = 0;
+    sWirelessManager->connectedBitmap = 1;
 
     return TRUE;
 }
 
-static void sub_02030FD0(void *param0)
+/**
+ * @brief Callback used when the WM_StartParent asynchronous process completes.
+ *
+ * @param wm_startparentcallback
+ */
+static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
 {
-    WMStartParentCallback *v0 = (WMStartParentCallback *)param0;
-    const u16 v1 = (u16)(1 << v0->aid);
+    WMStartParentCallback *callback = (WMStartParentCallback *)wm_startparentcallback;
+    const u16 connected = (u16)(1 << callback->aid);
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
-    switch (v0->state) {
+    switch (callback->state) {
     case WM_STATECODE_BEACON_SENT:
-        sWirelessManager->unk_13B9++;
+        sWirelessManager->sentBeaconCount++;
         break;
-    case WM_STATECODE_CONNECTED: {
-        if ((sWirelessManager->unk_13B7 == 1) || (sWirelessManager->unk_13B6 == 1) || (sub_02031900() >= sWirelessManager->unk_13A8) || (v0->ssid[0] != sub_0203895C()) || (0 != memcmp("DP", &v0->ssid[1], sizeof("DP")))) {
-            WMErrCode v2;
+    case WM_STATECODE_CONNECTED: 
+        if ((sWirelessManager->pauseConnectSystem == 1) || (sWirelessManager->pauseConnection == 1) || (WirelessManager_GetNumConnected() >= sWirelessManager->numConnectionsMax) || (callback->ssid[0] != sub_0203895C()) || (0 != memcmp("DP", &callback->ssid[1], sizeof("DP")))) {
+            WMErrCode disconnectCode;
 
-            v2 = WM_Disconnect(NULL, v0->aid);
+            disconnectCode = WM_Disconnect(NULL, callback->aid);
 
-            if (v2 != WM_ERRCODE_OPERATING) {
-                sub_02030EF4(v2);
+            if (disconnectCode != WM_ERRCODE_OPERATING) {
+                WirelessManager_SetErrorCode(disconnectCode);
                 WirelessManager_SetState(WIRELESS_STATE_ERROR);
             }
             break;
         }
 
-        sWirelessManager->unk_13A2 |= v1;
+        sWirelessManager->connectedBitmap |= connected;
 
-        if (sWirelessManager->unk_139C) {
-            sWirelessManager->unk_139C(v0->aid);
+        if (sWirelessManager->connectCallback) {
+            sWirelessManager->connectCallback(callback->aid);
         }
-    } break;
-    case WM_STATECODE_DISCONNECTED: {
-        sWirelessManager->unk_13A2 &= ~v1;
+        break;
+    case WM_STATECODE_DISCONNECTED: 
+        sWirelessManager->connectedBitmap &= ~connected;
 
         if (sWirelessManager->disconnectCallback) {
-            sWirelessManager->disconnectCallback(v0->aid);
+            sWirelessManager->disconnectCallback(callback->aid);
         }
-    } break;
+        break;
     case WM_STATECODE_DISCONNECTED_FROM_MYSELF:
         break;
-    case WM_STATECODE_PARENT_START: {
-        if (!sub_020310DC()) {
+    case WM_STATECODE_PARENT_START: 
+        if (!WirelessManager_StartMPServer()) {
             WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
-    } break;
+        break;
     default:
         break;
     }
 }
 
-static BOOL sub_020310DC(void)
+/**
+ * @brief Starts the internal MP_PARENT process 
+ *
+ * @return TRUE if there is no error while starting the MP
+ */
+static BOOL WirelessManager_StartMPServer(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
-    if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
+    if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
         return 1;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
 
-    v0 = WM_StartMP(sub_0203114C, (u16 *)sWirelessManager->unk_1020, (u16)sWirelessManager->unk_137C, (u16 *)sWirelessManager->unk_F40, (u16)sWirelessManager->unk_1378, 1);
+    errorCode = WM_StartMP(WirelessManager_FinishStartMPServer, (u16 *)sWirelessManager->recvBuffer, (u16)sWirelessManager->recvBufferSize, (u16 *)sWirelessManager->sendBuffer, (u16)sWirelessManager->sendBufferSize, 1);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_0203114C(void *param0)
+/**
+ * @brief Callback used when the server's WM_StartMP asynchronous process completes.
+ *
+ * @param wm_startmpcallback
+ */
+static void WirelessManager_FinishStartMPServer(void *wm_startmpcallback)
 {
-    WMstartMPCallback *v0 = (WMstartMPCallback *)param0;
+    WMstartMPCallback *callback = (WMstartMPCallback *)wm_startmpcallback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
-    switch (v0->state) {
+    switch (callback->state) {
     case WM_STATECODE_MP_START:
-        if (sWirelessManager->unk_1388 == 2) {
-            if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
-                (void)0;
-            } else if (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) {
+        if (sWirelessManager->connectionType == WIRELESS_CONNECTION_TRANSMIT_KEY_SERVER) {
+            if (sWirelessManager->state != WIRELESS_STATE_CONNECTED && sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) {
                 return;
             }
-        } else if (sWirelessManager->unk_1388 == WIRELESS_STATE_CONNECTED) {
-            (void)0;
-        }
+        } 
 
         WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
         break;
@@ -278,212 +319,257 @@ static void sub_0203114C(void *param0)
     case WM_STATECODE_MP_IND:
     case WM_STATECODE_MPACK_IND:
     default:
-
         break;
     }
 }
 
-static BOOL sub_020311A8(void)
+/**
+ * @brief Ends the internal MP_PARENT process
+ *
+ * @return TRUE if there is no error ending the MP
+ */
+static BOOL WirelessManager_EndMPServer(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    v0 = WM_EndMP(sub_020311CC);
+    errorCode = WM_EndMP(WirelessManager_FinishEndMPServer);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_020311CC(void *param0)
+/**
+ * @brief Callback used when the server's WM_EndMP asynchronous process completes. 
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishEndMPServer(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
-        sub_02031ECC();
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
+        WirelessManager_Reset();
         return;
     }
 
-    if (!sub_020311EC()) {
-        sub_02031ECC();
+    if (!WirelessManager_EndServer()) {
+        WirelessManager_Reset();
         return;
     }
 }
 
-static BOOL sub_020311EC(void)
+/**
+ * @brief Ends the internal WM parent process
+ *
+ * @return TRUE if there is no error while ending the server
+ */
+static BOOL WirelessManager_EndServer(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
-    v0 = WM_EndParent(sub_02031208);
+    errorCode = WM_EndParent(WirelessManager_FinishEndServer);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_02031208(void *param0)
+/**
+ * @brief Callback used when the WM_EndParent asynchronous process completes. 
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishEndServer(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
         return;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_IDLE);
 }
 
-BOOL sub_02031220(int param0, const u8 *param1, u16 param2)
+/**
+ * @brief Initializes the Wireless Manager as a client and starts the scan process. Automatically connects to a Server when found.
+ * 
+ * @param connectionType
+ * @param macAddress
+ * @param channel
+ *
+ * @return TRUE if there is no error while starting the scan
+ */
+BOOL WirelessManager_ConnectClientAuto(int connectionType, const u8 *macAddress, u16 channel)
 {
-    sWirelessManager->unk_137C = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
-    sWirelessManager->unk_1378 = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
+    sWirelessManager->recvBufferSize = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
+    sWirelessManager->sendBufferSize = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
 
     WirelessManager_SetState(WIRELESS_STATE_SCAN);
 
-    sWirelessManager->unk_1220.channel = 1;
-    *(u16 *)(&sWirelessManager->unk_1354.bssid[4]) = *(u16 *)(param1 + 4);
-    *(u16 *)(&sWirelessManager->unk_1354.bssid[2]) = *(u16 *)(param1 + 2);
-    *(u16 *)(&sWirelessManager->unk_1354.bssid[0]) = *(u16 *)(param1 + 0);
+    sWirelessManager->bssDesc.channel = 1;
+    *(u16 *)(&sWirelessManager->scanParam.bssid[4]) = *(u16 *)(macAddress + 4);
+    *(u16 *)(&sWirelessManager->scanParam.bssid[2]) = *(u16 *)(macAddress + 2);
+    *(u16 *)(&sWirelessManager->scanParam.bssid[0]) = *(u16 *)(macAddress + 0);
 
-    sWirelessManager->unk_1388 = param0;
+    sWirelessManager->connectionType = connectionType;
 
-    sWirelessManager->unk_1374 = NULL;
-    sWirelessManager->unk_1380 = param2;
-    sWirelessManager->unk_1354.channel = 0;
-    sWirelessManager->unk_1382 = 1;
+    sWirelessManager->scanCallback = NULL;
+    sWirelessManager->channel = channel;
+    sWirelessManager->scanParam.channel = 0;
+    sWirelessManager->autoConnect = TRUE;
 
-    if (!sub_02031320()) {
+    if (!WirelessManager_StartScan()) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        return 0;
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-BOOL sub_020312B8(UnkFuncPtr_020312B8 param0, const u8 *param1, u16 param2)
+/**
+ * @brief Initializes the Wireless Manager as a client and starts the scan process with a given callback.
+ *
+ * @param scanCallback
+ * @param macAddress
+ * @param channel
+ *
+ * @return TRUE if there is no error while starting the scan
+ */
+BOOL WirelessManager_ConnectClientScanCallback(WirelessManagerScanFunc scanCallback, const u8 *macAddress, u16 channel)
 {
     WirelessManager_SetState(WIRELESS_STATE_SCAN);
 
-    sWirelessManager->unk_1374 = param0;
-    sWirelessManager->unk_1380 = param2;
-    sWirelessManager->unk_1354.channel = 0;
-    sWirelessManager->unk_1382 = 0;
+    sWirelessManager->scanCallback = scanCallback;
+    sWirelessManager->channel = channel;
+    sWirelessManager->scanParam.channel = 0;
+    sWirelessManager->autoConnect = FALSE;
 
-    *(u16 *)(&sWirelessManager->unk_1354.bssid[4]) = *(u16 *)(param1 + 4);
-    *(u16 *)(&sWirelessManager->unk_1354.bssid[2]) = *(u16 *)(param1 + 2);
-    *(u16 *)(&sWirelessManager->unk_1354.bssid[0]) = *(u16 *)(param1);
+    *(u16 *)(&sWirelessManager->scanParam.bssid[4]) = *(u16 *)(macAddress + 4);
+    *(u16 *)(&sWirelessManager->scanParam.bssid[2]) = *(u16 *)(macAddress + 2);
+    *(u16 *)(&sWirelessManager->scanParam.bssid[0]) = *(u16 *)(macAddress);
 
-    if (!sub_02031320()) {
+    if (!WirelessManager_StartScan()) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        return 0;
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static BOOL sub_02031320(void)
+/**
+ * @brief Starts the internal WM scan process 
+ *
+ * @return TRUE if there is no error while starting the scan
+ */ 
+static BOOL WirelessManager_StartScan(void)
 {
-    WMErrCode v0;
-    u16 v1 = WM_GetAllowedChannel();
+    WMErrCode errorCode;
+    u16 channel = WM_GetAllowedChannel();
 
-    if (v1 == 0x8000) {
-        sub_02030EF4(WM_ERRCODE_ILLEGAL_STATE);
+    if (channel == 0x8000) {
+        WirelessManager_SetErrorCode(WM_ERRCODE_ILLEGAL_STATE);
         Link_SetErrorState(1);
-        return 0;
+        return FALSE;
     }
 
-    if (v1 == 0) {
-        sub_02030EF4(22);
+    if (channel == 0) {
+        WirelessManager_SetErrorCode(WM_ERRCODE_DISCONNECTED_SERVER);
         Link_SetErrorState(1);
-        return 0;
+        return FALSE;
     }
 
-    if (sWirelessManager->unk_1380 == 0) {
+    if (sWirelessManager->channel == 0) {
         while (TRUE) {
-            sWirelessManager->unk_1354.channel++;
+            sWirelessManager->scanParam.channel++;
 
-            if (sWirelessManager->unk_1354.channel > 16) {
-                sWirelessManager->unk_1354.channel = 1;
+            if (sWirelessManager->scanParam.channel > 16) {
+                sWirelessManager->scanParam.channel = 1;
             }
 
-            if (v1 & (0x1 << (sWirelessManager->unk_1354.channel - 1))) {
+            if (channel & (0x1 << (sWirelessManager->scanParam.channel - 1))) {
                 break;
             }
         }
     } else {
-        sWirelessManager->unk_1354.channel = (u16)sWirelessManager->unk_1380;
+        sWirelessManager->scanParam.channel = (u16)sWirelessManager->channel;
     }
 
-    sWirelessManager->unk_1354.maxChannelTime = WM_GetDispersionScanPeriod() / 3;
-    sWirelessManager->unk_1354.scanBuf = &sWirelessManager->unk_1220;
+    sWirelessManager->scanParam.maxChannelTime = WM_GetDispersionScanPeriod() / 3;
+    sWirelessManager->scanParam.scanBuf = &sWirelessManager->bssDesc;
 
-    v0 = WM_StartScan(sub_020313E8, &sWirelessManager->unk_1354);
+    errorCode = WM_StartScan(WirelessManager_FinishStartScan, &sWirelessManager->scanParam);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_020313E8(void *param0)
+/**
+ * @brief Callback used when the WM_StartScan asynchronous process completes. Restarts the scan if necessary.
+ */ 
+static void WirelessManager_FinishStartScan(void *wm_startscancallback)
 {
-    WMstartScanCallback *v0 = (WMstartScanCallback *)param0;
+    WMstartScanCallback *callback = (WMstartScanCallback *)wm_startscancallback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 
     if (sWirelessManager->state != WIRELESS_STATE_SCAN) {
-        sWirelessManager->unk_1382 = 0;
+        sWirelessManager->autoConnect = FALSE;
 
-        if (!sub_020314E4()) {
+        if (!WirelessManager_EndScan()) {
             WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
 
         return;
     }
 
-    switch (v0->state) {
+    switch (callback->state) {
     case WM_STATECODE_SCAN_START:
         return;
     case WM_STATECODE_PARENT_NOT_FOUND:
         break;
     case WM_STATECODE_PARENT_FOUND:
 
-        DC_InvalidateRange(&sWirelessManager->unk_1220, sizeof(WMbssDesc));
+        DC_InvalidateRange(&sWirelessManager->bssDesc, sizeof(WMbssDesc));
 
-        if ((sWirelessManager->unk_1394 != NULL) && (v0->gameInfoLength >= 8)) {
-            UnkStruct_0203330C *v1 = (UnkStruct_0203330C *)v0->gameInfo.userGameInfo;
+        if ((sWirelessManager->ggidScanCallback != NULL) && (callback->gameInfoLength >= 8)) {
+            UnkStruct_0203330C *v1 = (UnkStruct_0203330C *)callback->gameInfo.userGameInfo;
 
-            sWirelessManager->unk_1394(v0->gameInfo.ggid, v1->unk_04);
+            sWirelessManager->ggidScanCallback(callback->gameInfo.ggid, v1->unk_04);
         }
 
-        if ((v0->gameInfoLength < 8) || (v0->gameInfo.ggid != sWirelessManager->unk_00.ggid)) {
+        if ((callback->gameInfoLength < 8) || (callback->gameInfo.ggid != sWirelessManager->parentParam.ggid)) {
             break;
         }
 
-        if ((v0->gameInfo.gameNameCount_attribute & (WM_ATTR_FLAG_ENTRY | WM_ATTR_FLAG_MB)) != WM_ATTR_FLAG_ENTRY) {
+        if ((callback->gameInfo.gameNameCount_attribute & (WM_ATTR_FLAG_ENTRY | WM_ATTR_FLAG_MB)) != WM_ATTR_FLAG_ENTRY) {
             break;
         }
 
-        if (sWirelessManager->unk_1374 != NULL) {
-            sWirelessManager->unk_1374(&sWirelessManager->unk_1220);
+        if (sWirelessManager->scanCallback != NULL) {
+            sWirelessManager->scanCallback(&sWirelessManager->bssDesc);
         }
 
-        if (sWirelessManager->unk_1382) {
-            if (!sub_020314E4()) {
+        if (sWirelessManager->autoConnect) {
+            if (!WirelessManager_EndScan()) {
                 WirelessManager_SetState(WIRELESS_STATE_ERROR);
             }
 
@@ -492,94 +578,115 @@ static void sub_020313E8(void *param0)
         break;
     }
 
-    if (!sub_02031320()) {
+    if (!WirelessManager_StartScan()) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
     }
 }
 
-BOOL sub_020314C0(void)
+/**
+ * @brief Changes the WirelessManager state to stop scanning.
+ *
+ * @return TRUE if the WirelessManager was in WIRELESS_STATE_SCAN, FALSE otherwise.
+ */
+BOOL WirelessManager_StopScan(void)
 {
     if (sWirelessManager->state != WIRELESS_STATE_SCAN) {
-        return 0;
+        return FALSE;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
-    return 1;
+    return TRUE;
 }
 
-static BOOL sub_020314E4(void)
+/**
+ * @brief Ends the internal WM scan process.
+ *
+ * @return TRUE if there was no error while ending the scan
+ */
+static BOOL WirelessManager_EndScan(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
-    v0 = WM_EndScan(sub_02031500);
+    errorCode = WM_EndScan(WirelessManager_FinishEndScan);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_02031500(void *param0)
+/**
+ * @brief Callback used when the WM_EndScan asynchronous process completes.
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishEndScan(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
         return;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_IDLE);
 
-    if (!sWirelessManager->unk_1382) {
+    if (!sWirelessManager->autoConnect) {
         return;
     }
 
-    {
-        if (!sub_02031538()) {
-            WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        }
+    if (!WirelessManager_StartClient()) {
+        WirelessManager_SetState(WIRELESS_STATE_ERROR);
     }
 }
 
-static BOOL sub_02031538(void)
+/**
+ * @brief Starts the internal WM as a client/child
+ *
+ * @return TRUE if there was no issue starting the connection process or if the client is already connected
+ */
+static BOOL WirelessManager_StartClient(void)
 {
-    u8 v0[32];
-    WMErrCode v1;
+    u8 ssid[32];
+    WMErrCode errorCode;
 
     if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
-        return 1;
+        return TRUE;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
-    MI_CpuCopy8("DP", &v0[1], sizeof("DP"));
+    MI_CpuCopy8("DP", &ssid[1], sizeof("DP"));
 
-    v0[0] = sub_0203895C();
-    v1 = WM_StartConnectEx(sub_020315A8, &sWirelessManager->unk_1220, v0, 1, WM_AUTHMODE_OPEN_SYSTEM);
+    ssid[0] = sub_0203895C();
+    errorCode = WM_StartConnectEx(WirelessManager_FinishStartClient, &sWirelessManager->bssDesc, ssid, 1, WM_AUTHMODE_OPEN_SYSTEM);
 
-    if (v1 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v1);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_020315A8(void *param0)
+/**
+ * @brief Callback used when the Client's WM_StartConnectEx asynchronous process completes.
+ */
+static void WirelessManager_FinishStartClient(void *wm_connectcallback)
 {
-    WMStartConnectCallback *v0 = (WMStartConnectCallback *)param0;
+    WMStartConnectCallback *callback = (WMStartConnectCallback *)wm_connectcallback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
 
-        if (v0->errcode == WM_ERRCODE_OVER_MAX_ENTRY) {
+        if (callback->errcode == WM_ERRCODE_OVER_MAX_ENTRY) {
             WirelessManager_SetState(WIRELESS_STATE_ERROR);
             return;
-        } else if (v0->errcode == WM_ERRCODE_NO_ENTRY) {
+        } else if (callback->errcode == WM_ERRCODE_NO_ENTRY) {
             WirelessManager_SetState(WIRELESS_STATE_ERROR);
             return;
-        } else if (v0->errcode == WM_ERRCODE_FAILED) {
+        } else if (callback->errcode == WM_ERRCODE_FAILED) {
             if (sub_02038938()) {
                 WirelessManager_SetState(WIRELESS_STATE_ERROR);
             } else {
@@ -594,84 +701,88 @@ static void sub_020315A8(void *param0)
         return;
     }
 
-    if (v0->state == WM_STATECODE_BEACON_LOST) {
+    if (callback->state == WM_STATECODE_BEACON_LOST) {
         return;
     }
 
-    if (v0->state == WM_STATECODE_CONNECTED) {
-        if (sWirelessManager->unk_13A9) {
-            sub_02030EF4(20);
+    if (callback->state == WM_STATECODE_CONNECTED) {
+        if (sWirelessManager->pauseConnectionClient) {
+            WirelessManager_SetErrorCode(WM_ERRCODE_DISCONNECTED);
             WirelessManager_SetState(WIRELESS_STATE_ERROR);
             return;
         } else {
             WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
 
-            if (!sub_02031668()) {
+            if (!WirelessManager_StartMPClient()) {
                 WirelessManager_SetState(WIRELESS_STATE_BUSY);
                 return;
             }
 
-            sWirelessManager->unk_13A0 = v0->aid;
+            sWirelessManager->aid = callback->aid;
             return;
         }
-    } else if (v0->state == WM_STATECODE_CONNECT_START) {
+    } else if (callback->state == WM_STATECODE_CONNECT_START) {
         return;
-    } else if (v0->state == WM_STATECODE_DISCONNECTED) {
-        sub_02030EF4(20);
+    } else if (callback->state == WM_STATECODE_DISCONNECTED) {
+        WirelessManager_SetErrorCode(WM_ERRCODE_DISCONNECTED);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
-    } else if (v0->state == WM_STATECODE_DISCONNECTED_FROM_MYSELF) {
+    } else if (callback->state == WM_STATECODE_DISCONNECTED_FROM_MYSELF) {
         return;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_ERROR);
 }
 
-static BOOL sub_02031668(void)
+/**
+ * @brief Starts the internal MP_CHILD process.
+ *
+ * @return TRUE if there was no error while starting the MP_CHILD process.
+ */
+static BOOL WirelessManager_StartMPClient(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
-    v0 = WM_StartMP(sub_020316B8, (u16 *)sWirelessManager->unk_1020, (u16)sWirelessManager->unk_137C, (u16 *)sWirelessManager->unk_F40, (u16)sWirelessManager->unk_1378, 1);
+    errorCode = WM_StartMP(WirelessManager_FinishStartMPClient, (u16 *)sWirelessManager->recvBuffer, (u16)sWirelessManager->recvBufferSize, (u16 *)sWirelessManager->sendBuffer, (u16)sWirelessManager->sendBufferSize, 1);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_020316B8(void *param0)
+/**
+ * @brief Callback used when the Client's WM_StartMP asynchronous process completes.
+ *
+ * @param wm_startmpcallback
+ */
+static void WirelessManager_FinishStartMPClient(void *wm_startmpcallback)
 {
-    WMstartMPCallback *v0 = (WMstartMPCallback *)param0;
+    WMstartMPCallback *callback = (WMstartMPCallback *)wm_startmpcallback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        if (v0->errcode == WM_ERRCODE_SEND_FAILED) {
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        if (callback->errcode == WM_ERRCODE_SEND_FAILED) {
             return;
-        } else if (v0->errcode == WM_ERRCODE_TIMEOUT) {
+        } else if (callback->errcode == WM_ERRCODE_TIMEOUT) {
             return;
-        } else if (v0->errcode == WM_ERRCODE_INVALID_POLLBITMAP) {
+        } else if (callback->errcode == WM_ERRCODE_INVALID_POLLBITMAP) {
             return;
         }
 
-        sub_02030EF4(v0->errcode);
+        WirelessManager_SetErrorCode(callback->errcode);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
 
         return;
     }
 
-    switch (v0->state) {
+    switch (callback->state) {
     case WM_STATECODE_MP_START:
-        if (sWirelessManager->unk_1388 == 3) {
+        if (sWirelessManager->connectionType == WIRELESS_CONNECTION_TRANSMIT_KEY_CLIENT) {
             if (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) {
                 return;
             }
-
-            if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
-                (void)0;
-            }
-        } else if (sWirelessManager->unk_1388 == WIRELESS_STATE_TRANSMIT_DATA) {
-            (void)0;
         }
 
         WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
@@ -682,92 +793,121 @@ static void sub_020316B8(void *param0)
         break;
     case WM_STATECODE_MPEND_IND:
     default:
-
         break;
     }
 }
 
-static BOOL sub_0203171C(void)
+/**
+ * @brief Ends the internal MP_CHILD process
+ *
+ * @return TRUE if there is no error while ending the MP 
+ */
+static BOOL WirelessManager_EndMPClient(void)
 {
-    WMErrCode v0;
+    WMErrCode error;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
-    v0 = WM_EndMP(sub_02031740);
+    error = WM_EndMP(WirelessManager_FinishEndMPClient);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (error != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(error);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_02031740(void *param0)
+/**
+ * @brief Callback used when the Client's WM_EndMP asynchronous process completes.
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishEndMPClient(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
-        (void)sub_02031EF4();
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
+        WirelessManager_Finalize();
         return;
     }
 
-    if (!sub_02031764()) {
+    if (!WirelessManager_DisconnectClient()) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
     }
 }
 
-static BOOL sub_02031764(void)
+/**
+ * @brief Disconnects the internal wm client.
+ * 
+ * @return TRUE if there was no error while disconnecting
+ */
+static BOOL WirelessManager_DisconnectClient(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    v0 = WM_Disconnect(sub_0203178C, 0);
+    errorCode = WM_Disconnect(WirelessManager_FinishDisconnectClient, 0);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        sub_02031ECC();
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        WirelessManager_Reset();
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_0203178C(void *param0)
+/**
+ * @brief Callback used when the Client's WM_Disconnect asynchronous process completes.
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishDisconnectClient(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
         return;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_IDLE);
 }
 
-static BOOL sub_020317A4(void)
+/**
+ * @brief Resets the internal WM
+ *
+ * @return TRUE if there were no errors while reseting.
+ */
+static BOOL WirelessManager_ResetInternal(void)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
-    v0 = WM_Reset(sub_020317C8);
+    errorCode = WM_Reset(WirelessManager_FinishResetInternal);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_020317C8(void *param0)
+/**
+ * @brief Callback used when the WM_Reset asynchronous process completes.
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishResetInternal(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        sub_02030EF4(v0->errcode);
+        WirelessManager_SetErrorCode(callback->errcode);
 
         return;
     }
@@ -775,63 +915,79 @@ static void sub_020317C8(void *param0)
     WirelessManager_SetState(WIRELESS_STATE_IDLE);
 }
 
-static BOOL sub_020317E8(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3)
+/**
+ * @brief Send a message to a given port with a send callback functions
+ *
+ * @return TRUE if there was no error while sending the message
+ */
+static BOOL WirelessManager_SendMPMessage(void *message, u16 size, int port, WirelessManagerSendFunc sendCallback)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
-    DC_FlushRange(sWirelessManager->unk_F40, (u32)sWirelessManager->unk_1378);
+    DC_FlushRange(sWirelessManager->sendBuffer, (u32)sWirelessManager->sendBufferSize);
 
-    v0 = WM_SetMPDataToPortEx(sub_02031840, (void *)param3, param0, param1, 0xffff, param2, WM_PRIORITY_NORMAL);
+    errorCode = WM_SetMPDataToPortEx(WirelessManager_FinishSendMPMessage, (void *)sendCallback, message, size, 0xffff, port, WM_PRIORITY_NORMAL);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        return 0;
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_02031840(void *param0)
+/**
+ * @brief Callback used when the WM_SetMPDataToPortEx asynchronous process completes.
+ *
+ * @param wm_portsendcallback
+ */
+static void WirelessManager_FinishSendMPMessage(void *wm_portsendcallback)
 {
-    WMPortSendCallback *v0 = (WMPortSendCallback *)param0;
+    WMPortSendCallback *callback = (WMPortSendCallback *)wm_portsendcallback;
 
-    if ((v0->errcode != WM_ERRCODE_SUCCESS) && (v0->errcode != WM_ERRCODE_SEND_FAILED)) {
-        sub_02030EF4(v0->errcode);
+    if ((callback->errcode != WM_ERRCODE_SUCCESS) && (callback->errcode != WM_ERRCODE_SEND_FAILED)) {
+        WirelessManager_SetErrorCode(callback->errcode);
         return;
     }
 
-    if (v0->arg != NULL) {
-        UnkFuncPtr_02031E9C v1 = (UnkFuncPtr_02031E9C)v0->arg;
+    if (callback->arg != NULL) {
+        WirelessManagerSendFunc sendFunc = (WirelessManagerSendFunc)callback->arg;
 
-        (*v1)(v0->errcode == WM_ERRCODE_SUCCESS);
+        (*sendFunc)(callback->errcode == WM_ERRCODE_SUCCESS);
     }
 }
 
-static void sub_02031868(void *param0)
+/**
+ * @brief Callback set with WM_SetPortCallback to receive messages 
+ *
+ * @param wm_portrecvcallback
+ */
+static void WirelessManager_RecvMessageCallback(void *wm_portrecvcallback)
 {
-    WMPortRecvCallback *v0 = (WMPortRecvCallback *)param0;
+    WMPortRecvCallback *callback = (WMPortRecvCallback *)wm_portrecvcallback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0->errcode);
-    } else if (sWirelessManager->unk_138C != NULL) {
-        if (v0->state == WM_STATECODE_PORT_INIT) {
-            (void)0;
-        } else if (v0->state == WM_STATECODE_PORT_RECV) {
-            (*sWirelessManager->unk_138C)(v0->aid, v0->data, v0->length);
-        } else if (v0->state == WM_STATECODE_DISCONNECTED) {
-            (*sWirelessManager->unk_138C)(v0->aid, NULL, 0);
-        } else if (v0->state == WM_STATECODE_DISCONNECTED_FROM_MYSELF) {
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
+    } else if (sWirelessManager->recvFunc != NULL) {
+        if (callback->state == WM_STATECODE_PORT_INIT) {
             (void)0;
-        } else if (v0->state == WM_STATECODE_CONNECTED) {
-            (void)0;
-        }
+        } else if (callback->state == WM_STATECODE_PORT_RECV) {
+            (*sWirelessManager->recvFunc)(callback->aid, callback->data, callback->length);
+        } else if (callback->state == WM_STATECODE_DISCONNECTED) {
+            (*sWirelessManager->recvFunc)(callback->aid, NULL, 0);
+        } 
     }
 }
 
-static void sub_020318B0(void *param0)
+/**
+ * @brief Callback used when the WM_End asynchronous process completes
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishEnd(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v0->errcode != WM_ERRCODE_SUCCESS) {
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
         WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
         return;
     }
@@ -840,89 +996,125 @@ static void sub_020318B0(void *param0)
     WirelessManager_SetState(WIRELESS_STATE_STOP);
 }
 
-void sub_020318D0(u32 param0)
+/**
+ * @brief Sets the WirelessManager's parentParam.ggid
+ */
+void WirelessManager_SetParentParamGGID(u32 ggid)
 {
-    sWirelessManager->unk_00.ggid = param0;
+    sWirelessManager->parentParam.ggid = ggid;
 }
 
-void sub_020318DC(u16 *param0, u16 param1)
+/**
+ * @brief Sets the WirelessManager's parentParam userGameInfo and userGameInfoLength
+ */
+void WirelessManager_SetParentParamGameInfoAndLength(u16 *param0, u16 param1)
 {
-    sWirelessManager->unk_00.userGameInfo = param0;
-    sWirelessManager->unk_00.userGameInfoLength = param1;
+    sWirelessManager->parentParam.userGameInfo = param0;
+    sWirelessManager->parentParam.userGameInfoLength = param1;
 }
 
-u16 sub_020318EC(void)
+/**
+ * @brief Gets the connectedBitmap
+ *
+ * @return sWirelessManager->connectedBitmap
+ */
+u16 WirelessManager_GetConnectedBitmap(void)
 {
-    return sWirelessManager->unk_13A2;
+    return sWirelessManager->connectedBitmap;
 }
 
-static u16 sub_02031900(void)
+/**
+ * @brief Gets the number of connected machines
+ *
+ * @return Number of 1s in sWirelessManager->connectedBitmap
+ */
+static u16 WirelessManager_GetNumConnected(void)
 {
-    int v0 = 0, v1;
-    u16 v2 = sWirelessManager->unk_13A2;
+    int cnt = 0, i;
+    u16 connected = sWirelessManager->connectedBitmap;
 
-    for (v1 = 0; v1 < 16; v1++) {
-        if (v2 & 0x1) {
-            v0++;
+    for (i = 0; i < 16; i++) {
+        if (connected & 0x1) {
+            cnt++;
         }
 
-        v2 = v2 >> 1;
+        connected = connected >> 1;
     }
 
-    return v0;
+    return cnt;
 }
 
-int sub_02031934(void)
+/**
+ * @brief Gets the current WirelessManagerState
+ *
+ * @return sWirelessManager->state, using the enum WirelessManagerState
+ */
+int WirelessManager_GetState(void)
 {
     return sWirelessManager->state;
 }
 
-int sub_02031948(void)
+/**
+ * @brief Gets the current error code
+ *
+ * @return sWirelessManager->errorCode, using either the enum WMErrCode or ExtendedWMErrCode
+ */
+int WirelessManager_GetErrorCode(void)
 {
-    return sWirelessManager->unk_13A4;
+    return sWirelessManager->errorCode;
 }
 
-BOOL sub_0203195C(void)
+/**
+ * @brief Starts the internal process to measure the signal strength of each channel, starting a channel 1
+ *
+ * @return TRUE if there were no issues while measuring the channels
+ */
+BOOL WirelessManager_StartMeasureChannel(void)
 {
-    u16 v0;
-    u8 v1[6];
+    u16 errorCode;
+    u8 macAddress[6];
 
-    OS_GetMacAddress(v1);
+    OS_GetMacAddress(macAddress);
 
-    sWirelessManager->unk_13AC = (u32)(OS_GetVBlankCount() + *(u16 *)&v1[0] + *(u16 *)&v1[2] + *(u16 *)&v1[4]);
-    sWirelessManager->unk_13AC = sWirelessManager->unk_13AC * 69069UL + 12345;
-    sWirelessManager->unk_13B0 = 0;
-    sWirelessManager->unk_13B2 = 100 + 1;
+    sWirelessManager->rand = (u32)(OS_GetVBlankCount() + *(u16 *)&macAddress[0] + *(u16 *)&macAddress[2] + *(u16 *)&macAddress[4]);
+    sWirelessManager->rand = sWirelessManager->rand * 69069UL + 12345;
+    sWirelessManager->measureChannel = 0;
+    sWirelessManager->measureChannelBusyRatio = 100 + 1;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    v0 = sub_020319F8(1);
+    errorCode = WirelessManager_MeasureChannel(1);
 
-    if (v0 == 24) {
-        sub_02030EF4(24);
+    if (errorCode == WM_ERRCODE_FATAL) {
+        WirelessManager_SetErrorCode(WM_ERRCODE_FATAL);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
-        return 0;
+        return FALSE;
     }
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        return 0;
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static u16 sub_020319F8(u16 param0)
+/**
+ * @brief Measures the signal strength of the given channel
+ *
+ * @return errorCode as returned by WM_MeasureChannel
+ */
+static u16 WirelessManager_MeasureChannel(u16 channel)
 {
-    u16 v0;
-    u16 v1;
+    u16 allowedChannel;
+    u16 errorCode;
 
-    v0 = WM_GetAllowedChannel();
+    allowedChannel = WM_GetAllowedChannel();
 
-    if (v0 == 0x8000) {
-        sub_02030EF4(WM_ERRCODE_ILLEGAL_STATE);
+    if (allowedChannel == 0x8000) {
+        WirelessManager_SetErrorCode(WM_ERRCODE_ILLEGAL_STATE);
 
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
@@ -930,40 +1122,36 @@ static u16 sub_020319F8(u16 param0)
         return WM_ERRCODE_ILLEGAL_STATE;
     }
 
-    if (v0 == 0) {
-        sub_02030EF4(22);
+    if (allowedChannel == 0) {
+        WirelessManager_SetErrorCode(WM_ERRCODE_DISCONNECTED_SERVER);
 
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
 
-        return 24;
+        return WM_ERRCODE_FATAL;
     }
 
-    while (((1 << (param0 - 1)) & v0) == 0) {
-        param0++;
+    while (((1 << (channel - 1)) & allowedChannel) == 0) {
+        channel++;
 
-        if (param0 > 16) {
-            return 24;
+        if (channel > 16) {
+            return WM_ERRCODE_FATAL;
         }
     }
 
-    v1 = sub_02031AF0(sub_02031A74, param0);
-
-    if (v1 != WM_ERRCODE_OPERATING) {
-        return v1;
-    }
+    errorCode = WirelessManager_MeasureChannelInternal(WirelessManager_FinishMeasureChannel, channel);
 
-    return v1;
+    return errorCode;
 }
 
-static void sub_02031A74(void *param0)
+static void WirelessManager_FinishMeasureChannel(void *param0)
 {
-    u16 v0;
-    u16 v1;
-    WMMeasureChannelCallback *v2 = (WMMeasureChannelCallback *)param0;
+    u16 errorCode;
+    u16 channel;
+    WMMeasureChannelCallback *measureChannelCallback = (WMMeasureChannelCallback *)param0;
 
-    if (v2->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v2->errcode);
+    if (measureChannelCallback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(measureChannelCallback->errcode);
 
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         Link_SetErrorState(1);
@@ -971,150 +1159,195 @@ static void sub_02031A74(void *param0)
         return;
     }
 
-    v1 = v2->channel;
+    channel = measureChannelCallback->channel;
 
-    if (sWirelessManager->unk_13B2 > v2->ccaBusyRatio) {
-        sWirelessManager->unk_13B2 = v2->ccaBusyRatio;
-        sWirelessManager->unk_13B4 = (u16)(1 << (v1 - 1));
-    } else if (sWirelessManager->unk_13B2 == v2->ccaBusyRatio) {
-        sWirelessManager->unk_13B4 |= 1 << (v1 - 1);
+    if (sWirelessManager->measureChannelBusyRatio > measureChannelCallback->ccaBusyRatio) {
+        sWirelessManager->measureChannelBusyRatio = measureChannelCallback->ccaBusyRatio;
+        sWirelessManager->leastUsedChannelBitmap = (u16)(1 << (channel - 1));
+    } else if (sWirelessManager->measureChannelBusyRatio == measureChannelCallback->ccaBusyRatio) {
+        sWirelessManager->leastUsedChannelBitmap |= 1 << (channel - 1);
     }
 
-    v0 = sub_020319F8(++v1);
+    errorCode = WirelessManager_MeasureChannel(++channel);
 
-    if (v0 == 24) {
+    if (errorCode == WM_ERRCODE_FATAL) {
         WirelessManager_SetState(WIRELESS_STATE_CHECK_CHANNEL);
         return;
     }
 
-    if (v0 != WM_ERRCODE_OPERATING) {
+    if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
         return;
     }
 }
 
-static WMErrCode sub_02031AF0(WMCallbackFunc param0, u16 param1)
+/**
+ * @brief Wrapper for WM_MeasureChannel
+ *
+ * @param wm_callback
+ * @param channel
+ *
+ * @return WMErrCode as returned by WM_MeasureChannel
+ */
+static WMErrCode WirelessManager_MeasureChannelInternal(WMCallbackFunc callback, u16 channel)
 {
-    return WM_MeasureChannel(param0, 3, 17, param1, 30);
+    return WM_MeasureChannel(callback, 3, 17, channel, 30);
 }
-
-u16 sub_02031B04(void)
+/**
+ * @brief Sets the measured channel to a least utilized channel and returns the value
+ *
+ * @return sWirelessManager->measureChannel, after settting it
+ */
+u16 WirelessManager_GetMeasureChannel(void)
 {
     WirelessManager_SetState(WIRELESS_STATE_IDLE);
-    sWirelessManager->unk_13B0 = (u16)sub_02031B30(sWirelessManager->unk_13B4);
+    sWirelessManager->measureChannel = (u16)WirelessManager_GetRandomChannel(sWirelessManager->leastUsedChannelBitmap);
 
-    return sWirelessManager->unk_13B0;
+    return sWirelessManager->measureChannel;
 }
 
-static s16 sub_02031B30(u16 param0)
+/**
+ * @brief Gets a random channel from among channels in the bitmap
+ *
+ * @return A random channel in the bitmap. 0 if none is found.
+ */
+static s16 WirelessManager_GetRandomChannel(u16 bitmap)
 {
-    s16 v0;
-    s16 v1 = 0;
-    u16 v2 = 0;
-    u16 v3;
+    s16 i;
+    s16 channel = 0;
+    u16 cnt = 0;
+    u16 randChannel;
 
-    for (v0 = 0; v0 < 16; v0++) {
-        if (param0 & (1 << v0)) {
-            v1 = (s16)(v0 + 1);
-            v2++;
+    for (i = 0; i < 16; i++) {
+        if (bitmap & (1 << i)) {
+            channel = (s16)(i + 1);
+            cnt++;
         }
     }
 
-    if (v2 <= 1) {
-        return v1;
+    if (cnt <= 1) {
+        return channel;
     }
 
-    v3 = (u16)((((sWirelessManager->unk_13AC = sWirelessManager->unk_13AC * 69069UL + 12345) & 0xFF) * v2) / 0x100);
-    v1 = 1;
+    randChannel = (u16)((((sWirelessManager->rand = sWirelessManager->rand * 69069UL + 12345) & 0xFF) * cnt) / 0x100);
+    channel = 1;
 
-    for (v0 = 0; v0 < 16; v0++) {
-        if (param0 & 1) {
-            if (v3 == 0) {
-                return (s16)(v0 + 1);
+    for (i = 0; i < 16; i++) {
+        if (bitmap & 1) {
+            if (randChannel == 0) {
+                return (s16)(i + 1);
             }
 
-            v3--;
+            randChannel--;
         }
 
-        param0 >>= 1;
+        bitmap >>= 1;
     }
 
     return 0;
 }
 
-BOOL sub_02031BC4(void *param0, BOOL param1)
+/**
+ * @brief Initializes sWirelessManager with default params
+ *
+ * @param heap
+ * @param isNotListening
+ *
+ * @return TRUE if initialization is successful
+ */
+BOOL WirelessManager_Initialize(void *heap, BOOL isNotListening)
 {
-    u32 v0 = (u32)param0;
+    u32 heapAddress = (u32)heap;
 
-    if (v0 % 32) {
-        v0 += 32 - (v0 % 32);
+    if (heapAddress % 32) {
+        heapAddress += 32 - (heapAddress % 32);
     }
 
-    sWirelessManager = (WirelessManager *)v0;
-    sWirelessManager->unk_137C = 0;
-    sWirelessManager->unk_1378 = 0;
-    sWirelessManager->unk_138C = NULL;
-    sWirelessManager->unk_13A0 = 0;
-    sWirelessManager->unk_13A2 = 1;
-    sWirelessManager->unk_13A4 = WM_ERRCODE_SUCCESS;
+    sWirelessManager = (WirelessManager *)heapAddress;
+    sWirelessManager->recvBufferSize = 0;
+    sWirelessManager->sendBufferSize = 0;
+    sWirelessManager->recvFunc = NULL;
+    sWirelessManager->aid = 0;
+    sWirelessManager->connectedBitmap = 1;
+    sWirelessManager->errorCode = WM_ERRCODE_SUCCESS;
     sWirelessManager->state = WIRELESS_STATE_STOP;
-    sWirelessManager->unk_00.userGameInfo = NULL;
-    sWirelessManager->unk_00.userGameInfoLength = 0;
-    sWirelessManager->unk_1390 = NULL;
-    sWirelessManager->unk_13A8 = (7 + 1);
-    sWirelessManager->unk_13A9 = 0;
-    sWirelessManager->unk_13B6 = 0;
-
-    if (!sub_02031C70(param1)) {
-        return 0;
+    sWirelessManager->parentParam.userGameInfo = NULL;
+    sWirelessManager->parentParam.userGameInfoLength = 0;
+    sWirelessManager->unusedCallback_1390 = NULL;
+    sWirelessManager->numConnectionsMax = (7 + 1);
+    sWirelessManager->pauseConnectionClient = FALSE;
+    sWirelessManager->pauseConnection = 0;
+
+    if (!WirelessManager_InitializeWM(isNotListening)) {
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-int sub_02031C50(void)
+/**
+ * @brief Gets allocated heap size for sWirelessManager
+ *
+ * @return sizeof(WirelessManager) + 32
+ */
+int WirelessManager_GetHeapSize(void)
 {
     return sizeof(WirelessManager) + 32;
 }
 
-static void sub_02031C58(void *param0)
+/**
+ * @brief WM indicator callback for WM_SetIndCallback 
+ */
+static void WirelessManager_InidcateCallback(void *param0)
 {
-    WMindCallback *v0 = (WMindCallback *)param0;
+    WMindCallback *callback = (WMindCallback *)param0;
 
-    if (v0->errcode == WM_ERRCODE_FIFO_ERROR) {
+    if (callback->errcode == WM_ERRCODE_FIFO_ERROR) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        sub_02030EF4(25);
+        WirelessManager_SetErrorCode(WM_ERRCODE_GF_MAX);
     }
 }
 
-static BOOL sub_02031C70(BOOL param0)
+/** 
+ * @brief Initializes the internal WM (for listening if isNotListening is FALSE)
+ *
+ * @param isNotListening
+ *
+ * @return TRUE if there was no error while running WM_Initialize or WM_InitializeForListening
+ */
+static BOOL WirelessManager_InitializeWM(BOOL isNotListening)
 {
-    WMErrCode v0;
+    WMErrCode errorCode;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    if (param0 == 1) {
-        v0 = WM_Initialize(&sWirelessManager->unk_40, sub_02031CBC, 2);
+    if (isNotListening == 1) {
+        errorCode = WM_Initialize(&sWirelessManager->nitroManagerBuffer, WirelessManager_FinishInitializeWM, 2);
     } else {
-        v0 = WM_InitializeForListening(&sWirelessManager->unk_40, sub_02031CBC, 2, 0);
+        errorCode = WM_InitializeForListening(&sWirelessManager->nitroManagerBuffer, WirelessManager_FinishInitializeWM, 2, 0);
     }
 
-    if (v0 != WM_ERRCODE_OPERATING) {
-        sub_02030EF4(v0);
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
         WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
-        return 0;
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-static void sub_02031CBC(void *param0)
+/**
+ * @brief Callback used when the WM_Initialize(ForListening) asynchronous process completes.
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishInitializeWM(void *wm_callback)
 {
-    WMErrCode v0;
-    WMCallback *v1 = (WMCallback *)param0;
+    WMErrCode errorCode;
+    WMCallback *callback = (WMCallback *)wm_callback;
 
-    if (v1->errcode != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v1->errcode);
+    if (callback->errcode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(callback->errcode);
 
         WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
         Link_SetErrorState(1);
@@ -1122,110 +1355,138 @@ static void sub_02031CBC(void *param0)
         return;
     }
 
-    v0 = WM_SetIndCallback(sub_02031C58);
+    errorCode = WM_SetIndCallback(WirelessManager_InidcateCallback);
 
-    if (v0 != WM_ERRCODE_SUCCESS) {
-        sub_02030EF4(v0);
+    if (errorCode != WM_ERRCODE_SUCCESS) {
+        WirelessManager_SetErrorCode(errorCode);
 
         WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
         Link_SetErrorState(1);
-
         return;
     }
 
-    WirelessManager_SetState(1);
+    WirelessManager_SetState(WIRELESS_STATE_IDLE);
 }
 
-static void sub_02031D00(void *param0)
+/**
+ * @brief Deadstripped. Callback used when the WM_SetLifeTime asynchronous process completes. 
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishSetLifeTime(void *wm_callback)
 {
-    WMCallback *v0 = (WMCallback *)param0;
+    (void)0;
 }
 
-BOOL sub_02031D04(int param0, u16 param1, u16 param2, u16 param3, u16 param4, BOOL param5)
+/**
+ * @brief Initializes the WirelessManager as a server and broadcasts a beacon for clients to connect to.
+ *
+ * @param connectionType
+ * @param tgid
+ * @param channel
+ * @param maxEntry
+ * @param beaconPeriod
+ * @param entryFlag
+ *
+ * @return TRUE if the initialization process begins without error
+ */
+BOOL WirelessManager_ConnectServer(int connectionType, u16 tgid, u16 channel, u16 maxEntry, u16 beaconPeriod, BOOL entryFlag)
 {
     if (sub_0203276C(sub_0203895C())) {
-        WM_SetLifeTime(sub_02031D00, 0xffff, 100, 5, 100);
+        WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xffff, 100, 5, 100);
     }
 
-    sWirelessManager->unk_137C = MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), WM_SIZE_MP_PARENT_RECEIVE_BUFFER(38, (5 - 1), 0)));
-    sWirelessManager->unk_1378 = WM_SIZE_MP_PARENT_SEND_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
+    sWirelessManager->recvBufferSize = MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), WM_SIZE_MP_PARENT_RECEIVE_BUFFER(38, (5 - 1), 0)));
+    sWirelessManager->sendBufferSize = WM_SIZE_MP_PARENT_SEND_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
 
-    sWirelessManager->unk_1388 = param0;
+    sWirelessManager->connectionType = connectionType;
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    sWirelessManager->unk_00.tgid = param1;
-    sWirelessManager->unk_00.channel = param2;
-    sWirelessManager->unk_00.beaconPeriod = param4;
+    sWirelessManager->parentParam.tgid = tgid;
+    sWirelessManager->parentParam.channel = channel;
+    sWirelessManager->parentParam.beaconPeriod = beaconPeriod;
 
-    switch (param0) {
-    case 0:
-        sWirelessManager->unk_00.parentMaxSize = 192;
+    switch (connectionType) {
+    case WIRELESS_CONNECTION_MP_SERVER:
+        sWirelessManager->parentParam.parentMaxSize = 192;
 
-        if (param3 >= 5) {
-            sWirelessManager->unk_00.childMaxSize = 12;
+        if (maxEntry >= 5) {
+            sWirelessManager->parentParam.childMaxSize = 12;
         } else {
-            sWirelessManager->unk_00.childMaxSize = 38;
+            sWirelessManager->parentParam.childMaxSize = 38;
         }
 
         break;
-    case 4:
-        sWirelessManager->unk_00.parentMaxSize = (12 * (1 + 7) + 4);
-        sWirelessManager->unk_00.childMaxSize = 12;
+    case WIRELESS_CONNECTION_TRANSMIT_DATA_SERVER:
+        sWirelessManager->parentParam.parentMaxSize = (12 * (1 + 7) + 4);
+        sWirelessManager->parentParam.childMaxSize = 12;
         break;
     }
 
-    sWirelessManager->unk_00.maxEntry = param3;
-    sWirelessManager->unk_00.CS_Flag = 0;
-    sWirelessManager->unk_00.multiBootFlag = 0;
-    sWirelessManager->unk_00.entryFlag = param5;
-    sWirelessManager->unk_00.KS_Flag = (u16)((param0 == 2) ? 1 : 0);
+    sWirelessManager->parentParam.maxEntry = maxEntry;
+    sWirelessManager->parentParam.CS_Flag = 0;
+    sWirelessManager->parentParam.multiBootFlag = 0;
+    sWirelessManager->parentParam.entryFlag = entryFlag;
+    sWirelessManager->parentParam.KS_Flag = (u16)((connectionType == WIRELESS_CONNECTION_TRANSMIT_KEY_SERVER) ? 1 : 0);
 
-    switch (param0) {
-    case 0:
-    case 2:
-    case 4:
-        return sub_02030F10();
+    switch (connectionType) {
+    case WIRELESS_CONNECTION_MP_SERVER:
+    case WIRELESS_CONNECTION_TRANSMIT_KEY_SERVER:
+    case WIRELESS_CONNECTION_TRANSMIT_DATA_SERVER:
+        return WirelessManager_SetParentParameter();
     default:
         break;
     }
 
-    return 0;
+    return FALSE;
 }
 
-BOOL sub_02031DD8(int param0, WMBssDesc *param1)
+/**
+ * @brief Initializes the WirelessManager as a client and begins scanning for servers using the data in bssDesc as a parameter.
+ * 
+ * @param connectionType
+ * @param bssDesc
+ *
+ * @return TRUE if the initialization process begins without error
+ */
+BOOL WirelessManager_ConnectClient(int connectionType, WMBssDesc *bssDesc)
 {
     if (sub_0203276C(sub_0203895C())) {
-        WM_SetLifeTime(sub_02031D00, 0xffff, 100, 5, 100);
+        WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xffff, 100, 5, 100);
     }
 
-    sWirelessManager->unk_137C = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
-    sWirelessManager->unk_1378 = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
+    sWirelessManager->recvBufferSize = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
+    sWirelessManager->sendBufferSize = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0)));
 
-    sWirelessManager->unk_1388 = param0;
+    sWirelessManager->connectionType = connectionType;
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    switch (param0) {
-    case 1:
-    case 3:
-    case 5:
-        MI_CpuCopy8(param1, &sWirelessManager->unk_1220, sizeof(sWirelessManager->unk_1220));
-        DC_FlushRange(&sWirelessManager->unk_1220, sizeof(sWirelessManager->unk_1220));
+    switch (connectionType) {
+    case WIRELESS_CONNECTION_MP_CLIENT:
+    case WIRELESS_CONNECTION_TRANSMIT_KEY_CLIENT:
+    case WIRELESS_CONNECTION_TRANSMIT_DATA_CLIENT:
+        MI_CpuCopy8(bssDesc, &sWirelessManager->bssDesc, sizeof(sWirelessManager->bssDesc));
+        DC_FlushRange(&sWirelessManager->bssDesc, sizeof(sWirelessManager->bssDesc));
         DC_WaitWriteBufferEmpty();
-        {
-            return sub_02031538();
-        }
+        return WirelessManager_StartClient();
     default:
         break;
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_02031E6C(UnkFuncPtr_02031E6C param0, int param1)
+/**
+ * @brief Sets the receive function on a given port
+ *
+ * @param recvFunction
+ * @param port
+ */
+void WirelessManager_SetRecvFunction(WirelessManagerRecvFunc recvFunction, int port)
 {
-    sWirelessManager->unk_138C = param0;
+    sWirelessManager->recvFunc = recvFunction;
 
-    if (WM_SetPortCallback(param1, sub_02031868, NULL) != WM_ERRCODE_SUCCESS) {
+    if (WM_SetPortCallback(port, WirelessManager_RecvMessageCallback, NULL) != WM_ERRCODE_SUCCESS) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
 
         while (TRUE) {
@@ -1234,16 +1495,29 @@ void sub_02031E6C(UnkFuncPtr_02031E6C param0, int param1)
     }
 }
 
-BOOL sub_02031E9C(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3)
+/**
+ * @brief Sends a message to a given port
+ *
+ * @param message
+ * @param size
+ * @param port
+ * @param sendCallback
+ *
+ * @return TRUE if there were no issues in the SendMPMessage process
+ */
+BOOL WirelessManager_SendMessage(void *message, u16 size, int port, WirelessManagerSendFunc callback)
 {
-    if ((sub_02031F90() == 0) && !(0xfe & sub_020318EC())) {
-        return 0;
+    if ((WirelessManager_GetAID() == 0) && !(0xfe & WirelessManager_GetConnectedBitmap())) {
+        return FALSE;
     }
 
-    return sub_020317E8(param0, param1, param2, param3);
+    return WirelessManager_SendMPMessage(message, size, port, callback);
 }
 
-void sub_02031ECC(void)
+/**
+ * @brief Resets the internal WM. Hangs if scanning.
+ */
+void WirelessManager_Reset(void)
 {
     if (WIRELESS_STATE_SCAN == sWirelessManager->state) {
         while (TRUE) {
@@ -1251,172 +1525,271 @@ void sub_02031ECC(void)
         }
     }
 
-    if (!sub_020317A4()) {
+    if (!WirelessManager_ResetInternal()) {
         WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
     }
 }
 
-void sub_02031EF4(void)
+/**
+ * @brief Ends the internal MP process and resets the WirelessManager
+ */
+void WirelessManager_Finalize(void)
 {
-    if (sWirelessManager->state == 1) {
+    if (sWirelessManager->state == WIRELESS_STATE_IDLE) {
         return;
     }
 
     if ((sWirelessManager->state != WIRELESS_STATE_TRANSMIT_KEY) && (sWirelessManager->state != WIRELESS_STATE_TRANSMIT_DATA) && (sWirelessManager->state != WIRELESS_STATE_CONNECTED)) {
         WirelessManager_SetState(WIRELESS_STATE_BUSY);
-        sub_02031ECC();
+        WirelessManager_Reset();
         return;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    switch (sWirelessManager->unk_1388) {
-    case 3:
+    switch (sWirelessManager->connectionType) {
+    case WIRELESS_CONNECTION_TRANSMIT_KEY_CLIENT:
         break;
-    case 5:
-    case 1:
-        if (!sub_0203171C()) {
-            sub_02031ECC();
+    case WIRELESS_CONNECTION_TRANSMIT_DATA_CLIENT:
+    case WIRELESS_CONNECTION_MP_CLIENT:
+        if (!WirelessManager_EndMPClient()) {
+            WirelessManager_Reset();
         }
         break;
-    case 2:
+    case WIRELESS_CONNECTION_TRANSMIT_KEY_SERVER:
         break;
-    case 4:
-    case 0:
-        if (!sub_020311A8()) {
-            sub_02031ECC();
+    case WIRELESS_CONNECTION_TRANSMIT_DATA_SERVER:
+    case WIRELESS_CONNECTION_MP_SERVER:
+        if (!WirelessManager_EndMPServer()) {
+            WirelessManager_Reset();
         }
     }
 }
 
-BOOL sub_02031F6C(void)
+/**
+ * @brief Ends the internal WM
+ *
+ * @return TRUE if there is no issue in the ending process.
+ */
+BOOL WirelessManager_End(void)
 {
-    int v0;
+    int errorCode;
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
-    v0 = WM_End(sub_020318B0);
+    errorCode = WM_End(WirelessManager_FinishEnd);
 
-    if (v0 != WM_ERRCODE_OPERATING) {
+    if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
 
-        return 0;
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-u16 sub_02031F90(void)
+/**
+ * @brief Gets the WirelessManager's AID
+ *
+ * @return sWirelessManager->aid
+ */
+u16 WirelessManager_GetAID(void)
 {
-    return sWirelessManager->unk_13A0;
+    return sWirelessManager->aid;
 }
 
-void sub_02031FA4(int param0)
+/**
+ * @brief Sets the max number of connections 
+ *
+ * @param numConnectionsMax
+ */
+void WirelessManager_SetMaxNumConnections(int numConnectionsMax)
 {
     if (sWirelessManager) {
-        sWirelessManager->unk_13A8 = param0;
+        sWirelessManager->numConnectionsMax = numConnectionsMax;
     }
 }
 
-BOOL sub_02031FBC(void)
+/**
+ * @brief Checks if the WirelessManager is idle.
+ *
+ * @return sWirelessManager->state == WIRELESS_STATE_IDLE
+ */
+BOOL WirelessManager_IsIdle(void)
 {
     return sWirelessManager->state == WIRELESS_STATE_IDLE;
 }
 
-BOOL sub_02031FD8(void)
+/**
+ * @brief Checks if the WirelessManager is busy.
+ *
+ * @return sWirelessManager->state == WIRELESS_STATE_BUSY
+ */
+BOOL WirelessManager_IsBusy(void)
 {
     return sWirelessManager->state == WIRELESS_STATE_BUSY;
 }
 
-BOOL sub_02031FF4(void)
+/**
+ * @brief Checks if the WirelessManager is erroring.
+ *
+ * @return sWirelessManager->state == WIRELESS_STATE_ERROR
+ */
+BOOL WirelessManager_IsError(void)
 {
     return sWirelessManager->state == WIRELESS_STATE_ERROR;
 }
 
-BOOL sub_02032010(void)
+/**
+ * @brief Checks if the WirelessManager is scanning.
+ *
+ * @return sWirelessManager->state == WIRELESS_STATE_SCAN
+ */
+BOOL WirelessManager_IsScanning(void)
 {
     if (sWirelessManager) {
         return sWirelessManager->state == WIRELESS_STATE_SCAN;
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_02032034(void *param0, int param1, int param2, int param3)
+/**
+ * @brief Sets the internal WM GameInfo
+ *
+ * @param buffer
+ * @param size
+ * @param ggid
+ * @param tgid
+ */
+void WirelessManager_SetGameInfo(void *buffer, int size, int ggid, int tgid)
 {
     if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
-        WM_SetGameInfo(NULL, param0, param1, param2, param3, WM_ATTR_FLAG_ENTRY);
-    } else {
-        (void)0;
+        WM_SetGameInfo(NULL, buffer, size, ggid, tgid, WM_ATTR_FLAG_ENTRY);
     }
 }
 
-static void sub_02032070(void *param0)
+/**
+ * @brief Callback used when the WM_SetEntry asynchronous process completes. Sets setEntry to TRUE on success.
+ *
+ * @param wm_callback
+ */
+static void WirelessManager_FinishSetEntry(void *wm_callback)
 {
-    WMCallback *v0 = param0;
+    WMCallback *callback = wm_callback;
 
-    if (v0->errcode == WM_ERRCODE_SUCCESS) {
-        sWirelessManager->unk_13B8 = 1;
+    if (callback->errcode == WM_ERRCODE_SUCCESS) {
+        sWirelessManager->setEntry = TRUE;
     }
 }
 
-BOOL sub_0203208C(BOOL param0)
+/**
+ * @brief Sets whether or not the WirelessManager can connect to clients
+ *
+ * @param enable
+ *
+ * @return TRUE if WM_SetEntry has no errors.
+ */
+BOOL WirelessManager_SetEntry(BOOL enable)
 {
-    sWirelessManager->unk_13B8 = 0;
+    sWirelessManager->setEntry = 0;
 
     if (sWirelessManager->state == WIRELESS_STATE_CONNECTED) {
-        if (WM_ERRCODE_OPERATING == WM_SetEntry(sub_02032070, param0)) {
-            return 1;
+        if (WM_ERRCODE_OPERATING == WM_SetEntry(WirelessManager_FinishSetEntry, enable)) {
+            return TRUE;
         }
     }
 
-    return 0;
+    return FALSE;
 }
 
-BOOL sub_020320C4(void)
+/**
+ * @brief Checks if all beacons have been sent by the server.
+ *
+ * @return sWirelessManager->sentBeaconCount >= 6
+ */
+BOOL WirelessManager_ServerSentAllBeacons(void)
 {
     if (sWirelessManager) {
-        return sWirelessManager->unk_13B9 >= 6;
+        return sWirelessManager->sentBeaconCount >= 6;
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_020320E8(void)
+/**
+ * @brief Resets the beacon sent count used by the Server
+ */
+void WirelessManager_ResetBeaconSentCount(void)
 {
-    sWirelessManager->unk_13B9 = 0;
+    sWirelessManager->sentBeaconCount = 0;
 }
 
-void sub_020320FC(UnkFuncPtr_020320FC param0)
+/**
+ * @brief Sets the ggidScanCallback
+ *
+ * @param callback
+ */
+void WirelessManager_SetGGIDScanCallback(UnkFuncPtr_020320FC callback)
 {
-    sWirelessManager->unk_1394 = param0;
+    sWirelessManager->ggidScanCallback = callback;
 }
 
+/**
+ * @brief Sets the disconnectCallback
+ * 
+ * @param callback
+ */
 void sub_SetDisconnectCallback(UnkFuncPtr_02032110 callback)
 {
     sWirelessManager->disconnectCallback = callback;
 }
 
-void sub_02032124(UnkFuncPtr_02032110 param0)
+/**
+ * @brief Sets the connectCallback
+ * 
+ * @param callback
+ */
+void WirelessManager_SetConnectCallback(UnkFuncPtr_02032110 callback)
 {
-    sWirelessManager->unk_139C = param0;
+    sWirelessManager->connectCallback = callback;
 }
 
-void sub_02032138(BOOL param0)
+/**
+ * @brief Pauses or unpauses the connection
+ *
+ * @param pause
+ */
+void WirelessManager_SetPauseConnection(BOOL pause)
 {
-    sWirelessManager->unk_13B6 = param0;
+    sWirelessManager->pauseConnection = pause;
 }
 
-BOOL sub_0203214C(void)
+/**
+ * @brief Gets whether the connection is currently paused
+ *
+ * @return sWirelessManager->pauseConnection
+ */
+BOOL WirelessManager_GetPauseConnection(void)
 {
-    return sWirelessManager->unk_13B6;
+    return sWirelessManager->pauseConnection;
 }
 
-void sub_02032160(BOOL param0)
+/**
+ * @brief Sets whether the system is paused
+ *
+ * @param pause
+ */
+void WirelessManager_SetPauseConnectionSystem(BOOL pause)
 {
-    sWirelessManager->unk_13B7 = param0;
+    sWirelessManager->pauseConnectSystem = pause;
 }
 
-void sub_02032174(BOOL param0)
+/**
+ * @brief Sets whether the client is paused. WirelessManager must be initialized as a client for this to do anything.
+ *
+ * @param pause
+ */
+void WirelessManager_SetPauseClientConnection(BOOL pause)
 {
-    sWirelessManager->unk_13A9 = param0;
+    sWirelessManager->pauseConnectionClient = pause;
 }
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index 703d284f4ad..223cc43bba4 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -78,8 +78,8 @@ void CommServerClient_Init(TrainerInfo *trainerInfo, BOOL param1)
     sCommServerClient = (CommServerClient *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommServerClient));
     MI_CpuClear8(sCommServerClient, sizeof(CommServerClient));
 
-    sCommServerClient->unk_14E8 = Heap_Alloc(HEAP_ID_COMMUNICATION, sub_02031C50());
-    MI_CpuClear8(sCommServerClient->unk_14E8, sub_02031C50());
+    sCommServerClient->unk_14E8 = Heap_Alloc(HEAP_ID_COMMUNICATION, WirelessManager_GetHeapSize());
+    MI_CpuClear8(sCommServerClient->unk_14E8, WirelessManager_GetHeapSize());
 
     sCommServerClient->unk_1500 = Heap_Alloc(HEAP_ID_COMMUNICATION, BattleRegulation_Size());
     MI_CpuClear8(sCommServerClient->unk_1500, BattleRegulation_Size());
@@ -239,10 +239,10 @@ static void sub_020334DC(BOOL param0)
         u32 v0 = (u32)sCommServerClient->unk_14E8;
 
         v0 = 32 - (v0 % 32) + v0;
-        (void)sub_02031BC4((void *)v0, param0);
+        (void)WirelessManager_Initialize((void *)v0, param0);
     }
 
-    sub_020318D0(sCommServerClient->unk_1504);
+    WirelessManager_SetParentParamGGID(sCommServerClient->unk_1504);
 }
 
 void sub_02033518(void)
@@ -277,17 +277,17 @@ BOOL CommServerClient_InitServer(BOOL param0, BOOL param1, BOOL param2)
 {
     sub_02033578();
     sub_02033550(param1);
-    sub_020320E8();
+    WirelessManager_ResetBeaconSentCount();
 
     if (!sCommServerClient->unk_1517) {
-        sub_02031E6C(sub_020351F8, 14);
+        WirelessManager_SetRecvFunction(sub_020351F8, 14);
         sCommServerClient->unk_1517 = 1;
     }
 
     sCommServerClient->unk_1519_5 = param2;
 
-    if (sub_02031934() == 1) {
-        if (sub_0203195C()) {
+    if (WirelessManager_GetState() == 1) {
+        if (WirelessManager_StartMeasureChannel()) {
             return 1;
         }
     }
@@ -304,14 +304,14 @@ BOOL CommServerClient_InitClient(BOOL param0, BOOL param1)
     }
 
     if (!sCommServerClient->unk_1517) {
-        sub_02031E6C(sub_0203509C, 14);
+        WirelessManager_SetRecvFunction(sub_0203509C, 14);
         sCommServerClient->unk_1517 = 1;
     }
 
-    if (sub_02031934() == 1) {
+    if (WirelessManager_GetState() == 1) {
         const u8 v0[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
-        if (sub_020312B8(sub_0203330C, v0, 0)) {
+        if (WirelessManager_ConnectClientScanCallback(sub_0203330C, v0, 0)) {
             return 1;
         }
     }
@@ -327,29 +327,29 @@ BOOL sub_020336D4(void)
 
     switch (sCommServerClient->unk_1518) {
     case 0:
-        if (sub_02032010()) {
-            sub_020314C0();
+        if (WirelessManager_IsScanning()) {
+            WirelessManager_StopScan();
             sCommServerClient->unk_1518 = 1;
             break;
-        } else if (sub_02031FD8()) {
+        } else if (WirelessManager_IsBusy()) {
             (void)0;
         } else {
-            sub_02031EF4();
+            WirelessManager_Finalize();
             sCommServerClient->unk_1518 = 2;
         }
         break;
     case 1:
-        if (!sub_02031FD8()) {
-            sub_02031EF4();
+        if (!WirelessManager_IsBusy()) {
+            WirelessManager_Finalize();
             sCommServerClient->unk_1518 = 2;
         }
         break;
     case 2:
-        if (sub_02031FBC()) {
+        if (WirelessManager_IsIdle()) {
             return 1;
         }
 
-        if (sub_02031FF4()) {
+        if (WirelessManager_IsError()) {
             sCommServerClient->unk_1518 = 1;
         }
         break;
@@ -363,7 +363,7 @@ BOOL sub_02033768(void)
     if (sCommServerClient) {
         if (sCommServerClient->unk_1516 == 0) {
             sCommServerClient->unk_1516 = 1;
-            sub_02031EF4();
+            WirelessManager_Finalize();
             return 1;
         }
     }
@@ -554,19 +554,19 @@ BOOL sub_020339E8(u16 param0)
 {
     int v0;
 
-    if (sub_02031934() == 2) {
-        (void)sub_020314C0();
+    if (WirelessManager_GetState() == 2) {
+        (void)WirelessManager_StopScan();
         return 0;
     }
 
-    if (sub_02031934() == 1) {
+    if (WirelessManager_GetState() == 1) {
         v0 = sub_0203895C();
         sCommServerClient->unk_1514 = sCommServerClient->unk_188[param0].channel;
 
         if (sub_020326C4(v0)) {
-            sub_02031220(1, sCommServerClient->unk_188[param0].bssid, 0);
+            WirelessManager_ConnectClientAuto(1, sCommServerClient->unk_188[param0].bssid, 0);
         } else {
-            sub_02031DD8(1, &(sCommServerClient->unk_188[param0]));
+            WirelessManager_ConnectClient(1, &(sCommServerClient->unk_188[param0]));
         }
 
         return 1;
@@ -622,7 +622,7 @@ static void sub_02033AA8(void)
 
         MI_CpuCopy8(&sCommServerClient->unk_14EC, &v2->unk_08, sizeof(Sentence));
 
-        v2->unk_54 = sub_0203214C();
+        v2->unk_54 = WirelessManager_GetPauseConnection();
     } else {
         v3 = (UnkStruct_02034168 *)sCommServerClient->unk_150C;
 
@@ -634,7 +634,7 @@ static void sub_02033AA8(void)
     }
 
     DC_FlushRange(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)));
-    sub_020318DC(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)));
+    WirelessManager_SetParentParamGameInfoAndLength(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)));
 }
 
 static void sub_02033B88(void)
@@ -644,19 +644,19 @@ static void sub_02033B88(void)
     if (sub_02033DDC() != v0->unk_06) {
         v0->unk_06 = sub_02033DDC();
         DC_FlushRange(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)));
-        sub_020318DC(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)));
-        sub_02032034(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)), sCommServerClient->unk_1504, Unk_021C07B8);
+        WirelessManager_SetParentParamGameInfoAndLength(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)));
+        WirelessManager_SetGameInfo(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)), sCommServerClient->unk_1504, Unk_021C07B8);
     }
 }
 
 static void sub_02033BDC(u16 param0)
 {
-    int v0 = sub_02031934();
+    int v0 = WirelessManager_GetState();
     int v1 = sub_02032E90();
 
     sub_02033B88();
 
-    if ((sub_02031F90() == 0) && (!CommServerClient_IsClientConnecting())) {
+    if ((WirelessManager_GetAID() == 0) && (!CommServerClient_IsClientConnecting())) {
         if (sCommServerClient->unk_1519_2) {
             sCommServerClient->unk_1519_0 = 1;
         }
@@ -676,7 +676,7 @@ static void sub_02033BDC(u16 param0)
         }
     }
 
-    if (25 == sub_02031948()) {
+    if (25 == WirelessManager_GetErrorCode()) {
         sub_020389FC(0);
     }
 
@@ -694,13 +694,13 @@ static void sub_02033BDC(u16 param0)
         break;
     case 1:
         if (sCommServerClient->unk_1516 == 1) {
-            if (sub_02031F6C()) {
+            if (WirelessManager_End()) {
                 return;
             }
         }
 
         if (sCommServerClient->unk_1516 == 2) {
-            if (sub_02031F6C()) {
+            if (WirelessManager_End()) {
                 return;
             }
         }
@@ -714,7 +714,7 @@ static void sub_02033BDC(u16 param0)
     case 7: {
         u16 v2;
 
-        v2 = sub_02031B04();
+        v2 = WirelessManager_GetMeasureChannel();
 
         if (sCommServerClient->unk_1515 == 0) {
             sCommServerClient->unk_1510 = v2;
@@ -730,7 +730,7 @@ static void sub_02033BDC(u16 param0)
         }
 
         sub_02033AA8();
-        (void)sub_02031D04(0, Unk_021C07B8, v2, CommLocal_MaxMachines(sub_0203895C()), sub_02033F0C(sub_0203895C()), sCommServerClient->unk_1519_5);
+        (void)WirelessManager_ConnectServer(0, Unk_021C07B8, v2, CommLocal_MaxMachines(sub_0203895C()), sub_02033F0C(sub_0203895C()), sCommServerClient->unk_1519_5);
         sCommServerClient->unk_1514 = v2;
     } break;
     default:
@@ -751,12 +751,12 @@ static BOOL sub_02033DA8(u16 param0)
         return 0;
     }
 
-    if (sub_02031934() != 4) {
+    if (WirelessManager_GetState() != 4) {
         return 0;
     }
 
     {
-        u16 v0 = sub_020318EC();
+        u16 v0 = WirelessManager_GetConnectedBitmap();
 
         if (v0 & (1 << param0)) {
             return 1;
@@ -795,7 +795,7 @@ BOOL CommServerClient_IsInitialized(void)
 BOOL sub_02033E30(void)
 {
     if (sCommServerClient) {
-        return sub_02031FBC();
+        return WirelessManager_IsIdle();
     }
 
     return 1;
@@ -804,7 +804,7 @@ BOOL sub_02033E30(void)
 BOOL CommServerClient_IsClientConnecting(void)
 {
     if (sCommServerClient) {
-        return sub_020318EC() & 0xfffe;
+        return WirelessManager_GetConnectedBitmap() & 0xfffe;
     }
 
     return 0;
@@ -812,7 +812,7 @@ BOOL CommServerClient_IsClientConnecting(void)
 
 BOOL sub_02033E68(void)
 {
-    if (CommServerClient_CheckError() && (20 == sub_02031948())) {
+    if (CommServerClient_CheckError() && (20 == WirelessManager_GetErrorCode())) {
         return 1;
     }
 
@@ -955,7 +955,7 @@ void *sub_020340E8(void)
 void sub_020340FC(void)
 {
     sub_02033AA8();
-    sub_02032034(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)), sCommServerClient->unk_1504, Unk_021C07B8);
+    WirelessManager_SetGameInfo(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)), sCommServerClient->unk_1504, Unk_021C07B8);
 }
 
 int sub_02034120(int param0)
@@ -977,7 +977,7 @@ int sub_02034120(int param0)
 
 BOOL sub_02034148(void)
 {
-    return sub_020320C4();
+    return WirelessManager_ServerSentAllBeacons();
 }
 
 void sub_02034150(void *param0)
diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c
index cbaca48e7b6..6391989f37c 100644
--- a/src/unk_020366A0.c
+++ b/src/unk_020366A0.c
@@ -338,7 +338,7 @@ void sub_02036978(void)
 
 void sub_02036994(BOOL param0)
 {
-    sub_0203208C(param0);
+    WirelessManager_SetEntry(param0);
 }
 
 BOOL sub_0203699C(void)
@@ -387,7 +387,7 @@ void sub_02036A38(int param0)
     Unk_021C07D4->unk_49 = param0;
     Unk_021C07D4->unk_44 = 3;
 
-    sub_02032138(1);
+    WirelessManager_SetPauseConnection(1);
     NetworkIcon_Init();
     CommMan_SetTask(sub_020375A4, 0);
 }
@@ -432,7 +432,7 @@ BOOL sub_02036AA0(void)
 
 void sub_02036AC4(void)
 {
-    sub_02032138(0);
+    WirelessManager_SetPauseConnection(0);
 
     if (!((Unk_021C07D4->unk_4F == 1) && (Unk_021C07D4->unk_50 == 1)) || (Unk_021C07D4->unk_4A == 9)) {
         CommMan_SetErrorHandling(0, 0);
@@ -443,10 +443,10 @@ void sub_02036AC4(void)
     Unk_021C07D4->unk_4A = 9;
     Unk_021C07D4->unk_53 = 0;
 
-    sub_02031FA4(Unk_021C07D4->unk_46);
+    WirelessManager_SetMaxNumConnections(Unk_021C07D4->unk_46);
 
     if (CommSys_CurNetId() == 0) {
-        sub_02032160(1);
+        WirelessManager_SetPauseConnectionSystem(1);
         CommMan_SetTask(sub_02037354, 15);
     } else {
         CommMan_SetTask(sub_0203739C, 5);
@@ -486,7 +486,7 @@ void sub_02036B84(void)
     }
 
     Unk_021C07D4->unk_53 = 1;
-    sub_02032138(1);
+    WirelessManager_SetPauseConnection(1);
 }
 
 void sub_02036BA0(void)
@@ -497,7 +497,7 @@ void sub_02036BA0(void)
 
     Unk_021C07D4->unk_53 = 1;
 
-    sub_02032138(1);
+    WirelessManager_SetPauseConnection(1);
     CommMan_SetTask(sub_020377E4, 0);
 }
 
@@ -986,7 +986,7 @@ static void sub_02037344(void)
 static void sub_02037354(void)
 {
     if (CommSys_ConnectedCount() <= 1) {
-        sub_02032160(0);
+        WirelessManager_SetPauseConnectionSystem(0);
         CommSys_ResetDS();
         CommMan_SetTask(sub_02037474, 0);
     }
@@ -996,7 +996,7 @@ static void sub_02037354(void)
         return;
     }
 
-    sub_02032160(0);
+    WirelessManager_SetPauseConnectionSystem(0);
     CommSys_ResetDS();
     CommMan_SetTask(sub_02037474, 0);
 }
@@ -1038,7 +1038,7 @@ static void sub_020373F0(void)
     }
 
     CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    sub_02031FA4(Unk_021C07D4->unk_46);
+    WirelessManager_SetMaxNumConnections(Unk_021C07D4->unk_46);
     CommInfo_Init(Unk_021C07D4->saveData, NULL);
 
     if (CommSys_InitClient(1, 1, 512)) {
@@ -1495,7 +1495,7 @@ void sub_02037B58(int param0)
 {
     if (Unk_021C07D4) {
         Unk_021C07D4->unk_46 = param0;
-        sub_02031FA4(param0);
+        WirelessManager_SetMaxNumConnections(param0);
     }
 }
 
@@ -1599,7 +1599,7 @@ static void sub_02037D08(void)
 
     CommServerClient_Init(Unk_021C07D4->unk_2C, 0);
     CommInfo_Init(Unk_021C07D4->saveData, NULL);
-    sub_020320FC(sub_02037C5C);
+    WirelessManager_SetGGIDScanCallback(sub_02037C5C);
     CommMan_SetTask(sub_02037CE4, 0);
 }
 
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 27fa8bb193e..38fa0ad2b3e 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -213,7 +213,7 @@ void sub_02095F9C(int param0, int param1, void *param2, void *param3)
 
     if (CommSys_CurNetId() == 0) {
         v0->unk_37C = CommSys_ConnectedCount();
-        v0->unk_380 = sub_020318EC();
+        v0->unk_380 = WirelessManager_GetConnectedBitmap();
         v0->unk_9458 = 1;
     }
 }
@@ -232,7 +232,7 @@ void sub_02095FE4(int param0, int param1, void *param2, void *param3)
 
             switch (v2->unk_02) {
             case 0:
-                if ((v0->unk_37C != CommSys_ConnectedCount()) || (v0->unk_37C != ov58_021D2A4C()) || (v0->unk_37C != MATH_CountPopulation(sub_020318EC()))) {
+                if ((v0->unk_37C != CommSys_ConnectedCount()) || (v0->unk_37C != ov58_021D2A4C()) || (v0->unk_37C != MATH_CountPopulation(WirelessManager_GetConnectedBitmap()))) {
                     v1.unk_03 = 0;
                 } else {
                     v0->unk_9418 |= 1 << param0;
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index 34361c7f367..1f8b7c5c3a6 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -210,7 +210,7 @@ void sub_02096274(int param0, int param1, void *param2, void *param3)
 
             switch (v2->unk_02) {
             case 0:
-                if ((v0->unk_4AAC != CommSys_ConnectedCount()) || (v0->unk_4AAC != ov59_021D2544()) || (v0->unk_4AAC != MATH_CountPopulation(sub_020318EC()))) {
+                if ((v0->unk_4AAC != CommSys_ConnectedCount()) || (v0->unk_4AAC != ov59_021D2544()) || (v0->unk_4AAC != MATH_CountPopulation(WirelessManager_GetConnectedBitmap()))) {
                     v1.unk_03 = 0;
                 } else {
                     v0->unk_4AB4 |= 1 << param0;
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 670397204de..6d6b369380f 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -169,7 +169,7 @@ static void sub_0209BF64(int param0, int param1, void *param2, void *param3)
 
             switch (v2->unk_02) {
             case 0:
-                if ((v0->unk_2C != CommSys_ConnectedCount()) || (v0->unk_2C != sub_0209C16C()) || (v0->unk_2C != MATH_CountPopulation(sub_020318EC()))) {
+                if ((v0->unk_2C != CommSys_ConnectedCount()) || (v0->unk_2C != sub_0209C16C()) || (v0->unk_2C != MATH_CountPopulation(WirelessManager_GetConnectedBitmap()))) {
                     v1.unk_03 = 0;
                 } else {
                     v0->unk_30 |= 1 << param0;

From e335bdf3bdbf806e55bb8d2b6926c15cbc26e5c0 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 4 May 2026 00:13:14 -0400
Subject: [PATCH 03/39] Rename to wireless_manager.c

---
 include/functypes/funcptr_020312B8.h          |  8 --
 include/functypes/funcptr_02031E6C.h          |  6 --
 include/functypes/funcptr_02031E9C.h          |  6 --
 include/functypes/funcptr_020320FC.h          |  6 --
 include/functypes/funcptr_02032110.h          |  6 --
 .../{unk_02030EE0.h => wireless_manager.h}    | 48 +++++------
 platinum.us/main.lsf                          |  2 +-
 src/communication_system.c                    |  2 +-
 src/meson.build                               |  2 +-
 src/overlay005/field_control.c                |  2 +-
 src/overlay058/ov58_021D0D80.c                |  2 +-
 src/overlay059/ov59_021D0D80.c                |  2 +-
 src/overlay109/ov109_021D3D50.c               |  2 +-
 src/underground/manager.c                     |  2 +-
 src/underground/secret_bases.c                |  2 +-
 src/unk_02033200.c                            |  2 +-
 src/unk_020366A0.c                            |  2 +-
 src/unk_02095E98.c                            |  2 +-
 src/unk_020961E8.c                            |  2 +-
 src/unk_0209BDF8.c                            |  2 +-
 src/{unk_02030EE0.c => wireless_manager.c}    | 79 +++++++++----------
 21 files changed, 77 insertions(+), 110 deletions(-)
 delete mode 100644 include/functypes/funcptr_020312B8.h
 delete mode 100644 include/functypes/funcptr_02031E6C.h
 delete mode 100644 include/functypes/funcptr_02031E9C.h
 delete mode 100644 include/functypes/funcptr_020320FC.h
 delete mode 100644 include/functypes/funcptr_02032110.h
 rename include/{unk_02030EE0.h => wireless_manager.h} (54%)
 rename src/{unk_02030EE0.c => wireless_manager.c} (95%)

diff --git a/include/functypes/funcptr_020312B8.h b/include/functypes/funcptr_020312B8.h
deleted file mode 100644
index ce70580fca5..00000000000
--- a/include/functypes/funcptr_020312B8.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef POKEPLATINUM_FUNCPTR_020312B8_H
-#define POKEPLATINUM_FUNCPTR_020312B8_H
-
-#include <nitro/wm.h>
-
-typedef void (*WirelessManagerScanFunc)(WMBssDesc *);
-
-#endif // POKEPLATINUM_FUNCPTR_020312B8_H
diff --git a/include/functypes/funcptr_02031E6C.h b/include/functypes/funcptr_02031E6C.h
deleted file mode 100644
index 69f5140e1cd..00000000000
--- a/include/functypes/funcptr_02031E6C.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_FUNCPTR_02031E6C_H
-#define POKEPLATINUM_FUNCPTR_02031E6C_H
-
-typedef void (*WirelessManagerRecvFunc)(u16, u16 *, u16);
-
-#endif // POKEPLATINUM_FUNCPTR_02031E6C_H
diff --git a/include/functypes/funcptr_02031E9C.h b/include/functypes/funcptr_02031E9C.h
deleted file mode 100644
index 67f783162e3..00000000000
--- a/include/functypes/funcptr_02031E9C.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_FUNCPTR_02031E9C_H
-#define POKEPLATINUM_FUNCPTR_02031E9C_H
-
-typedef void (*WirelessManagerSendFunc)(BOOL);
-
-#endif // POKEPLATINUM_FUNCPTR_02031E9C_H
diff --git a/include/functypes/funcptr_020320FC.h b/include/functypes/funcptr_020320FC.h
deleted file mode 100644
index d3769b04ce3..00000000000
--- a/include/functypes/funcptr_020320FC.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_FUNCPTR_020320FC_H
-#define POKEPLATINUM_FUNCPTR_020320FC_H
-
-typedef void (*UnkFuncPtr_020320FC)(u32, int);
-
-#endif // POKEPLATINUM_FUNCPTR_020320FC_H
diff --git a/include/functypes/funcptr_02032110.h b/include/functypes/funcptr_02032110.h
deleted file mode 100644
index 63e5a3d28cb..00000000000
--- a/include/functypes/funcptr_02032110.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_FUNCPTR_02032110_H
-#define POKEPLATINUM_FUNCPTR_02032110_H
-
-typedef void (*UnkFuncPtr_02032110)(int);
-
-#endif // POKEPLATINUM_FUNCPTR_02032110_H
diff --git a/include/unk_02030EE0.h b/include/wireless_manager.h
similarity index 54%
rename from include/unk_02030EE0.h
rename to include/wireless_manager.h
index 5aa804af2a2..35e65f896be 100644
--- a/include/unk_02030EE0.h
+++ b/include/wireless_manager.h
@@ -3,12 +3,6 @@
 
 #include <nitro/wm.h>
 
-#include "functypes/funcptr_020312B8.h"
-#include "functypes/funcptr_02031E6C.h"
-#include "functypes/funcptr_02031E9C.h"
-#include "functypes/funcptr_020320FC.h"
-#include "functypes/funcptr_02032110.h"
-
 enum WirelessManagerState {
     WIRELESS_STATE_STOP,
     WIRELESS_STATE_IDLE,
@@ -44,41 +38,47 @@ enum ExtendedWMErrCode {
     WM_ERRCODE_GF_MAX
 };
 
-BOOL WirelessManager_ConnectClientAuto(int param0, const u8 *param1, u16 param2);
-BOOL WirelessManager_ConnectClientScanCallback(WirelessManagerScanFunc param0, const u8 *param1, u16 param2);
+typedef void (*WirelessManagerScanFunc)(WMBssDesc *);
+typedef void (*WirelessManagerRecvFunc)(u16, u16 *, u16);
+typedef void (*WirelessManagerSendFunc)(BOOL);
+typedef void (*WirelessManagerGGIDScanFunc)(u32, int);
+typedef void (*WirelessManagerConnectFunc)(int);
+
+BOOL WirelessManager_ConnectClientAuto(int connectionType, const u8 *macAddress, u16 channel);
+BOOL WirelessManager_ConnectClientScanCallback(WirelessManagerScanFunc scanCallback, const u8 *macAddress, u16 channel);
 BOOL WirelessManager_StopScan(void);
-void WirelessManager_SetParentParamGGID(u32 param0);
-void WirelessManager_SetParentParamGameInfoAndLength(u16 *param0, u16 param1);
+void WirelessManager_SetParentParamGGID(u32 ggid);
+void WirelessManager_SetParentParamGameInfoAndLength(u16 *userGameInfo, u16 size);
 u16 WirelessManager_GetConnectedBitmap(void);
 int WirelessManager_GetState(void);
 int WirelessManager_GetErrorCode(void);
 BOOL WirelessManager_StartMeasureChannel(void);
 u16 WirelessManager_GetMeasureChannel(void);
-BOOL WirelessManager_Initialize(void *param0, BOOL param1);
+BOOL WirelessManager_Initialize(void *heap, BOOL isNotListening);
 int WirelessManager_GetHeapSize(void);
-BOOL WirelessManager_ConnectServer(int param0, u16 param1, u16 param2, u16 param3, u16 param4, BOOL param5);
-BOOL WirelessManager_ConnectClient(int param0, WMBssDesc *param1);
-void WirelessManager_SetRecvFunction(WirelessManagerRecvFunc param0, int param1);
-BOOL WirelessManager_SendMessage(void *param0, u16 param1, int param2, WirelessManagerSendFunc param3);
+BOOL WirelessManager_ConnectServer(int connectionType, u16 tgid, u16 channel, u16 maxEntry, u16 beaconPeriod, BOOL entryFlag);
+BOOL WirelessManager_ConnectClient(int connectionType, WMBssDesc *bssDesc);
+void WirelessManager_SetRecvFunction(WirelessManagerRecvFunc recvFunction, int port);
+BOOL WirelessManager_SendMessage(void *message, u16 size, int port, WirelessManagerSendFunc callback);
 void WirelessManager_Reset(void);
 void WirelessManager_Finalize(void);
 BOOL WirelessManager_End(void);
 u16 WirelessManager_GetAID(void);
-void WirelessManager_SetMaxNumConnections(int param0);
+void WirelessManager_SetMaxNumConnections(int numConnectionsMax);
 BOOL WirelessManager_IsIdle(void);
 BOOL WirelessManager_IsBusy(void);
 BOOL WirelessManager_IsError(void);
 BOOL WirelessManager_IsScanning(void);
-void WirelessManager_SetGameInfo(void *param0, int param1, int param2, int param3);
-BOOL WirelessManager_SetEntry(BOOL param0);
+void WirelessManager_SetGameInfo(void *buffer, int size, int ggid, int tgid);
+BOOL WirelessManager_SetEntry(BOOL enable);
 BOOL WirelessManager_ServerSentAllBeacons(void);
 void WirelessManager_ResetBeaconSentCount(void);
-void WirelessManager_SetGGIDScanCallback(UnkFuncPtr_020320FC param0);
-void sub_SetDisconnectCallback(UnkFuncPtr_02032110 param0);
-void WirelessManager_SetConnectCallback(UnkFuncPtr_02032110 param0);
-void WirelessManager_SetPauseConnection(BOOL param0);
+void WirelessManager_SetGGIDScanCallback(WirelessManagerGGIDScanFunc callback);
+void sub_SetDisconnectCallback(WirelessManagerConnectFunc callback);
+void WirelessManager_SetConnectCallback(WirelessManagerConnectFunc callback);
+void WirelessManager_SetPauseConnection(BOOL pause);
 BOOL WirelessManager_GetPauseConnection(void);
-void WirelessManager_SetPauseConnectionSystem(BOOL param0);
-void WirelessManager_SetPauseClientConnection(BOOL param0);
+void WirelessManager_SetPauseConnectionSystem(BOOL pause);
+void WirelessManager_SetPauseClientConnection(BOOL pause);
 
 #endif // POKEPLATINUM_UNK_02030EE0_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 0488144942c..7ed803f3273 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -151,7 +151,7 @@ Static main
 	Object main.nef.p/src_unk_02030A80.c.o
 	Object main.nef.p/src_unk_02030CE8.c.o
 	Object main.nef.p/src_unk_02030EA4.c.o
-	Object main.nef.p/src_unk_02030EE0.c.o
+	Object main.nef.p/src_wireless_manager.c.o
 	Object main.nef.p/src_comm_ring.c.o
 	Object main.nef.p/src_unk_020322D8.c.o
 	Object main.nef.p/src_unk_0203266C.c.o
diff --git a/src/communication_system.c b/src/communication_system.c
index 6d6c5b8518a..43f9a197ae5 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -19,7 +19,7 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_020322D8.h"
 #include "unk_0203266C.h"
 #include "unk_02032798.h"
diff --git a/src/meson.build b/src/meson.build
index 166c2f7268a..ef43ffe8f4f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -140,7 +140,7 @@ pokeplatinum_c = files(
     'unk_02030A80.c',
     'unk_02030CE8.c',
     'unk_02030EA4.c',
-    'unk_02030EE0.c',
+    'wireless_manager.c',
     'comm_ring.c',
     'unk_020322D8.c',
     'unk_0203266C.c',
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index fea83f21dfc..2e1767bff7a 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -60,7 +60,7 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "trainer_see.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_020366A0.h"
 #include "unk_0203C954.h"
 #include "unk_02054884.h"
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 747ca72147d..1e20b081053 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -43,7 +43,7 @@
 #include "touch_pad.h"
 #include "touch_screen.h"
 #include "trainer_info.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index b2072f7f2da..7e8861002be 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -49,7 +49,7 @@
 #include "system.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
 #include "unk_02038ED4.h"
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 948f841d685..40571b7241d 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -50,7 +50,7 @@
 #include "system.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
 #include "unk_02038ED4.h"
diff --git a/src/underground/manager.c b/src/underground/manager.c
index 1af6decc21d..af977c58625 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -45,7 +45,7 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "underground.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_020366A0.h"
 #include "vars_flags.h"
 
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index 95aad3ea6ab..cc4c20ca0a2 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -58,7 +58,7 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "underground.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_02033200.h"
 #include "unk_020366A0.h"
 #include "unk_0205F180.h"
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index 223cc43bba4..472ca881926 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -16,7 +16,7 @@
 #include "system.h"
 #include "trainer_info.h"
 #include "unk_02014A84.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_0203266C.h"
 #include "unk_020366A0.h"
 
diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c
index 6391989f37c..cc08451aba2 100644
--- a/src/unk_020366A0.c
+++ b/src/unk_020366A0.c
@@ -19,7 +19,7 @@
 #include "sound_playback.h"
 #include "system.h"
 #include "trainer_info.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_0203266C.h"
 #include "unk_02032798.h"
 #include "unk_02033200.h"
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 38fa0ad2b3e..2779e6cb511 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -13,7 +13,7 @@
 
 #include "bg_window.h"
 #include "communication_system.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_02032798.h"
 #include "unk_020366A0.h"
 #include "unk_02099500.h"
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index 1f8b7c5c3a6..fb988fe00c5 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -13,7 +13,7 @@
 #include "communication_system.h"
 #include "math_util.h"
 #include "sound_playback.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_02032798.h"
 #include "unk_020366A0.h"
 #include "unk_02099500.h"
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 6d6b369380f..815b23e820d 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -18,7 +18,7 @@
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 #include "unk_02032798.h"
 #include "unk_020366A0.h"
 #include "unk_0205B33C.h"
diff --git a/src/unk_02030EE0.c b/src/wireless_manager.c
similarity index 95%
rename from src/unk_02030EE0.c
rename to src/wireless_manager.c
index 41525aa1029..7d74d48bfa8 100644
--- a/src/unk_02030EE0.c
+++ b/src/wireless_manager.c
@@ -1,4 +1,4 @@
-#include "unk_02030EE0.h"
+#include "wireless_manager.h"
 
 #include <nitro.h>
 #include <nitro/cht.h>
@@ -7,12 +7,6 @@
 
 #include "struct_defs/struct_0203330C.h"
 
-#include "functypes/funcptr_020312B8.h"
-#include "functypes/funcptr_02031E6C.h"
-#include "functypes/funcptr_02031E9C.h"
-#include "functypes/funcptr_020320FC.h"
-#include "functypes/funcptr_02032110.h"
-
 #include "unk_0203266C.h"
 #include "unk_020366A0.h"
 
@@ -44,9 +38,9 @@ typedef struct WirelessManager {
     BOOL (* unusedCallback_1390)(WMStartParentCallback *);
     // clang-format on
 
-    UnkFuncPtr_020320FC ggidScanCallback;
-    UnkFuncPtr_02032110 disconnectCallback;
-    UnkFuncPtr_02032110 connectCallback;
+    WirelessManagerGGIDScanFunc ggidScanCallback;
+    WirelessManagerConnectFunc disconnectCallback;
+    WirelessManagerConnectFunc connectCallback;
     u16 aid; //machine id. 0 for the server, 1~7 for clients
     u16 connectedBitmap; //bitmap of (1 << aid) for connected machines
     int errorCode;
@@ -63,41 +57,41 @@ typedef struct WirelessManager {
 } WirelessManager;
 
 void include_unk_021C07A8(void);
-static void WirelessManager_InidcateCallback(void *param0);
-static BOOL WirelessManager_InitializeWM(BOOL param0);
-static void WirelessManager_FinishInitializeWM(void *param0);
-static u16 WirelessManager_MeasureChannel(u16 param0);
-static void WirelessManager_FinishMeasureChannel(void *param0);
-static WMErrCode WirelessManager_MeasureChannelInternal(WMCallbackFunc param0, u16 param1);
-static s16 WirelessManager_GetRandomChannel(u16 param0);
+static void WirelessManager_InidcateCallback(void *callback);
+static BOOL WirelessManager_InitializeWM(BOOL isNotListening);
+static void WirelessManager_FinishInitializeWM(void *callback);
+static u16 WirelessManager_MeasureChannel(u16 chanel);
+static void WirelessManager_FinishMeasureChannel(void *callback);
+static WMErrCode WirelessManager_MeasureChannelInternal(WMCallbackFunc callback, u16 port);
+static s16 WirelessManager_GetRandomChannel(u16 bitmap);
 static BOOL WirelessManager_SetParentParameter(void);
-static void WirelessManager_FinishSetParentParameter(void *param0);
+static void WirelessManager_FinishSetParentParameter(void *callback);
 static BOOL WirelessManager_StartServer(void);
-static void WirelessManager_FinishStartServer(void *param0);
+static void WirelessManager_FinishStartServer(void *callback);
 static BOOL WirelessManager_StartMPServer(void);
-static void WirelessManager_FinishStartMPServer(void *param0);
+static void WirelessManager_FinishStartMPServer(void *callback);
 static BOOL WirelessManager_StartScan(void);
-static void WirelessManager_FinishStartScan(void *param0);
+static void WirelessManager_FinishStartScan(void *callback);
 static BOOL WirelessManager_EndScan(void);
-static void WirelessManager_FinishEndScan(void *param0);
+static void WirelessManager_FinishEndScan(void *callback);
 static BOOL WirelessManager_StartClient(void);
-static void WirelessManager_FinishStartClient(void *param0);
+static void WirelessManager_FinishStartClient(void *callback);
 static BOOL WirelessManager_StartMPClient(void);
-static void WirelessManager_FinishStartMPClient(void *param0);
-static BOOL WirelessManager_SendMPMessage(void *param0, u16 param1, int param2, WirelessManagerSendFunc param3);
-static void WirelessManager_FinishSendMPMessage(void *param0);
-static void WirelessManager_RecvMessageCallback(void *param0);
+static void WirelessManager_FinishStartMPClient(void *callback);
+static BOOL WirelessManager_SendMPMessage(void *message, u16 size, int port, WirelessManagerSendFunc callback);
+static void WirelessManager_FinishSendMPMessage(void *callback);
+static void WirelessManager_RecvMessageCallback(void *callback);
 static BOOL WirelessManager_EndMPServer(void);
-static void WirelessManager_FinishEndMPServer(void *param0);
+static void WirelessManager_FinishEndMPServer(void *callback);
 static BOOL WirelessManager_EndServer(void);
-static void WirelessManager_FinishEndServer(void *param0);
+static void WirelessManager_FinishEndServer(void *callback);
 static BOOL WirelessManager_EndMPClient(void);
-static void WirelessManager_FinishEndMPClient(void *param0);
+static void WirelessManager_FinishEndMPClient(void *callback);
 static BOOL WirelessManager_DisconnectClient(void);
-static void WirelessManager_FinishDisconnectClient(void *param0);
-static void WirelessManager_FinishEnd(void *param0);
+static void WirelessManager_FinishDisconnectClient(void *callback);
+static void WirelessManager_FinishEnd(void *callback);
 static BOOL WirelessManager_ResetInternal(void);
-static void WirelessManager_FinishResetInternal(void *param0);
+static void WirelessManager_FinishResetInternal(void *callback);
 static u16 WirelessManager_GetNumConnected(void);
 
 static WirelessManager *sWirelessManager;
@@ -1006,10 +1000,13 @@ void WirelessManager_SetParentParamGGID(u32 ggid)
 
 /**
  * @brief Sets the WirelessManager's parentParam userGameInfo and userGameInfoLength
+ *
+ * @param userGameInfo
+ * @param size
  */
-void WirelessManager_SetParentParamGameInfoAndLength(u16 *param0, u16 param1)
+void WirelessManager_SetParentParamGameInfoAndLength(u16 *userGameInfo, u16 size)
 {
-    sWirelessManager->parentParam.userGameInfo = param0;
+    sWirelessManager->parentParam.userGameInfo = userGameInfo;
     sWirelessManager->parentParam.userGameInfoLength = param1;
 }
 
@@ -1297,10 +1294,12 @@ int WirelessManager_GetHeapSize(void)
 
 /**
  * @brief WM indicator callback for WM_SetIndCallback 
+ *
+ * @param wm_callback
  */
-static void WirelessManager_InidcateCallback(void *param0)
+static void WirelessManager_InidcateCallback(void *wm_callback)
 {
-    WMindCallback *callback = (WMindCallback *)param0;
+    WMindCallback *callback = (WMindCallback *)wm_callback;
 
     if (callback->errcode == WM_ERRCODE_FIFO_ERROR) {
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
@@ -1729,7 +1728,7 @@ void WirelessManager_ResetBeaconSentCount(void)
  *
  * @param callback
  */
-void WirelessManager_SetGGIDScanCallback(UnkFuncPtr_020320FC callback)
+void WirelessManager_SetGGIDScanCallback(WirelessManagerGGIDScanFunc callback)
 {
     sWirelessManager->ggidScanCallback = callback;
 }
@@ -1739,7 +1738,7 @@ void WirelessManager_SetGGIDScanCallback(UnkFuncPtr_020320FC callback)
  * 
  * @param callback
  */
-void sub_SetDisconnectCallback(UnkFuncPtr_02032110 callback)
+void sub_SetDisconnectCallback(WirelessManagerConnectFunc callback)
 {
     sWirelessManager->disconnectCallback = callback;
 }
@@ -1749,7 +1748,7 @@ void sub_SetDisconnectCallback(UnkFuncPtr_02032110 callback)
  * 
  * @param callback
  */
-void WirelessManager_SetConnectCallback(UnkFuncPtr_02032110 callback)
+void WirelessManager_SetConnectCallback(WirelessManagerConnectFunc callback)
 {
     sWirelessManager->connectCallback = callback;
 }

From 46d51bbb114b1d880245c7dacdde20207c4cf5b9 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 4 May 2026 00:14:23 -0400
Subject: [PATCH 04/39] make format

---
 include/wireless_manager.h      |  2 +-
 src/communication_system.c      |  2 +-
 src/overlay005/field_control.c  |  2 +-
 src/overlay058/ov58_021D0D80.c  |  2 +-
 src/overlay059/ov59_021D0D80.c  |  2 +-
 src/overlay109/ov109_021D3D50.c |  2 +-
 src/underground/manager.c       |  2 +-
 src/underground/secret_bases.c  |  2 +-
 src/unk_02033200.c              |  2 +-
 src/unk_020366A0.c              |  2 +-
 src/unk_02095E98.c              |  2 +-
 src/unk_020961E8.c              |  2 +-
 src/unk_0209BDF8.c              |  2 +-
 src/wireless_manager.c          | 58 ++++++++++++++++-----------------
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/include/wireless_manager.h b/include/wireless_manager.h
index 35e65f896be..55505b19c84 100644
--- a/include/wireless_manager.h
+++ b/include/wireless_manager.h
@@ -28,7 +28,7 @@ enum WirelessConnectionType {
     WIRELESS_CONNECTION_COUNT
 };
 
-//Extention of the NitroSDK WMErrCode enum 
+// Extention of the NitroSDK WMErrCode enum
 enum ExtendedWMErrCode {
     WM_ERRCODE_DISCONNECTED = WM_ERRCODE_MAX, //=20
     WM_ERRCODE_NO_SERVER,
diff --git a/src/communication_system.c b/src/communication_system.c
index 43f9a197ae5..d1e9aeaf047 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -19,13 +19,13 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system.h"
-#include "wireless_manager.h"
 #include "unk_020322D8.h"
 #include "unk_0203266C.h"
 #include "unk_02032798.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
+#include "wireless_manager.h"
 
 enum TransmissionType {
     TRANSMISSION_TYPE_SERVER_CLIENT,
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index 2e1767bff7a..67f7e712abe 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -60,7 +60,6 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "trainer_see.h"
-#include "wireless_manager.h"
 #include "unk_020366A0.h"
 #include "unk_0203C954.h"
 #include "unk_02054884.h"
@@ -69,6 +68,7 @@
 #include "unk_0205B33C.h"
 #include "unk_0205F180.h"
 #include "vars_flags.h"
+#include "wireless_manager.h"
 
 static BOOL Field_CheckMapTransition(FieldSystem *fieldSystem, const FieldInput *input);
 static u16 Field_TileBehaviorToScript(FieldSystem *fieldSystem, u8 behavior);
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 1e20b081053..d778dac29e4 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -43,7 +43,6 @@
 #include "touch_pad.h"
 #include "touch_screen.h"
 #include "trainer_info.h"
-#include "wireless_manager.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
@@ -51,6 +50,7 @@
 #include "unk_0205C22C.h"
 #include "unk_02095E98.h"
 #include "vram_transfer.h"
+#include "wireless_manager.h"
 #include "yes_no_touch_menu.h"
 
 typedef struct {
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 7e8861002be..a2f0ba10c07 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -49,7 +49,6 @@
 #include "system.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "wireless_manager.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
 #include "unk_02038ED4.h"
@@ -57,6 +56,7 @@
 #include "unk_0205C22C.h"
 #include "unk_020961E8.h"
 #include "vram_transfer.h"
+#include "wireless_manager.h"
 
 static void ov59_021D1100(void *param0);
 static void ov59_021D1128(void);
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 40571b7241d..1bd2496ed8e 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -50,13 +50,13 @@
 #include "system.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "wireless_manager.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
 #include "unk_0209BDF8.h"
 #include "vram_transfer.h"
+#include "wireless_manager.h"
 
 static void ov109_021D40A8(void *param0);
 static void ov109_021D40D0(void);
diff --git a/src/underground/manager.c b/src/underground/manager.c
index af977c58625..8f2538113be 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -45,9 +45,9 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "underground.h"
-#include "wireless_manager.h"
 #include "unk_020366A0.h"
 #include "vars_flags.h"
+#include "wireless_manager.h"
 
 #include "res/graphics/trap_effects/trap_effects.naix"
 #include "res/text/bank/underground_common.h"
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index cc4c20ca0a2..3c50d369a9e 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -58,12 +58,12 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "underground.h"
-#include "wireless_manager.h"
 #include "unk_02033200.h"
 #include "unk_020366A0.h"
 #include "unk_0205F180.h"
 #include "unk_020655F4.h"
 #include "vars_flags.h"
+#include "wireless_manager.h"
 
 #include "res/field/props/models/prop_models.naix"
 #include "res/graphics/trap_effects/trap_effects.naix"
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index 472ca881926..f1dc951e60b 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -16,9 +16,9 @@
 #include "system.h"
 #include "trainer_info.h"
 #include "unk_02014A84.h"
-#include "wireless_manager.h"
 #include "unk_0203266C.h"
 #include "unk_020366A0.h"
+#include "wireless_manager.h"
 
 typedef struct {
     u8 unk_00[84];
diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c
index cc08451aba2..1d00eeca559 100644
--- a/src/unk_020366A0.c
+++ b/src/unk_020366A0.c
@@ -19,11 +19,11 @@
 #include "sound_playback.h"
 #include "system.h"
 #include "trainer_info.h"
-#include "wireless_manager.h"
 #include "unk_0203266C.h"
 #include "unk_02032798.h"
 #include "unk_02033200.h"
 #include "unk_02039814.h"
+#include "wireless_manager.h"
 
 typedef void (*UnkFuncPtr_02036C94)(void);
 
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 2779e6cb511..6d559f4c4f9 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -13,10 +13,10 @@
 
 #include "bg_window.h"
 #include "communication_system.h"
-#include "wireless_manager.h"
 #include "unk_02032798.h"
 #include "unk_020366A0.h"
 #include "unk_02099500.h"
+#include "wireless_manager.h"
 
 typedef struct UnkStruct_02095EAC_t UnkStruct_02095EAC;
 
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index fb988fe00c5..535db933185 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -13,10 +13,10 @@
 #include "communication_system.h"
 #include "math_util.h"
 #include "sound_playback.h"
-#include "wireless_manager.h"
 #include "unk_02032798.h"
 #include "unk_020366A0.h"
 #include "unk_02099500.h"
+#include "wireless_manager.h"
 
 typedef struct UnkStruct_020961E8_t UnkStruct_020961E8;
 
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 815b23e820d..6089160d0e4 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -18,12 +18,12 @@
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
-#include "wireless_manager.h"
 #include "unk_02032798.h"
 #include "unk_020366A0.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
 #include "unk_02099500.h"
+#include "wireless_manager.h"
 
 typedef struct {
     u32 unk_00;
diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index 7d74d48bfa8..f694f81e324 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -12,11 +12,11 @@
 
 /**
  * @struct WirelessManager
- * @brief Wrapper struct for NitroSDK's wm.c 
+ * @brief Wrapper struct for NitroSDK's wm.c
  *
- * WirelessManager is treated as a static class and 
- * serves as a wrapper for the NitroSDK's wireless manager 
- * (shortened to wm.c). 
+ * WirelessManager is treated as a static class and
+ * serves as a wrapper for the NitroSDK's wireless manager
+ * (shortened to wm.c).
  */
 typedef struct WirelessManager {
     WMpparam parentParam ATTRIBUTE_ALIGN(32);
@@ -41,11 +41,11 @@ typedef struct WirelessManager {
     WirelessManagerGGIDScanFunc ggidScanCallback;
     WirelessManagerConnectFunc disconnectCallback;
     WirelessManagerConnectFunc connectCallback;
-    u16 aid; //machine id. 0 for the server, 1~7 for clients
-    u16 connectedBitmap; //bitmap of (1 << aid) for connected machines
+    u16 aid; // machine id. 0 for the server, 1~7 for clients
+    u16 connectedBitmap; // bitmap of (1 << aid) for connected machines
     int errorCode;
     u8 numConnectionsMax;
-    u8 pauseConnectionClient; //if this WirelessManager is a Client that has disconnected
+    u8 pauseConnectionClient; // if this WirelessManager is a Client that has disconnected
     u32 rand;
     u16 measureChannel;
     u16 measureChannelBusyRatio;
@@ -220,7 +220,7 @@ static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
     case WM_STATECODE_BEACON_SENT:
         sWirelessManager->sentBeaconCount++;
         break;
-    case WM_STATECODE_CONNECTED: 
+    case WM_STATECODE_CONNECTED:
         if ((sWirelessManager->pauseConnectSystem == 1) || (sWirelessManager->pauseConnection == 1) || (WirelessManager_GetNumConnected() >= sWirelessManager->numConnectionsMax) || (callback->ssid[0] != sub_0203895C()) || (0 != memcmp("DP", &callback->ssid[1], sizeof("DP")))) {
             WMErrCode disconnectCode;
 
@@ -239,7 +239,7 @@ static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
             sWirelessManager->connectCallback(callback->aid);
         }
         break;
-    case WM_STATECODE_DISCONNECTED: 
+    case WM_STATECODE_DISCONNECTED:
         sWirelessManager->connectedBitmap &= ~connected;
 
         if (sWirelessManager->disconnectCallback) {
@@ -248,7 +248,7 @@ static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
         break;
     case WM_STATECODE_DISCONNECTED_FROM_MYSELF:
         break;
-    case WM_STATECODE_PARENT_START: 
+    case WM_STATECODE_PARENT_START:
         if (!WirelessManager_StartMPServer()) {
             WirelessManager_SetState(WIRELESS_STATE_ERROR);
         }
@@ -259,7 +259,7 @@ static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
 }
 
 /**
- * @brief Starts the internal MP_PARENT process 
+ * @brief Starts the internal MP_PARENT process
  *
  * @return TRUE if there is no error while starting the MP
  */
@@ -304,7 +304,7 @@ static void WirelessManager_FinishStartMPServer(void *wm_startmpcallback)
             if (sWirelessManager->state != WIRELESS_STATE_CONNECTED && sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) {
                 return;
             }
-        } 
+        }
 
         WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
         break;
@@ -339,7 +339,7 @@ static BOOL WirelessManager_EndMPServer(void)
 }
 
 /**
- * @brief Callback used when the server's WM_EndMP asynchronous process completes. 
+ * @brief Callback used when the server's WM_EndMP asynchronous process completes.
  *
  * @param wm_callback
  */
@@ -379,7 +379,7 @@ static BOOL WirelessManager_EndServer(void)
 }
 
 /**
- * @brief Callback used when the WM_EndParent asynchronous process completes. 
+ * @brief Callback used when the WM_EndParent asynchronous process completes.
  *
  * @param wm_callback
  */
@@ -397,7 +397,7 @@ static void WirelessManager_FinishEndServer(void *wm_callback)
 
 /**
  * @brief Initializes the Wireless Manager as a client and starts the scan process. Automatically connects to a Server when found.
- * 
+ *
  * @param connectionType
  * @param macAddress
  * @param channel
@@ -462,10 +462,10 @@ BOOL WirelessManager_ConnectClientScanCallback(WirelessManagerScanFunc scanCallb
 }
 
 /**
- * @brief Starts the internal WM scan process 
+ * @brief Starts the internal WM scan process
  *
  * @return TRUE if there is no error while starting the scan
- */ 
+ */
 static BOOL WirelessManager_StartScan(void)
 {
     WMErrCode errorCode;
@@ -514,7 +514,7 @@ static BOOL WirelessManager_StartScan(void)
 
 /**
  * @brief Callback used when the WM_StartScan asynchronous process completes. Restarts the scan if necessary.
- */ 
+ */
 static void WirelessManager_FinishStartScan(void *wm_startscancallback)
 {
     WMstartScanCallback *callback = (WMstartScanCallback *)wm_startscancallback;
@@ -794,7 +794,7 @@ static void WirelessManager_FinishStartMPClient(void *wm_startmpcallback)
 /**
  * @brief Ends the internal MP_CHILD process
  *
- * @return TRUE if there is no error while ending the MP 
+ * @return TRUE if there is no error while ending the MP
  */
 static BOOL WirelessManager_EndMPClient(void)
 {
@@ -833,7 +833,7 @@ static void WirelessManager_FinishEndMPClient(void *wm_callback)
 
 /**
  * @brief Disconnects the internal wm client.
- * 
+ *
  * @return TRUE if there was no error while disconnecting
  */
 static BOOL WirelessManager_DisconnectClient(void)
@@ -951,7 +951,7 @@ static void WirelessManager_FinishSendMPMessage(void *wm_portsendcallback)
 }
 
 /**
- * @brief Callback set with WM_SetPortCallback to receive messages 
+ * @brief Callback set with WM_SetPortCallback to receive messages
  *
  * @param wm_portrecvcallback
  */
@@ -968,7 +968,7 @@ static void WirelessManager_RecvMessageCallback(void *wm_portrecvcallback)
             (*sWirelessManager->recvFunc)(callback->aid, callback->data, callback->length);
         } else if (callback->state == WM_STATECODE_DISCONNECTED) {
             (*sWirelessManager->recvFunc)(callback->aid, NULL, 0);
-        } 
+        }
     }
 }
 
@@ -1293,7 +1293,7 @@ int WirelessManager_GetHeapSize(void)
 }
 
 /**
- * @brief WM indicator callback for WM_SetIndCallback 
+ * @brief WM indicator callback for WM_SetIndCallback
  *
  * @param wm_callback
  */
@@ -1307,7 +1307,7 @@ static void WirelessManager_InidcateCallback(void *wm_callback)
     }
 }
 
-/** 
+/**
  * @brief Initializes the internal WM (for listening if isNotListening is FALSE)
  *
  * @param isNotListening
@@ -1368,7 +1368,7 @@ static void WirelessManager_FinishInitializeWM(void *wm_callback)
 }
 
 /**
- * @brief Deadstripped. Callback used when the WM_SetLifeTime asynchronous process completes. 
+ * @brief Deadstripped. Callback used when the WM_SetLifeTime asynchronous process completes.
  *
  * @param wm_callback
  */
@@ -1442,7 +1442,7 @@ BOOL WirelessManager_ConnectServer(int connectionType, u16 tgid, u16 channel, u1
 
 /**
  * @brief Initializes the WirelessManager as a client and begins scanning for servers using the data in bssDesc as a parameter.
- * 
+ *
  * @param connectionType
  * @param bssDesc
  *
@@ -1597,7 +1597,7 @@ u16 WirelessManager_GetAID(void)
 }
 
 /**
- * @brief Sets the max number of connections 
+ * @brief Sets the max number of connections
  *
  * @param numConnectionsMax
  */
@@ -1735,7 +1735,7 @@ void WirelessManager_SetGGIDScanCallback(WirelessManagerGGIDScanFunc callback)
 
 /**
  * @brief Sets the disconnectCallback
- * 
+ *
  * @param callback
  */
 void sub_SetDisconnectCallback(WirelessManagerConnectFunc callback)
@@ -1745,7 +1745,7 @@ void sub_SetDisconnectCallback(WirelessManagerConnectFunc callback)
 
 /**
  * @brief Sets the connectCallback
- * 
+ *
  * @param callback
  */
 void WirelessManager_SetConnectCallback(WirelessManagerConnectFunc callback)

From adede789ba783717f4d42c8e8c734a9e419eb4ed Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 4 May 2026 00:34:24 -0400
Subject: [PATCH 05/39] Fix param renaming error

---
 src/wireless_manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index f694f81e324..fa5e50b790c 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -1007,7 +1007,7 @@ void WirelessManager_SetParentParamGGID(u32 ggid)
 void WirelessManager_SetParentParamGameInfoAndLength(u16 *userGameInfo, u16 size)
 {
     sWirelessManager->parentParam.userGameInfo = userGameInfo;
-    sWirelessManager->parentParam.userGameInfoLength = param1;
+    sWirelessManager->parentParam.userGameInfoLength = size;
 }
 
 /**

From 0bfbe90ad5b6c7e968be52efb2b2722637dcf8c4 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 6 May 2026 22:55:35 -0400
Subject: [PATCH 06/39] Requested Changes

---
 include/wireless_manager.h |  10 ++--
 src/wireless_manager.c     | 106 +++++++++++++------------------------
 2 files changed, 42 insertions(+), 74 deletions(-)

diff --git a/include/wireless_manager.h b/include/wireless_manager.h
index 55505b19c84..eb93df0de91 100644
--- a/include/wireless_manager.h
+++ b/include/wireless_manager.h
@@ -1,10 +1,10 @@
-#ifndef POKEPLATINUM_UNK_02030EE0_H
-#define POKEPLATINUM_UNK_02030EE0_H
+#ifndef POKEPLATINUM_WIRELESS_MANAGER_H
+#define POKEPLATINUM_WIRELESS_MANAGER_H
 
 #include <nitro/wm.h>
 
 enum WirelessManagerState {
-    WIRELESS_STATE_STOP,
+    WIRELESS_STATE_STOP = 0,
     WIRELESS_STATE_IDLE,
     WIRELESS_STATE_SCAN,
     WIRELESS_STATE_BUSY,
@@ -19,7 +19,7 @@ enum WirelessManagerState {
 };
 
 enum WirelessConnectionType {
-    WIRELESS_CONNECTION_MP_SERVER,
+    WIRELESS_CONNECTION_MP_SERVER = 0,
     WIRELESS_CONNECTION_MP_CLIENT,
     WIRELESS_CONNECTION_TRANSMIT_KEY_SERVER,
     WIRELESS_CONNECTION_TRANSMIT_KEY_CLIENT,
@@ -81,4 +81,4 @@ BOOL WirelessManager_GetPauseConnection(void);
 void WirelessManager_SetPauseConnectionSystem(BOOL pause);
 void WirelessManager_SetPauseClientConnection(BOOL pause);
 
-#endif // POKEPLATINUM_UNK_02030EE0_H
+#endif // POKEPLATINUM_WIRELESS_MANAGER_H
diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index fa5e50b790c..827b0698846 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -119,7 +119,7 @@ static void WirelessManager_SetState(int state)
  */
 static void WirelessManager_SetErrorCode(int errorCode)
 {
-    if ((sWirelessManager->state == WIRELESS_STATE_ERROR) || (sWirelessManager->state == WIRELESS_STATE_FATAL_ERROR)) {
+    if (sWirelessManager->state == WIRELESS_STATE_ERROR || sWirelessManager->state == WIRELESS_STATE_FATAL_ERROR) {
         return;
     }
 
@@ -133,11 +133,9 @@ static void WirelessManager_SetErrorCode(int errorCode)
  */
 static BOOL WirelessManager_SetParentParameter(void)
 {
-    WMErrCode errorCode;
-
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    errorCode = WM_SetParentParameter(WirelessManager_FinishSetParentParameter, &sWirelessManager->parentParam);
+    WMErrCode errorCode = WM_SetParentParameter(WirelessManager_FinishSetParentParameter, &sWirelessManager->parentParam);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -175,8 +173,6 @@ static void WirelessManager_FinishSetParentParameter(void *wm_callback)
  */
 static BOOL WirelessManager_StartServer(void)
 {
-    WMErrCode errorCode;
-
     if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
         return TRUE;
     }
@@ -187,7 +183,7 @@ static BOOL WirelessManager_StartServer(void)
     status->wep_flag = 0;
     DC_FlushRange(&status->wep_flag, sizeof(status->wep_flag));
 
-    errorCode = WM_StartParent(WirelessManager_FinishStartServer);
+    WMErrCode errorCode = WM_StartParent(WirelessManager_FinishStartServer);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -221,7 +217,7 @@ static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
         sWirelessManager->sentBeaconCount++;
         break;
     case WM_STATECODE_CONNECTED:
-        if ((sWirelessManager->pauseConnectSystem == 1) || (sWirelessManager->pauseConnection == 1) || (WirelessManager_GetNumConnected() >= sWirelessManager->numConnectionsMax) || (callback->ssid[0] != sub_0203895C()) || (0 != memcmp("DP", &callback->ssid[1], sizeof("DP")))) {
+        if (sWirelessManager->pauseConnectSystem == TRUE || sWirelessManager->pauseConnection == TRUE || WirelessManager_GetNumConnected() >= sWirelessManager->numConnectionsMax || callback->ssid[0] != sub_0203895C() || 0 != memcmp("DP", &callback->ssid[1], sizeof("DP"))) {
             WMErrCode disconnectCode;
 
             disconnectCode = WM_Disconnect(NULL, callback->aid);
@@ -265,15 +261,13 @@ static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
  */
 static BOOL WirelessManager_StartMPServer(void)
 {
-    WMErrCode errorCode;
-
     if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
-        return 1;
+        return TRUE;
     }
 
     WirelessManager_SetState(WIRELESS_STATE_CONNECTED);
 
-    errorCode = WM_StartMP(WirelessManager_FinishStartMPServer, (u16 *)sWirelessManager->recvBuffer, (u16)sWirelessManager->recvBufferSize, (u16 *)sWirelessManager->sendBuffer, (u16)sWirelessManager->sendBufferSize, 1);
+    WMErrCode errorCode = WM_StartMP(WirelessManager_FinishStartMPServer, (u16 *)sWirelessManager->recvBuffer, (u16)sWirelessManager->recvBufferSize, (u16 *)sWirelessManager->sendBuffer, (u16)sWirelessManager->sendBufferSize, 1);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -324,11 +318,9 @@ static void WirelessManager_FinishStartMPServer(void *wm_startmpcallback)
  */
 static BOOL WirelessManager_EndMPServer(void)
 {
-    WMErrCode errorCode;
-
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    errorCode = WM_EndMP(WirelessManager_FinishEndMPServer);
+    WMErrCode errorCode = WM_EndMP(WirelessManager_FinishEndMPServer);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -366,9 +358,7 @@ static void WirelessManager_FinishEndMPServer(void *wm_callback)
  */
 static BOOL WirelessManager_EndServer(void)
 {
-    WMErrCode errorCode;
-
-    errorCode = WM_EndParent(WirelessManager_FinishEndServer);
+    WMErrCode errorCode = WM_EndParent(WirelessManager_FinishEndServer);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -468,7 +458,6 @@ BOOL WirelessManager_ConnectClientScanCallback(WirelessManagerScanFunc scanCallb
  */
 static BOOL WirelessManager_StartScan(void)
 {
-    WMErrCode errorCode;
     u16 channel = WM_GetAllowedChannel();
 
     if (channel == 0x8000) {
@@ -502,7 +491,7 @@ static BOOL WirelessManager_StartScan(void)
     sWirelessManager->scanParam.maxChannelTime = WM_GetDispersionScanPeriod() / 3;
     sWirelessManager->scanParam.scanBuf = &sWirelessManager->bssDesc;
 
-    errorCode = WM_StartScan(WirelessManager_FinishStartScan, &sWirelessManager->scanParam);
+    WMErrCode errorCode = WM_StartScan(WirelessManager_FinishStartScan, &sWirelessManager->scanParam);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -599,9 +588,7 @@ BOOL WirelessManager_StopScan(void)
  */
 static BOOL WirelessManager_EndScan(void)
 {
-    WMErrCode errorCode;
-
-    errorCode = WM_EndScan(WirelessManager_FinishEndScan);
+    WMErrCode errorCode = WM_EndScan(WirelessManager_FinishEndScan);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -644,7 +631,6 @@ static void WirelessManager_FinishEndScan(void *wm_callback)
 static BOOL WirelessManager_StartClient(void)
 {
     u8 ssid[32];
-    WMErrCode errorCode;
 
     if ((sWirelessManager->state == WIRELESS_STATE_CONNECTED) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_KEY) || (sWirelessManager->state == WIRELESS_STATE_TRANSMIT_DATA)) {
         return TRUE;
@@ -654,7 +640,7 @@ static BOOL WirelessManager_StartClient(void)
     MI_CpuCopy8("DP", &ssid[1], sizeof("DP"));
 
     ssid[0] = sub_0203895C();
-    errorCode = WM_StartConnectEx(WirelessManager_FinishStartClient, &sWirelessManager->bssDesc, ssid, 1, WM_AUTHMODE_OPEN_SYSTEM);
+    WMErrCode errorCode = WM_StartConnectEx(WirelessManager_FinishStartClient, &sWirelessManager->bssDesc, ssid, 1, WM_AUTHMODE_OPEN_SYSTEM);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -735,9 +721,7 @@ static void WirelessManager_FinishStartClient(void *wm_connectcallback)
  */
 static BOOL WirelessManager_StartMPClient(void)
 {
-    WMErrCode errorCode;
-
-    errorCode = WM_StartMP(WirelessManager_FinishStartMPClient, (u16 *)sWirelessManager->recvBuffer, (u16)sWirelessManager->recvBufferSize, (u16 *)sWirelessManager->sendBuffer, (u16)sWirelessManager->sendBufferSize, 1);
+    WMErrCode errorCode = WM_StartMP(WirelessManager_FinishStartMPClient, (u16 *)sWirelessManager->recvBuffer, (u16)sWirelessManager->recvBufferSize, (u16 *)sWirelessManager->sendBuffer, (u16)sWirelessManager->sendBufferSize, 1);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -798,13 +782,11 @@ static void WirelessManager_FinishStartMPClient(void *wm_startmpcallback)
  */
 static BOOL WirelessManager_EndMPClient(void)
 {
-    WMErrCode error;
-
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
-    error = WM_EndMP(WirelessManager_FinishEndMPClient);
+    WMErrCode errorCode = WM_EndMP(WirelessManager_FinishEndMPClient);
 
-    if (error != WM_ERRCODE_OPERATING) {
-        WirelessManager_SetErrorCode(error);
+    if (errorCode != WM_ERRCODE_OPERATING) {
+        WirelessManager_SetErrorCode(errorCode);
         return FALSE;
     }
 
@@ -838,11 +820,9 @@ static void WirelessManager_FinishEndMPClient(void *wm_callback)
  */
 static BOOL WirelessManager_DisconnectClient(void)
 {
-    WMErrCode errorCode;
-
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    errorCode = WM_Disconnect(WirelessManager_FinishDisconnectClient, 0);
+    WMErrCode errorCode = WM_Disconnect(WirelessManager_FinishDisconnectClient, 0);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -877,10 +857,8 @@ static void WirelessManager_FinishDisconnectClient(void *wm_callback)
  */
 static BOOL WirelessManager_ResetInternal(void)
 {
-    WMErrCode errorCode;
-
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
-    errorCode = WM_Reset(WirelessManager_FinishResetInternal);
+    WMErrCode errorCode = WM_Reset(WirelessManager_FinishResetInternal);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
         WirelessManager_SetErrorCode(errorCode);
@@ -916,17 +894,11 @@ static void WirelessManager_FinishResetInternal(void *wm_callback)
  */
 static BOOL WirelessManager_SendMPMessage(void *message, u16 size, int port, WirelessManagerSendFunc sendCallback)
 {
-    WMErrCode errorCode;
-
     DC_FlushRange(sWirelessManager->sendBuffer, (u32)sWirelessManager->sendBufferSize);
 
-    errorCode = WM_SetMPDataToPortEx(WirelessManager_FinishSendMPMessage, (void *)sendCallback, message, size, 0xffff, port, WM_PRIORITY_NORMAL);
-
-    if (errorCode != WM_ERRCODE_OPERATING) {
-        return FALSE;
-    }
+    WMErrCode errorCode = WM_SetMPDataToPortEx(WirelessManager_FinishSendMPMessage, (void *)sendCallback, message, size, 0xFFFF, port, WM_PRIORITY_NORMAL);
 
-    return TRUE;
+    return errorCode == WM_ERRCODE_OPERATING;
 }
 
 /**
@@ -963,7 +935,7 @@ static void WirelessManager_RecvMessageCallback(void *wm_portrecvcallback)
         WirelessManager_SetErrorCode(callback->errcode);
     } else if (sWirelessManager->recvFunc != NULL) {
         if (callback->state == WM_STATECODE_PORT_INIT) {
-            (void)0;
+            ;
         } else if (callback->state == WM_STATECODE_PORT_RECV) {
             (*sWirelessManager->recvFunc)(callback->aid, callback->data, callback->length);
         } else if (callback->state == WM_STATECODE_DISCONNECTED) {
@@ -1068,7 +1040,6 @@ int WirelessManager_GetErrorCode(void)
  */
 BOOL WirelessManager_StartMeasureChannel(void)
 {
-    u16 errorCode;
     u8 macAddress[6];
 
     OS_GetMacAddress(macAddress);
@@ -1080,7 +1051,7 @@ BOOL WirelessManager_StartMeasureChannel(void)
 
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
 
-    errorCode = WirelessManager_MeasureChannel(1);
+    u16 errorCode = WirelessManager_MeasureChannel(1);
 
     if (errorCode == WM_ERRCODE_FATAL) {
         WirelessManager_SetErrorCode(WM_ERRCODE_FATAL);
@@ -1105,10 +1076,7 @@ BOOL WirelessManager_StartMeasureChannel(void)
  */
 static u16 WirelessManager_MeasureChannel(u16 channel)
 {
-    u16 allowedChannel;
-    u16 errorCode;
-
-    allowedChannel = WM_GetAllowedChannel();
+    u16 allowedChannel = WM_GetAllowedChannel();
 
     if (allowedChannel == 0x8000) {
         WirelessManager_SetErrorCode(WM_ERRCODE_ILLEGAL_STATE);
@@ -1136,16 +1104,19 @@ static u16 WirelessManager_MeasureChannel(u16 channel)
         }
     }
 
-    errorCode = WirelessManager_MeasureChannelInternal(WirelessManager_FinishMeasureChannel, channel);
+    u16 errorCode = WirelessManager_MeasureChannelInternal(WirelessManager_FinishMeasureChannel, channel);
 
     return errorCode;
 }
 
-static void WirelessManager_FinishMeasureChannel(void *param0)
+/**
+ * @brief Callbacked used when the WM_MeasureChannel asynchronous process completes
+ *
+ * @param wm_measurechannelcallback
+ */
+static void WirelessManager_FinishMeasureChannel(void *wm_measurechannelcallback)
 {
-    u16 errorCode;
-    u16 channel;
-    WMMeasureChannelCallback *measureChannelCallback = (WMMeasureChannelCallback *)param0;
+    WMMeasureChannelCallback *measureChannelCallback = (WMMeasureChannelCallback *)wm_measurechannelcallback;
 
     if (measureChannelCallback->errcode != WM_ERRCODE_SUCCESS) {
         WirelessManager_SetErrorCode(measureChannelCallback->errcode);
@@ -1156,7 +1127,7 @@ static void WirelessManager_FinishMeasureChannel(void *param0)
         return;
     }
 
-    channel = measureChannelCallback->channel;
+    u16 channel = measureChannelCallback->channel;
 
     if (sWirelessManager->measureChannelBusyRatio > measureChannelCallback->ccaBusyRatio) {
         sWirelessManager->measureChannelBusyRatio = measureChannelCallback->ccaBusyRatio;
@@ -1165,7 +1136,7 @@ static void WirelessManager_FinishMeasureChannel(void *param0)
         sWirelessManager->leastUsedChannelBitmap |= 1 << (channel - 1);
     }
 
-    errorCode = WirelessManager_MeasureChannel(++channel);
+    u16 errorCode = WirelessManager_MeasureChannel(++channel);
 
     if (errorCode == WM_ERRCODE_FATAL) {
         WirelessManager_SetState(WIRELESS_STATE_CHECK_CHANNEL);
@@ -1342,7 +1313,6 @@ static BOOL WirelessManager_InitializeWM(BOOL isNotListening)
  */
 static void WirelessManager_FinishInitializeWM(void *wm_callback)
 {
-    WMErrCode errorCode;
     WMCallback *callback = (WMCallback *)wm_callback;
 
     if (callback->errcode != WM_ERRCODE_SUCCESS) {
@@ -1354,7 +1324,7 @@ static void WirelessManager_FinishInitializeWM(void *wm_callback)
         return;
     }
 
-    errorCode = WM_SetIndCallback(WirelessManager_InidcateCallback);
+    WMErrCode errorCode = WM_SetIndCallback(WirelessManager_InidcateCallback);
 
     if (errorCode != WM_ERRCODE_SUCCESS) {
         WirelessManager_SetErrorCode(errorCode);
@@ -1374,7 +1344,6 @@ static void WirelessManager_FinishInitializeWM(void *wm_callback)
  */
 static void WirelessManager_FinishSetLifeTime(void *wm_callback)
 {
-    (void)0;
 }
 
 /**
@@ -1392,7 +1361,7 @@ static void WirelessManager_FinishSetLifeTime(void *wm_callback)
 BOOL WirelessManager_ConnectServer(int connectionType, u16 tgid, u16 channel, u16 maxEntry, u16 beaconPeriod, BOOL entryFlag)
 {
     if (sub_0203276C(sub_0203895C())) {
-        WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xffff, 100, 5, 100);
+        WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xFFFF, 100, 5, 100);
     }
 
     sWirelessManager->recvBufferSize = MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), MATH_MAX(WM_SIZE_MP_PARENT_RECEIVE_BUFFER(12, 7, 0), WM_SIZE_MP_PARENT_RECEIVE_BUFFER(38, (5 - 1), 0)));
@@ -1451,7 +1420,7 @@ BOOL WirelessManager_ConnectServer(int connectionType, u16 tgid, u16 channel, u1
 BOOL WirelessManager_ConnectClient(int connectionType, WMBssDesc *bssDesc)
 {
     if (sub_0203276C(sub_0203895C())) {
-        WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xffff, 100, 5, 100);
+        WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xFFFF, 100, 5, 100);
     }
 
     sWirelessManager->recvBufferSize = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0);
@@ -1489,7 +1458,7 @@ void WirelessManager_SetRecvFunction(WirelessManagerRecvFunc recvFunction, int p
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
 
         while (TRUE) {
-            (void)0;
+            ;
         }
     }
 }
@@ -1506,7 +1475,7 @@ void WirelessManager_SetRecvFunction(WirelessManagerRecvFunc recvFunction, int p
  */
 BOOL WirelessManager_SendMessage(void *message, u16 size, int port, WirelessManagerSendFunc callback)
 {
-    if ((WirelessManager_GetAID() == 0) && !(0xfe & WirelessManager_GetConnectedBitmap())) {
+    if ((WirelessManager_GetAID() == 0) && !(0xFE & WirelessManager_GetConnectedBitmap())) {
         return FALSE;
     }
 
@@ -1520,7 +1489,6 @@ void WirelessManager_Reset(void)
 {
     if (WIRELESS_STATE_SCAN == sWirelessManager->state) {
         while (TRUE) {
-            (void)0;
         }
     }
 

From 7e20b1db007ee33ae30e6f103dab991b59758588 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Thu, 7 May 2026 15:52:47 -0400
Subject: [PATCH 07/39] Fix missed rename while merging

---
 src/unk_02033200.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index 97bbfb769d3..b6241039f4d 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -532,7 +532,7 @@ void sub_020339AC(int param0, TrainerInfo *param1)
 BOOL sub_020339E8(u16 param0)
 {
     if (WirelessManager_GetState() == 2) {
-        (void)sub_020314C0();
+        (void)WirelessManager_StopScan();
         return 0;
     }
 

From d1e43453b10cbc3c78d426643383b31593bf293d Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Thu, 7 May 2026 16:03:23 -0400
Subject: [PATCH 08/39] properly name WirelessManager_SetDisconnectCallback

---
 include/wireless_manager.h | 2 +-
 src/underground/manager.c  | 4 ++--
 src/wireless_manager.c     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wireless_manager.h b/include/wireless_manager.h
index eb93df0de91..d849d579e5b 100644
--- a/include/wireless_manager.h
+++ b/include/wireless_manager.h
@@ -74,7 +74,7 @@ BOOL WirelessManager_SetEntry(BOOL enable);
 BOOL WirelessManager_ServerSentAllBeacons(void);
 void WirelessManager_ResetBeaconSentCount(void);
 void WirelessManager_SetGGIDScanCallback(WirelessManagerGGIDScanFunc callback);
-void sub_SetDisconnectCallback(WirelessManagerConnectFunc callback);
+void WirelessManager_SetDisconnectCallback(WirelessManagerConnectFunc callback);
 void WirelessManager_SetConnectCallback(WirelessManagerConnectFunc callback);
 void WirelessManager_SetPauseConnection(BOOL pause);
 BOOL WirelessManager_GetPauseConnection(void);
diff --git a/src/underground/manager.c b/src/underground/manager.c
index 8f2538113be..46296761798 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -161,7 +161,7 @@ static void UndergroundMan_Init(UndergroundManager *dest, FieldSystem *fieldSyst
 
     SystemFlag_SetEnteredUnderground(SaveData_GetVarsFlags(sUndergroundMan->fieldSystem->saveData));
     sUndergroundMan->sysTask = SysTask_Start(UndergroundMan_ClearPrinterIDsTask, NULL, 0);
-    sub_SetDisconnectCallback(UndergroundMan_DisconnectCallback);
+    WirelessManager_SetDisconnectCallback(UndergroundMan_DisconnectCallback);
 }
 
 static void UndergroundMan_Free(void)
@@ -172,7 +172,7 @@ static void UndergroundMan_Free(void)
         }
     }
 
-    sub_SetDisconnectCallback(NULL);
+    WirelessManager_SetDisconnectCallback(NULL);
     SysTask_Done(sUndergroundMan->sysTask);
 
     UndergroundTextPrinter_Free(sUndergroundMan->commonTextPrinter);
diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index 827b0698846..0dd4980e0ee 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -1706,7 +1706,7 @@ void WirelessManager_SetGGIDScanCallback(WirelessManagerGGIDScanFunc callback)
  *
  * @param callback
  */
-void sub_SetDisconnectCallback(WirelessManagerConnectFunc callback)
+void WirelessManager_SetDisconnectCallback(WirelessManagerConnectFunc callback)
 {
     sWirelessManager->disconnectCallback = callback;
 }

From 99b0b16e7614bed3a3e7ea4744c22ada80c764c1 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 11 May 2026 11:04:35 -0400
Subject: [PATCH 09/39] Document comm_manager part 1

---
 include/constants/battle.h                   |    1 -
 include/constants/communication/comm_error.h |   10 +
 include/constants/communication/comm_type.h  |   23 +
 include/unk_020366A0.h                       |  104 +-
 src/battle/battle_lib.c                      |    3 +-
 src/battle/battle_main.c                     |    5 +-
 src/comm_player_manager.c                    |    6 +-
 src/communication_system.c                   |   86 +-
 src/error_message_reset.c                    |    2 +-
 src/field_battle_data_transfer.c             |    2 +-
 src/field_comm_manager.c                     |   10 +-
 src/main.c                                   |    2 +-
 src/main_menu/ov97_0222D04C.c                |   10 +-
 src/nintendo_wfc/main.c                      |   20 +-
 src/nintendo_wfc/voice_chat.c                |    2 +-
 src/overlay005/field_control.c               |    4 +-
 src/overlay005/land_data.c                   |   15 +-
 src/overlay005/save_info_window.c            |    2 +-
 src/overlay007/communication_club.c          |    6 +-
 src/overlay010/ov10_0221F800.c               |    2 +-
 src/overlay058/ov58_021D0D80.c               |   20 +-
 src/overlay059/ov59_021D0D80.c               |   12 +-
 src/overlay065/ov65_0222DCE0.c               |   20 +-
 src/overlay065/ov65_0223648C.c               |   14 +-
 src/overlay066/ov66_02231428.c               |    2 +-
 src/overlay067/ov67_0225C700.c               |   16 +-
 src/overlay070/ov70_0225D9A4.c               |    2 +-
 src/overlay070/ov70_02265F38.c               |   18 +-
 src/overlay083/ov83_0223D4CC.c               |    2 +-
 src/overlay088/ov88_0223B140.c               |    3 +-
 src/overlay094/screens/network_handler.c     |   18 +-
 src/overlay109/ov109_021D0D80.c              |    8 +-
 src/overlay109/ov109_021D3D50.c              |    8 +-
 src/overlay114/ov114_0225C700.c              |    2 +-
 src/scrcmd.c                                 |   12 +-
 src/start_menu.c                             |    2 +-
 src/underground/comm_manager.c               |   20 +-
 src/underground/manager.c                    |    2 +-
 src/underground/secret_bases.c               |    4 +-
 src/unk_02033200.c                           |   18 +-
 src/unk_020366A0.c                           | 1991 ++++++++++--------
 src/unk_0205A0D8.c                           |    2 +-
 src/unk_0205B33C.c                           |   50 +-
 src/unk_0205C22C.c                           |    2 +-
 src/unk_02095E98.c                           |    2 +-
 src/unk_020961E8.c                           |    2 +-
 src/unk_0209BDF8.c                           |    6 +-
 src/wireless_manager.c                       |   26 +-
 48 files changed, 1458 insertions(+), 1141 deletions(-)
 create mode 100644 include/constants/communication/comm_error.h

diff --git a/include/constants/battle.h b/include/constants/battle.h
index 310ed8b233a..565d2fcda5e 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -138,7 +138,6 @@
 #define STRUGGLING_ALL    (STRUGGLING_MOVE_1 | STRUGGLING_MOVE_2 | STRUGGLING_MOVE_3 | STRUGGLING_MOVE_4)
 
 #define LINK_BATTLE_TIMEOUT         (60 * 30)
-#define LINK_BATTLE_RESET_SAVEPOINT 1
 
 #define PAYDAY_MAX       0xFFFF
 #define NUM_SCREEN_TURNS 5
diff --git a/include/constants/communication/comm_error.h b/include/constants/communication/comm_error.h
new file mode 100644
index 00000000000..2c5537d6eae
--- /dev/null
+++ b/include/constants/communication/comm_error.h
@@ -0,0 +1,10 @@
+#ifndef POKEPLATINUM_CONSTANTS_COMM_PACKETS_H
+#define POKEPLATINUM_CONSTANTS_COMM_PACKETS_H
+
+#define COMM_ERROR_NONE 0
+#define COMM_ERROR_RESET_SAVEPOINT 1
+#define COMM_ERROR_RESET_TITLE 2
+#define COMM_ERROR_3 3
+#define COMM_ERROR_4 4
+
+#endif
\ No newline at end of file
diff --git a/include/constants/communication/comm_type.h b/include/constants/communication/comm_type.h
index ee3dffbbb89..e7528fc11bb 100644
--- a/include/constants/communication/comm_type.h
+++ b/include/constants/communication/comm_type.h
@@ -10,5 +10,28 @@
 #define COMM_TYPE_POFFIN_MAKING  6
 #define COMM_TYPE_MIX_RECORDS    7
 #define COMM_TYPE_CONTEST        8
+#define COMM_TYPE_UNION          9
+#define COMM_TYPE_UNDERGROUND   10
+#define COMM_TYPE_11            11
+#define COMM_TYPE_12            12
+#define COMM_TYPE_DRAW            13
+#define COMM_TYPE_POKETCH            14
+#define COMM_TYPE_MYSTERY_GIFT  15
+#define COMM_TYPE_MULTI_BATTLE_FRONTIER  16
+#define COMM_TYPE_PARTY  17
+#define COMM_TYPE_UNION_APP  18
+#define COMM_TYPE_SINGLE_BATTLE_WIFI  19
+
+#define COMM_TYPE_LOGIN_WIFI 23
+#define COMM_TYPE_24 24
+#define COMM_TYPE_25 25
+#define COMM_TYPE_SPIN_TRADE 26
+
+#define COMM_TYPE_POFFIN_WIFI 29
+
+#define COMM_TYPE_LOBBY_WIFI 33
+#define COMM_TYPE_FRONTIER_WIFI 34
+#define COMM_TYPE_CLUB_WIFI 35
+#define COMM_TYPE_EMAIL_WIFI 36
 
 #endif
diff --git a/include/unk_020366A0.h b/include/unk_020366A0.h
index 0ea1f36326e..07c3e06298f 100644
--- a/include/unk_020366A0.h
+++ b/include/unk_020366A0.h
@@ -9,46 +9,46 @@
 #include "savedata.h"
 
 BOOL CommMan_IsInitialized(void);
-void sub_02036794(SaveData *saveData);
-void sub_020367D0(void);
-void sub_020367F0(void);
-void sub_02036814(BOOL param0);
-void sub_02036824(void);
-BOOL sub_02036834(void);
-void CommMan_CloseSecretBase(void);
-void sub_02036894(void);
+void CommManager_StartUnderground(SaveData *saveData);
+void CommManager_EndUnderground(void);
+void CommManager_ResetUnderground(void);
+void CommManager_SetPauseUnderground(BOOL param0);
+void CommManager_ResetUndergroundServer(void);
+BOOL CommManager_IsConnectingUnderground(void);
+void CommManager_CloseSecretBase(void);
+void CommManager_SetDoNotConnectUndergroundFlag(void);
 void CommMan_ReopenSecretBase(void);
 void CommMan_StartBattleServer(SaveData *saveData, int param1, int param2, const BattleRegulation *param3, BOOL param4);
 void CommMan_StartBattleClient(SaveData *saveData, int param1, int param2, const BattleRegulation *param3, BOOL param4);
-void sub_02036948(int param0);
-void sub_02036964(void);
-void sub_02036978(void);
-void sub_02036994(BOOL param0);
-BOOL sub_0203699C(void);
-void sub_020369EC(SaveData *saveData);
-void sub_02036A38(int param0);
-int sub_02036A68(void);
-BOOL sub_02036AA0(void);
-void sub_02036AC4(void);
-BOOL sub_02036B44(void);
-void sub_02036B68(void);
-void sub_02036B84(void);
-void sub_02036BA0(void);
-void sub_02036BC8(void);
-void sub_02036BD8(void);
-void sub_02036BE8(SaveData *saveData, int param1);
-void sub_02036C1C(SaveData *saveData, int param1);
-void sub_02036C50(void);
-void sub_0203781C(void);
-void sub_02037854(int param0);
-void sub_02037878(void);
-void sub_02037888(int param0);
-void sub_020378B8(void);
-void sub_020378C8(int param0);
+void CommManager_ConnectBattleClient(int param0);
+void CommManager_ResetBattleClient(void);
+void CommManager_EndBattle(void);
+void WirelessManager_SetEntry2(BOOL param0);
+BOOL CommManager_IsWaitingBattle(void);
+void CommManager_StartUnion(SaveData *saveData);
+void CommManager_ConnectUnion(int param0);
+int CommManager_IsConnectedUnionClientSuccess(void);
+BOOL CommManager_IsConnectUnionServer(void);
+void CommManager_UnionRestartSearch(void);
+BOOL CommManager_UnionRestartSuccess(void);
+void CommManager_ExitUnion(void);
+void CommManager_PauseUnionClient(void);
+void CommManager_PauseUnionServer(void);
+void CommManager_SetState_UnionApp(void);
+void CommManager_SetState_Union(void);
+void CommManager_StartRandomBattleServer(SaveData *saveData, int param1);
+void CommManager_StartRandomBattleClient(SaveData *saveData, int param1);
+void CommManager_Update(void);
+void CommManager_StartDrawServer(void);
+void CommManager_StartDrawClient(int param0);
+void CommManager_SetState_MixRecords(void);
+void CommManager_StartMixRecordsClient(int param0);
+void CommManager_SetState_SpinTrade(void);
+void CommManager_StartSpinTradeClient(int param0);
 void sub_02037A78(int param0, int param1, void *param2, void *param3);
 void sub_02037AD8(int param0, int param1, void *param2, void *param3);
 int sub_02037B54(void);
-void sub_02037B58(int param0);
+void CommManager_SetMaxNumConnections(int param0);
 void sub_02037BC0(SaveData *saveData);
 void sub_02037BFC(void);
 BOOL sub_02037C18(void);
@@ -77,18 +77,18 @@ void sub_02038548(SaveData *saveData);
 void sub_0203859C(void);
 BOOL sub_020385D0(void);
 void *sub_0203871C(SaveData *saveData, int param1);
-void sub_0203878C(SaveData *saveData, const void *param1);
-void sub_020387E8(void);
-BOOL sub_02038804(void);
-BOOL sub_0203881C(void);
-void sub_0203883C(UnkEnum_ov66_02232F38 param0);
-void sub_0203888C(void);
-u32 sub_020388AC(void);
+void CommManager_LoginWifiLobby(SaveData *saveData, const void *param1);
+void CommManager_LogoutWifiLobby(void);
+BOOL CommManager_GetWifiLobbyLoginSuccess(void);
+BOOL CommManager_IsWifiLobbyError(void);
+void CommManager_StartWifiP2P(UnkEnum_ov66_02232F38 param0);
+void CommManager_EndWifiP2P(void);
+u32 CommManager_GetWifiP2PConnectState(void);
 void *sub_020388E8(void);
 void CommMan_SetErrorHandling(BOOL param0, BOOL param1);
 BOOL sub_02038938(void);
-int sub_0203895C(void);
-int sub_02038974(void);
+int CommManager_GetCommType(void);
+int CommManager_GetContestRegulation(void);
 void sub_0203898C(u8 *param0);
 void sub_020389A0(u8 *param0);
 BOOL CommMan_IsConnectedToWifi(void);
@@ -98,14 +98,14 @@ void sub_020389FC(int param0);
 void NetworkError_DisplayGTSCriticalError(void);
 void sub_02038A1C(int param0, BgConfig *param1);
 void sub_02038A20(int param0);
-BOOL sub_02038AB8(void);
-BOOL Link_SetErrorState(int param0);
-void sub_02038B00(void);
-void sub_02038B20(void);
-void sub_02038B40(void);
-void sub_02038B60(void);
-void sub_02038B84(void);
-void sub_02038EA4(void);
-BOOL sub_02038EB4(void);
+BOOL CommManager_CheckResetFinished(void);
+BOOL CommManager_SetCommError(int param0);
+void CommManager_SetState_WifiPoffin(void);
+void CommManager_SetState_WifiClub(void);
+void CommManager_SetState_WifiLobby(void);
+void CommManager_SetState_LoginWifi(void);
+void CommManager_SetState_SingleBattleWifi(void);
+void CommManager_SetState_FrontierWifi(void);
+BOOL CommManager_IsInitializedNotPoketch(void);
 
 #endif // POKEPLATINUM_UNK_020366A0_H
diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c
index 26c45fc3c26..5cedb4d7b30 100644
--- a/src/battle/battle_lib.c
+++ b/src/battle/battle_lib.c
@@ -5,6 +5,7 @@
 
 #include "constants/battle.h"
 #include "constants/battle/battle_script.h"
+#include "constants/communication/comm_error.h"
 #include "constants/flavor.h"
 #include "constants/heap.h"
 #include "constants/items.h"
@@ -287,7 +288,7 @@ void BattleIO_UpdateTimeout(BattleContext *battleCtx)
 {
     battleCtx->linkBattleTimeout++;
     if (battleCtx->linkBattleTimeout > LINK_BATTLE_TIMEOUT) {
-        Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
     }
 }
 
diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c
index b9f1dccb107..a4a3b93876b 100644
--- a/src/battle/battle_main.c
+++ b/src/battle/battle_main.c
@@ -7,6 +7,7 @@
 
 #include "constants/battle.h"
 #include "constants/battle/battle_controller.h"
+#include "constants/communication/comm_error.h"
 #include "constants/heap.h"
 #include "generated/game_records.h"
 #include "generated/trainer_classes.h"
@@ -1735,7 +1736,7 @@ static BOOL ov16_0223D354(ApplicationManager *appMan)
             v0->unk_1022++;
 
             if (v0->unk_1022 > (60 * 30)) {
-                Link_SetErrorState(1);
+                CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
             }
         }
         break;
@@ -1913,7 +1914,7 @@ static BOOL ov16_0223D354(ApplicationManager *appMan)
             v0->unk_1022++;
 
             if (v0->unk_1022 > (60 * 30)) {
-                Link_SetErrorState(1);
+                CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
             }
         }
         break;
diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index 2084268bd56..0b4f4e40d18 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -1461,7 +1461,7 @@ BOOL sub_020590C4(void)
         { 4, 8 },
         { 11, 8 }
     };
-    int connectedPlayers = CommType_MaxPlayers(sub_0203895C());
+    int connectedPlayers = CommType_MaxPlayers(CommManager_GetCommType());
     int netId, netJd, playerCnt = 0, v6[4], v7;
     int v8 = 0;
     UnkStruct_020590C4 *v9;
@@ -1520,7 +1520,7 @@ static UnkStruct_020590C4 Unk_02100B74[] = {
 
 static void sub_020591A8(void)
 {
-    int connectedPlayers = CommType_MaxPlayers(sub_0203895C());
+    int connectedPlayers = CommType_MaxPlayers(CommManager_GetCommType());
     int netJd = 0;
     UnkStruct_020590C4 *v6;
     u8 netId;
@@ -1564,7 +1564,7 @@ void CommPlayer_SetBattleDir(void)
 
 BOOL sub_0205928C(void)
 {
-    int connectedPlayers = CommType_MaxPlayers(sub_0203895C());
+    int connectedPlayers = CommType_MaxPlayers(CommManager_GetCommType());
     int netId = 0, dir;
 
     for (netId = 0; netId < connectedPlayers; netId++) {
diff --git a/src/communication_system.c b/src/communication_system.c
index d1e9aeaf047..28cecbf1dd9 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -153,7 +153,7 @@ static BOOL CommSys_Init(BOOL shouldAlloc, int maxPacketSize)
     Unk_021C07C5 = FALSE;
 
     if (shouldAlloc) {
-        int maxMachines = CommLocal_MaxMachines(sub_0203895C()) + 1;
+        int maxMachines = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
         if (sCommunicationSystem != NULL) {
             return TRUE;
@@ -166,7 +166,7 @@ static BOOL CommSys_Init(BOOL shouldAlloc, int maxPacketSize)
 
         MI_CpuClear8(sCommunicationSystem, sizeof(CommunicationSystem));
 
-        if (CommLocal_IsWifiGroup(sub_0203895C())) {
+        if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
             sCommunicationSystem->maxPacketSize = maxPacketSize * 2 + 64;
         } else {
             sCommunicationSystem->maxPacketSize = maxPacketSize + 64;
@@ -180,7 +180,7 @@ static BOOL CommSys_Init(BOOL shouldAlloc, int maxPacketSize)
         sCommunicationSystem->recvBufferRingServer = Heap_Alloc(HEAP_ID_COMMUNICATION, sCommunicationSystem->allocSize);
         sCommunicationSystem->unk_488 = Heap_Alloc(HEAP_ID_COMMUNICATION, sCommunicationSystem->allocSize);
 
-        if (sub_0203895C() == 10) {
+        if (CommManager_GetCommType() == 10) {
             CommQueueMan_Init(&sCommunicationSystem->commQueueManSend, 100, &sCommunicationSystem->sendRing);
             CommQueueMan_Init(&sCommunicationSystem->commQueueManSendServer, 800, &sCommunicationSystem->sendRingServer);
         } else {
@@ -215,7 +215,7 @@ static BOOL CommSys_Init(BOOL shouldAlloc, int maxPacketSize)
 static void CommSys_ClearData(void)
 {
     int netId, size;
-    int maxMachines = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    int maxMachines = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
     sCommunicationSystem->playerMovementState = MOVEMENT_STATE_NORMAL;
     sCommunicationSystem->randomPadKeyTimer = 0;
@@ -306,7 +306,7 @@ static void CommSys_ClearServerRecvData(int netId)
     sCommunicationSystem->unk_697[netId] = 1;
     sCommunicationSystem->unk_664[netId] = 0;
 
-    int v0 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    int v0 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
     int v1 = sCommunicationSystem->allocSize / v0;
 
     CommRing_Init(&sCommunicationSystem->unk_4B0[netId], &sCommunicationSystem->unk_488[netId * v1], v1);
@@ -338,7 +338,7 @@ BOOL CommSys_InitServer(BOOL param0, BOOL param1, int param2, BOOL param3)
 {
     BOOL ret = TRUE;
 
-    if (!CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (!CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         ret = CommServerClient_InitServer(param0, param1, param3);
         WirelessManager_SetConnectCallback(sub_02034770);
     }
@@ -351,7 +351,7 @@ BOOL CommSys_InitClient(BOOL param0, BOOL param1, int param2)
 {
     BOOL v0 = TRUE;
 
-    if (!CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (!CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         v0 = CommServerClient_InitClient(param0, param1);
     }
 
@@ -440,7 +440,7 @@ void CommSys_Delete(void)
     BOOL v0 = FALSE;
 
     if (sCommunicationSystem) {
-        if (CommLocal_IsWifiGroup(sub_0203895C())) {
+        if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
             NintendoWFC_Stop();
             v0 = 1;
         } else {
@@ -508,7 +508,7 @@ static void sub_020349C4(void)
 
 BOOL CommSys_Update(void)
 {
-    sub_02036C50();
+    CommManager_Update();
 
     if (sCommunicationSystem != NULL) {
         if (!sCommunicationSystem->shuttingDown) {
@@ -524,7 +524,7 @@ BOOL CommSys_Update(void)
                 CommSys_RecvData();
             }
 
-            if ((CommSys_CurNetId() == 0 && CommSys_IsPlayerConnected(0) || CommSys_IsAlone()) && !sub_0203272C(sub_0203895C())) {
+            if ((CommSys_CurNetId() == 0 && CommSys_IsPlayerConnected(0) || CommSys_IsAlone()) && !sub_0203272C(CommManager_GetCommType())) {
                 sub_02034F68();
             }
 
@@ -595,7 +595,7 @@ void CommSys_ResetBattleClient(void)
 
 static void sub_02034B50(void)
 {
-    if (sub_0203272C(sub_0203895C())) {
+    if (sub_0203272C(CommManager_GetCommType())) {
         if (sCommunicationSystem->wifiConnected) {
             if (sCommunicationSystem->unk_65C) {
                 if (!CommSys_CheckRecvLimit()) {
@@ -622,7 +622,7 @@ static void sub_02034B50(void)
 
             if (NintendoWFC_SendData(sCommunicationSystem->sendBuffer[0], 38)) {
                 int i;
-                int v1 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+                int v1 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
                 for (i = 0; i < v1; i++) {
                     if (CommSys_IsPlayerConnected(i)) {
@@ -633,7 +633,7 @@ static void sub_02034B50(void)
                 Unk_02100A1D = 4;
             }
         }
-    } else if (CommLocal_IsWifiGroup(sub_0203895C())) {
+    } else if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         if (sCommunicationSystem->wifiConnected) {
             if (sCommunicationSystem->unk_65C) {
                 if (sCommunicationSystem->unk_660 > 3) {
@@ -689,8 +689,8 @@ static BOOL sub_02034CF8(int param0)
     int v1;
     int i, v3, v4 = 0;
 
-    v0 = sub_02036128(sub_0203895C());
-    v1 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    v0 = sub_02036128(CommManager_GetCommType());
+    v1 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
     for (i = 0; i < v1; i++) {
         CommRing_UpdateEndPos(&sCommunicationSystem->unk_4B0[i]);
@@ -726,12 +726,12 @@ static void CommSys_UpdateServerClient(void)
         return;
     }
 
-    if (CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         return;
     }
 
-    v2 = sub_02036128(sub_0203895C());
-    v3 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    v2 = sub_02036128(CommManager_GetCommType());
+    v3 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
     if ((Unk_02100A1C == 2) || (Unk_02100A1C == 0)) {
         Unk_02100A1C++;
@@ -771,7 +771,7 @@ static void CommSys_UpdateServerClient(void)
 static BOOL CommSys_CheckRecvLimit(void)
 {
     int i;
-    int v1 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    int v1 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
     for (i = 1; i < v1; i++) {
         if (CommSys_IsPlayerConnected(i) && sCommunicationSystem->unk_664[i] > 3) {
@@ -785,9 +785,9 @@ static BOOL CommSys_CheckRecvLimit(void)
 static void sub_02034F68(void)
 {
     int i;
-    int v1 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    int v1 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
-    if (CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         if (CommSys_IsPlayerConnected(0)) {
             if (sCommunicationSystem->unk_65C) {
                 if (!CommSys_CheckRecvLimit()) {
@@ -876,8 +876,8 @@ static void sub_020350A4(u16 param0, u16 *param1, u16 param2)
     sCommunicationSystem->unk_6AA = 0;
 
     if (CommSys_TransmissionType() == 1) {
-        int v3 = sub_02036128(sub_0203895C());
-        int v4 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+        int v3 = sub_02036128(CommManager_GetCommType());
+        int v4 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
         for (i = 0; i < v4; i++) {
             if (v0[0] == 0xff) {
@@ -940,8 +940,8 @@ static void sub_02035200(u16 param0, u16 *_buffer, u16 param2)
     sCommunicationSystem->unk_697[param0] = 0;
 
     if (CommSys_TransmissionType() == 1) {
-        int v2 = sub_02036128(sub_0203895C());
-        int v3 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+        int v2 = sub_02036128(CommManager_GetCommType());
+        int v3 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
         if (!(buffer[0] & 0x2)) {
             CommRring_Write(&sCommunicationSystem->unk_4B0[param0], buffer, v2, 1449);
@@ -979,8 +979,8 @@ void sub_020352C0(u16 param0, u16 *param1, u16 param2)
     sCommunicationSystem->unk_697[param0] = 0;
 
     if (CommSys_TransmissionType() == 1) {
-        int v2 = sub_02036128(sub_0203895C());
-        int v3 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+        int v2 = sub_02036128(CommManager_GetCommType());
+        int v3 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
         if (buffer[0] == 0xff) {
             sCommunicationSystem->unk_68C = sCommunicationSystem->unk_68C & ~(1 << param0);
@@ -1028,12 +1028,12 @@ static void sub_020353CC(void)
         return;
     }
 
-    if (CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         return;
     }
 
-    int v3 = sub_02036128(sub_0203895C());
-    int v4 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    int v3 = sub_02036128(CommManager_GetCommType());
+    int v4 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
     if (CommSys_IsAlone()) {
         if (Unk_02100A1D == 2 || Unk_02100A1D == 0) {
@@ -1217,8 +1217,8 @@ static BOOL sub_02035730(u8 *param0)
 
 static BOOL sub_020357F0(u8 *param0)
 {
-    int v1 = sub_02036128(sub_0203895C());
-    int v2 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    int v1 = sub_02036128(CommManager_GetCommType());
+    int v2 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
     if (sCommunicationSystem->unk_6AC == 0) {
         param0[0] = 0x0;
@@ -1315,7 +1315,7 @@ BOOL CommSys_SendDataHuge(int cmd, const void *data, int size)
         return TRUE;
     }
 
-    if (sub_0203895C() == 10) {
+    if (CommManager_GetCommType() == 10) {
         sub_020363BC();
     }
 
@@ -1332,7 +1332,7 @@ BOOL CommSys_SendData(int cmd, const void *data, int size)
         return TRUE;
     }
 
-    if (sub_0203895C() == 10) {
+    if (CommManager_GetCommType() == 10) {
         sub_020363BC();
     }
 
@@ -1358,7 +1358,7 @@ BOOL CommSys_SendDataHugeServer(int cmd, const void *data, int size)
         return TRUE;
     }
 
-    if (sub_0203895C() == 10) {
+    if (CommManager_GetCommType() == 10) {
         sub_020363BC();
     }
 
@@ -1385,7 +1385,7 @@ BOOL CommSys_SendDataServer(int cmd, const void *data, int size)
         return TRUE;
     }
 
-    if (sub_0203895C() == 10) {
+    if (CommManager_GetCommType() == 10) {
         sub_020363BC();
     }
 
@@ -1524,7 +1524,7 @@ static void CommSys_RecvDataServer(void)
         return;
     }
 
-    v3 = CommLocal_MaxMachines(sub_0203895C()) + 1;
+    v3 = CommLocal_MaxMachines(CommManager_GetCommType()) + 1;
 
     for (i = 0; i < v3; i++) {
         CommRing_UpdateEndPos(&sCommunicationSystem->sendRingClient[i]);
@@ -1541,7 +1541,7 @@ BOOL CommSys_IsPlayerConnected(u16 param0)
         return FALSE;
     }
 
-    if (CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         if (sCommunicationSystem->wifiConnected) {
             u16 v0 = DWC_GetAIDBitmap();
 
@@ -1592,7 +1592,7 @@ int CommSys_ConnectedCount(void)
 BOOL CommSys_IsInitialized(void)
 {
     if (sCommunicationSystem) {
-        if (CommLocal_IsWifiGroup(sub_0203895C())) {
+        if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
             return TRUE;
         }
     }
@@ -1731,7 +1731,7 @@ void sub_02036058(int unused0, int unused1, void *param2, void *unused3)
 u16 CommSys_CurNetId(void)
 {
     if (sCommunicationSystem) {
-        if (CommLocal_IsWifiGroup(sub_0203895C())) {
+        if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
             int netId = NintendoWFC_GetNetID();
 
             if (netId != -1) {
@@ -1885,7 +1885,7 @@ int sub_020362F4(int networkId)
 
 BOOL sub_02036314(void)
 {
-    if (!CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (!CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         return FALSE;
     }
 
@@ -1896,7 +1896,7 @@ void sub_0203632C(BOOL param0)
 {
     int i;
 
-    if (CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         if (sCommunicationSystem->unk_65C == param0) {
             return;
         }
@@ -1917,7 +1917,7 @@ void sub_02036378(BOOL param0)
 {
     sub_0203632C(param0);
 
-    if (CommLocal_IsWifiGroup(sub_0203895C())) {
+    if (CommLocal_IsWifiGroup(CommManager_GetCommType())) {
         if (param0) {
             NintendoWFC_SetVoiceChatEnabled_Battle(0);
         } else {
diff --git a/src/error_message_reset.c b/src/error_message_reset.c
index ee242b7bbc5..947bfb21d63 100644
--- a/src/error_message_reset.c
+++ b/src/error_message_reset.c
@@ -157,7 +157,7 @@ void ErrorMessageReset_PrintErrorAndReset(void)
         HandleConsoleFold();
         CommSys_Update();
 
-        if (sub_02038AB8()) {
+        if (CommManager_CheckResetFinished()) {
             break;
         }
 
diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c
index d314ef9dcc4..801971b6018 100644
--- a/src/field_battle_data_transfer.c
+++ b/src/field_battle_data_transfer.c
@@ -395,7 +395,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f
     dto->palPad = SaveData_GetPalPad(fieldSystem->saveData);
     dto->saveData = fieldSystem->saveData;
 
-    if (sub_020326C4(sub_0203895C())) {
+    if (sub_020326C4(CommManager_GetCommType())) {
         int unionAppearance = TrainerInfo_Appearance(trainerInfo);
         int unionGender = TrainerInfo_Gender(trainerInfo);
 
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index b61ca70b9ef..0ac71fbf6bb 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -261,13 +261,13 @@ static void Task_ClientWait(void)
 
 static void Task_ConnectBattleClient(void)
 {
-    sub_02036948(sFieldCommMan->unk_3E);
+    CommManager_ConnectBattleClient(sFieldCommMan->unk_3E);
     FieldCommMan_SetTask(sub_02059964, 0);
 }
 
 static void sub_02059964(void)
 {
-    if (!sub_0203699C()) {
+    if (!CommManager_IsWaitingBattle()) {
         return;
     }
 
@@ -513,7 +513,7 @@ static void sub_02059D58(void)
 
     v1 = (0x4 | 0x1);
 
-    switch (sub_0203895C()) {
+    switch (CommManager_GetCommType()) {
     case 4:
     case 5:
         v1 = (((0x4 | 0x1) | 0x2) | 0x8);
@@ -589,7 +589,7 @@ static void sub_02059E50(void)
 
 static void sub_02059E80(void)
 {
-    sub_02036964();
+    CommManager_ResetBattleClient();
     FieldCommMan_SetTask(sub_02059E94, 2);
 }
 
@@ -710,7 +710,7 @@ static void sub_0205A058(void)
         return;
     }
 
-    sub_02036978();
+    CommManager_EndBattle();
     FieldCommMan_SetTask(FieldCommMan_Delete, 0);
 }
 
diff --git a/src/main.c b/src/main.c
index 6c8405d22e1..47e0b999212 100644
--- a/src/main.c
+++ b/src/main.c
@@ -219,7 +219,7 @@ static void WaitFrame(void)
 
 static void TrySystemReset(enum OSResetParameter resetParam)
 {
-    if (sub_02038AB8() && CARD_TryWaitBackupAsync() == TRUE) {
+    if (CommManager_CheckResetFinished() && CARD_TryWaitBackupAsync() == TRUE) {
         OS_ResetSystem(resetParam);
     }
 
diff --git a/src/main_menu/ov97_0222D04C.c b/src/main_menu/ov97_0222D04C.c
index fd1b7ee6103..729bb2bbf6f 100644
--- a/src/main_menu/ov97_0222D04C.c
+++ b/src/main_menu/ov97_0222D04C.c
@@ -120,13 +120,13 @@ static void ov97_0222D140(void)
 
 static void ov97_0222D144(void)
 {
-    sub_02036948(Unk_ov97_0223F1A4->unk_27);
+    CommManager_ConnectBattleClient(Unk_ov97_0223F1A4->unk_27);
     ov97_0222D0A4(ov97_0222D164, 0);
 }
 
 static void ov97_0222D164(void)
 {
-    if (!sub_0203699C()) {
+    if (!CommManager_IsWaitingBattle()) {
         return;
     }
 
@@ -164,7 +164,7 @@ void ov97_0222D1C4(MysteryGiftAppData *param0, SaveData *saveData, int param2)
         return;
     }
 
-    sub_02036BE8(saveData, param2);
+    CommManager_StartRandomBattleServer(saveData, param2);
 
     ov97_0222D04C(param0);
     ov97_0222D0A4(ov97_0222D0B4, 0);
@@ -184,7 +184,7 @@ void ov97_0222D200(MysteryGiftAppData *param0, int param1)
     }
 
     saveData = ((ApplicationArgs *)ApplicationManager_Args(MysteryGiftApp_GetApplicationManager()))->saveData;
-    sub_02036C1C(saveData, param1);
+    CommManager_StartRandomBattleClient(saveData, param1);
 
     ov97_0222D04C(param0);
     ov97_0222D0A4(ov97_0222D128, 0);
@@ -248,5 +248,5 @@ void ov97_0222D2DC(void)
 {
     Heap_FreeExplicit(HEAP_ID_COMMUNICATION, Unk_ov97_0223F1A4);
     Unk_ov97_0223F1A4 = NULL;
-    sub_02036978();
+    CommManager_EndBattle();
 }
diff --git a/src/nintendo_wfc/main.c b/src/nintendo_wfc/main.c
index 1a202f6a93f..d38ce8413b9 100644
--- a/src/nintendo_wfc/main.c
+++ b/src/nintendo_wfc/main.c
@@ -11,6 +11,8 @@
 #include "global/assert.h"
 #include "nintendo_wfc/voice_chat.h"
 
+#include "constants/communication/comm_error.h"
+
 #include "battle_frontier_stats.h"
 #include "communication_system.h"
 #include "dwc_error.h"
@@ -384,7 +386,7 @@ int NintendoWFC_Process(BOOL cancelConnection)
         }
         break;
     case WFC_STATE_MATCHMAKING_SUCCESS:
-        if (!sub_0203272C(sub_0203895C())) {
+        if (!sub_0203272C(CommManager_GetCommType())) {
             NintendoWFC_StartVoiceChat(sNintendoWFCManager->primaryHeapID);
         }
 
@@ -526,7 +528,7 @@ static void LoginCompleteCallback(DWCError error, int profileID, void *userParam
         BOOL success = DWC_UpdateServersAsync(NULL, UpdateServersCallback, sNintendoWFCManager->userData, DummyFriendStatusCallback, userParam, DeleteDuplicateFriendCallback, userParam);
 
         if (success == FALSE) {
-            Link_SetErrorState(TRUE);
+            CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
             return;
         }
 
@@ -642,7 +644,7 @@ static void SendCallback(int unused, u8 id)
 
 static void SetOtherPlayersEnabledVC(u32 header)
 {
-    if (!sub_0203272C(sub_0203895C())) {
+    if (!sub_0203272C(CommManager_GetCommType())) {
         if (header & 0x100) {
             sNintendoWFCManager->otherPlayersEnabledVoiceChat = TRUE;
         } else {
@@ -722,7 +724,7 @@ static void *NintendoWFCAlloc(DWCAllocType allocType, u32 size, int alignment)
     }
 
     if (ptr == NULL) {
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
         OS_RestoreInterrupts(intrMode);
 
         return NULL;
@@ -744,7 +746,7 @@ static void NintendoWFCFree(DWCAllocType allocType, void *ptr, u32 size)
 
     if (blockGroupID == 16) {
         if (sNintendoWFCManager->heap2AllocPtr == NULL) {
-            Link_SetErrorState(1);
+            CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
             return;
         }
 
@@ -801,7 +803,7 @@ int NintendoWFC_HandleError(void)
                 case WFC_STATE_INIT:
                 case WFC_STATE_WAIT_CONNECTION:
                 case WFC_STATE_INIT_LOGIN:
-                    if (sub_0203895C() != 33) {
+                    if (CommManager_GetCommType() != 33) {
                         DWC_CleanupInet();
                     }
                 default:
@@ -949,7 +951,7 @@ static void DisableVoiceChat(void)
 void NintendoWFC_StartVoiceChat(enum HeapID heapID)
 {
     int otherPlayersCount = 1;
-    BOOL v2 = sub_0203272C(sub_0203895C());
+    BOOL v2 = sub_0203272C(CommManager_GetCommType());
 
     if (v2) {
         otherPlayersCount = CommSys_ConnectedCount() - 1;
@@ -1301,7 +1303,7 @@ static void MatchmakingHostMatchedCallback(DWCError error, BOOL cancelled, BOOL
 
     if (error == DWC_ERROR_NONE) {
         if (!cancelled) {
-            if (sub_02032740(sub_0203895C()) && (hostFriendIdx == WFC_NOT_A_FRIEND)) {
+            if (sub_02032740(CommManager_GetCommType()) && (hostFriendIdx == WFC_NOT_A_FRIEND)) {
                 refuseNewConnections = TRUE;
             }
 
@@ -1460,7 +1462,7 @@ void NintendoWFC_ManageSecondaryHeap(BOOL create, enum HeapID heapID)
 
         if (sNintendoWFCManager->heap2AllocPtr != NULL) {
             if (NNS_FndGetTotalFreeSizeForExpHeap(sNintendoWFCManager->heap2) != sNintendoWFCManager->heap2Size) {
-                Link_SetErrorState(1);
+                CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
                 return;
             }
 
diff --git a/src/nintendo_wfc/voice_chat.c b/src/nintendo_wfc/voice_chat.c
index 3cb1adfde60..c286b62b919 100644
--- a/src/nintendo_wfc/voice_chat.c
+++ b/src/nintendo_wfc/voice_chat.c
@@ -383,7 +383,7 @@ void VoiceChat_Start(enum HeapID heapID, int codec, int numConferenceSessions)
 
     VCTConfig voiceChatConfig;
 
-    if (!sub_0203272C(sub_0203895C())) {
+    if (!sub_0203272C(CommManager_GetCommType())) {
         voiceChatConfig.mode = VCT_MODE_PHONE;
     } else {
         voiceChatConfig.mode = VCT_MODE_CONFERENCE;
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index 67f7e712abe..2982086de35 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -462,7 +462,7 @@ BOOL FieldInput_Process_UnionRoom(const FieldInput *input, FieldSystem *fieldSys
                 sub_0205F5E4(fieldSystem->playerAvatar, PlayerAvatar_GetDir(fieldSystem->playerAvatar));
             }
 
-            sub_02036B84();
+            CommManager_PauseUnionClient();
             ScriptManager_Set(fieldSystem, MapObject_GetScript(object), object);
 
             return TRUE;
@@ -478,7 +478,7 @@ BOOL FieldInput_Process_UnionRoom(const FieldInput *input, FieldSystem *fieldSys
         Sound_PlayEffect(SEQ_SE_DP_WIN_OPEN);
         StartMenu_OpenUnionRoom(fieldSystem);
         sub_0205BEA8(4);
-        sub_02036BA0();
+        CommManager_PauseUnionServer();
         return TRUE;
     }
 
diff --git a/src/overlay005/land_data.c b/src/overlay005/land_data.c
index c0a45aad5d9..f01c8d6b0fd 100644
--- a/src/overlay005/land_data.c
+++ b/src/overlay005/land_data.c
@@ -4,6 +4,7 @@
 #include <string.h>
 
 #include "constants/battle.h"
+#include "constants/communication/comm_error.h"
 #include "constants/field/map.h"
 #include "constants/heap.h"
 #include "constants/quadrant.h"
@@ -682,7 +683,7 @@ void LandDataManager_Tick(FieldSystem *fieldSystem, LandDataManager *landDataMan
                 trackedTarget->prevPosition = *trackedTarget->position;
 
                 if (trackedTarget->prevPosition.z % (MAP_OBJECT_TILE_SIZE / 2) != 0) {
-                    if (Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT)) {
+                    if (CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT)) {
                         return;
                     }
                 }
@@ -713,7 +714,7 @@ void LandDataManager_Tick(FieldSystem *fieldSystem, LandDataManager *landDataMan
                     }
 
                     if (trackedTarget->prevPosition.x % (MAP_OBJECT_TILE_SIZE / 2) != 0) {
-                        if (Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT)) {
+                        if (CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT)) {
                             return;
                         }
                     }
@@ -731,7 +732,7 @@ void LandDataManager_Tick(FieldSystem *fieldSystem, LandDataManager *landDataMan
                     }
 
                     if (trackedTarget->prevPosition.z % (MAP_OBJECT_TILE_SIZE / 2) != 0) {
-                        if (Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT)) {
+                        if (CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT)) {
                             return;
                         }
                     }
@@ -1820,7 +1821,7 @@ BOOL LandDataManager_GetRelativeLoadedMapsQuadrantOfTile(const LandDataManager *
     u32 mapMatrixIndex = mapMatrixX + (mapMatrixZ * landDataMan->mapMatrixWidth);
 
     if (mapMatrixIndex >= landDataMan->mapMatrixWidth * landDataMan->mapMatrixHeight) {
-        if (Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT)) {
+        if (CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT)) {
             return FALSE;
         }
     }
@@ -2305,7 +2306,7 @@ void LandDataManager_DistortionWorldTick(FieldSystem *fieldSystem, LandDataManag
                 trackedTarget->prevPosition = *trackedTarget->position;
 
                 if (trackedTarget->prevPosition.z % (MAP_OBJECT_TILE_SIZE / 2) != 0) {
-                    if (Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT)) {
+                    if (CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT)) {
                         return;
                     }
                 }
@@ -2334,7 +2335,7 @@ void LandDataManager_DistortionWorldTick(FieldSystem *fieldSystem, LandDataManag
                     }
 
                     if (trackedTarget->prevPosition.x % (MAP_OBJECT_TILE_SIZE / 2) != 0) {
-                        if (Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT)) {
+                        if (CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT)) {
                             return;
                         }
                     }
@@ -2352,7 +2353,7 @@ void LandDataManager_DistortionWorldTick(FieldSystem *fieldSystem, LandDataManag
                     }
 
                     if (trackedTarget->prevPosition.z % (MAP_OBJECT_TILE_SIZE / 2) != 0) {
-                        if (Link_SetErrorState(LINK_BATTLE_RESET_SAVEPOINT)) {
+                        if (CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT)) {
                             return;
                         }
                     }
diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c
index 85753415a8c..859c68facc2 100644
--- a/src/overlay005/save_info_window.c
+++ b/src/overlay005/save_info_window.c
@@ -216,7 +216,7 @@ void FieldSystem_SaveStateIfCommunicationOff(FieldSystem *fieldSystem)
         return;
     }
 
-    if (sub_02038EB4() == TRUE) {
+    if (CommManager_IsInitializedNotPoketch() == TRUE) {
         return;
     }
 
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index d1e343ef394..4e16110672d 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -1129,7 +1129,7 @@ static void ov7_0224AC48(SysTask *task, void *param1)
 
     ov7_0224A64C(commClubMan);
 
-    sub_02036994(0);
+    WirelessManager_SetEntry2(0);
     ListMenu_ProcessInput(commClubMan->unk_5C);
 
     if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
@@ -1169,7 +1169,7 @@ static void ov7_0224ACA4(SysTask *task, void *param1)
         CommTiming_StartSync(10);
         CommClubMan_SetTask(ov7_0224AF2C);
     } else if (v1 != 0xffffffff) {
-        sub_02036994(1);
+        WirelessManager_SetEntry2(1);
         CommClubMan_Disconnect();
         CommClubMan_DestroyList(task, commClubMan);
         sCommClubMan->retCode = COMM_CLUB_RET_CANCEL;
@@ -1565,7 +1565,7 @@ static void ov7_0224B370(SysTask *task, void *param1)
 
 static void ov7_0224B3A8(CommClubManager *commClubMan)
 {
-    sub_02036994(0);
+    WirelessManager_SetEntry2(0);
     sCommClubMan->retCode = COMM_CLUB_RET_2;
     CommMan_SetErrorHandling(1, 1);
     CommInfo_SendPlayerInfo();
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index a1eb2d942b9..b4363adad9e 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -2372,7 +2372,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
         journalEntryOnlineEvent = JournalEntry_CreateEventUnionBattle(opponentName1, opponentGender1, battleResult, param0->heapID);
         Heap_Free(opponentName1);
     } else {
-        switch (sub_0203895C()) {
+        switch (CommManager_GetCommType()) {
         case 1:
             opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
             opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index d778dac29e4..37a7eddf8ce 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -208,7 +208,7 @@ int ov58_021D0D80(ApplicationManager *appMan, int *param1)
         CommMan_SetErrorHandling(0, 1);
 
         if (CommSys_CurNetId() == 0) {
-            sub_02037B58(3);
+            CommManager_SetMaxNumConnections(3);
         }
 
         NetworkIcon_Init();
@@ -327,8 +327,8 @@ int ov58_021D1018(ApplicationManager *appMan, int *param1)
         (*param1)++;
         break;
     case 1:
-        sub_02037B58(1);
-        sub_02036AC4();
+        CommManager_SetMaxNumConnections(1);
+        CommManager_UnionRestartSearch();
         sub_0205C2C8(v1->unk_00);
 
         GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB);
@@ -347,7 +347,7 @@ int ov58_021D1018(ApplicationManager *appMan, int *param1)
         }
         break;
     case 3:
-        sub_02037B58(2);
+        CommManager_SetMaxNumConnections(2);
 
         ov58_021D13B4(v0);
 
@@ -355,7 +355,7 @@ int ov58_021D1018(ApplicationManager *appMan, int *param1)
         ApplicationManager_FreeData(appMan);
         SetVBlankCallback(NULL, NULL);
         Heap_Destroy(HEAP_ID_DRAWING);
-        sub_02037B58(2);
+        CommManager_SetMaxNumConnections(2);
 
         return 1;
     }
@@ -822,7 +822,7 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
                         break;
                     }
 
-                    sub_02037B58(CommSys_ConnectedCount());
+                    CommManager_SetMaxNumConnections(CommSys_ConnectedCount());
                     param0->unk_9458 = 2;
                     ov58_021D2A98(param0, 1, TEXT_SPEED_FAST);
                     ov58_021D2CB0(param0, 5);
@@ -1051,7 +1051,7 @@ static int ov58_021D1E4C(UnkStruct_02095EAC *param0, int param1)
         Window_CopyToVRAM(&param0->unk_32C);
 
         if (CommSys_CurNetId() == 0) {
-            sub_02037B58(CommSys_ConnectedCount() + 1);
+            CommManager_SetMaxNumConnections(CommSys_ConnectedCount() + 1);
             param0->unk_9458 = 1;
         }
         break;
@@ -1198,7 +1198,7 @@ static int ov58_021D2180(UnkStruct_02095EAC *param0, int param1)
         ov58_021D2D10(param0);
 
         if (CommSys_CurNetId() == 0) {
-            sub_02037B58(CommSys_ConnectedCount() + 1);
+            CommManager_SetMaxNumConnections(CommSys_ConnectedCount() + 1);
             param0->unk_9458 = 1;
         }
         break;
@@ -1747,7 +1747,7 @@ static void ov58_021D2B3C(UnkStruct_02095EAC *param0, int param1)
             v0 = 5;
         }
 
-        sub_02037B58(v0);
+        CommManager_SetMaxNumConnections(v0);
     }
 }
 
@@ -1763,7 +1763,7 @@ static int ov58_021D2B5C(UnkStruct_02095EAC *param0)
             }
 
             param0->unk_36C = 19;
-            sub_02037B58(1);
+            CommManager_SetMaxNumConnections(1);
 
             if (param0->unk_945C) {
                 ov58_021D2D10(param0);
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index a2f0ba10c07..3abfc196251 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -205,8 +205,8 @@ int ov59_021D0D80(ApplicationManager *appMan, int *param1)
 
         Sound_SetSceneAndPlayBGM(SOUND_SCENE_SUB_52, SEQ_NONE, 0);
         sub_020961E8(v0);
-        sub_02037878();
-        sub_02037B58(3);
+        CommManager_SetState_MixRecords();
+        CommManager_SetMaxNumConnections(3);
 
         if (CommSys_CurNetId() == 0) {
             sub_0205BEA8(2);
@@ -306,8 +306,8 @@ int ov59_021D0FF4(ApplicationManager *appMan, int *unused)
     ov59_021D17C8(v0);
     ov59_021D1354(v0->unk_00);
 
-    sub_02037B58(2);
-    sub_02036AC4();
+    CommManager_SetMaxNumConnections(2);
+    CommManager_UnionRestartSearch();
     sub_0205C2C8(v0->unk_08->unk_04);
     MessageLoader_Free(v0->unk_28);
     StringTemplate_Free(v0->unk_24);
@@ -1632,7 +1632,7 @@ static void ov59_021D28D8(UnkStruct_020961E8 *param0, int param1)
 {
     if (CommSys_CurNetId() == 0) {
         if (param1 == -1) {
-            sub_02037B58(1);
+            CommManager_SetMaxNumConnections(1);
         } else {
             int v0 = CommSys_ConnectedCount() + param1;
 
@@ -1640,7 +1640,7 @@ static void ov59_021D28D8(UnkStruct_020961E8 *param0, int param1)
                 v0 = 5;
             }
 
-            sub_02037B58(v0);
+            CommManager_SetMaxNumConnections(v0);
         }
 
         if (param1 == -1) {
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 272d80aa3d4..c65c175d58a 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -663,17 +663,17 @@ static int ov65_0222DF88(UnkStruct_ov65_0222EBE0 *param0)
 static void ov65_0222DFD4(int param0)
 {
     if ((param0 == 19) || (18 == param0)) {
-        sub_02038B00();
+        CommManager_SetState_WifiPoffin();
     } else if (ov65_0222DD64(param0)) {
-        sub_02038B20();
+        CommManager_SetState_WifiClub();
     } else if (param0 == 16) {
-        sub_02038B60();
+        CommManager_SetState_LoginWifi();
     } else if ((param0 == 21) || (param0 == 20)) {
         sub_0203632C(0);
-        sub_02038EA4();
+        CommManager_SetState_FrontierWifi();
     } else {
         sub_0203632C(1);
-        sub_02038B84();
+        CommManager_SetState_SingleBattleWifi();
     }
 }
 
@@ -2368,7 +2368,7 @@ static int ov65_0222FFAC(UnkStruct_ov65_0222EBE0 *param0, int param1)
     ov65_0222FEEC(param0);
     ov65_02232E58(param0, 16);
 
-    sub_02038B60();
+    CommManager_SetState_LoginWifi();
     param0->unk_3D0 = -1;
 
     NARC_dtor(v3);
@@ -2892,7 +2892,7 @@ static int ov65_02230AF8(UnkStruct_ov65_0222EBE0 *param0, int param1)
     if ((gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) || (param0->unk_3BC == 0)) {
         ov65_02232DFC(param0);
         sub_02038378();
-        sub_02038B60();
+        CommManager_SetState_LoginWifi();
 
         if (ov65_02235194(&param0->unk_3EC) == 0) {
             param0->unk_3BC = 20;
@@ -2946,7 +2946,7 @@ static int ov65_02230C04(UnkStruct_ov65_0222EBE0 *param0, int param1)
         ov65_02232DFC(param0);
         ov65_02232E58(param0, 16);
 
-        sub_02038B60();
+        CommManager_SetState_LoginWifi();
 
         if (ov65_02235194(&param0->unk_3EC) == 0) {
             param0->unk_3A8 = ov65_0222EBB8();
@@ -3038,7 +3038,7 @@ static int ov65_02230D6C(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     } else if (v1 == 0) {
         ov65_02232E58(param0, 16);
-        sub_02038B60();
+        CommManager_SetState_LoginWifi();
         ov65_0223503C(param0);
     } else {
         ov65_0223503C(param0);
@@ -3468,7 +3468,7 @@ static int ov65_02231440(UnkStruct_ov65_0222EBE0 *param0, int param1)
             v1 = 0;
         } else {
             ov65_02234FCC(param0, -1, v0);
-            sub_02038B84();
+            CommManager_SetState_SingleBattleWifi();
         }
 
         ov65_0223500C(param0, v1);
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index b323d36ada4..bca76406e30 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -1165,12 +1165,12 @@ static BOOL ov65_02237464(u32 param0, u32 param1)
     if (v0 == 1) {
         switch (param1) {
         case 0:
-            sub_02038B00();
+            CommManager_SetState_WifiPoffin();
             break;
         case 1:
         case 2:
         case 3:
-            sub_02038B20();
+            CommManager_SetState_WifiClub();
             break;
         }
     }
@@ -2106,7 +2106,7 @@ static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
     sub_02038378();
     ov65_022375CC(param0);
-    sub_02038B60();
+    CommManager_SetState_LoginWifi();
     CommMan_SetErrorHandling(0, 1);
 
     return 1;
@@ -2144,7 +2144,7 @@ static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
     }
 
     sub_02038378();
-    sub_02038B60();
+    CommManager_SetState_LoginWifi();
     ov65_022375CC(param0);
     param0->unk_00.unk_07 = 0;
     CommMan_SetErrorHandling(0, 1);
@@ -2304,7 +2304,7 @@ static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
     param0->unk_00.unk_05 = 7;
 
     sub_02038378();
-    sub_02038B60();
+    CommManager_SetState_LoginWifi();
 
     return 0;
 }
@@ -2511,7 +2511,7 @@ static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
     }
 
     sub_02038378();
-    sub_02038B60();
+    CommManager_SetState_LoginWifi();
 
     param0->unk_00.unk_07 = 0;
 
@@ -2740,7 +2740,7 @@ static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID)
 {
     sub_02038378();
-    sub_02038B60();
+    CommManager_SetState_LoginWifi();
 
     param0->unk_00.unk_07 = 0;
     CommMan_SetErrorHandling(0, 1);
diff --git a/src/overlay066/ov66_02231428.c b/src/overlay066/ov66_02231428.c
index 5aa84cfd39c..2a6109a9d5d 100644
--- a/src/overlay066/ov66_02231428.c
+++ b/src/overlay066/ov66_02231428.c
@@ -273,7 +273,7 @@ int ov66_02231718(int param0, int param1)
 
 BOOL ov66_02231760(void)
 {
-    if (sub_020383E8() || sub_0203881C()) {
+    if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
         return 1;
     }
 
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index 002902e473d..ed71e5472ff 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -228,7 +228,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         UnkStruct_ov66_0222E71C *v3;
 
         v3 = ov66_0222E3BC(v1->unk_04);
-        sub_0203878C(v0->saveData, v3);
+        CommManager_LoginWifiLobby(v0->saveData, v3);
     }
 
         ov67_0225D210(&v0->unk_70, 23);
@@ -236,18 +236,18 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         (*param1)++;
         break;
     case 5:
-        if (sub_020383E8() || sub_0203881C()) {
+        if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
             ov67_0225D310(&v0->unk_70);
             (*param1) = 9;
         }
 
-        if (sub_02038804() == 1) {
+        if (CommManager_GetWifiLobbyLoginSuccess() == 1) {
             ov66_0222F16C(v1->unk_04);
             (*param1)++;
         }
         break;
     case 6:
-        if (sub_020383E8() || sub_0203881C()) {
+        if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
             ov67_0225D310(&v0->unk_70);
             (*param1) = 9;
         }
@@ -324,7 +324,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
 
         switch (v11) {
         case 0:
-            sub_020387E8();
+            CommManager_LogoutWifiLobby();
             (*param1) = 13;
             break;
         case 0xfffffffe:
@@ -341,7 +341,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         ov67_0225D294(&v0->unk_40);
         ov67_0225D294(&v0->unk_70);
         ov67_0225D294(&v0->unk_A0);
-        sub_020387E8();
+        CommManager_LogoutWifiLobby();
         (*param1)++;
         break;
     case 15:
@@ -437,7 +437,7 @@ int ov67_0225CC6C(ApplicationManager *appMan, int *param1)
     case 2:
         ov67_0225D210(&v0->unk_40, 26);
 
-        if (sub_020383E8() || sub_0203881C()) {
+        if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
             (*param1) = 5;
             ov67_0225D2EC(&v0->unk_40);
         } else {
@@ -461,7 +461,7 @@ int ov67_0225CC6C(ApplicationManager *appMan, int *param1)
         }
         break;
     case 5:
-        sub_020387E8();
+        CommManager_LogoutWifiLobby();
         (*param1) = 6;
         break;
     case 6:
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 5c499198bd6..c0c2dd6ec0d 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -696,7 +696,7 @@ int ov70_0225DB90(ApplicationManager *appMan, int *param1)
 
         if (sub_020383E8()) {
             ov70_0225F184(&v0->unk_3F4, &v0->unk_340);
-        } else if (sub_0203881C()) {
+        } else if (CommManager_IsWifiLobbyError()) {
             ov70_0225F1C0(&v0->unk_3F4, &v0->unk_340, ov66_022326DC());
         } else {
             ov70_0225F1F0(&v0->unk_3F4, &v0->unk_340, ov66_0222DFF8(v0->unk_34));
diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c
index b06270acfcc..82f3f731f61 100644
--- a/src/overlay070/ov70_02265F38.c
+++ b/src/overlay070/ov70_02265F38.c
@@ -123,7 +123,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
             break;
         }
 
-        if (sub_020388AC() == 0) {
+        if (CommManager_GetWifiP2PConnectState() == 0) {
             v1->unk_00 = 4;
             ov70_02262E88(param0, 23);
             break;
@@ -269,7 +269,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
             ov70_0225DFBC(param1);
         }
 
-        sub_0203883C(v1->unk_01);
+        CommManager_StartWifiP2P(v1->unk_01);
 
         if (ov66_02233374() == 1) {
             ov66_0222EA10(v2, v1->unk_02, 1, param2, 0, 0, 0, 0);
@@ -284,7 +284,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
         u32 v6;
         u32 v7;
 
-        v6 = sub_020388AC();
+        v6 = CommManager_GetWifiP2PConnectState();
         v7 = ov66_02233224(v1->unk_01);
         v0->unk_00 = ov66_022332F8(v1->unk_01);
 
@@ -401,7 +401,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
         ov70_02266CCC(&v0->unk_3C, 0);
         ov70_02266CF0(&v0->unk_3C, param1, 0);
 
-        v12 = sub_020388AC();
+        v12 = CommManager_GetWifiP2PConnectState();
         v13 = ov66_02233224(v1->unk_01);
 
         switch (sub_020380E4()) {
@@ -438,7 +438,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
         ov70_02266CF0(&v0->unk_3C, param1, 0);
         ov66_0222E3E4(ov70_0225DEE8(param1), v1->unk_03);
 
-        sub_02038B40();
+        CommManager_SetState_WifiLobby();
         CommInfo_Init(ov66_0222E0C4(ov70_0225DEE8(param1)), NULL);
         CommInfo_SetPersonalTrainerInfo(ov66_0222E918(v2));
         sub_0203632C(0);
@@ -686,13 +686,13 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
     } break;
     case 23:
         CommInfo_Delete();
-        sub_0203888C();
+        CommManager_EndWifiP2P();
         ov70_02262E88(param0, 24);
         break;
     case 24: {
         u32 v34;
 
-        v34 = sub_020388AC();
+        v34 = CommManager_GetWifiP2PConnectState();
 
         if (v34 == 0) {
             ov70_02262E88(param0, 28);
@@ -746,7 +746,7 @@ BOOL ov70_022669B8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
 
         if (sub_020382C0() == 0) {
             CommInfo_Delete();
-            sub_0203888C();
+            CommManager_EndWifiP2P();
         }
 
         ov70_02262E88(param0, 1);
@@ -880,7 +880,7 @@ static BOOL ov70_02266BAC(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_0225DE
     u32 v0;
     u32 v1;
     UnkStruct_ov66_0222DFF8 *v2 = ov70_0225DEE8(param1);
-    v0 = sub_020388AC();
+    v0 = CommManager_GetWifiP2PConnectState();
     v1 = ov66_02233224(param2->unk_01);
 
     if (v0 == 0) {
diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c
index 676443cb1a4..09772669672 100644
--- a/src/overlay083/ov83_0223D4CC.c
+++ b/src/overlay083/ov83_0223D4CC.c
@@ -57,7 +57,7 @@ UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, v
 BOOL ov83_0223D508(int param0, const void *param1, int param2, UnkStruct_ov83_0223D4CC *param3)
 {
     if (param3->unk_00 == 1) {
-        if (sub_0203895C() == 29) {
+        if (CommManager_GetCommType() == 29) {
             BOOL v0 = 1;
 
             if (CommSys_IsCmdQueued(param0)) {
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 359fdb9aa0e..bcca592c95f 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -16,6 +16,7 @@
 #include "overlay088/struct_ov88_0223C370.h"
 #include "overlay088/struct_ov88_0223C8AC.h"
 
+#include "constants/communication/comm_error.h"
 #include "bag.h"
 #include "battle_frontier_stats.h"
 #include "bg_window.h"
@@ -2593,7 +2594,7 @@ static void ov88_0223E998(UnkStruct_02095E80 *param0)
         param0->unk_3708++;
 
         if (param0->unk_3708 > (30 * 60)) {
-            Link_SetErrorState(4);
+            CommManager_SetCommError(COMM_ERROR_4);
         }
     }
 }
diff --git a/src/overlay094/screens/network_handler.c b/src/overlay094/screens/network_handler.c
index 9be2c13a805..e2a06e8019c 100644
--- a/src/overlay094/screens/network_handler.c
+++ b/src/overlay094/screens/network_handler.c
@@ -486,7 +486,7 @@ static int ov94_02242F98(GTSApplicationState *param0)
         case -2:
         case -14:
         case -15:
-            Link_SetErrorState(4);
+            CommManager_SetCommError(4);
             break;
         case -13:
             NetworkError_DisplayGTSCriticalError();
@@ -586,13 +586,13 @@ static int ov94_02243120(GTSApplicationState *param0)
         case -3:
         case -4:
         case -5:
-            Link_SetErrorState(3);
+            CommManager_SetCommError(3);
             break;
         case -12:
         case -15:
         case -2:
         case -14:
-            Link_SetErrorState(4);
+            CommManager_SetCommError(4);
             break;
         case -13:
             NetworkError_DisplayGTSCriticalError();
@@ -703,13 +703,13 @@ static int ov94_022432F4(GTSApplicationState *param0)
             param0->currentScreenInstruction = 33;
             break;
         case -5:
-            Link_SetErrorState(3);
+            CommManager_SetCommError(3);
             break;
         case -12:
         case -2:
         case -14:
         case -15:
-            Link_SetErrorState(4);
+            CommManager_SetCommError(4);
             break;
         case -13:
             NetworkError_DisplayGTSCriticalError();
@@ -943,7 +943,7 @@ static int GTSApplication_NetworkHandler_DeleteReceivedPokemonResponse(GTSApplic
             appState->currentScreenInstruction = 33;
             break;
         case -3: // first byte = 5
-            Link_SetErrorState(3);
+            CommManager_SetCommError(3);
             break;
         case -4: // first byte = 3
         case -12:
@@ -951,7 +951,7 @@ static int GTSApplication_NetworkHandler_DeleteReceivedPokemonResponse(GTSApplic
         case -15:
         case -2: // first byte = 14
         case -14:
-            Link_SetErrorState(4);
+            CommManager_SetCommError(4);
             break;
         case -13: // catch-all
             NetworkError_DisplayGTSCriticalError();
@@ -1033,13 +1033,13 @@ static int GTSApplication_NetworkHandler_DeleteDesyncedPokemonResponse(GTSApplic
         case -4: // first byte = 3
             GTSApplication_NetworkHandler_ReturnToPreviousScreen(appState);
         case -5: // first byte = 2 (unsuccessful delete)
-            Link_SetErrorState(3);
+            CommManager_SetCommError(3);
             break;
         case -12:
         case -15:
         case -2: // first byte = 14
         case -14:
-            Link_SetErrorState(4);
+            CommManager_SetCommError(4);
             break;
         case -13:
             NetworkError_DisplayGTSCriticalError();
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 0a06bf37d24..06134992632 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -1411,8 +1411,8 @@ static int ov109_021D1B2C(UnkStruct_ov109_021D0F70 *param0)
     if (param0->unk_18 == 0) {
         if (CommTiming_IsSyncState(202)) {
             CommMan_SetErrorHandling(0, 0);
-            sub_02037B58(1);
-            sub_02036AC4();
+            CommManager_SetMaxNumConnections(1);
+            CommManager_UnionRestartSearch();
             param0->unk_00 = 50;
         }
     } else {
@@ -1423,8 +1423,8 @@ static int ov109_021D1B2C(UnkStruct_ov109_021D0F70 *param0)
 
             if (param0->unk_D0->unk_3C == 0) {
                 CommMan_SetErrorHandling(0, 0);
-                sub_02037B58(1);
-                sub_02036AC4();
+                CommManager_SetMaxNumConnections(1);
+                CommManager_UnionRestartSearch();
             }
 
             param0->unk_00 = 50;
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index e292f1e05dd..79387edbca3 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -205,8 +205,8 @@ int ov109_021D3D50(ApplicationManager *appMan, int *param1)
         ov109_021D45F4(v0);
         Sound_SetSceneAndPlayBGM(SOUND_SCENE_SUB_52, SEQ_NONE, 0);
         sub_0209BE50(v2->unk_34);
-        sub_020378B8();
-        sub_02037B58(3);
+        CommManager_SetState_SpinTrade();
+        CommManager_SetMaxNumConnections(3);
 
         if (CommSys_CurNetId() == 0) {
             sub_0205BEA8(13);
@@ -1682,7 +1682,7 @@ static void ov109_021D5858(UnkStruct_ov109_021D5140 *param0, int param1)
 {
     if (CommSys_CurNetId() == 0) {
         if (param1 == -1) {
-            sub_02037B58(1);
+            CommManager_SetMaxNumConnections(1);
         } else {
             int v0 = CommSys_ConnectedCount() + param1;
 
@@ -1690,7 +1690,7 @@ static void ov109_021D5858(UnkStruct_ov109_021D5140 *param0, int param1)
                 v0 = 5;
             }
 
-            sub_02037B58(v0);
+            CommManager_SetMaxNumConnections(v0);
         }
 
         if (param1 == -1) {
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 68e246e54da..815e7f2152f 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1067,7 +1067,7 @@ BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0)
 
     if (CommInfo_IsInitialized() == 1) {
         CommInfo_Delete();
-        sub_0203888C();
+        CommManager_EndWifiP2P();
     } else {
         if (sub_020382C0() == 1) {
             return 1;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index ee2348d1454..dca02c9f981 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -4224,9 +4224,9 @@ static BOOL ScrCmd_139(ScriptContext *ctx)
     u16 v0 = ScriptContext_ReadHalfWord(ctx);
 
     if ((v0 == 5) || (v0 == 7) || (v0 == 9) || (v0 == 6) || (v0 == 12) || (v0 == 10)) {
-        sub_02036BC8();
+        CommManager_SetState_UnionApp();
     } else if (v0 == 11) {
-        sub_02036BD8();
+        CommManager_SetState_Union();
     }
 
     if (CommSys_CurNetId() == 0) {
@@ -4266,7 +4266,7 @@ static BOOL ScrCmd_13E(ScriptContext *ctx)
     FieldSystem *fieldSystem = ctx->fieldSystem;
 
     sub_0205C2B0(fieldSystem->unk_80);
-    sub_02036AC4();
+    CommManager_UnionRestartSearch();
     ScriptContext_Pause(ctx, sub_020437E8);
 
     return TRUE;
@@ -4360,14 +4360,14 @@ static BOOL ScrCmd_142(ScriptContext *ctx)
 static BOOL ScrCmd_13A(ScriptContext *ctx)
 {
     sub_0205BEA8(4);
-    sub_02036BA0();
+    CommManager_PauseUnionServer();
     return FALSE;
 }
 
 static BOOL ScrCmd_13B(ScriptContext *ctx)
 {
-    sub_02036BD8();
-    sub_02036AC4();
+    CommManager_SetState_Union();
+    CommManager_UnionRestartSearch();
     sub_0205BEA8(0);
     return FALSE;
 }
diff --git a/src/start_menu.c b/src/start_menu.c
index cc0f2385303..3fbe3f4676a 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -723,7 +723,7 @@ static void sub_0203B2EC(StartMenu *menu, FieldSystem *fieldSystem)
         if (menu->inUnionRoom) {
             sub_0205C2B0(fieldSystem->unk_80);
 
-            sub_02036AC4();
+            CommManager_UnionRestartSearch();
             sub_0205BEA8(0);
         }
     }
diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c
index dca21a71e90..92975342e96 100644
--- a/src/underground/comm_manager.c
+++ b/src/underground/comm_manager.c
@@ -73,14 +73,14 @@ void CommManUnderground_InitUnderground(FieldSystem *fieldSystem)
         return;
     }
 
-    sub_02036794(FieldSystem_GetSaveData(fieldSystem));
+    CommManager_StartUnderground(FieldSystem_GetSaveData(fieldSystem));
     FieldCommMan_Init(fieldSystem);
 
     fieldCommMan = FieldCommMan_Get();
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_UNDERGROUND, HEAP_SIZE_UNDERGROUND);
 
     if (!SystemFlag_CheckHasSeenUndergroundRoarkIntro(SaveData_GetVarsFlags(fieldCommMan->fieldSystem->saveData))) {
-        sub_02036894();
+        CommManager_SetDoNotConnectUndergroundFlag();
     }
 }
 
@@ -108,7 +108,7 @@ void CommManUnderground_ExitUnderground(void)
 
 void CommManUnderground_CloseSecretBase(void)
 {
-    CommMan_CloseSecretBase();
+    CommManager_CloseSecretBase();
     CommManUnderground_SetFieldCommManTask(CommManUnderground_CloseSecretBaseTask, 0);
 }
 
@@ -270,7 +270,7 @@ static void CommManUnderground_WaitForRoarkSceneTask(void)
         return;
     }
 
-    sub_020367F0();
+    CommManager_ResetUnderground();
     sub_02059524();
 
     CommManUnderground_SetFieldCommManTask(CommManUnderground_CheckForConnectionsTask, 12 * 2);
@@ -293,7 +293,7 @@ static void CommManUnderground_CheckForConnectionsTask(void)
     UndergroundMan_Process();
     sub_02059524();
 
-    if (sub_02036834()) {
+    if (CommManager_IsConnectingUnderground()) {
         if (CommSys_CurNetId() == 0) {
             SecretBases_ClearAllBaseInfo();
             CommManUnderground_SetFieldCommManTask(CommManUnderground_ConnectTaskServer, 60);
@@ -312,7 +312,7 @@ static void CommManUnderground_ConnectTaskClient(void)
     }
 
     if (sub_02033E68() || CommSys_CheckError() || fieldCommMan->timer == 0) {
-        sub_020367F0();
+        CommManager_ResetUnderground();
         CommManUnderground_SetFieldCommManTask(CommManUnderground_RestartTaskClient, 0);
     } else if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         if (fieldCommMan->timer != 0) {
@@ -387,7 +387,7 @@ static void CommManUnderground_MainTaskServer(void)
         Traps_ForceEndCurrentTrapEffectClient(CommSys_CurNetId(), TRUE);
         UndergroundMan_ForceEndCurrentSysTask();
 
-        sub_02036824();
+        CommManager_ResetUndergroundServer();
         CommManUnderground_SetFieldCommManTask(CommManUnderground_WaitUntilAloneTaskServer, 0);
     }
 }
@@ -549,7 +549,7 @@ static void CommManUnderground_RestartClient(void)
     Mining_ClearMessageQueue();
     CommPlayerMan_Stop();
     UndergroundMan_ForceEndCurrentSysTask();
-    sub_020367F0();
+    CommManager_ResetUnderground();
     UndergroundPlayer_ResetHeldFlagInfo();
     CommManUnderground_SetFieldCommManTask(CommManUnderground_RestartTaskClient, 0);
 }
@@ -592,7 +592,7 @@ static void CommManUnderground_BaseTransitionEndTaskClient(void)
         SecretBases_ResetAllBaseInfo();
         CommPlayerMan_Stop();
         UndergroundMan_ForceEndCurrentSysTask();
-        sub_020367F0();
+        CommManager_ResetUnderground();
         UndergroundPlayer_ResetHeldFlagInfo();
         CommManUnderground_SetFieldCommManTask(CommManUnderground_RestartTaskClient, 0);
     } else {
@@ -651,7 +651,7 @@ static void CommManUnderground_ExitUndergroundTask(void)
 
     UndergroundMan_FreeAllResources();
 
-    sub_020367D0();
+    CommManager_EndUnderground();
     Heap_Destroy(HEAP_ID_UNDERGROUND);
 
     fieldCommMan->isUnderground = FALSE;
diff --git a/src/underground/manager.c b/src/underground/manager.c
index 46296761798..19bf65c4746 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -722,7 +722,7 @@ void UndergroundMan_Process(void)
             }
         }
 
-        sub_02037B58(UndergroundMan_CountInitializedPlayers() + 2);
+        CommManager_SetMaxNumConnections(UndergroundMan_CountInitializedPlayers() + 2);
     }
 
     sUndergroundMan->dummyCounter++;
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index 3c50d369a9e..9e09b9f4c3b 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -2761,7 +2761,7 @@ static void ov23_0224DC08(void)
 {
     WirelessManager_SetPauseClientConnection(TRUE);
     WirelessManager_SetPauseConnection(TRUE);
-    sub_02036814(TRUE);
+    CommManager_SetPauseUnderground(TRUE);
     sub_020340FC();
 }
 
@@ -2769,6 +2769,6 @@ static void ov23_0224DC24(void)
 {
     WirelessManager_SetPauseClientConnection(FALSE);
     WirelessManager_SetPauseConnection(FALSE);
-    sub_02036814(FALSE);
+    CommManager_SetPauseUnderground(FALSE);
     sub_020340FC();
 }
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index b6241039f4d..340d867afef 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -121,8 +121,8 @@ static BOOL sub_020332E4(const u8 *param0, const u8 *param1, int param2)
 static void sub_0203330C(WMBssDesc *param0)
 {
     UnkStruct_0203330C *v1;
-    int v2 = sub_0203895C();
-    int v3 = sub_02038974();
+    int v2 = CommManager_GetCommType();
+    int v3 = CommManager_GetContestRegulation();
 
     v1 = (UnkStruct_0203330C *)param0->gameInfo.userGameInfo;
 
@@ -537,7 +537,7 @@ BOOL sub_020339E8(u16 param0)
     }
 
     if (WirelessManager_GetState() == 1) {
-        int v0 = sub_0203895C();
+        int v0 = CommManager_GetCommType();
         sCommServerClient->unk_1514 = sCommServerClient->unk_188[param0].channel;
 
         if (sub_020326C4(v0)) {
@@ -573,7 +573,7 @@ void sub_02033A5C(void)
 
 static void sub_02033AA8(void)
 {
-    int v4 = sub_0203895C();
+    int v4 = CommManager_GetCommType();
 
     TrainerInfo *v1 = sub_02033F9C();
 
@@ -588,8 +588,8 @@ static void sub_02033AA8(void)
         MI_CpuCopy8(sCommServerClient->unk_1500, v2->unk_30, BattleRegulation_Size());
 
         v2->unk_00 = TrainerInfo_ID(v1);
-        v2->unk_04 = sub_0203895C();
-        v2->unk_05 = sub_02038974();
+        v2->unk_04 = CommManager_GetCommType();
+        v2->unk_05 = CommManager_GetContestRegulation();
 
         MI_CpuCopy8(&sCommServerClient->unk_14EC, &v2->unk_08, sizeof(Sentence));
 
@@ -598,8 +598,8 @@ static void sub_02033AA8(void)
         UnkStruct_02034168 *v3 = (UnkStruct_02034168 *)sCommServerClient->unk_150C;
 
         v3->unk_00 = TrainerInfo_ID(v1);
-        v3->unk_04 = sub_0203895C();
-        v3->unk_05 = sub_02038974();
+        v3->unk_04 = CommManager_GetCommType();
+        v3->unk_05 = CommManager_GetContestRegulation();
 
         MI_CpuCopy8(sCommServerClient->unk_00, v3->unk_08, 84);
     }
@@ -701,7 +701,7 @@ static void sub_02033BDC(u16 param0)
         }
 
         sub_02033AA8();
-        (void)WirelessManager_ConnectServer(0, Unk_021C07B8, v2, CommLocal_MaxMachines(sub_0203895C()), sub_02033F0C(sub_0203895C()), sCommServerClient->unk_1519_5);
+        (void)WirelessManager_ConnectServer(0, Unk_021C07B8, v2, CommLocal_MaxMachines(CommManager_GetCommType()), sub_02033F0C(CommManager_GetCommType()), sCommServerClient->unk_1519_5);
         sCommServerClient->unk_1514 = v2;
     } break;
     default:
diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c
index 1d00eeca559..31b4318206f 100644
--- a/src/unk_020366A0.c
+++ b/src/unk_020366A0.c
@@ -4,6 +4,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_type.h"
+#include "constants/communication/comm_error.h"
 #include "nintendo_wfc/main.h"
 #include "overlay065/struct_ov65_0222F6EC.h"
 #include "overlay066/ov66_022324F0.h"
@@ -25,165 +27,172 @@
 #include "unk_02039814.h"
 #include "wireless_manager.h"
 
-typedef void (*UnkFuncPtr_02036C94)(void);
+typedef void (*CommTaskFunc)(void);
 
 typedef struct {
     void *unk_00;
     u8 unk_04[6];
-    MATHRandContext32 unk_0C;
-    UnkFuncPtr_02036C94 task;
+    MATHRandContext32 rand;
+    CommTaskFunc task;
     SaveData *saveData;
-    TrainerInfo *unk_2C;
-    const BattleRegulation *unk_30;
+    TrainerInfo *trainerInfo;
+    const BattleRegulation *battleRegulation;
     UnkStruct_ov65_0222F6EC unk_34;
     int timer;
-    u16 unk_44;
-    u8 unk_46;
-    u8 unk_47;
+    u16 retryConnectionAttempts;
+    u8 maxNumConnection;
+    u8 connectedCount;
     u8 unk_48;
-    u8 unk_49;
-    u8 unk_4A;
-    u8 unk_4B;
+    u8 connectionID;
+    u8 commType;
+    u8 contestRegulation;
     u8 unk_4C;
     s8 unk_4D;
     u8 unk_4E;
-    u8 unk_4F;
+    u8 errorDisconnect;
     u8 unk_50;
     u8 unk_51;
     u8 unk_52;
-    u8 unk_53; // network service
+    u8 pauseUnion;
     u8 unk_54;
-    u8 unk_55;
+    u8 initializeAsServer; //always FALSE
     u8 unk_56;
-    u8 unk_57;
+    u8 doNotConnectUnderground;
     u8 unk_58;
-    u8 unk_59;
-    u8 unk_5A;
+    u8 commError;
+    u8 pauseUnderground;
     const void *unk_5C;
-    u8 unk_60;
+    u8 lobbyLoginSuccess;
     u8 unk_61[3];
-} UnkStruct_021C07D4;
+} CommunicationManager;
 
-static void CommMan_SetTask(UnkFuncPtr_02036C94 param0, int param1);
-static void sub_02036CA4(void);
+static void CommManager_SetTask(CommTaskFunc param0, int param1);
+static void CommTask_StartUnderground(void);
 static void sub_02036E08(void);
-static void sub_02036D80(void);
-static void sub_02036E5C(void);
+static void CommTask_ReinitUnderground(void);
+static void CommTask_SearchUndergroundClient(void);
 static void sub_02036EDC(void);
 static void sub_02036F44(void);
-static void sub_020370B8(void);
-static void sub_0203712C(void);
-static void sub_02036FA4(void);
+static void CommTask_ConnectUndergroundClient(void);
+static void CommTask_ResetUnderground(void);
+static void CommTask_ResetUndergroundServer(void);
 static void sub_02036FBC(void);
-static void sub_02036FD4(void);
-static void sub_02037040(void);
+static void CommTask_InitUndergroundServer(void);
+static void CommTask_WaitUndergroundServer(void);
 static void sub_02037094(void);
-static void sub_020370B4(void);
-static void sub_02037344(void);
-static void sub_020370EC(void);
-static void sub_02037144(void);
-static void sub_020371A8(void);
+static void CommTask_ConnectUndergroundServer(void);
+static void CommManager_EndConnectionUnderground(void);
+static void CommTask_RestartSecretBase(void);
+static void CommTask_StartBattleServer(void);
+static void CommTask_WaitBattleServer(void);
 static void sub_0203718C(void);
-static void sub_020371C0(void);
+static void CommTask_StartBattleClient(void);
 static void sub_02037208(void);
-static void sub_02037210(void);
+static void CommTask_ConnectBattleClient(void);
 static void sub_02037238(void);
-static void sub_020372C4(void);
+static void CommTask_WaitBattleClient(void);
 static void sub_020372DC(void);
 static void sub_020372F0(void);
 static void sub_02037270(void);
 static void sub_02037284(void);
-static void sub_02037108(void);
-static void sub_020373F0(void);
-static void sub_02037444(void);
-static void sub_02037474(void);
-static void sub_0203748C(void);
+static void CommTask_StartWirelessClient(void);
+static void CommTask_StartUnion(void);
+static void CommTask_SearchUnionClient(void);
+static void CommTask_EndUnionClient(void);
+static void CommTask_InitializeServerUnion(void);
 static void sub_020374F4(void);
-static void sub_0203754C(void);
+static void CommTask_RestartUnionClient(void);
 static void sub_020376A8(void);
 static void sub_020375A4(void);
 static void sub_020375BC(void);
 static void sub_020375E8(void);
 static void sub_0203764C(void);
-static void sub_02037724(void);
-static void sub_0203773C(void);
-static void sub_02037740(void);
-static void sub_02037790(void);
-static void sub_020377E4(void);
-static void sub_02037E20(void);
-static void sub_02037E68(void);
-static void sub_02037330(void);
-static void sub_02037334(void);
+static void CommTask_SuccededConnectUnionClient(void);
+static void CommTask_FailedConnectUnionClient(void);
+static void CommTask_ResetUnionClient(void);
+static void CommTask_ConnectUnionServer(void);
+static void CommTask_PauseUnionServer(void);
+static void CommTask_StartRandomBattleServer(void);
+static void CommTask_StartMysteryGiftClient(void);
+static void CommTask_None(void);
+static void CommTask_End(void);
 static void sub_02037354(void);
 static void sub_0203739C(void);
-static void sub_020373B8(void);
+static void CommTask_EndConnection(void);
 static void sub_02038164(void);
 static void sub_02038314(void);
-static void sub_02038BA8(void);
-static void sub_02038C1C(void);
-static void sub_02038C68(void);
-static void sub_02038D80(void);
-static void sub_02038D94(void);
-static void sub_02038DC8(void);
-static void sub_02038DCC(void);
-static void sub_02038DEC(void);
-static void sub_02038E38(void);
-static void sub_02038E84(void);
-static BOOL sub_02038C74(int param0);
-static BOOL sub_02038D10(void);
-static BOOL sub_02038D44(void);
-static BOOL sub_02038D5C(u32 *param0);
-static void sub_020378F8(void);
-static void sub_02037910(void);
-static void sub_0203794C(void);
-static void sub_020379D0(void);
-
-static UnkStruct_021C07D4 *Unk_021C07D4 = NULL;
+static void CommTask_StartWifiLobby(void);
+static void CommTask_LogInWifiLobby(void);
+static void CommTask_ConnectWifiLobby(void);
+static void CommTask_LogoutWifiLobby(void);
+static void CommTask_WaitLogoutWifiLobby(void);
+static void CommTask_WifiLobbyError(void);
+static void CommTask_ConnectWifiLobbyP2P(void);
+static void CommTask_WaitWifiLobbyMatchServerP2P(void);
+static void CommTask_DisconnectWifiLobbyP2P(void);
+static void CommTask_WifiLobbyTimeout(void);
+static BOOL CommManager_ProcessWifiLobbyDWCError(int param0);
+static BOOL CommManager_UpdateWifiLobby(void);
+static BOOL CommManager_UpdateWifiLobbyCommon(void);
+static BOOL CommManager_UpdateWifiLobbyMatchmaking(u32 *param0);
+static void CommTask_StartDrawClient(void);
+static void CommTask_InitDrawClient(void);
+static void CommTask_ConnectDraw(void);
+static void CommTask_ConnectingDraw(void);
+
+static CommunicationManager *sCommMan = NULL;
 static u8 Unk_02100A20[] = { "FREAK" };
 static u8 Unk_02100A30[] = { " GAME" };
 static u8 Unk_02100A28[] = { " FULL" };
 
-static void sub_020366A0(SaveData *saveData, int param1)
+/**
+ * @brief Initializes sCommMan with the given commType
+ *
+ * @param SaveData
+ * @param commType
+ */
+static void CommManager_Initialize(SaveData *saveData, int commType)
 {
-    void *v0;
-
-    if (Unk_021C07D4 != NULL) {
+    if (sCommMan != NULL) {
         return;
     }
 
     GF_ASSERT(saveData);
     WirelessDriver_Init();
 
-    Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
-    MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
+    sCommMan = (CommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationManager));
+    MI_CpuFill8(sCommMan, 0, sizeof(CommunicationManager));
 
-    Unk_021C07D4->timer = 50;
-    Unk_021C07D4->unk_4E = 1;
-    Unk_021C07D4->saveData = saveData;
-    Unk_021C07D4->unk_2C = SaveData_GetTrainerInfo(saveData);
-    Unk_021C07D4->unk_46 = 1 + 1;
-    Unk_021C07D4->unk_48 = 0;
-    Unk_021C07D4->unk_53 = 0;
-    Unk_021C07D4->unk_4A = param1;
+    sCommMan->timer = 50;
+    sCommMan->unk_4E = 1;
+    sCommMan->saveData = saveData;
+    sCommMan->trainerInfo = SaveData_GetTrainerInfo(saveData);
+    sCommMan->maxNumConnection = 1 + 1;
+    sCommMan->unk_48 = 0;
+    sCommMan->pauseUnion = FALSE;
+    sCommMan->commType = commType;
 
-    CommSys_Seed(&Unk_021C07D4->unk_0C);
+    CommSys_Seed(&sCommMan->rand);
     CommCmd_Init(NULL, 0, NULL);
 
-    if ((param1 != 9) && (param1 != 17) && (param1 != 15)) {
+    if ((commType != COMM_TYPE_UNION) && (commType != COMM_TYPE_PARTY) && (commType != COMM_TYPE_MYSTERY_GIFT)) {
         NetworkIcon_Init();
     }
 }
 
-static void sub_02036734(void)
+/**
+ * @brief Frees sCommMan, if it exists
+ */
+static void CommMan_Free(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
     sub_020327E0();
 
-    if (Unk_021C07D4->unk_00) {
-        Heap_Free(Unk_021C07D4->unk_00);
+    if (sCommMan->unk_00) {
+        Heap_Free(sCommMan->unk_00);
     }
 
     if (CommMan_IsConnectedToWifi()) {
@@ -192,181 +201,261 @@ static void sub_02036734(void)
 
     NetworkIcon_Destroy();
     WirelessDriver_Shutdown();
-    Heap_Free(Unk_021C07D4);
+    Heap_Free(sCommMan);
     Heap_Destroy(HEAP_ID_COMMUNICATION);
 
-    Unk_021C07D4 = NULL;
+    sCommMan = NULL;
 }
 
+/**
+ * @brief Checks if sCommMan is initialized
+ *
+ * @return TRUE if sCommMan is not NULL
+ */
 BOOL CommMan_IsInitialized(void)
 {
-    if (Unk_021C07D4) {
-        return 1;
+    if (sCommMan) {
+        return TRUE;
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_02036794(SaveData *saveData)
+/**
+ * @brief Initializes the Communication Manager for Underground play
+ */
+void CommManager_StartUnderground(SaveData *saveData)
 {
-    if (Unk_021C07D4 != NULL) {
+    if (sCommMan != NULL) {
         return;
     }
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0xF000);
-    sub_020366A0(saveData, 10);
+    CommManager_Initialize(saveData, COMM_TYPE_UNDERGROUND);
 
-    Unk_021C07D4->unk_4B = 0;
+    sCommMan->contestRegulation = 0;
 
-    CommMan_SetTask(sub_02036CA4, 50);
+    CommManager_SetTask(CommTask_StartUnderground, 50);
 }
 
-void sub_020367D0(void)
+/**
+ * @brief Shuts down and ends the Communication Manager for Underground play
+ */
+void CommManager_EndUnderground(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
     CommSys_StartShutdown();
-    CommMan_SetTask(sub_02037344, 0);
+    CommManager_SetTask(CommManager_EndConnectionUnderground, 0);
 }
 
-void sub_020367F0(void)
+/**
+ * @brief Resets the Commmunication Manager for the underground
+ */
+void CommManager_ResetUnderground(void)
 {
     CommSys_Reset();
-    Unk_021C07D4->unk_44 = CommSys_CurNetId();
-    CommMan_SetTask(sub_0203712C, 0);
+    sCommMan->retryConnectionAttempts = CommSys_CurNetId();
+    CommManager_SetTask(CommTask_ResetUnderground, 0);
 }
 
-void sub_02036814(BOOL param0)
+/**
+ * @brief Sets a flag to pause underground connection that pauses the client search process
+ *
+ * @param pause
+ */
+void CommManager_SetPauseUnderground(BOOL pause)
 {
-    Unk_021C07D4->unk_5A = param0;
+    sCommMan->pauseUnderground = pause;
 }
 
-void sub_02036824(void)
+/**
+ * @brief Resets the Communication Manager as a server for the underground
+ */
+void CommManager_ResetUndergroundServer(void)
 {
-    CommMan_SetTask(sub_02036FA4, 0);
+    CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
 }
 
-BOOL sub_02036834(void)
+/**
+ * @brief Checks if the current CommManager task is an underground connecting task. Unused
+ *
+ * @return TRUE if the current sCommMan->task is CommTask_ConnectUndergroundClient or CommTask_ConnectUndergroundServer
+ */
+BOOL CommManager_IsConnectingUnderground(void)
 {
-    int v0;
-    u32 v1[] = {
-        (u32)sub_020370B8, (u32)sub_020370B4, 0
+    int i;
+    u32 connectFunctions[] = {
+        (u32)CommTask_ConnectUndergroundClient, (u32)CommTask_ConnectUndergroundServer, 0
     };
-    u32 v2 = (u32)Unk_021C07D4->task;
+    u32 task = (u32)sCommMan->task;
 
-    if (Unk_021C07D4 == NULL) {
-        return 0;
+    if (sCommMan == NULL) {
+        return FALSE;
     }
 
-    for (v0 = 0; v1[v0] != 0; v0++) {
-        if (v2 == v1[v0]) {
-            return 1;
+    for (i = 0; connectFunctions[i] != 0; i++) {
+        if (task == connectFunctions[i]) {
+            return TRUE;
         }
     }
 
-    return 0;
+    return FALSE;
 }
 
-void CommMan_CloseSecretBase(void)
+/**
+ * @brief Closes the secret base and switches to single player underground mode
+ */
+void CommManager_CloseSecretBase(void)
 {
-    CommMan_SetTask(sub_020370EC, 0);
+    CommManager_SetTask(CommTask_RestartSecretBase, 0);
 }
 
-void sub_02036894(void)
+/**
+ * @brief Sets a flag that prevents the CommManager from connecting after initializing for the underground
+ */
+void CommManager_SetDoNotConnectUndergroundFlag(void)
 {
-    Unk_021C07D4->unk_57 = 1;
+    sCommMan->doNotConnectUnderground = TRUE;
 }
 
+/**
+ * @brief Reopens the underground secret base to Wireless/Online play
+ */
 void CommMan_ReopenSecretBase(void)
 {
     WirelessDriver_Init();
-    CommMan_SetTask(sub_02037108, 0);
+    CommManager_SetTask(CommTask_StartWirelessClient, 0);
 }
 
-void CommMan_StartBattleServer(SaveData *saveData, int param1, int param2, const BattleRegulation *param3, BOOL param4)
+/**
+ * @brief Initializes the Communication Manager for battles as a server
+ *
+ * @param saveData
+ * @param commType
+ * @param contestRegulation
+ * @param battleRegulation
+ * @param unusedBool
+ */
+void CommMan_StartBattleServer(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool)
 {
     if (CommSys_IsInitialized()) {
         return;
     }
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
-    sub_020366A0(saveData, param1);
+    CommManager_Initialize(saveData, commType);
 
-    Unk_021C07D4->unk_4B = param2;
-    Unk_021C07D4->unk_30 = param3;
+    sCommMan->contestRegulation = contestRegulation;
+    sCommMan->battleRegulation = battleRegulation;
 
-    CommMan_SetTask(sub_02037144, 0);
+    CommManager_SetTask(CommTask_StartBattleServer, 0);
 }
 
-void CommMan_StartBattleClient(SaveData *saveData, int param1, int param2, const BattleRegulation *param3, BOOL param4)
+/**
+ * @brief Initializes the Communication Manager for battles as a client
+ *
+ * @param saveData
+ * @param commType
+ * @param contestRegulation
+ * @param battleRegulation
+ * @param unusedBool
+ */
+void CommMan_StartBattleClient(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool)
 {
     if (CommSys_IsInitialized()) {
         return;
     }
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
-    sub_020366A0(saveData, param1);
+    CommManager_Initialize(saveData, commType);
 
-    Unk_021C07D4->unk_4B = param2;
-    Unk_021C07D4->unk_30 = param3;
+    sCommMan->contestRegulation = contestRegulation;
+    sCommMan->battleRegulation = battleRegulation;
 
-    CommMan_SetTask(sub_020371C0, 0);
+    CommManager_SetTask(CommTask_StartBattleClient, 0);
 }
 
-void sub_02036948(int param0)
+/**
+ * @brief Connects a client to the battle with the given connectionID
+ *
+ * @param connectionID
+ */
+void CommManager_ConnectBattleClient(int connectionID)
 {
-    Unk_021C07D4->unk_49 = param0;
-    CommMan_SetTask(sub_02037210, 0);
+    sCommMan->connectionID = connectionID;
+    CommManager_SetTask(CommTask_ConnectBattleClient, 0);
 }
 
-void sub_02036964(void)
+/**
+ * @brief Resets the communication system and manager for battles for the client
+ */
+void CommManager_ResetBattleClient(void)
 {
     CommSys_ResetBattleClient();
-    CommMan_SetTask(sub_020372DC, 0);
+    CommManager_SetTask(sub_020372DC, 0);
 }
 
-void sub_02036978(void)
+/**
+ * @brief Ends the communication for battles
+ */
+void CommManager_EndBattle(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    CommMan_SetTask(sub_020373B8, 5);
+    CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
-void sub_02036994(BOOL param0)
+/**
+ * @brief Calls WirelessManager_SetEntry(entry)
+ *
+ * @param entry
+ */
+void WirelessManager_SetEntry2(BOOL entry)
 {
-    WirelessManager_SetEntry(param0);
+    WirelessManager_SetEntry(entry);
 }
 
-BOOL sub_0203699C(void)
+/**
+ * @brief Checks if the current CommManager task is a battle waiting task.
+ *
+ * @return TRUE if the current sCommMan->task is CommTask_WaitBattleServer or CommTask_WaitBattleClient
+ */
+BOOL CommManager_IsWaitingBattle(void)
 {
-    int v0;
-    u32 v1[] = {
-        (u32)sub_020371A8,
-        (u32)sub_020372C4,
+    int i;
+    u32 waitFunctions[] = {
+        (u32)CommTask_WaitBattleServer,
+        (u32)CommTask_WaitBattleClient,
         0,
     };
-    u32 v2 = (u32)Unk_021C07D4->task;
+    u32 task = (u32)sCommMan->task;
 
-    if (Unk_021C07D4 == NULL) {
-        return 0;
+    if (sCommMan == NULL) {
+        return FALSE;
     }
 
-    for (v0 = 0; v1[v0] != 0; v0++) {
-        if (v2 == v1[v0]) {
-            return 1;
+    for (i = 0; waitFunctions[i] != 0; i++) {
+        if (task == waitFunctions[i]) {
+            return TRUE;
         }
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_020369EC(SaveData *saveData)
+/**
+ * @brief Initializes the Communication Manager for Union play
+ *
+ * @param saveData
+ */
+void CommManager_StartUnion(SaveData *saveData)
 {
-    if (Unk_021C07D4 != NULL) {
+    if (sCommMan != NULL) {
         return;
     }
 
@@ -374,171 +463,224 @@ void sub_020369EC(SaveData *saveData)
         NetworkError_DisplayGTSCriticalError();
     }
 
-    sub_020366A0(saveData, 9);
+    CommManager_Initialize(saveData, COMM_TYPE_UNION);
 
-    Unk_021C07D4->unk_4A = 9;
-    Unk_021C07D4->unk_4B = 0;
+    sCommMan->commType = COMM_TYPE_UNION;
+    sCommMan->contestRegulation = 0;
 
-    CommMan_SetTask(sub_020373F0, 0);
+    CommManager_SetTask(CommTask_StartUnion, 0);
 }
 
-void sub_02036A38(int param0)
+/**
+ * @brief Connect to the union with the given connectionID
+ *
+ * @param connectionID
+ */
+void CommManager_ConnectUnion(int connectionID)
 {
-    Unk_021C07D4->unk_49 = param0;
-    Unk_021C07D4->unk_44 = 3;
+    sCommMan->connectionID = connectionID;
+    sCommMan->retryConnectionAttempts = 3;
 
     WirelessManager_SetPauseConnection(1);
     NetworkIcon_Init();
-    CommMan_SetTask(sub_020375A4, 0);
+    CommManager_SetTask(sub_020375A4, 0);
 }
 
-int sub_02036A68(void)
+/**
+ * @brief Checks if the current CommManager task is the union client connection success task
+ *
+ * @return TRUE if the task is CommTask_SuccededConnectUnionClient, -1 if sCommMan isn't initialized or the current task is CommTask_FailedConnectUnionClient, FALSE otherwise
+ */
+int CommManager_IsConnectedUnionClientSuccess(void)
 {
-    u32 v0;
-
-    if (Unk_021C07D4 == NULL) {
+    u32 task;
+    
+    if (sCommMan == NULL) {
         return -1;
     }
 
-    v0 = (u32)Unk_021C07D4->task;
+    task = (u32)sCommMan->task;
 
-    if (v0 == (u32)sub_02037724) {
-        return 1;
+    if (task == (u32)CommTask_SuccededConnectUnionClient) {
+        return TRUE;
     }
 
-    if (v0 == (u32)sub_0203773C) {
+    if (task == (u32)CommTask_FailedConnectUnionClient) {
         return -1;
     }
 
-    return 0;
+    return FALSE;
 }
 
-BOOL sub_02036AA0(void)
+/**
+ * @brief Checks if the current CommManager task is the union server connect task
+ *
+ * @return TRUE if the task is CommTask_ConnectUnionServer, FALSE otherwise or if sCommMan isn't initialized or the current task 
+ */
+BOOL CommManager_IsConnectUnionServer(void)
 {
-    u32 v0;
-
-    if (Unk_021C07D4 == NULL) {
-        return 0;
+    u32 task;
+    
+    if (sCommMan == NULL) {
+        return FALSE;
     }
 
-    v0 = (u32)Unk_021C07D4->task;
+    task = (u32)sCommMan->task;
 
-    if (v0 == (u32)sub_02037790) {
-        return 1;
+    if (task == (u32)CommTask_ConnectUnionServer) {
+        return TRUE;
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_02036AC4(void)
+/**
+ * @brief Restarts the search for clients in the union and resets the connection
+ */
+void CommManager_UnionRestartSearch(void)
 {
     WirelessManager_SetPauseConnection(0);
 
-    if (!((Unk_021C07D4->unk_4F == 1) && (Unk_021C07D4->unk_50 == 1)) || (Unk_021C07D4->unk_4A == 9)) {
+    if (!((sCommMan->errorDisconnect == 1) && (sCommMan->unk_50 == 1)) || (sCommMan->commType == COMM_TYPE_UNION)) {
         CommMan_SetErrorHandling(0, 0);
     }
 
     NetworkIcon_Destroy();
 
-    Unk_021C07D4->unk_4A = 9;
-    Unk_021C07D4->unk_53 = 0;
+    sCommMan->commType = COMM_TYPE_UNION;
+    sCommMan->pauseUnion = FALSE;
 
-    WirelessManager_SetMaxNumConnections(Unk_021C07D4->unk_46);
+    WirelessManager_SetMaxNumConnections(sCommMan->maxNumConnection);
 
     if (CommSys_CurNetId() == 0) {
         WirelessManager_SetPauseConnectionSystem(1);
-        CommMan_SetTask(sub_02037354, 15);
+        CommManager_SetTask(sub_02037354, 15);
     } else {
-        CommMan_SetTask(sub_0203739C, 5);
+        CommManager_SetTask(sub_0203739C, 5);
     }
 }
 
-BOOL sub_02036B44(void)
+/**
+ * @brief Checks if the Comm Manager has restarted successfully for Union play
+ *
+ * @return TRUE when sCommMan is NULL or when the current task is not CommTask_EndUnionClient
+ */
+BOOL CommManager_UnionRestartSuccess(void)
 {
-    u32 v0;
+    u32 task;
 
-    if (Unk_021C07D4 == NULL) {
-        return 1;
+    if (sCommMan == NULL) {
+        return TRUE;
     }
 
-    v0 = (u32)Unk_021C07D4->task;
+    task = (u32)sCommMan->task;
 
-    if (v0 == (u32)sub_02037474) {
-        return 0;
+    if (task == (u32)CommTask_EndUnionClient) {
+        return FALSE;
     }
 
-    return 1;
+    return TRUE;
 }
 
-void sub_02036B68(void)
+/**
+ * @brief Starts the Communication Manager end connection task for union play
+ */
+void CommManager_ExitUnion(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    CommMan_SetTask(sub_020373B8, 5);
+    CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
-void sub_02036B84(void)
+/**
+ * @brief Pauses the client connection to the server for union play
+ */
+void CommManager_PauseUnionClient(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    Unk_021C07D4->unk_53 = 1;
+    sCommMan->pauseUnion = TRUE;
     WirelessManager_SetPauseConnection(1);
 }
 
-void sub_02036BA0(void)
+/**
+ * @brief Pauses the server connection to the clients for union play
+ */
+void CommManager_PauseUnionServer(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    Unk_021C07D4->unk_53 = 1;
+    sCommMan->pauseUnion = TRUE;
 
     WirelessManager_SetPauseConnection(1);
-    CommMan_SetTask(sub_020377E4, 0);
+    CommManager_SetTask(CommTask_PauseUnionServer, 0);
 }
 
-void sub_02036BC8(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_UNION_APP
+ */
+void CommManager_SetState_UnionApp(void)
 {
-    Unk_021C07D4->unk_4A = 18;
+    sCommMan->commType = COMM_TYPE_UNION_APP;
 }
 
-void sub_02036BD8(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_UNION
+ */
+void CommManager_SetState_Union(void)
 {
-    Unk_021C07D4->unk_4A = 9;
+    sCommMan->commType = COMM_TYPE_UNION;
 }
 
-void sub_02036BE8(SaveData *saveData, int param1)
+/**
+ * @brief Initializes the Communication Manager as a server to play a battle against a random opponent
+ *
+ * @param saveData
+ * @param commType
+ */
+void CommManager_StartRandomBattleServer(SaveData *saveData, int commType)
 {
     if (CommSys_IsInitialized()) {
         return;
     }
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
-    sub_020366A0(saveData, param1);
-    CommMan_SetTask(sub_02037E20, 0);
+    CommManager_Initialize(saveData, commType);
+    CommManager_SetTask(CommTask_StartRandomBattleServer, 0);
 }
 
-void sub_02036C1C(SaveData *saveData, int param1)
+/**
+ * @brief Initializes the Communication Manager as a client to play a battle against a random opponent
+ *
+ * @param saveData
+ * @param commType
+ */
+void CommManager_StartRandomBattleClient(SaveData *saveData, int commType)
 {
     if (CommSys_IsInitialized()) {
         return;
     }
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
-    sub_020366A0(saveData, param1);
-    CommMan_SetTask(sub_02037E68, 0);
+    CommManager_Initialize(saveData, commType);
+    CommManager_SetTask(CommTask_StartMysteryGiftClient, 0);
 }
 
-void sub_02036C50(void)
+/**
+ * @brief Calls the current task function and updates the network icon
+ */
+void CommManager_Update(void)
 {
-    if (Unk_021C07D4) {
-        if (Unk_021C07D4->task != NULL) {
-            UnkFuncPtr_02036C94 v0 = Unk_021C07D4->task;
-            v0();
+    if (sCommMan) {
+        if (sCommMan->task != NULL) {
+            CommTaskFunc task = sCommMan->task;
+            task();
         }
     }
 
@@ -549,18 +691,25 @@ void sub_02036C50(void)
     }
 }
 
-static void CommMan_SetTask(UnkFuncPtr_02036C94 task, int timer)
+/**
+ * @brief Sets the Communication Manager's current task and timer
+ *
+ * @param task
+ * @param timer
+ */
+static void CommManager_SetTask(CommTaskFunc task, int timer)
 {
-    Unk_021C07D4->task = task;
-    Unk_021C07D4->timer = timer;
+    sCommMan->task = task;
+    sCommMan->timer = timer;
 }
 
-static void sub_02036CA4(void)
+/**
+ * @brief Starts the Underground process
+ */
+static void CommTask_StartUnderground(void)
 {
-    void *v0;
-
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
@@ -568,32 +717,35 @@ static void sub_02036CA4(void)
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    CommInfo_Init(Unk_021C07D4->saveData, NULL);
+    CommServerClient_Init(sCommMan->trainerInfo, 1);
+    CommInfo_Init(sCommMan->saveData, NULL);
     CommSys_SetAlone(1);
     CommSys_EnableSendMovementData();
 
-    if (Unk_021C07D4->unk_55) {
-        if (CommSys_InitServer(1, Unk_021C07D4->unk_4E, 500, 1)) {
-            u32 v1 = MATH_Rand32(&Unk_021C07D4->unk_0C, 40 / 2);
+    if (sCommMan->initializeAsServer) {
+        if (CommSys_InitServer(1, sCommMan->unk_4E, 500, 1)) {
+            u32 rand = MATH_Rand32(&sCommMan->rand, 40 / 2);
 
-            Unk_021C07D4->unk_4E = 0;
-            CommMan_SetTask(sub_02037040, 40 / 2 + v1);
+            sCommMan->unk_4E = 0;
+            CommManager_SetTask(CommTask_WaitUndergroundServer, 40 / 2 + rand);
         }
     } else {
         if (CommSys_InitClient(1, 1, 500)) {
-            if (Unk_021C07D4->unk_57) {
-                CommMan_SetTask(sub_02037330, 0);
+            if (sCommMan->doNotConnectUnderground) {
+                CommManager_SetTask(CommTask_None, 0);
             } else {
-                CommMan_SetTask(sub_02036E5C, 32 * 2);
+                CommManager_SetTask(CommTask_SearchUndergroundClient, 32 * 2);
             }
         }
     }
 }
 
-static void sub_02036D80(void)
+/**
+ * @brief Reinitializes the Communication Manager for underground play
+ */
+static void CommTask_ReinitUnderground(void)
 {
-    BOOL v0;
+    BOOL ret;
 
     if (!sub_02033E30()) {
         return;
@@ -602,91 +754,91 @@ static void sub_02036D80(void)
     CommSys_SetAlone(1);
     CommSys_EnableSendMovementData();
 
-    if (Unk_021C07D4->unk_55) {
-        CommMan_SetTask(sub_02036FD4, 0);
+    if (sCommMan->initializeAsServer) {
+        CommManager_SetTask(CommTask_InitUndergroundServer, 0);
     } else {
-        v0 = CommSys_InitClient(0, 1, 500);
+        ret = CommSys_InitClient(0, 1, 500);
 
-        if (v0) {
-            u32 v1 = MATH_Rand32(&Unk_021C07D4->unk_0C, 32 * 2);
+        if (ret) {
+            u32 rand = MATH_Rand32(&sCommMan->rand, 32 * 2);
 
-            if (Unk_021C07D4->unk_44 > 0) {
-                v1 = 2 * 32 * Unk_021C07D4->unk_44;
-                Unk_021C07D4->unk_44 = 0;
+            if (sCommMan->retryConnectionAttempts > 0) {
+                rand = 2 * 32 * sCommMan->retryConnectionAttempts;
+                sCommMan->retryConnectionAttempts = 0;
             }
 
-            CommMan_SetTask(sub_02036E5C, v1);
+            CommManager_SetTask(CommTask_SearchUndergroundClient, rand);
         }
     }
 }
 
 static void sub_02036E08(void)
 {
-    BOOL v0;
+    BOOL ret;
 
     if (!sub_02033E30()) {
         return;
     }
 
-    v0 = CommSys_InitClient(0, 0, 500);
+    ret = CommSys_InitClient(0, 0, 500);
 
-    if (v0) {
-        u32 v1 = MATH_Rand32(&Unk_021C07D4->unk_0C, 32);
-        CommMan_SetTask(sub_02036E5C, 32 / 2 + v1);
+    if (ret) {
+        u32 rand = MATH_Rand32(&sCommMan->rand, 32);
+        CommManager_SetTask(CommTask_SearchUndergroundClient, 32 / 2 + rand);
     }
 }
 
-static void sub_02036E5C(void)
+static void CommTask_SearchUndergroundClient(void)
 {
     int v0;
 
     sub_02033A5C();
 
-    if (Unk_021C07D4->unk_5A || Unk_021C07D4->unk_56) {
+    if (sCommMan->pauseUnderground || sCommMan->unk_56) {
         return;
     }
 
     v0 = sub_020338EC();
 
     if (v0 != -1) {
-        Unk_021C07D4->unk_49 = v0;
-        CommMan_SetTask(sub_02036EDC, 32);
+        sCommMan->connectionID = v0;
+        CommManager_SetTask(sub_02036EDC, 32);
         return;
     }
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
     v0 = sub_0203394C();
 
     if (v0 != -1) {
-        Unk_021C07D4->unk_49 = v0;
-        CommMan_SetTask(sub_02036EDC, 32);
+        sCommMan->connectionID = v0;
+        CommManager_SetTask(sub_02036EDC, 32);
         return;
     }
 
-    CommMan_SetTask(sub_02036FA4, 0);
+    CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
 }
 
 static void sub_02036EDC(void)
 {
     sub_02033A5C();
 
-    if (sub_02033898(Unk_021C07D4->unk_49) != 0) {
-        if (sub_02034984(Unk_021C07D4->unk_49)) {
-            CommMan_SetTask(sub_02036F44, 100);
+    if (sub_02033898(sCommMan->connectionID) != 0) {
+        if (sub_02034984(sCommMan->connectionID)) {
+            CommManager_SetTask(sub_02036F44, 100);
             return;
         }
     }
 
     if (CommSys_CheckError()) {
-        CommMan_SetTask(sub_02036FA4, 0);
-    } else if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+        CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
+    } else if (sCommMan->timer != 0) {
+        sCommMan->timer--;
     } else {
-        CommMan_SetTask(sub_02036FA4, 0);
+        CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
     }
 }
 
@@ -696,30 +848,30 @@ static void sub_02036F44(void)
         CommSys_Reset();
         CommSys_SetAlone(0);
         CommSys_EnableSendMovementData();
-        CommMan_SetTask(sub_020370B8, 0);
+        CommManager_SetTask(CommTask_ConnectUndergroundClient, 0);
         return;
     }
 
     if (CommSys_CheckError()) {
-        CommMan_SetTask(sub_02036FA4, 0);
+        CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
         return;
     }
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
-    CommMan_SetTask(sub_02036FA4, 0);
+    CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
 }
 
-static void sub_02036FA4(void)
+static void CommTask_ResetUndergroundServer(void)
 {
     if (!sub_020336D4()) {
         return;
     }
 
-    CommMan_SetTask(sub_02036FD4, 0);
+    CommManager_SetTask(CommTask_InitUndergroundServer, 0);
 }
 
 static void sub_02036FBC(void)
@@ -728,46 +880,44 @@ static void sub_02036FBC(void)
         return;
     }
 
-    CommMan_SetTask(sub_02036E08, 0);
+    CommManager_SetTask(sub_02036E08, 0);
 }
 
-static void sub_02036FD4(void)
+static void CommTask_InitUndergroundServer(void)
 {
-    TrainerInfo *v0;
-
     if (!sub_02033E30()) {
         return;
     }
 
     CommSys_SetAlone(1);
 
-    if (CommSys_InitServer(0, Unk_021C07D4->unk_4E, 500, 1)) {
-        u32 v1 = MATH_Rand32(&Unk_021C07D4->unk_0C, 40 / 2);
+    if (CommSys_InitServer(0, sCommMan->unk_4E, 500, 1)) {
+        u32 rand = MATH_Rand32(&sCommMan->rand, 40 / 2);
 
-        Unk_021C07D4->unk_4E = 0;
-        CommMan_SetTask(sub_02037040, 40 / 2 + v1);
+        sCommMan->unk_4E = 0;
+        CommManager_SetTask(CommTask_WaitUndergroundServer, 40 / 2 + rand);
     }
 }
 
-static void sub_02037040(void)
+static void CommTask_WaitUndergroundServer(void)
 {
     if (CommSys_IsClientConnecting()) {
-        Unk_021C07D4->unk_4E = 1;
-        CommMan_SetTask(sub_02037094, 0);
+        sCommMan->unk_4E = 1;
+        CommManager_SetTask(sub_02037094, 0);
         return;
     }
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
-    if (Unk_021C07D4->unk_55) {
+    if (sCommMan->initializeAsServer) {
         return;
     }
 
     if (sub_020336D4()) {
-        CommMan_SetTask(sub_02036FBC, 2);
+        CommManager_SetTask(sub_02036FBC, 2);
     }
 }
 
@@ -776,20 +926,20 @@ static void sub_02037094(void)
     CommSys_SetAlone(0);
     sub_02033EA8(1);
     CommSys_EnableSendMovementData();
-    CommMan_SetTask(sub_020370B4, 0);
+    CommManager_SetTask(CommTask_ConnectUndergroundServer, 0);
 }
 
-static void sub_020370B4(void)
+static void CommTask_ConnectUndergroundServer(void)
 {
     return;
 }
 
-static void sub_020370B8(void)
+static void CommTask_ConnectUndergroundClient(void)
 {
     return;
 }
 
-static void sub_020370BC(void)
+static void CommTask_StartSecretBase(void)
 {
     if (!CommMan_IsConnectedToWifi()) {
         if (!sub_02033E30()) {
@@ -801,20 +951,20 @@ static void sub_020370BC(void)
         CommServerClient_SetSecretBaseClosedState(TRUE);
     }
 
-    CommMan_SetTask(sub_02037330, 0);
+    CommManager_SetTask(CommTask_None, 0);
 }
 
-static void sub_020370EC(void)
+static void CommTask_RestartSecretBase(void)
 {
     if (!sub_020336D4()) {
         return;
     }
 
     CommSys_Reset();
-    CommMan_SetTask(sub_020370BC, 0);
+    CommManager_SetTask(CommTask_StartSecretBase, 0);
 }
 
-static void sub_02037108(void)
+static void CommTask_StartWirelessClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
@@ -822,32 +972,30 @@ static void sub_02037108(void)
 
     CommServerClient_SetSecretBaseClosedState(FALSE);
     CommSys_Reset();
-    CommMan_SetTask(sub_02036D80, 0);
+    CommManager_SetTask(CommTask_ReinitUnderground, 0);
 }
 
-static void sub_0203712C(void)
+static void CommTask_ResetUnderground(void)
 {
     if (!sub_020336D4()) {
         return;
     }
 
-    CommMan_SetTask(sub_02036D80, 0);
+    CommManager_SetTask(CommTask_ReinitUnderground, 0);
 }
 
-static void sub_02037144(void)
+static void CommTask_StartBattleServer(void)
 {
-    TrainerInfo *v0;
-
     if (!WirelessDriver_IsReady()) {
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    CommInfo_Init(Unk_021C07D4->saveData, Unk_021C07D4->unk_30);
+    CommServerClient_Init(sCommMan->trainerInfo, 1);
+    CommInfo_Init(sCommMan->saveData, sCommMan->battleRegulation);
 
     if (CommSys_InitServer(1, 1, 512, 1)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_0203718C, 0);
+        CommManager_SetTask(sub_0203718C, 0);
     }
 }
 
@@ -857,28 +1005,28 @@ static void sub_0203718C(void)
         return;
     }
 
-    CommMan_SetTask(sub_020371A8, 0);
+    CommManager_SetTask(CommTask_WaitBattleServer, 0);
 }
 
-static void sub_020371A8(void)
+static void CommTask_WaitBattleServer(void)
 {
     if (!CommSys_IsInitialized()) {
-        CommMan_SetTask(sub_02037334, 0);
+        CommManager_SetTask(CommTask_End, 0);
     }
 }
 
-static void sub_020371C0(void)
+static void CommTask_StartBattleClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    CommInfo_Init(Unk_021C07D4->saveData, Unk_021C07D4->unk_30);
+    CommServerClient_Init(sCommMan->trainerInfo, 1);
+    CommInfo_Init(sCommMan->saveData, sCommMan->battleRegulation);
 
     if (CommSys_InitClient(1, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037208, 0);
+        CommManager_SetTask(sub_02037208, 0);
     }
 }
 
@@ -887,38 +1035,38 @@ static void sub_02037208(void)
     sub_02033A5C();
 }
 
-static void sub_02037210(void)
+static void CommTask_ConnectBattleClient(void)
 {
     sub_02033A5C();
 
-    if (sub_02034984(Unk_021C07D4->unk_49)) {
-        CommMan_SetTask(sub_02037238, 10);
+    if (sub_02034984(sCommMan->connectionID)) {
+        CommManager_SetTask(sub_02037238, 10);
     }
 }
 
 static void sub_02037238(void)
 {
     if (CommSys_CheckError()) {
-        CommMan_SetTask(sub_02037270, 0);
+        CommManager_SetTask(sub_02037270, 0);
     }
 
     if (CommSys_IsPlayerConnected(CommSys_CurNetId()) && (0 != CommSys_CurNetId())) {
-        CommMan_SetTask(sub_020372C4, 0);
+        CommManager_SetTask(CommTask_WaitBattleClient, 0);
     }
 }
 
 static void sub_02037270(void)
 {
     sub_020336D4();
-    CommMan_SetTask(sub_02037284, 2);
+    CommManager_SetTask(sub_02037284, 2);
 }
 
 static void sub_02037284(void)
 {
     TrainerInfo *v0;
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
@@ -928,29 +1076,27 @@ static void sub_02037284(void)
 
     if (CommSys_InitClient(0, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037210, 10);
+        CommManager_SetTask(CommTask_ConnectBattleClient, 10);
     }
 }
 
-static void sub_020372C4(void)
+static void CommTask_WaitBattleClient(void)
 {
     if (!CommSys_IsInitialized()) {
-        CommMan_SetTask(sub_02037334, 0);
+        CommManager_SetTask(CommTask_End, 0);
     }
 }
 
 static void sub_020372DC(void)
 {
     sub_020336D4();
-    CommMan_SetTask(sub_020372F0, 2);
+    CommManager_SetTask(sub_020372F0, 2);
 }
 
 static void sub_020372F0(void)
 {
-    TrainerInfo *v0;
-
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
@@ -960,27 +1106,36 @@ static void sub_020372F0(void)
 
     if (CommSys_InitClient(0, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037208, 10);
+        CommManager_SetTask(sub_02037208, 10);
     }
 }
 
-static void sub_02037330(void)
+/**
+ * @brief Blank task, does nothing when called
+ */
+static void CommTask_None(void)
 {
     return;
 }
 
-static void sub_02037334(void)
+/**
+ * @brief Deletes the Communication Manager after the connection ended
+ */
+static void CommTask_End(void)
 {
     if (CommSys_IsInitialized()) {
         return;
     }
 
-    sub_02036734();
+    CommMan_Free();
 }
 
-static void sub_02037344(void)
+/**
+ * @brief Calls the end connection function for underground connections
+ */
+static void CommManager_EndConnectionUnderground(void)
 {
-    CommMan_SetTask(sub_020373B8, 5);
+    CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
 static void sub_02037354(void)
@@ -988,17 +1143,17 @@ static void sub_02037354(void)
     if (CommSys_ConnectedCount() <= 1) {
         WirelessManager_SetPauseConnectionSystem(0);
         CommSys_ResetDS();
-        CommMan_SetTask(sub_02037474, 0);
+        CommManager_SetTask(CommTask_EndUnionClient, 0);
     }
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
     WirelessManager_SetPauseConnectionSystem(0);
     CommSys_ResetDS();
-    CommMan_SetTask(sub_02037474, 0);
+    CommManager_SetTask(CommTask_EndUnionClient, 0);
 }
 
 static void sub_0203739C(void)
@@ -1008,53 +1163,60 @@ static void sub_0203739C(void)
     }
 
     CommSys_Reset();
-    CommMan_SetTask(sub_02037474, 0);
+    CommManager_SetTask(CommTask_EndUnionClient, 0);
 }
 
-static void sub_020373B8(void)
+/**
+ * @brief Handles ending the connection and deletes the Communication System
+ */
+static void CommTask_EndConnection(void)
 {
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
     }
 
     if (!sub_020336D4()) {
         return;
     }
 
-    if (Unk_021C07D4->timer != 0) {
+    if (sCommMan->timer != 0) {
         return;
     }
 
     CommSys_Delete();
-    CommMan_SetTask(sub_02037334, 0);
+    CommManager_SetTask(CommTask_End, 0);
 }
 
-static void sub_020373F0(void)
+/**
+ * @brief Task to initialize sCommMan for Union play
+ */
+static void CommTask_StartUnion(void)
 {
-    void *v0;
-
     if (!WirelessDriver_IsReady()) {
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    WirelessManager_SetMaxNumConnections(Unk_021C07D4->unk_46);
-    CommInfo_Init(Unk_021C07D4->saveData, NULL);
+    CommServerClient_Init(sCommMan->trainerInfo, 1);
+    WirelessManager_SetMaxNumConnections(sCommMan->maxNumConnection);
+    CommInfo_Init(sCommMan->saveData, NULL);
 
     if (CommSys_InitClient(1, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037444, 32 * 2);
+        CommManager_SetTask(CommTask_SearchUnionClient, 32 * 2);
     }
 }
 
-static void sub_02037444(void)
+/**
+ * @brief Searches for parents to connect to as a client for union play, initializes as a server if none are found
+ */
+static void CommTask_SearchUnionClient(void)
 {
     int v0;
 
     sub_02033A5C();
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
@@ -1062,30 +1224,33 @@ static void sub_02037444(void)
         return;
     }
 
-    CommMan_SetTask(sub_0203748C, 0);
+    CommManager_SetTask(CommTask_InitializeServerUnion, 0);
 }
 
-static void sub_02037474(void)
+static void CommTask_EndUnionClient(void)
 {
     if (!sub_020336D4()) {
         return;
     }
 
-    CommMan_SetTask(sub_0203748C, 0);
+    CommManager_SetTask(CommTask_InitializeServerUnion, 0);
 }
 
-static void sub_0203748C(void)
+/**
+ * @brief Initializes the current CommManager as a server for union play
+ */
+static void CommTask_InitializeServerUnion(void)
 {
     if (!sub_02033E30()) {
         return;
     }
 
-    if (CommSys_InitServer(0, Unk_021C07D4->unk_4E, 512, 1)) {
-        u32 v1 = MATH_Rand32(&Unk_021C07D4->unk_0C, 40 * 2);
+    if (CommSys_InitServer(0, sCommMan->unk_4E, 512, 1)) {
+        u32 rand = MATH_Rand32(&sCommMan->rand, 40 * 2);
 
         CommSys_SwitchTransitionTypeToParallel();
-        Unk_021C07D4->unk_4E = 0;
-        CommMan_SetTask(sub_020374F4, 10000);
+        sCommMan->unk_4E = 0;
+        CommManager_SetTask(sub_020374F4, 10000);
     }
 }
 
@@ -1095,26 +1260,26 @@ static void sub_020374F4(void)
         (void)0;
     } else {
         if (CommSys_IsClientConnecting()) {
-            Unk_021C07D4->unk_4E = 1;
+            sCommMan->unk_4E = 1;
             NetworkIcon_Init();
-            CommMan_SetTask(sub_02037790, 0);
+            CommManager_SetTask(CommTask_ConnectUnionServer, 0);
             return;
         }
 
-        if (Unk_021C07D4->timer != 0) {
-            Unk_021C07D4->timer--;
+        if (sCommMan->timer != 0) {
+            sCommMan->timer--;
             return;
         }
     }
 
     if (sub_020336D4()) {
-        CommMan_SetTask(sub_0203754C, 0);
+        CommManager_SetTask(CommTask_RestartUnionClient, 0);
     }
 }
 
-static void sub_0203754C(void)
+static void CommTask_RestartUnionClient(void)
 {
-    u32 v1;
+    u32 rand;
 
     if (!sub_02033E30()) {
         return;
@@ -1122,8 +1287,8 @@ static void sub_0203754C(void)
 
     if (CommSys_InitClient(0, 0, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        v1 = MATH_Rand32(&Unk_021C07D4->unk_0C, 32);
-        CommMan_SetTask(sub_02037444, v1);
+        rand = MATH_Rand32(&sCommMan->rand, 32);
+        CommManager_SetTask(CommTask_SearchUnionClient, rand);
     }
 }
 
@@ -1133,7 +1298,7 @@ static void sub_020375A4(void)
         return;
     }
 
-    CommMan_SetTask(sub_020375BC, 0);
+    CommManager_SetTask(sub_020375BC, 0);
 }
 
 static void sub_020375BC(void)
@@ -1144,114 +1309,114 @@ static void sub_020375BC(void)
 
     if (CommSys_InitClient(0, 0, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_020375E8, 100);
+        CommManager_SetTask(sub_020375E8, 100);
     }
 }
 
 static void sub_020375E8(void)
 {
-    if (sub_02033898(Unk_021C07D4->unk_49) != 0) {
-        if (sub_02034984(Unk_021C07D4->unk_49)) {
-            CommMan_SetTask(sub_0203764C, 100);
+    if (sub_02033898(sCommMan->connectionID) != 0) {
+        if (sub_02034984(sCommMan->connectionID)) {
+            CommManager_SetTask(sub_0203764C, 100);
             return;
         }
     }
 
     if (CommSys_CheckError()) {
-        CommMan_SetTask(sub_02037740, 0);
-    } else if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+        CommManager_SetTask(CommTask_ResetUnionClient, 0);
+    } else if (sCommMan->timer != 0) {
+        sCommMan->timer--;
     } else {
-        CommMan_SetTask(sub_02037740, 0);
+        CommManager_SetTask(CommTask_ResetUnionClient, 0);
     }
 }
 
 static void sub_0203764C(void)
 {
     if (CommSys_CheckError()) {
-        CommMan_SetTask(sub_02037740, 0);
+        CommManager_SetTask(CommTask_ResetUnionClient, 0);
         return;
     }
 
     if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
-        Unk_021C07D4->unk_48 = 0;
-        CommMan_SetTask(sub_020376A8, 120);
+        sCommMan->unk_48 = 0;
+        CommManager_SetTask(sub_020376A8, 120);
         return;
     }
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
-    CommMan_SetTask(sub_02037740, 0);
+    CommManager_SetTask(CommTask_ResetUnionClient, 0);
 }
 
 static void sub_020376A8(void)
 {
     if (CommSys_CheckError()) {
-        CommMan_SetTask(sub_02037740, 0);
+        CommManager_SetTask(CommTask_ResetUnionClient, 0);
         return;
     }
 
-    if (Unk_021C07D4->unk_48 == 2) {
-        CommMan_SetTask(sub_0203773C, 0);
+    if (sCommMan->unk_48 == 2) {
+        CommManager_SetTask(CommTask_FailedConnectUnionClient, 0);
         return;
     }
 
-    if (Unk_021C07D4->unk_48 == 1) {
+    if (sCommMan->unk_48 == 1) {
         CommInfo_SendPlayerInfo();
-        CommMan_SetTask(sub_02037724, 0);
+        CommManager_SetTask(CommTask_SuccededConnectUnionClient, 0);
         return;
     }
 
-    if (Unk_021C07D4->timer > (120 - 10)) {
+    if (sCommMan->timer > (120 - 10)) {
         CommSys_SendDataFixedSize(6, Unk_02100A20);
     }
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
-    CommMan_SetTask(sub_02037740, 0);
+    CommManager_SetTask(CommTask_ResetUnionClient, 0);
 }
 
-static void sub_02037724(void)
+static void CommTask_SuccededConnectUnionClient(void)
 {
     if (CommSys_CheckError()) {
-        CommMan_SetTask(sub_02037740, 0);
+        CommManager_SetTask(CommTask_ResetUnionClient, 0);
         return;
     }
 }
 
-static void sub_0203773C(void)
+static void CommTask_FailedConnectUnionClient(void)
 {
     return;
 }
 
-static void sub_02037740(void)
+static void CommTask_ResetUnionClient(void)
 {
-    Unk_021C07D4->unk_48 = 0;
+    sCommMan->unk_48 = 0;
 
     if (!sub_020336D4()) {
         return;
     }
 
-    if (Unk_021C07D4->unk_44 != 0) {
-        Unk_021C07D4->unk_44--;
-        CommMan_SetTask(sub_020375BC, 0);
+    if (sCommMan->retryConnectionAttempts != 0) {
+        sCommMan->retryConnectionAttempts--;
+        CommManager_SetTask(sub_020375BC, 0);
     } else {
-        CommMan_SetTask(sub_0203773C, 0);
+        CommManager_SetTask(CommTask_FailedConnectUnionClient, 0);
     }
 }
 
-static void sub_02037790(void)
+static void CommTask_ConnectUnionServer(void)
 {
     if (!CommSys_IsClientConnecting()) {
         if (!sub_02038938()) {
             if (sub_020336D4()) {
-                CommMan_SetTask(sub_0203754C, 0);
+                CommManager_SetTask(CommTask_RestartUnionClient, 0);
             }
         }
     } else {
@@ -1262,29 +1427,27 @@ static void sub_02037790(void)
 
     if (CommSys_CheckError()) {
         if (!sub_02038938()) {
-            CommMan_SetTask(sub_02037740, 0);
+            CommManager_SetTask(CommTask_ResetUnionClient, 0);
             return;
         }
     }
 }
 
-static void sub_020377E4(void)
+static void CommTask_PauseUnionServer(void)
 {
-    u32 v1;
-
     if (!sub_02033E30()) {
         return;
     }
 
-    if (CommSys_InitServer(0, Unk_021C07D4->unk_4E, 512, 0)) {
+    if (CommSys_InitServer(0, sCommMan->unk_4E, 512, 0)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037330, 0);
+        CommManager_SetTask(CommTask_None, 0);
     }
 }
 
-void sub_0203781C(void)
+void CommManager_StartDrawServer(void)
 {
-    Unk_021C07D4->unk_4A = 13;
+    sCommMan->commType = COMM_TYPE_DRAW;
 
     if (CommSys_CurNetId() == 0) {
         u8 v0 = 0;
@@ -1295,121 +1458,124 @@ void sub_0203781C(void)
     }
 }
 
-void sub_02037854(int param0)
+void CommManager_StartDrawClient(int param0)
 {
-    Unk_021C07D4->unk_49 = param0;
-    Unk_021C07D4->unk_44 = 3;
-    CommMan_SetTask(sub_020378F8, 0);
+    sCommMan->connectionID = param0;
+    sCommMan->retryConnectionAttempts = 3;
+    CommManager_SetTask(CommTask_StartDrawClient, 0);
 }
 
-void sub_02037878(void)
+void CommManager_SetState_MixRecords(void)
 {
-    Unk_021C07D4->unk_4A = 7;
+    sCommMan->commType = COMM_TYPE_MIX_RECORDS;
 }
 
-void sub_02037888(int param0)
+void CommManager_StartMixRecordsClient(int param0)
 {
-    Unk_021C07D4->unk_49 = param0;
-    Unk_021C07D4->unk_4A = 7;
-    Unk_021C07D4->unk_44 = 3;
+    sCommMan->connectionID = param0;
+    sCommMan->commType = COMM_TYPE_MIX_RECORDS;
+    sCommMan->retryConnectionAttempts = 3;
 
     NetworkIcon_Init();
-    CommMan_SetTask(sub_020375A4, 0);
+    CommManager_SetTask(sub_020375A4, 0);
 }
 
-void sub_020378B8(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_SPIN_TRADE
+ */
+void CommManager_SetState_SpinTrade(void)
 {
-    Unk_021C07D4->unk_4A = 26;
+    sCommMan->commType = COMM_TYPE_SPIN_TRADE;
 }
 
-void sub_020378C8(int param0)
+void CommManager_StartSpinTradeClient(int param0)
 {
-    Unk_021C07D4->unk_49 = param0;
-    Unk_021C07D4->unk_4A = 26;
-    Unk_021C07D4->unk_44 = 3;
+    sCommMan->connectionID = param0;
+    sCommMan->commType = COMM_TYPE_SPIN_TRADE;
+    sCommMan->retryConnectionAttempts = 3;
 
     NetworkIcon_Init();
-    CommMan_SetTask(sub_020375A4, 0);
+    CommManager_SetTask(sub_020375A4, 0);
 }
 
-static void sub_020378F8(void)
+static void CommTask_StartDrawClient(void)
 {
     if (sub_020336D4()) {
-        CommMan_SetTask(sub_02037910, 0);
+        CommManager_SetTask(CommTask_InitDrawClient, 0);
     }
 }
 
-static void sub_02037910(void)
+static void CommTask_InitDrawClient(void)
 {
     if (!sub_02033E30()) {
         return;
     }
 
-    Unk_021C07D4->unk_4A = 13;
+    sCommMan->commType = COMM_TYPE_DRAW;
 
     if (CommSys_InitClient(0, 0, 512)) {
         CommSys_SwitchTransitionTypeToServerClient();
-        CommMan_SetTask(sub_0203794C, 100);
+        CommManager_SetTask(CommTask_ConnectDraw, 100);
     }
 }
 
-static void sub_0203794C(void)
+static void CommTask_ConnectDraw(void)
 {
-    if (sub_02033898(Unk_021C07D4->unk_49) != 0) {
-        if (sub_02034984(Unk_021C07D4->unk_49)) {
-            CommMan_SetTask(sub_020379D0, 100);
+    if (sub_02033898(sCommMan->connectionID) != 0) {
+        if (sub_02034984(sCommMan->connectionID)) {
+            CommManager_SetTask(CommTask_ConnectingDraw, 100);
             return;
         }
     }
 
-    if (CommSys_CheckError() || (Unk_021C07D4->timer == 0)) {
-        Unk_021C07D4->unk_44--;
+    if (CommSys_CheckError() || (sCommMan->timer == 0)) {
+        sCommMan->retryConnectionAttempts--;
 
-        if (Unk_021C07D4->unk_44 == 0) {
-            CommMan_SetTask(sub_0203773C, 0);
+        if (sCommMan->retryConnectionAttempts == 0) {
+            CommManager_SetTask(CommTask_FailedConnectUnionClient, 0);
         } else {
-            CommMan_SetTask(sub_020378F8, 0);
+            CommManager_SetTask(CommTask_StartDrawClient, 0);
         }
-    } else if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    } else if (sCommMan->timer != 0) {
+        sCommMan->timer--;
     }
 }
 
-static void sub_020379D0(void)
+static void CommTask_ConnectingDraw(void)
 {
-    if (Unk_021C07D4->timer > 90) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer > 90) {
+        sCommMan->timer--;
         return;
     }
 
     if (CommSys_CheckError()) {
-        Unk_021C07D4->unk_44--;
+        sCommMan->retryConnectionAttempts--;
 
-        if (Unk_021C07D4->unk_44 == 0) {
-            CommMan_SetTask(sub_0203773C, 0);
+        if (sCommMan->retryConnectionAttempts == 0) {
+            CommManager_SetTask(CommTask_FailedConnectUnionClient, 0);
         } else {
-            CommMan_SetTask(sub_020378F8, 0);
+            CommManager_SetTask(CommTask_StartDrawClient, 0);
         }
 
         return;
     }
 
     if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
-        CommMan_SetTask(sub_02037724, 0);
+        CommManager_SetTask(CommTask_SuccededConnectUnionClient, 0);
         return;
     }
 
-    if (Unk_021C07D4->timer != 0) {
-        Unk_021C07D4->timer--;
+    if (sCommMan->timer != 0) {
+        sCommMan->timer--;
         return;
     }
 
-    Unk_021C07D4->unk_44--;
+    sCommMan->retryConnectionAttempts--;
 
-    if (Unk_021C07D4->unk_44 == 0) {
-        CommMan_SetTask(sub_0203773C, 0);
+    if (sCommMan->retryConnectionAttempts == 0) {
+        CommManager_SetTask(CommTask_FailedConnectUnionClient, 0);
     } else {
-        CommMan_SetTask(sub_020378F8, 0);
+        CommManager_SetTask(CommTask_StartDrawClient, 0);
     }
 }
 
@@ -1432,7 +1598,7 @@ void sub_02037A78(int param0, int param1, void *param2, void *param3)
         }
     }
 
-    if (v2 && (!Unk_021C07D4->unk_53)) {
+    if (v2 && (!sCommMan->pauseUnion)) {
         Unk_02100A30[0] = param0;
         CommSys_SendDataFixedSizeServer(7, Unk_02100A30);
         return;
@@ -1460,7 +1626,7 @@ void sub_02037AD8(int param0, int param1, void *param2, void *param3)
         v0 = v2[0];
 
         if (v0 == CommSys_CurNetId()) {
-            Unk_021C07D4->unk_48 = 1;
+            sCommMan->unk_48 = 1;
         }
 
         return;
@@ -1479,7 +1645,7 @@ void sub_02037AD8(int param0, int param1, void *param2, void *param3)
         v0 = v2[0];
 
         if (v0 == (u8)CommSys_CurNetId()) {
-            Unk_021C07D4->unk_48 = 2;
+            sCommMan->unk_48 = 2;
         }
 
         return;
@@ -1491,10 +1657,10 @@ int sub_02037B54(void)
     return sizeof(Unk_02100A20);
 }
 
-void sub_02037B58(int param0)
+void CommManager_SetMaxNumConnections(int param0)
 {
-    if (Unk_021C07D4) {
-        Unk_021C07D4->unk_46 = param0;
+    if (sCommMan) {
+        sCommMan->maxNumConnection = param0;
         WirelessManager_SetMaxNumConnections(param0);
     }
 }
@@ -1510,12 +1676,12 @@ static void sub_02037B78(void)
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    CommInfo_Init(Unk_021C07D4->saveData, NULL);
+    CommServerClient_Init(sCommMan->trainerInfo, 1);
+    CommInfo_Init(sCommMan->saveData, NULL);
 
     if (CommSys_InitClient(1, 1, 32)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037B70, 0);
+        CommManager_SetTask(sub_02037B70, 0);
     }
 }
 
@@ -1526,20 +1692,20 @@ void sub_02037BC0(SaveData *saveData)
     }
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7000);
-    sub_020366A0(saveData, 14);
+    CommManager_Initialize(saveData, COMM_TYPE_POKETCH);
 
-    Unk_021C07D4->unk_4B = 0;
+    sCommMan->contestRegulation = 0;
 
-    CommMan_SetTask(sub_02037B78, 0);
+    CommManager_SetTask(sub_02037B78, 0);
 }
 
 void sub_02037BFC(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    CommMan_SetTask(sub_020373B8, 5);
+    CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
 BOOL sub_02037C18(void)
@@ -1548,9 +1714,9 @@ BOOL sub_02037C18(void)
     u32 v1[] = {
         (u32)sub_02037B70, 0
     };
-    u32 v2 = (u32)Unk_021C07D4->task;
+    u32 v2 = (u32)sCommMan->task;
 
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return 0;
     }
 
@@ -1568,17 +1734,17 @@ static void sub_02037C5C(u32 param0, int param1)
     switch (param0) {
     case 0x333:
         if (param1 == 15) {
-            Unk_021C07D4->unk_54 |= 0x1;
+            sCommMan->unk_54 |= 0x1;
         }
         break;
     case 0x400318:
-        Unk_021C07D4->unk_54 |= 0x1;
+        sCommMan->unk_54 |= 0x1;
         break;
     case 0x400131:
-        Unk_021C07D4->unk_54 |= 0x2;
+        sCommMan->unk_54 |= 0x2;
         break;
     case 0x400286:
-        Unk_021C07D4->unk_54 |= 0x4;
+        sCommMan->unk_54 |= 0x4;
         break;
     }
 }
@@ -1587,7 +1753,7 @@ static void sub_02037CE4(void)
 {
     if (CommSys_InitClient(1, 1, 32)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037B70, 0);
+        CommManager_SetTask(sub_02037B70, 0);
     }
 }
 
@@ -1597,10 +1763,10 @@ static void sub_02037D08(void)
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 0);
-    CommInfo_Init(Unk_021C07D4->saveData, NULL);
+    CommServerClient_Init(sCommMan->trainerInfo, 0);
+    CommInfo_Init(sCommMan->saveData, NULL);
     WirelessManager_SetGGIDScanCallback(sub_02037C5C);
-    CommMan_SetTask(sub_02037CE4, 0);
+    CommManager_SetTask(sub_02037CE4, 0);
 }
 
 void sub_02037D48(SaveData *saveData)
@@ -1610,82 +1776,80 @@ void sub_02037D48(SaveData *saveData)
     }
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7000);
-    sub_020366A0(saveData, 17);
-    Unk_021C07D4->unk_4B = 0;
-    CommMan_SetTask(sub_02037D08, 0);
+    CommManager_Initialize(saveData, COMM_TYPE_PARTY);
+    sCommMan->contestRegulation = 0;
+    CommManager_SetTask(sub_02037D08, 0);
 }
 
 void sub_02037D84(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    CommMan_SetTask(sub_020373B8, 5);
+    CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
 u8 sub_02037DA0(void)
 {
-    return Unk_021C07D4->unk_54;
+    return sCommMan->unk_54;
 }
 
 BOOL sub_02037DB0(void)
 {
     CommSys_StartShutdown();
 
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return 1;
     }
 
-    if ((Unk_021C07D4->unk_4A == 24) || (Unk_021C07D4->unk_4A == 25) || (Unk_021C07D4->unk_4A == 36)) {
+    if ((sCommMan->commType == COMM_TYPE_24) || (sCommMan->commType == COMM_TYPE_25) || (sCommMan->commType == COMM_TYPE_EMAIL_WIFI)) {
         NintendoWFC_Stop();
         return 1;
     } else if (CommMan_IsConnectedToWifi()) {
-        if (Unk_021C07D4->unk_4A == 33) {
-            CommMan_SetTask(sub_02038D80, 0);
+        if (sCommMan->commType == COMM_TYPE_LOBBY_WIFI) {
+            CommManager_SetTask(CommTask_LogoutWifiLobby, 0);
         } else {
-            CommMan_SetTask(sub_02038314, 0);
+            CommManager_SetTask(sub_02038314, 0);
         }
     } else {
-        CommMan_SetTask(sub_020370EC, 0);
+        CommManager_SetTask(CommTask_RestartSecretBase, 0);
     }
 
     return 0;
 }
 
-static void sub_02037E20(void)
+static void CommTask_StartRandomBattleServer(void)
 {
-    TrainerInfo *v0;
-
     if (!WirelessDriver_IsReady()) {
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    CommInfo_Init(Unk_021C07D4->saveData, NULL);
+    CommServerClient_Init(sCommMan->trainerInfo, 1);
+    CommInfo_Init(sCommMan->saveData, NULL);
 
     if (CommSys_InitServer(1, 1, 512, 1)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_0203718C, 0);
+        CommManager_SetTask(sub_0203718C, 0);
     }
 }
 
-static void sub_02037E68(void)
+static void CommTask_StartMysteryGiftClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
     }
 
-    CommServerClient_Init(Unk_021C07D4->unk_2C, 1);
-    CommInfo_Init(Unk_021C07D4->saveData, NULL);
+    CommServerClient_Init(sCommMan->trainerInfo, 1);
+    CommInfo_Init(sCommMan->saveData, NULL);
 
     if (CommSys_InitClient(1, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_02037208, 0);
+        CommManager_SetTask(sub_02037208, 0);
     }
 }
 
-static void sub_02037EB0(void)
+static void CommTask_WifiBattleError(void)
 {
     return;
 }
@@ -1695,18 +1859,18 @@ static void sub_02037EB4(void)
     int v0 = NintendoWFC_Process(0);
 
     if (v0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     } else if (v0 == ((DWC_ERROR_NUM) + 3)) {
         (void)0;
     }
 }
 
-static void sub_02037ED0(void)
+static void CommTask_DisconnectWifiBattle(void)
 {
     return;
 }
 
-static void sub_02037ED4(void)
+static void CommTask_WifiBattleFailed(void)
 {
     return;
 }
@@ -1720,28 +1884,28 @@ static void sub_02037ED8(void)
     v0 = NintendoWFC_Process(0);
 
     if ((v0 >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > v0)) {
-        CommMan_SetTask(sub_02037ED4, 0);
+        CommManager_SetTask(CommTask_WifiBattleFailed, 0);
     } else if (v0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     } else if (v0 == ((DWC_ERROR_NUM) + 3)) {
-        CommMan_SetTask(sub_02037EB4, 0);
+        CommManager_SetTask(sub_02037EB4, 0);
     } else if (v0 == ((DWC_ERROR_NUM) + 4)) {
-        if (Unk_021C07D4->unk_4F) {
-            CommMan_SetTask(sub_02037EB0, 0);
+        if (sCommMan->errorDisconnect) {
+            CommManager_SetTask(CommTask_WifiBattleError, 0);
         } else {
-            CommMan_SetTask(sub_02037ED0, 0);
+            CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
         }
     } else if (v0 == ((DWC_ERROR_NUM) + 1)) {
-        if (Unk_021C07D4->unk_4F) {
-            CommMan_SetTask(sub_02037EB0, 0);
+        if (sCommMan->errorDisconnect) {
+            CommManager_SetTask(CommTask_WifiBattleError, 0);
         } else {
-            CommMan_SetTask(sub_02037ED0, 0);
+            CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
         }
     }
 
-    if (Unk_021C07D4->unk_4F) {
-        if (Unk_021C07D4->unk_47 != CommSys_ConnectedCount()) {
-            CommMan_SetTask(sub_02037EB0, 0);
+    if (sCommMan->errorDisconnect) {
+        if (sCommMan->connectedCount != CommSys_ConnectedCount()) {
+            CommManager_SetTask(CommTask_WifiBattleError, 0);
         }
     }
 }
@@ -1750,16 +1914,16 @@ void sub_02037F94(int param0, int param1, int param2)
 {
     int v0;
 
-    if (Unk_021C07D4) {
+    if (sCommMan) {
         if ((param0 == ((DWC_ERROR_NUM) + 6)) || (param0 == ((DWC_ERROR_NUM) + 5))) {
             v0 = param0;
         } else {
             v0 = -param0;
         }
 
-        Unk_021C07D4->unk_34.unk_00 = v0;
-        Unk_021C07D4->unk_34.unk_04 = param1;
-        Unk_021C07D4->unk_34.unk_08 = param2;
+        sCommMan->unk_34.unk_00 = v0;
+        sCommMan->unk_34.unk_04 = param1;
+        sCommMan->unk_34.unk_08 = param2;
     }
 }
 
@@ -1768,17 +1932,17 @@ static void sub_02037FBC(void)
     int v0 = NintendoWFC_Process(0);
 
     if ((v0 >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > v0)) {
-        CommMan_SetTask(sub_02037ED4, 0);
+        CommManager_SetTask(CommTask_WifiBattleFailed, 0);
     } else if (v0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     } else if (v0 == NINTENDO_WFC_RESULT_MATCHMAKING_SUCCESS) {
-        CommMan_SetTask(sub_02037ED8, 0);
+        CommManager_SetTask(sub_02037ED8, 0);
     } else if (v0 == NINTENDO_WFC_RESULT_CONN_RESET) {
-        CommMan_SetTask(sub_02037ED0, 0);
+        CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
     } else if (v0 == NINTENDO_WFC_RESULT_CONN_RESET_AFTER_HOST_LEFT) {
-        CommMan_SetTask(sub_02037ED4, 0);
+        CommManager_SetTask(CommTask_WifiBattleFailed, 0);
     } else if (v0 == NINTENDO_WFC_RESULT_CONNECTION_CLOSED) {
-        CommMan_SetTask(sub_02037ED0, 0);
+        CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
     }
 }
 
@@ -1787,21 +1951,21 @@ static void sub_0203802C(void)
     int v0 = NintendoWFC_Process(1);
 
     if (v0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     } else {
-        int v1 = NintendoWFC_StartConnectionWithFriends(Unk_021C07D4->unk_4D, CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1, 0);
+        int v1 = NintendoWFC_StartConnectionWithFriends(sCommMan->unk_4D, CommLocal_MaxMachines(sCommMan->commType) + 1, 0);
 
         switch (v1) {
         case 0:
             CommSys_Reset();
 
-            CommMan_SetTask(sub_02037FBC, 0);
+            CommManager_SetTask(sub_02037FBC, 0);
             break;
         case -1:
         case -2:
             break;
         case -3:
-            CommMan_SetTask(sub_02037EB0, 0);
+            CommManager_SetTask(CommTask_WifiBattleError, 0);
             break;
         }
     }
@@ -1809,47 +1973,47 @@ static void sub_0203802C(void)
 
 int sub_020380A0(int param0)
 {
-    if (Unk_021C07D4->task != sub_02037FBC) {
+    if (sCommMan->task != sub_02037FBC) {
         return 0;
     }
 
     NintendoDWC_SetDataTransferCallbacks(sub_020351F8, sub_0203509C);
-    Unk_021C07D4->unk_4D = param0;
-    CommMan_SetTask(sub_0203802C, 0);
+    sCommMan->unk_4D = param0;
+    CommManager_SetTask(sub_0203802C, 0);
     return 1;
 }
 
 int sub_020380E4(void)
 {
-    if (Unk_021C07D4->task == sub_02037FBC) {
+    if (sCommMan->task == sub_02037FBC) {
         return 0;
     }
 
-    if (Unk_021C07D4->task == sub_02037ED8) {
+    if (sCommMan->task == sub_02037ED8) {
         return 1;
     }
 
-    if (Unk_021C07D4->task == sub_02037EB4) {
+    if (sCommMan->task == sub_02037EB4) {
         return 3;
     }
 
-    if (Unk_021C07D4->task == sub_02037ED0) {
+    if (sCommMan->task == CommTask_DisconnectWifiBattle) {
         return 4;
     }
 
-    if (Unk_021C07D4->task == sub_02037ED4) {
+    if (sCommMan->task == CommTask_WifiBattleFailed) {
         return 5;
     }
 
-    if (Unk_021C07D4->task == sub_02038DEC) {
+    if (sCommMan->task == CommTask_WaitWifiLobbyMatchServerP2P) {
         return 0;
     }
 
-    if (Unk_021C07D4->task == sub_02038DCC) {
+    if (sCommMan->task == CommTask_ConnectWifiLobbyP2P) {
         return 1;
     }
 
-    if (Unk_021C07D4->task == sub_02038E84) {
+    if (sCommMan->task == CommTask_WifiLobbyTimeout) {
         return 3;
     }
 
@@ -1867,15 +2031,15 @@ static void sub_02038164(void)
 
     switch (v0) {
     case 0:
-        Unk_021C07D4->unk_58 = 0;
+        sCommMan->unk_58 = 0;
         CommSys_Reset();
-        CommMan_SetTask(sub_02037FBC, 0);
+        CommManager_SetTask(sub_02037FBC, 0);
         break;
     case -1:
     case -2:
         break;
     case -3:
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
         break;
     case -4:
         return;
@@ -1884,9 +2048,9 @@ static void sub_02038164(void)
     v1 = NintendoWFC_HandleError();
 
     if (v1 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     } else if (v1 == ((DWC_ERROR_NUM) + 6)) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 }
 
@@ -1896,11 +2060,11 @@ static void sub_020381F0(void)
 
     CommSys_SetWifiConnected(0);
 
-    if (NintendoWFC_EndConnection(Unk_021C07D4->unk_4C)) {
+    if (NintendoWFC_EndConnection(sCommMan->unk_4C)) {
         if (NintendoWFC_ReturnToReadyState()) {
             CommInfo_Delete();
 
-            CommMan_SetTask(sub_02038164, 0);
+            CommManager_SetTask(sub_02038164, 0);
             return;
         }
     }
@@ -1908,37 +2072,37 @@ static void sub_020381F0(void)
     v0 = NintendoWFC_Process(0);
 
     if (v0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 }
 
 void sub_02038240(int param0, int param1, void *param2, void *param3)
 {
     if (CommSys_CurNetId() == 0) {
-        Unk_021C07D4->unk_4C = 0;
-        CommMan_SetTask(sub_020381F0, 0);
+        sCommMan->unk_4C = 0;
+        CommManager_SetTask(sub_020381F0, 0);
     } else {
-        Unk_021C07D4->unk_4C = 1;
-        CommMan_SetTask(sub_020381F0, 0);
+        sCommMan->unk_4C = 1;
+        CommManager_SetTask(sub_020381F0, 0);
     }
 
-    Unk_021C07D4->unk_58 = 1;
+    sCommMan->unk_58 = 1;
 }
 
 BOOL sub_02038284(void)
 {
-    return Unk_021C07D4->unk_58;
+    return sCommMan->unk_58;
 }
 
 BOOL sub_02038294(void)
 {
-    u32 v0 = (u32)Unk_021C07D4->task;
+    u32 v0 = (u32)sCommMan->task;
 
     if (v0 == (u32)sub_02038164) {
         return 1;
     }
 
-    if (v0 == (u32)sub_02038C68) {
+    if (v0 == (u32)CommTask_ConnectWifiLobby) {
         return 1;
     }
 
@@ -1947,7 +2111,7 @@ BOOL sub_02038294(void)
 
 BOOL sub_020382C0(void)
 {
-    u32 v0 = (u32)Unk_021C07D4->task;
+    u32 v0 = (u32)sCommMan->task;
 
     if (v0 == (u32)sub_02037FBC) {
         return 1;
@@ -1957,7 +2121,7 @@ BOOL sub_020382C0(void)
         return 1;
     }
 
-    if (v0 == (u32)sub_02038C68) {
+    if (v0 == (u32)CommTask_ConnectWifiLobby) {
         return 1;
     }
 
@@ -1966,8 +2130,8 @@ BOOL sub_020382C0(void)
 
 UnkStruct_ov65_0222F6EC *sub_020382F8(void)
 {
-    GF_ASSERT(Unk_021C07D4);
-    return &Unk_021C07D4->unk_34;
+    GF_ASSERT(sCommMan);
+    return &sCommMan->unk_34;
 }
 
 static void sub_02038314(void)
@@ -1978,52 +2142,52 @@ static void sub_02038314(void)
 
     if (NintendoWFC_EndConnection(0)) {
         NintendoWFC_ReturnToReadyState();
-        CommMan_SetTask(sub_020373B8, 0);
+        CommManager_SetTask(CommTask_EndConnection, 0);
     }
 
     v0 = NintendoWFC_Process(0);
 
     if (v0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 }
 
 void sub_02038350(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
     ResetUnlock(RESET_LOCK_0x1);
     CommInfo_Delete();
-    CommMan_SetTask(sub_020373B8, 5);
+    CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
 void sub_02038378(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    Unk_021C07D4->unk_4C = 0;
-    CommMan_SetTask(sub_020381F0, 0);
+    sCommMan->unk_4C = 0;
+    CommManager_SetTask(sub_020381F0, 0);
 }
 
 void sub_02038398(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
     CommMan_SetErrorHandling(0, 1);
 
     if (CommSys_CurNetId() == 0) {
-        Unk_021C07D4->unk_4C = 0;
+        sCommMan->unk_4C = 0;
     } else {
-        Unk_021C07D4->unk_4C = 1;
+        sCommMan->unk_4C = 1;
     }
 
-    CommMan_SetTask(sub_020381F0, 0);
+    CommManager_SetTask(sub_020381F0, 0);
 }
 
 void sub_020383D4(void)
@@ -2035,18 +2199,18 @@ void sub_020383D4(void)
 
 BOOL sub_020383E8(void)
 {
-    if (Unk_021C07D4) {
-        u32 v0 = (u32)Unk_021C07D4->task;
+    if (sCommMan) {
+        u32 v0 = (u32)sCommMan->task;
 
-        if (v0 == (u32)sub_02037EB0) {
+        if (v0 == (u32)CommTask_WifiBattleError) {
             return 1;
         }
 
-        if ((v0 == (u32)sub_02037EB4) && Unk_021C07D4->unk_4F) {
+        if ((v0 == (u32)sub_02037EB4) && sCommMan->errorDisconnect) {
             return 1;
         }
 
-        if ((v0 == (u32)sub_02038E84) && Unk_021C07D4->unk_4F) {
+        if ((v0 == (u32)CommTask_WifiLobbyTimeout) && sCommMan->errorDisconnect) {
             return 1;
         }
     }
@@ -2056,13 +2220,13 @@ BOOL sub_020383E8(void)
 
 void sub_02038438(SaveData *saveData)
 {
-    if (!Unk_021C07D4) {
+    if (!sCommMan) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
-        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
-        MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
-        Unk_021C07D4->unk_4A = 24;
-        Unk_021C07D4->unk_51 = 1;
-        Unk_021C07D4->saveData = saveData;
+        sCommMan = (CommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationManager));
+        MI_CpuFill8(sCommMan, 0, sizeof(CommunicationManager));
+        sCommMan->commType = COMM_TYPE_24;
+        sCommMan->unk_51 = 1;
+        sCommMan->saveData = saveData;
         CommMan_SetErrorHandling(0, 1);
         ResetLock(RESET_LOCK_0x1);
     }
@@ -2070,24 +2234,24 @@ void sub_02038438(SaveData *saveData)
 
 void sub_0203848C(void)
 {
-    if (Unk_021C07D4) {
+    if (sCommMan) {
         ResetUnlock(RESET_LOCK_0x1);
         CommMan_SetErrorHandling(0, 0);
-        Heap_Free(Unk_021C07D4);
-        Unk_021C07D4 = NULL;
+        Heap_Free(sCommMan);
+        sCommMan = NULL;
         Heap_Destroy(HEAP_ID_COMMUNICATION);
     }
 }
 
 void sub_020384C0(SaveData *saveData)
 {
-    if (!Unk_021C07D4) {
+    if (!sCommMan) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
-        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
-        MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
-        Unk_021C07D4->unk_4A = 25;
-        Unk_021C07D4->unk_51 = 1;
-        Unk_021C07D4->saveData = saveData;
+        sCommMan = (CommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationManager));
+        MI_CpuFill8(sCommMan, 0, sizeof(CommunicationManager));
+        sCommMan->commType = COMM_TYPE_25;
+        sCommMan->unk_51 = 1;
+        sCommMan->saveData = saveData;
         CommMan_SetErrorHandling(0, 1);
         ResetLock(RESET_LOCK_0x1);
     }
@@ -2095,24 +2259,24 @@ void sub_020384C0(SaveData *saveData)
 
 void sub_02038514(void)
 {
-    if (Unk_021C07D4) {
+    if (sCommMan) {
         ResetUnlock(RESET_LOCK_0x1);
         CommMan_SetErrorHandling(0, 0);
-        Heap_Free(Unk_021C07D4);
-        Unk_021C07D4 = NULL;
+        Heap_Free(sCommMan);
+        sCommMan = NULL;
         Heap_Destroy(HEAP_ID_COMMUNICATION);
     }
 }
 
 void sub_02038548(SaveData *saveData)
 {
-    if (!Unk_021C07D4) {
+    if (!sCommMan) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
-        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
-        MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
-        Unk_021C07D4->unk_4A = 36;
-        Unk_021C07D4->unk_51 = 1;
-        Unk_021C07D4->saveData = saveData;
+        sCommMan = (CommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationManager));
+        MI_CpuFill8(sCommMan, 0, sizeof(CommunicationManager));
+        sCommMan->commType = COMM_TYPE_EMAIL_WIFI;
+        sCommMan->unk_51 = 1;
+        sCommMan->saveData = saveData;
         CommMan_SetErrorHandling(0, 1);
         ResetLock(RESET_LOCK_0x1);
     }
@@ -2120,11 +2284,11 @@ void sub_02038548(SaveData *saveData)
 
 void sub_0203859C(void)
 {
-    if (Unk_021C07D4) {
+    if (sCommMan) {
         ResetUnlock(RESET_LOCK_0x1);
         CommMan_SetErrorHandling(0, 0);
-        Heap_Free(Unk_021C07D4);
-        Unk_021C07D4 = NULL;
+        Heap_Free(sCommMan);
+        sCommMan = NULL;
         Heap_Destroy(HEAP_ID_COMMUNICATION);
     }
 }
@@ -2134,18 +2298,18 @@ BOOL sub_020385D0(void)
     int v0, v1;
     DWCErrorType v2;
 
-    if (!Unk_021C07D4) {
+    if (!sCommMan) {
         return 0;
     }
 
-    if ((Unk_021C07D4->unk_4A == 24) || (Unk_021C07D4->unk_4A == 36)) {
+    if ((sCommMan->commType == COMM_TYPE_24) || (sCommMan->commType == COMM_TYPE_EMAIL_WIFI)) {
         v1 = DWC_GetLastErrorEx(&v0, &v2);
 
         if (v1 != 0) {
             DWC_ClearError();
             return 1;
         }
-    } else if (Unk_021C07D4->unk_4A == 25) {
+    } else if (sCommMan->commType == COMM_TYPE_25) {
         v1 = DWC_GetLastErrorEx(&v0, &v2);
 
         if (v1 != 0) {
@@ -2158,84 +2322,86 @@ BOOL sub_020385D0(void)
     return 0;
 }
 
-static void sub_0203862C(void)
+static void CommTask_ConnectWifiBattle(void)
 {
     int v0 = NintendoWFC_ConnectToDWCServer();
 
-    Unk_021C07D4->timer--;
+    sCommMan->timer--;
 
     if (v0 == NINTENDO_WFC_RESULT_CONNECTED_TO_SERVER) {
-        if (Unk_021C07D4->unk_4A == 33) {
+        if (sCommMan->commType == COMM_TYPE_LOBBY_WIFI) {
             BOOL v1;
 
-            v1 = ov66_02232714(Unk_021C07D4->unk_5C);
+            v1 = ov66_02232714(sCommMan->unk_5C);
 
             if (v1 == TRUE) {
-                Unk_021C07D4->unk_60 = 1;
-                CommMan_SetTask(sub_02038C1C, Unk_021C07D4->timer);
+                sCommMan->lobbyLoginSuccess = TRUE;
+                CommManager_SetTask(CommTask_LogInWifiLobby, sCommMan->timer);
                 return;
             } else {
-                CommMan_SetTask(sub_02038DC8, 0);
+                CommManager_SetTask(CommTask_WifiLobbyError, 0);
                 return;
             }
         } else {
-            CommMan_SetTask(sub_02038164, 0);
+            CommManager_SetTask(sub_02038164, 0);
             return;
         }
     } else if (v0 != 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 
-    if (Unk_021C07D4->timer <= 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+    if (sCommMan->timer <= 0) {
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 }
 
-static void sub_020386B4(void)
+static void CommTask_StartWifiBattleServer(void)
 {
-    TrainerInfo *v0;
-
     if (!WirelessDriver_IsReady()) {
         return;
     }
-
-    {
-        Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, (0x2A000 + 0xA000 + 0x1400));
-    }
-
+    
+    Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, (0x2A000 + 0xA000 + 0x1400));
+    
     if (CommSys_InitServer(1, 1, 512, 1)) {
-        NintendoWFC_Init(Unk_021C07D4->saveData, HEAP_ID_NINTENDO_WFC, (0x2B000 + 0x1400), CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1);
+        NintendoWFC_Init(sCommMan->saveData, HEAP_ID_NINTENDO_WFC, (0x2B000 + 0x1400), CommLocal_MaxMachines(sCommMan->commType) + 1);
         NintendoWFC_SetFatalErrorCallback(sub_020389FC);
         CommSys_SwitchTransitionTypeToParallel();
-        CommMan_SetTask(sub_0203862C, (30 * 60 * 2));
+        CommManager_SetTask(CommTask_ConnectWifiBattle, (30 * 60 * 2));
     }
 }
 
 void *sub_0203871C(SaveData *saveData, int param1)
 {
     TrainerInfo *v0 = SaveData_GetTrainerInfo(saveData);
-
+    
     if (CommSys_IsInitialized()) {
         return NULL;
     }
 
     ResetLock(RESET_LOCK_0x1);
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
-    sub_020366A0(saveData, 23);
-    Unk_021C07D4->unk_00 = Heap_Alloc(HEAP_ID_COMMUNICATION, param1);
-    MI_CpuFill8(Unk_021C07D4->unk_00, 0, param1);
+    CommManager_Initialize(saveData, COMM_TYPE_LOGIN_WIFI);
+    sCommMan->unk_00 = Heap_Alloc(HEAP_ID_COMMUNICATION, param1);
+    MI_CpuFill8(sCommMan->unk_00, 0, param1);
 
-    Unk_021C07D4->unk_4B = 0;
-    Unk_021C07D4->saveData = saveData;
+    sCommMan->contestRegulation = 0;
+    sCommMan->saveData = saveData;
 
-    CommMan_SetTask(sub_020386B4, 0);
+    CommManager_SetTask(CommTask_StartWifiBattleServer, 0);
 
-    return Unk_021C07D4->unk_00;
+    return sCommMan->unk_00;
 }
 
-void sub_0203878C(SaveData *saveData, const void *param1)
+/**
+ * @brief Initializes the Communication Manager for the Wifi Lobby 
+ *
+ * @param saveData
+ * @param param1
+ */
+void CommManager_LoginWifiLobby(SaveData *saveData, const void *param1)
 {
-    TrainerInfo *v0 = SaveData_GetTrainerInfo(saveData);
+    TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(saveData);
 
     if (CommSys_IsInitialized()) {
         return;
@@ -2243,84 +2409,101 @@ void sub_0203878C(SaveData *saveData, const void *param1)
 
     ResetLock(RESET_LOCK_0x1);
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
-    sub_020366A0(saveData, 33);
+    CommManager_Initialize(saveData, COMM_TYPE_LOBBY_WIFI);
 
-    Unk_021C07D4->unk_00 = NULL;
-    Unk_021C07D4->unk_5C = param1;
-    Unk_021C07D4->unk_60 = 0;
-    Unk_021C07D4->unk_4B = 0;
-    Unk_021C07D4->saveData = saveData;
+    sCommMan->unk_00 = NULL;
+    sCommMan->unk_5C = param1;
+    sCommMan->lobbyLoginSuccess = FALSE;
+    sCommMan->contestRegulation = 0;
+    sCommMan->saveData = saveData;
 
-    CommMan_SetTask(sub_02038BA8, 0);
+    CommManager_SetTask(CommTask_StartWifiLobby, 0);
 }
 
-void sub_020387E8(void)
+/**
+ * @brief Begins the Communication Manager's log out of wifi lobby task
+ */
+void CommManager_LogoutWifiLobby(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return;
     }
 
-    CommMan_SetTask(sub_02038D80, 0);
+    CommManager_SetTask(CommTask_LogoutWifiLobby, 0);
 }
 
-BOOL sub_02038804(void)
+/**
+ * @brief Gets the flag for whether the login task has been reached successfully
+ *
+ * @return sCommMan->lobbyLoginSuccess
+ */
+BOOL CommManager_GetWifiLobbyLoginSuccess(void)
 {
-    if (Unk_021C07D4 == NULL) {
+    if (sCommMan == NULL) {
         return 0;
     }
 
-    return Unk_021C07D4->unk_60;
+    return sCommMan->lobbyLoginSuccess;
 }
 
-BOOL sub_0203881C(void)
+/**
+ * @brief Checks if the current Communication Manager is in a Wifi Lobby Error state
+ *
+ * @return TRUE if the current task is CommTask_WifiLobbyError
+ */
+BOOL CommManager_IsWifiLobbyError(void)
 {
-    if (Unk_021C07D4) {
-        u32 v0 = (u32)Unk_021C07D4->task;
+    if (sCommMan) {
+        u32 task = (u32)sCommMan->task;
 
-        if (v0 == (u32)sub_02038DC8) {
-            return 1;
+        if (task == (u32)CommTask_WifiLobbyError) {
+            return TRUE;
         }
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_0203883C(UnkEnum_ov66_02232F38 param0)
+/**
+ * @brief Starts the wifi p2p connection
+ */
+void CommManager_StartWifiP2P(UnkEnum_ov66_02232F38 param0)
 {
-    GF_ASSERT(Unk_021C07D4);
+    GF_ASSERT(sCommMan);
     GF_ASSERT(sub_020382C0() == 1);
 
     if (ov66_02233184(param0) == 0) {
         ov66_02232F38(param0, 4);
-        CommMan_SetTask(sub_02038DEC, 0);
+        CommManager_SetTask(CommTask_WaitWifiLobbyMatchServerP2P, 0);
     } else {
         ov66_02233260(param0);
-        CommMan_SetTask(sub_02038DEC, 0);
+        CommManager_SetTask(CommTask_WaitWifiLobbyMatchServerP2P, 0);
     }
 }
 
-void sub_0203888C(void)
+/**
+ * @brief Ends the wifi p2p connection
+ */
+void CommManager_EndWifiP2P(void)
 {
-    u32 v0;
-
     if (ov66_02233374() == 1) {
         ov66_02233064();
     }
 
     ov66_0223361C();
-    CommMan_SetTask(sub_02038E38, 0);
+    CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
 }
 
-u32 sub_020388AC(void)
+u32 CommManager_GetWifiP2PConnectState(void)
 {
-    if (Unk_021C07D4) {
-        u32 v0 = (u32)Unk_021C07D4->task;
+    if (sCommMan) {
+        u32 task = (u32)sCommMan->task;
 
-        if (v0 == (u32)sub_02038DCC) {
+        if (task == (u32)CommTask_ConnectWifiLobbyP2P) {
             return 2;
-        } else if (v0 == (u32)sub_02038DEC) {
+        } else if (task == (u32)CommTask_WaitWifiLobbyMatchServerP2P) {
             return 1;
-        } else if (v0 == (u32)sub_02038E38) {
+        } else if (task == (u32)CommTask_DisconnectWifiLobbyP2P) {
             return 3;
         }
     }
@@ -2330,52 +2513,62 @@ u32 sub_020388AC(void)
 
 void *sub_020388E8(void)
 {
-    return Unk_021C07D4->unk_00;
+    return sCommMan->unk_00;
 }
 
-void CommMan_SetErrorHandling(BOOL param0, BOOL param1)
+void CommMan_SetErrorHandling(BOOL errorDisconnect, BOOL param1)
 {
-    if (Unk_021C07D4) {
-        Unk_021C07D4->unk_4F = param0;
-        Unk_021C07D4->unk_50 = param1;
+    if (sCommMan) {
+        sCommMan->errorDisconnect = errorDisconnect;
+        sCommMan->unk_50 = param1;
 
-        if (param0) {
-            Unk_021C07D4->unk_47 = CommSys_ConnectedCount();
+        if (errorDisconnect) {
+            sCommMan->connectedCount = CommSys_ConnectedCount();
         } else {
-            Unk_021C07D4->unk_47 = 0;
+            sCommMan->connectedCount = 0;
         }
     }
 
-    sub_02033EA8(param0);
-    sub_02033ED4(param0);
+    sub_02033EA8(errorDisconnect);
+    sub_02033ED4(errorDisconnect);
 }
 
 BOOL sub_02038938(void)
 {
-    if (Unk_021C07D4) {
-        if (Unk_021C07D4->unk_59 != 0) {
-            return 1;
+    if (sCommMan) {
+        if (sCommMan->commError != 0) {
+            return TRUE;
         }
 
-        return Unk_021C07D4->unk_50;
+        return sCommMan->unk_50;
     }
 
-    return 0;
+    return FALSE;
 }
 
-int sub_0203895C(void)
+/**
+ * @brief Gets the Communication Manager's current communication type
+ *
+ * @return sCommMan->commType (default COMM_TYPE_SINGLE_BATTLE)
+ */
+int CommManager_GetCommType(void)
 {
-    if (Unk_021C07D4) {
-        return Unk_021C07D4->unk_4A;
+    if (sCommMan) {
+        return sCommMan->commType;
     }
 
-    return 1;
+    return COMM_TYPE_SINGLE_BATTLE;
 }
 
-int sub_02038974(void)
+/**
+ * @brief Gets the Communication Manager's current contest regulation type
+ *
+ * @return sCommMan->contestRegulation (default 0)
+ */
+int CommManager_GetContestRegulation(void)
 {
-    if (Unk_021C07D4) {
-        return Unk_021C07D4->unk_4B;
+    if (sCommMan) {
+        return sCommMan->contestRegulation;
     }
 
     return 0;
@@ -2383,23 +2576,23 @@ int sub_02038974(void)
 
 void sub_0203898C(u8 *param0)
 {
-    MI_CpuCopy8(param0, Unk_021C07D4->unk_04, NELEMS(Unk_021C07D4->unk_04));
+    MI_CpuCopy8(param0, sCommMan->unk_04, NELEMS(sCommMan->unk_04));
 }
 
 void sub_020389A0(u8 *param0)
 {
-    MI_CpuCopy8(Unk_021C07D4->unk_04, param0, NELEMS(Unk_021C07D4->unk_04));
+    MI_CpuCopy8(sCommMan->unk_04, param0, NELEMS(sCommMan->unk_04));
 }
 
 BOOL CommMan_IsConnectedToWifi(void)
 {
-    return CommLocal_IsWifiGroup(sub_0203895C());
+    return CommLocal_IsWifiGroup(CommManager_GetCommType());
 }
 
 void sub_020389C4(u8 param0)
 {
-    if (Unk_021C07D4) {
-        Unk_021C07D4->unk_52 = param0;
+    if (sCommMan) {
+        sCommMan->unk_52 = param0;
     }
 }
 
@@ -2409,8 +2602,8 @@ u8 sub_020389D8(void)
         return 0;
     }
 
-    if (Unk_021C07D4) {
-        return Unk_021C07D4->unk_52;
+    if (sCommMan) {
+        return sCommMan->unk_52;
     }
 
     return 0;
@@ -2418,23 +2611,26 @@ u8 sub_020389D8(void)
 
 void sub_020389FC(int param0)
 {
-    int v0 = 0;
+    int i = 0;
 
     NetworkError_DisplayNetworkError(HEAP_ID_SYSTEM, 1, param0);
 
     while (TRUE) {
-        v0++;
+        i++;
     }
 }
 
+/**
+ * @brief Displays the GTS Critical Error screen and halts the game
+ */
 void NetworkError_DisplayGTSCriticalError(void)
 {
-    int v0 = 0;
+    int i = 0;
 
     NetworkError_DisplayNetworkError(HEAP_ID_SYSTEM, 4, 0);
 
     while (TRUE) {
-        v0++;
+        i++;
     }
 }
 
@@ -2447,19 +2643,19 @@ void sub_02038A20(int param0)
 {
     if (sub_02038938()) {
         if (CommSys_CheckError() || sub_020383E8() || sub_020385D0()
-            || (Unk_021C07D4->unk_59 != 0) || sub_0203881C()) {
+            || (sCommMan->commError != COMM_ERROR_NONE) || CommManager_IsWifiLobbyError()) {
             if (!HeapCanaryOK()) {
                 if (!sub_020389D8()) {
                     Sound_StopWaveOutAndSequences();
-                    SaveData_SaveStateCancel(Unk_021C07D4->saveData);
+                    SaveData_SaveStateCancel(sCommMan->saveData);
                     gSystem.touchAutoSampling = TRUE;
 
-                    if (Unk_021C07D4->unk_59 == 3) {
-                        sub_020389C4(3);
-                    } else if ((Unk_021C07D4->unk_4A == 25) || (Unk_021C07D4->unk_4A == 15) || (Unk_021C07D4->unk_4A == 36)) {
-                        sub_020389C4(2);
+                    if (sCommMan->commError == COMM_ERROR_3) {
+                        sub_020389C4(COMM_ERROR_3);
+                    } else if ((sCommMan->commType == COMM_TYPE_25) || (sCommMan->commType == COMM_TYPE_MYSTERY_GIFT) || (sCommMan->commType == COMM_TYPE_EMAIL_WIFI)) {
+                        sub_020389C4(COMM_ERROR_RESET_TITLE);
                     } else {
-                        sub_020389C4(1);
+                        sub_020389C4(COMM_ERROR_RESET_SAVEPOINT);
                     }
                 }
             }
@@ -2467,254 +2663,321 @@ void sub_02038A20(int param0)
     }
 }
 
-BOOL sub_02038AB8(void)
+/**
+ * @brief Checks if the Commmunication Manager is in a state that indicates it's finished being reset
+ *
+ * @return TRUE if it has been reset
+ */
+BOOL CommManager_CheckResetFinished(void)
 {
     if (CommServerClient_IsInClosedSecretBase() || !CommMan_IsInitialized()) {
-        return 1;
+        return TRUE;
     }
 
     if (!sub_020332D0()) {
-        return 1;
+        return TRUE;
     }
 
-    return 0;
+    return FALSE;
 }
 
-BOOL Link_SetErrorState(int param0)
+/**
+ * @brief Sets the Communication Manager's current comm error
+ *
+ * @param error
+ *
+ * @return TRUE if sCommMan is initialized 
+ */
+BOOL CommManager_SetCommError(int error)
 {
-    if (Unk_021C07D4) {
-        Unk_021C07D4->unk_59 = param0;
+    if (sCommMan) {
+        sCommMan->commError = error;
         CommSys_StartShutdown();
-        return 1;
+        return TRUE;
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_02038B00(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_POFFIN_WIFI and updates the data transfer callbacks
+ */
+void CommManager_SetState_WifiPoffin(void)
 {
-    Unk_021C07D4->unk_4A = 29;
+    sCommMan->commType = COMM_TYPE_POFFIN_WIFI;
     NintendoDWC_SetDataTransferCallbacks(sub_020352C0, sub_020352C0);
 }
 
-void sub_02038B20(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_CLUB_WIFI and updates the data transfer callbacks
+ */
+void CommManager_SetState_WifiClub(void)
 {
-    Unk_021C07D4->unk_4A = 35;
+    sCommMan->commType = COMM_TYPE_CLUB_WIFI;
     NintendoDWC_SetDataTransferCallbacks(sub_020352C0, sub_020352C0);
 }
 
-void sub_02038B40(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_LOBBY_WIFI and updates the data transfer callbacks
+ */
+void CommManager_SetState_WifiLobby(void)
 {
-    Unk_021C07D4->unk_4A = 33;
+    sCommMan->commType = COMM_TYPE_LOBBY_WIFI;
     NintendoDWC_SetDataTransferCallbacks(sub_020352C0, sub_020352C0);
 }
 
-void sub_02038B60(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_LOGIN_WIFI and updates the data transfer callbacks
+ */
+void CommManager_SetState_LoginWifi(void)
 {
-    Unk_021C07D4->unk_4A = 23;
+    sCommMan->commType = COMM_TYPE_LOGIN_WIFI;
     NintendoDWC_SetDataTransferCallbacks(sub_020351F8, sub_0203509C);
 }
 
-void sub_02038B84(void)
+/**
+ * @brief Sets sCommMan->commType to COMM_TYPE_SINGLE_BATTLE and updates the data transfer callbacks
+ */
+void CommManager_SetState_SingleBattleWifi(void)
 {
-    Unk_021C07D4->unk_4A = 19;
+    sCommMan->commType = COMM_TYPE_SINGLE_BATTLE_WIFI;
     NintendoDWC_SetDataTransferCallbacks(sub_020351F8, sub_0203509C);
 }
 
-static void sub_02038BA8(void)
+/**
+ * @brief Task to initialize the Communication Manager for the Wifi Lobby and battle
+ */
+static void CommTask_StartWifiLobby(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
     }
 
-    {
-        Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, 0x60000);
-    }
+    Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, 0x60000);
 
     if (CommSys_InitServer(1, 1, 512, 1)) {
-        NintendoWFC_Init(Unk_021C07D4->saveData, HEAP_ID_NINTENDO_WFC, 0x58000, CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1);
+        NintendoWFC_Init(sCommMan->saveData, HEAP_ID_NINTENDO_WFC, 0x58000, CommLocal_MaxMachines(sCommMan->commType) + 1);
         NintendoWFC_SetFatalErrorCallback(sub_020389FC);
         CommSys_SwitchTransitionTypeToParallel();
         NintendoWFC_SetVoiceChatEnabled(0);
         sub_0203632C(0);
-        CommMan_SetTask(sub_0203862C, (30 * 60 * 2));
+        CommManager_SetTask(CommTask_ConnectWifiBattle, (30 * 60 * 2));
     }
 }
 
-static void sub_02038C1C(void)
+/** 
+ * @brief Task while logging in to the wifi lobby, errors if timed out
+ */
+static void CommTask_LogInWifiLobby(void)
 {
-    BOOL v0;
+    BOOL result;
 
-    Unk_021C07D4->timer--;
+    sCommMan->timer--;
 
-    if (Unk_021C07D4->timer <= 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+    if (sCommMan->timer <= 0) {
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
         return;
     }
 
     CommSys_SetWifiConnected(1);
 
-    v0 = sub_02038D44();
+    result = CommManager_UpdateWifiLobbyCommon();
 
-    if (v0 == 0) {
+    if (result == 0) {
         return;
     }
 
-    v0 = ov66_02232804();
+    result = ov66_02232804();
 
-    if (v0) {
-        CommMan_SetTask(sub_02038C68, 0);
+    if (result) {
+        CommManager_SetTask(CommTask_ConnectWifiLobby, 0);
     }
 }
 
-static void sub_02038C68(void)
+/**
+ * @brief Task while connecting to the wifi lobby. Internal process handled entirely by CommManager_UpdateWifiLobbyCommon
+ */
+static void CommTask_ConnectWifiLobby(void)
 {
-    BOOL v0 = sub_02038D44();
+    BOOL v0 = CommManager_UpdateWifiLobbyCommon();
 
     if (v0 == 0) {
         return;
     }
 }
 
-static BOOL sub_02038C74(int param0)
+/**
+ * @brief Processes any DWC Error when handling the wifi connection for the wifi lobby
+ *
+ * @return TRUE if no error occured
+ */
+static BOOL CommManager_ProcessWifiLobbyDWCError(int dwcError)
 {
-    BOOL v0 = 1;
+    BOOL ret = TRUE;
 
-    if ((param0 >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > param0)) {
-        CommMan_SetTask(sub_02037ED4, 0);
-        v0 = 0;
-    } else if (param0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
-        v0 = 0;
-    } else if (param0 == ((DWC_ERROR_NUM) + 3)) {
-        CommMan_SetTask(sub_02038E84, 0);
-        v0 = 0;
-    } else if (param0 == ((DWC_ERROR_NUM) + 4)) {
-        v0 = 0;
+    if ((dwcError >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > dwcError)) {
+        CommManager_SetTask(CommTask_WifiBattleFailed, 0);
+        ret = FALSE;
+    } else if (dwcError < 0) {
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
+        ret = FALSE;
+    } else if (dwcError == ((DWC_ERROR_NUM) + 3)) {
+        CommManager_SetTask(CommTask_WifiLobbyTimeout, 0);
+        ret = FALSE;
+    } else if (dwcError == ((DWC_ERROR_NUM) + 4)) {
+        ret = FALSE;
 
-        if (Unk_021C07D4->unk_4F) {
-            CommMan_SetTask(sub_02037EB0, 0);
+        if (sCommMan->errorDisconnect) {
+            CommManager_SetTask(CommTask_WifiBattleError, 0);
         } else {
-            CommMan_SetTask(sub_02037ED0, 0);
+            CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
         }
     }
 
-    if (Unk_021C07D4->unk_4F) {
-        if (Unk_021C07D4->unk_47 != CommSys_ConnectedCount()) {
-            CommMan_SetTask(sub_02037EB0, 0);
-            v0 = 0;
+    if (sCommMan->errorDisconnect) {
+        if (sCommMan->connectedCount != CommSys_ConnectedCount()) {
+            CommManager_SetTask(CommTask_WifiBattleError, 0);
+            ret = 0;
         }
     }
 
-    return v0;
+    return ret;
 }
 
-static BOOL sub_02038D10(void)
+/**
+ * @brief Calls the updates wifi lobby function
+ *
+ * @return TRUE if no error occured processing the lobby
+ */
+static BOOL CommManager_UpdateWifiLobby(void)
 {
     UnkEnum_ov66_0223287C v0;
-    BOOL v1 = 1;
+    BOOL noError = TRUE;
 
-    v0 = ov66_022325D8();
+    v0 = ov66_022325D8(); //Wifi lobby update function
 
     switch (v0) {
-    case UnkEnum_ov66_0223287C_00:
-    case UnkEnum_ov66_0223287C_01:
-    case UnkEnum_ov66_0223287C_02:
-    case UnkEnum_ov66_0223287C_03:
+    case UnkEnum_ov66_0223287C_00: //none
+    case UnkEnum_ov66_0223287C_01: //login wait
+    case UnkEnum_ov66_0223287C_02: //connect
+    case UnkEnum_ov66_0223287C_03: //logout wait
         break;
 
-    case UnkEnum_ov66_0223287C_04:
-        CommMan_SetTask(sub_02038DC8, 0);
-        v1 = 0;
+    case UnkEnum_ov66_0223287C_04: //error
+        CommManager_SetTask(CommTask_WifiLobbyError, 0);
+        noError = FALSE;
         break;
     }
 
-    return v1;
+    return noError;
 }
 
-static BOOL sub_02038D44(void)
+/**
+ * @brief Calls the update wifi lobby function and wifi connection process function
+ *
+ * @return TRUE if no error occured processing the lobby or handling the connection
+ */
+static BOOL CommManager_UpdateWifiLobbyCommon(void)
 {
     int v0;
-    BOOL v1;
+    BOOL ret;
 
     v0 = NintendoWFC_Process(0);
 
-    v1 = sub_02038C74(v0);
+    ret = CommManager_ProcessWifiLobbyDWCError(v0);
 
-    if (v1 == 0) {
-        return v1;
+    if (ret == 0) {
+        return ret;
     }
 
-    v1 = sub_02038D10();
-    return v1;
+    ret = CommManager_UpdateWifiLobby();
+    return ret;
 }
 
-static BOOL sub_02038D5C(u32 *param0)
+/**
+ * @brief Updates the wifi lobby matchmaking
+ *
+ * @param matchmakingRet
+ *
+ * @return TRUE if no errors occurred while updating the lobby or while processing matchmaking
+ */
+static BOOL CommManager_UpdateWifiLobbyMatchmaking(u32 *matchmakingRet)
 {
-    int v0;
-    BOOL v1;
+    int wfcResult;
+    BOOL ret;
 
-    v0 = NintendoWFC_Process(0);
+    wfcResult = NintendoWFC_Process(0);
 
-    if (v0 >= NINTENDO_WFC_RESULT_MATCHMAKING_SUCCESS) {
-        *param0 = v0;
+    if (wfcResult >= NINTENDO_WFC_RESULT_MATCHMAKING_SUCCESS) {
+        *matchmakingRet = wfcResult;
     } else {
-        *param0 = 0;
+        *matchmakingRet = 0;
 
-        v1 = sub_02038C74(v0);
+        ret = CommManager_ProcessWifiLobbyDWCError(wfcResult);
 
-        if (v1 == 0) {
-            return v1;
+        if (ret == 0) {
+            return ret;
         }
     }
 
-    v1 = sub_02038D10();
-    return v1;
+    ret = CommManager_UpdateWifiLobby();
+    return ret;
 }
 
-static void sub_02038D80(void)
+/**
+ * @brief Calls the Wifi Lobby logout function and waits
+ */
+static void CommTask_LogoutWifiLobby(void)
 {
     ov66_0223282C();
-    CommMan_SetTask(sub_02038D94, 0);
+    CommManager_SetTask(CommTask_WaitLogoutWifiLobby, 0);
 }
 
-static void sub_02038D94(void)
+/**
+ * @brief Waits until the Wifi logout function is complete, then ends communication
+ */
+static void CommTask_WaitLogoutWifiLobby(void)
 {
-    BOOL v0;
+    BOOL result;
 
     NintendoWFC_Process(0);
-    sub_02038D10();
+    CommManager_UpdateWifiLobby();
 
-    v0 = ov66_02232854();
+    result = ov66_02232854();
 
-    if (v0) {
+    if (result) {
         ResetUnlock(RESET_LOCK_0x1);
         CommInfo_Delete();
-        CommMan_SetTask(sub_020373B8, 5);
+        CommManager_SetTask(CommTask_EndConnection, 5);
         CommSys_SetWifiConnected(0);
     }
 }
 
-static void sub_02038DC8(void)
+/**
+ * @brief Task the Comm Manager uses to indicate that an error has occured in the wifi lobby. Does nothing when called.
+ */
+static void CommTask_WifiLobbyError(void)
 {
     return;
 }
 
-static void sub_02038DCC(void)
+/**
+ * @brief Connects to the Wifi Lobby using a p2p connection
+ */
+static void CommTask_ConnectWifiLobbyP2P(void)
 {
     BOOL v0;
-
-    sub_02038D44();
+    CommManager_UpdateWifiLobbyCommon();
 
     v0 = ov66_02233164();
 
     if (v0 == 1) {
         ov66_0223361C();
-        CommMan_SetTask(sub_02038E38, 0);
+        CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
     }
 }
 
-static void sub_02038DEC(void)
+static void CommTask_WaitWifiLobbyMatchServerP2P(void)
 {
     BOOL v0;
     u32 v1;
@@ -2723,72 +2986,86 @@ static void sub_02038DEC(void)
 
     if (v0 == 1) {
         ov66_0223361C();
-        CommMan_SetTask(sub_02038E38, 0);
+        CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
         return;
     }
 
-    sub_02038D5C(&v1);
+    CommManager_UpdateWifiLobbyMatchmaking(&v1);
 
     switch (v1) {
     case 0:
         break;
     case (DWC_ERROR_NUM):
-        CommMan_SetTask(sub_02038DCC, 0);
+        CommManager_SetTask(CommTask_ConnectWifiLobbyP2P, 0);
         break;
     default:
         ov66_0223361C();
-        CommMan_SetTask(sub_02038C68, 0);
+        CommManager_SetTask(CommTask_ConnectWifiLobby, 0);
         break;
     }
 }
 
-static void sub_02038E38(void)
+/**
+ * @brief Handles a wifi lobby p2p disconnect and updates the wifi lobby
+ */
+static void CommTask_DisconnectWifiLobbyP2P(void)
 {
-    BOOL v0;
-    int v1 = NintendoWFC_Process(1);
+    BOOL updateResult;
+    int ret = NintendoWFC_Process(1);
 
-    if (v1 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+    if (ret < 0) {
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
         return;
     }
 
-    v0 = sub_02038D10();
+    updateResult = CommManager_UpdateWifiLobby();
 
-    if (v0 == 0) {
+    if (updateResult == 0) {
         return;
     }
 
     if (NintendoWFC_EndConnection(0)) {
-        v1 = NintendoWFC_ReturnToReadyState();
+        ret = NintendoWFC_ReturnToReadyState();
 
-        if (v1) {
+        if (ret) {
             CommSys_Reset();
             sub_0203632C(0);
-            CommMan_SetTask(sub_02038C68, 0);
+            CommManager_SetTask(CommTask_ConnectWifiLobby, 0);
         }
     }
 }
 
-static void sub_02038E84(void)
+/**
+ * @brief Handles a wifi lobby timeout and updates the wifi lobby
+ */
+static void CommTask_WifiLobbyTimeout(void)
 {
-    int v0 = NintendoWFC_Process(0);
+    int ret = NintendoWFC_Process(0);
 
-    if (v0 < 0) {
-        CommMan_SetTask(sub_02037EB0, 0);
+    if (ret < 0) {
+        CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 
-    sub_02038D10();
+    CommManager_UpdateWifiLobby();
 }
 
-void sub_02038EA4(void)
+/**
+ * @brief Sets the Communication Manager's commType to COMM_TYPE_FRONTIER_WIFI
+ */
+void CommManager_SetState_FrontierWifi(void)
 {
-    Unk_021C07D4->unk_4A = 34;
+    sCommMan->commType = COMM_TYPE_FRONTIER_WIFI;
 }
 
-BOOL sub_02038EB4(void)
+/**
+ * @brief Checks if the Communication System is initialized and the comm type isn't poketch
+ *
+ * @return TRUE if the Communication System is initialized and the comm type isn't poketch
+ */
+BOOL CommManager_IsInitializedNotPoketch(void)
 {
-    if (Unk_021C07D4 && (Unk_021C07D4->unk_4A == 14)) {
-        return 0;
+    if (sCommMan && (sCommMan->commType == COMM_TYPE_POKETCH)) {
+        return FALSE;
     }
 
     return CommSys_IsInitialized();
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index b8004298a2a..2f747ae05ba 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -673,7 +673,7 @@ void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1)
     Window_Init(&v0->unk_64);
 
     v0->unk_78 = ColoredArrow_New(HEAP_ID_FIELD2);
-    v0->unk_88 = sub_0203895C();
+    v0->unk_88 = CommManager_GetCommType();
     v0->unk_4C = NULL;
     v0->unk_48 = NULL;
     v0->unk_50 = NULL;
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index b7e55aa5d16..bd1ccb8c2a1 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -128,7 +128,7 @@ UnkStruct_0205B43C *FieldSystem_InitCommUnionRoom(FieldSystem *fieldSystem)
     }
 
     CommFieldCmd_Init((void *)fieldSystem);
-    sub_02037B58(2);
+    CommManager_SetMaxNumConnections(2);
     sub_0205B5B4(v0, sub_0205B408, 40);
 
     return v0;
@@ -154,7 +154,7 @@ static UnkStruct_0205B43C *sub_0205B3A0(FieldSystem *fieldSystem)
     }
 
     saveData = FieldSystem_GetSaveData(fieldSystem);
-    sub_020369EC(saveData);
+    CommManager_StartUnion(saveData);
 
     v2 = (UnkStruct_0205B43C *)Heap_Alloc(HEAP_ID_31, sizeof(UnkStruct_0205B43C));
     MI_CpuClear8(v2, sizeof(UnkStruct_0205B43C));
@@ -188,7 +188,7 @@ static int Unk_021C0850;
 
 static void sub_0205B43C(UnkStruct_0205B43C *param0)
 {
-    if (sub_02036AA0()) {
+    if (CommManager_IsConnectUnionServer()) {
         Unk_021C0850 = 0;
         sub_0205B5B4(param0, sub_0205B4F8, 0);
         return;
@@ -199,15 +199,15 @@ static void sub_0205B43C(UnkStruct_0205B43C *param0)
 
         if (param0->unk_20 == 1) {
             if (param0->unk_30 == 5) {
-                sub_02037888(param0->unk_18);
+                CommManager_StartMixRecordsClient(param0->unk_18);
             } else if (param0->unk_30 == 6) {
-                sub_020378C8(param0->unk_18);
+                CommManager_StartSpinTradeClient(param0->unk_18);
             } else {
-                sub_02036A38(param0->unk_18);
+                CommManager_ConnectUnion(param0->unk_18);
             }
         } else if (param0->unk_20 == 2) {
             sub_02095E98(NULL);
-            sub_02037854(param0->unk_18);
+            CommManager_StartDrawClient(param0->unk_18);
         }
 
         sub_0205B5B4(param0, sub_0205B634, 12);
@@ -217,7 +217,7 @@ static void sub_0205B43C(UnkStruct_0205B43C *param0)
 
 static void sub_0205B4B0(UnkStruct_0205B43C *param0)
 {
-    if (sub_02036B44() == 1) {
+    if (CommManager_UnionRestartSuccess() == 1) {
         CommFieldCmd_Init((void *)param0->fieldSystem);
         sub_0205B5B4(param0, sub_0205B43C, 2);
     }
@@ -260,8 +260,8 @@ static void sub_0205B4F8(UnkStruct_0205B43C *param0)
         sub_0205B5B4(param0, sub_0205B578, 0);
     }
 
-    if (sub_02036AA0() == 0) {
-        sub_02036AC4();
+    if (CommManager_IsConnectUnionServer() == 0) {
+        CommManager_UnionRestartSearch();
         sub_0205C160(param0);
         sub_0205BEA8(0);
         sub_0205B5B4(param0, sub_0205B4B0, 2);
@@ -275,7 +275,7 @@ static void sub_0205B578(UnkStruct_0205B43C *param0)
     }
 
     if (0 == CommSys_IsClientConnecting()) {
-        sub_02036AC4();
+        CommManager_UnionRestartSearch();
         sub_0205C160(param0);
         sub_0205BEA8(0);
         sub_0205B5B4(param0, sub_0205B4B0, 2);
@@ -318,7 +318,7 @@ static void sub_0205B5FC(UnkStruct_0205B43C *param0)
         return;
     }
 
-    sub_02036B68();
+    CommManager_ExitUnion();
     sub_0205B5B4(param0, sub_0205B620, 0);
 }
 
@@ -333,7 +333,7 @@ static void sub_0205B620(UnkStruct_0205B43C *param0)
 
 static void sub_0205B634(UnkStruct_0205B43C *param0)
 {
-    if (1 == sub_02036A68()) {
+    if (1 == CommManager_IsConnectedUnionClientSuccess()) {
         CommInfo_SendPlayerInfo();
         sub_0205B5B4(param0, sub_0205B6C4, 3);
         return;
@@ -344,7 +344,7 @@ static void sub_0205B634(UnkStruct_0205B43C *param0)
         sub_0205B5B4(param0, sub_0205B4F8, 0);
     }
 
-    if (0 == sub_02036A68()) {
+    if (0 == CommManager_IsConnectedUnionClientSuccess()) {
         return;
     }
 
@@ -359,7 +359,7 @@ static void sub_0205B634(UnkStruct_0205B43C *param0)
 static void sub_0205B694(UnkStruct_0205B43C *param0)
 {
     if (!FieldSystem_IsRunningTask(param0->fieldSystem)) {
-        sub_02036AC4();
+        CommManager_UnionRestartSearch();
         sub_0205C160(param0);
         sub_0205BEA8(0);
         sub_0205B5B4(param0, sub_0205B4B0, 2);
@@ -368,7 +368,7 @@ static void sub_0205B694(UnkStruct_0205B43C *param0)
 
 static void sub_0205B6C4(UnkStruct_0205B43C *param0)
 {
-    if (1 == sub_02036A68()) {
+    if (1 == CommManager_IsConnectedUnionClientSuccess()) {
         if (CommInfo_TrainerInfo(CommSys_CurNetId()) != NULL) {
             param0->unk_20 = 0;
             param0->unk_1C = 1;
@@ -377,8 +377,8 @@ static void sub_0205B6C4(UnkStruct_0205B43C *param0)
             CommMan_SetErrorHandling(1, 1);
             sub_0205B5B4(param0, sub_0205B72C, 3);
         }
-    } else if (0 == sub_02036A68()) {
-        sub_02036AC4();
+    } else if (0 == CommManager_IsConnectedUnionClientSuccess()) {
+        CommManager_UnionRestartSearch();
         sub_0205C160(param0);
         sub_0205B5B4(param0, sub_0205B4B0, 2);
 
@@ -391,8 +391,8 @@ static void sub_0205B6C4(UnkStruct_0205B43C *param0)
 
 static void sub_0205B72C(UnkStruct_0205B43C *param0)
 {
-    if (0 == sub_02036A68()) {
-        sub_02036AC4();
+    if (0 == CommManager_IsConnectedUnionClientSuccess()) {
+        CommManager_UnionRestartSearch();
         sub_0205C160(param0);
         sub_0205B5B4(param0, sub_0205B4B0, 2);
 
@@ -574,11 +574,11 @@ u32 sub_0205B8DC(UnkStruct_0205B43C *param0)
     }
 
     if (CommSys_CurNetId() == 0) {
-        if (sub_02036AA0() == 1) {
+        if (CommManager_IsConnectUnionServer() == 1) {
             return param0->unk_40;
         }
     } else {
-        if (sub_02036A68() == 1) {
+        if (CommManager_IsConnectedUnionClientSuccess() == 1) {
             return param0->unk_40;
         }
     }
@@ -588,7 +588,7 @@ u32 sub_0205B8DC(UnkStruct_0205B43C *param0)
 
 u32 sub_0205B91C(UnkStruct_0205B43C *param0)
 {
-    if (sub_02036AA0() == 1) {
+    if (CommManager_IsConnectUnionServer() == 1) {
         return param0->unk_30;
     }
 
@@ -662,7 +662,7 @@ void sub_0205B9C4(int param0, int param1, void *param2, void *param3)
     fieldSystem->unk_7C->unk_40 = *v1;
 
     if (*v1 == 4) {
-        sub_0203781C();
+        CommManager_StartDrawServer();
     }
 }
 
@@ -1017,7 +1017,7 @@ int UnionRoom_GetMessage(UnkStruct_0205B43C *param0, int param1, int msgType, St
 
     if (trainerInfo == NULL) {
         CommMan_SetErrorHandling(1, 1);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(1);
         return 0;
     }
 
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index 3066d7b120f..863cc18b1b4 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -444,7 +444,7 @@ void sub_0205C820(MapObjectManager *mapObjMan, UnkStruct_0205C22C *param1)
     }
 
     if (LocalMapObj_IsAnimationSet(mapObj) == 1) {
-        if (sub_02036AA0() || sub_02036A68()) {
+        if (CommManager_IsConnectUnionServer() || CommManager_IsConnectedUnionClientSuccess()) {
             int v2;
 
             for (v2 = 0; v2 < 10; v2++) {
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 6d559f4c4f9..5700e3fdc5d 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -237,7 +237,7 @@ void sub_02095FE4(int param0, int param1, void *param2, void *param3)
                 } else {
                     v0->unk_9418 |= 1 << param0;
                     v1.unk_03 = 1;
-                    sub_02037B58(CommSys_ConnectedCount());
+                    CommManager_SetMaxNumConnections(CommSys_ConnectedCount());
                 }
                 break;
             case 1:
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index 535db933185..c33005633fe 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -216,7 +216,7 @@ void sub_02096274(int param0, int param1, void *param2, void *param3)
                     v0->unk_4AB4 |= 1 << param0;
                     v1.unk_03 = 1;
 
-                    sub_02037B58(CommSys_ConnectedCount());
+                    CommManager_SetMaxNumConnections(CommSys_ConnectedCount());
                 }
                 break;
             case 1:
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 6089160d0e4..68c6e85c2c4 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -62,8 +62,8 @@ void sub_0209BE50(UnkStruct_0209BDF8 *param0)
 
 void sub_0209BE64(UnkStruct_0209BDF8 *param0)
 {
-    sub_02037B58(2);
-    sub_02036AC4();
+    CommManager_SetMaxNumConnections(2);
+    CommManager_UnionRestartSearch();
     sub_0205C2C8(param0->unk_00->unk_14.unk_0C);
     sub_0205BEA8(0);
 }
@@ -175,7 +175,7 @@ static void sub_0209BF64(int param0, int param1, void *param2, void *param3)
                     v0->unk_30 |= 1 << param0;
                     v1.unk_03 = 1;
 
-                    sub_02037B58(CommSys_ConnectedCount());
+                    CommManager_SetMaxNumConnections(CommSys_ConnectedCount());
                 }
                 break;
             case 1:
diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index 0dd4980e0ee..5133be84d19 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -7,6 +7,8 @@
 
 #include "struct_defs/struct_0203330C.h"
 
+#include "constants/communication/comm_error.h"
+
 #include "unk_0203266C.h"
 #include "unk_020366A0.h"
 
@@ -217,7 +219,7 @@ static void WirelessManager_FinishStartServer(void *wm_startparentcallback)
         sWirelessManager->sentBeaconCount++;
         break;
     case WM_STATECODE_CONNECTED:
-        if (sWirelessManager->pauseConnectSystem == TRUE || sWirelessManager->pauseConnection == TRUE || WirelessManager_GetNumConnected() >= sWirelessManager->numConnectionsMax || callback->ssid[0] != sub_0203895C() || 0 != memcmp("DP", &callback->ssid[1], sizeof("DP"))) {
+        if (sWirelessManager->pauseConnectSystem == TRUE || sWirelessManager->pauseConnection == TRUE || WirelessManager_GetNumConnected() >= sWirelessManager->numConnectionsMax || callback->ssid[0] != CommManager_GetCommType() || 0 != memcmp("DP", &callback->ssid[1], sizeof("DP"))) {
             WMErrCode disconnectCode;
 
             disconnectCode = WM_Disconnect(NULL, callback->aid);
@@ -462,13 +464,13 @@ static BOOL WirelessManager_StartScan(void)
 
     if (channel == 0x8000) {
         WirelessManager_SetErrorCode(WM_ERRCODE_ILLEGAL_STATE);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
         return FALSE;
     }
 
     if (channel == 0) {
         WirelessManager_SetErrorCode(WM_ERRCODE_DISCONNECTED_SERVER);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
         return FALSE;
     }
 
@@ -639,7 +641,7 @@ static BOOL WirelessManager_StartClient(void)
     WirelessManager_SetState(WIRELESS_STATE_BUSY);
     MI_CpuCopy8("DP", &ssid[1], sizeof("DP"));
 
-    ssid[0] = sub_0203895C();
+    ssid[0] = CommManager_GetCommType();
     WMErrCode errorCode = WM_StartConnectEx(WirelessManager_FinishStartClient, &sWirelessManager->bssDesc, ssid, 1, WM_AUTHMODE_OPEN_SYSTEM);
 
     if (errorCode != WM_ERRCODE_OPERATING) {
@@ -1056,7 +1058,7 @@ BOOL WirelessManager_StartMeasureChannel(void)
     if (errorCode == WM_ERRCODE_FATAL) {
         WirelessManager_SetErrorCode(WM_ERRCODE_FATAL);
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
         return FALSE;
     }
 
@@ -1082,7 +1084,7 @@ static u16 WirelessManager_MeasureChannel(u16 channel)
         WirelessManager_SetErrorCode(WM_ERRCODE_ILLEGAL_STATE);
 
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
 
         return WM_ERRCODE_ILLEGAL_STATE;
     }
@@ -1091,7 +1093,7 @@ static u16 WirelessManager_MeasureChannel(u16 channel)
         WirelessManager_SetErrorCode(WM_ERRCODE_DISCONNECTED_SERVER);
 
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
 
         return WM_ERRCODE_FATAL;
     }
@@ -1122,7 +1124,7 @@ static void WirelessManager_FinishMeasureChannel(void *wm_measurechannelcallback
         WirelessManager_SetErrorCode(measureChannelCallback->errcode);
 
         WirelessManager_SetState(WIRELESS_STATE_ERROR);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
 
         return;
     }
@@ -1319,7 +1321,7 @@ static void WirelessManager_FinishInitializeWM(void *wm_callback)
         WirelessManager_SetErrorCode(callback->errcode);
 
         WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
 
         return;
     }
@@ -1330,7 +1332,7 @@ static void WirelessManager_FinishInitializeWM(void *wm_callback)
         WirelessManager_SetErrorCode(errorCode);
 
         WirelessManager_SetState(WIRELESS_STATE_FATAL_ERROR);
-        Link_SetErrorState(1);
+        CommManager_SetCommError(COMM_ERROR_RESET_SAVEPOINT);
         return;
     }
 
@@ -1360,7 +1362,7 @@ static void WirelessManager_FinishSetLifeTime(void *wm_callback)
  */
 BOOL WirelessManager_ConnectServer(int connectionType, u16 tgid, u16 channel, u16 maxEntry, u16 beaconPeriod, BOOL entryFlag)
 {
-    if (sub_0203276C(sub_0203895C())) {
+    if (sub_0203276C(CommManager_GetCommType())) {
         WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xFFFF, 100, 5, 100);
     }
 
@@ -1419,7 +1421,7 @@ BOOL WirelessManager_ConnectServer(int connectionType, u16 tgid, u16 channel, u1
  */
 BOOL WirelessManager_ConnectClient(int connectionType, WMBssDesc *bssDesc)
 {
-    if (sub_0203276C(sub_0203895C())) {
+    if (sub_0203276C(CommManager_GetCommType())) {
         WM_SetLifeTime(WirelessManager_FinishSetLifeTime, 0xFFFF, 100, 5, 100);
     }
 

From 14060fbe05508a761203417bf47994104643bded Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Thu, 14 May 2026 11:15:10 -0400
Subject: [PATCH 10/39] Finish documenting communication_manager functions

---
 include/unk_020366A0.h                        |   84 +-
 src/applications/poketch/link_searcher/main.c |    6 +-
 src/battle/battle_main.c                      |   18 +-
 src/communication_system.c                    |    4 +-
 src/error_message_reset.c                     |    2 +-
 src/field_comm_manager.c                      |   10 +-
 src/main.c                                    |   10 +-
 src/main_menu/main_menu.c                     |   10 +-
 src/main_menu/mystery_gift_app.c              |   10 +-
 src/main_menu/ov97_02238D74.c                 |    4 +-
 src/network_icon.c                            |    6 +-
 src/nintendo_wfc/main.c                       |    2 +-
 src/overlay007/communication_club.c           |    2 +-
 src/overlay017/ov17_0223B140.c                |    2 +-
 src/overlay017/ov17_0223CB1C.c                |    2 +-
 src/overlay017/ov17_0223DAD0.c                |    2 +-
 src/overlay017/ov17_0224F4D4.c                |    2 +-
 src/overlay058/ov58_021D0D80.c                |    2 +-
 src/overlay059/ov59_021D0D80.c                |    4 +-
 src/overlay061/ov61_0222B008.c                |    2 +-
 src/overlay061/ov61_0222BF44.c                |    8 +-
 src/overlay065/ov65_0222DCE0.c                |  160 +--
 src/overlay065/ov65_0223648C.c                |   44 +-
 src/overlay066/ov66_02231428.c                |    2 +-
 src/overlay067/ov67_0225C700.c                |   16 +-
 src/overlay070/ov70_0225D9A4.c                |    4 +-
 src/overlay070/ov70_02265F38.c                |   12 +-
 src/overlay082/ov82_0223B140.c                |    2 +-
 src/overlay083/ov83_0223B5A0.c                |    2 +-
 src/overlay088/ov88_0223B140.c                |    4 +-
 src/overlay094/screens/wfc_init.c             |   10 +-
 src/overlay096/ov96_0223BCE0.c                |    8 +-
 src/overlay098/ov98_022471C8.c                |   18 +-
 src/overlay109/ov109_021D0D80.c               |    6 +-
 src/overlay109/ov109_021D3D50.c               |    4 +-
 src/overlay114/ov114_0225C700.c               |    6 +-
 src/overlay115/ov115_02260440.c               |    2 +-
 src/overlay116/ov116_022604C4.c               |    2 +-
 src/overlay117/ov117_02260440.c               |    2 +-
 src/overlay117/ov117_02260668.c               |    2 +-
 src/underground/traps.c                       |    2 +-
 src/unk_02032798.c                            |    6 +-
 src/unk_02033200.c                            |    2 +-
 src/unk_020366A0.c                            | 1171 +++++++++++------
 src/unk_0203909C.c                            |    2 +-
 src/unk_0203D1B8.c                            |    6 +-
 src/unk_0205A0D8.c                            |    2 +-
 src/unk_0205B33C.c                            |    8 +-
 src/unk_0207DFAC.c                            |    2 +-
 src/unk_02095E98.c                            |    2 +-
 src/unk_020961E8.c                            |    2 +-
 src/unk_0209C194.c                            |    2 +-
 src/wireless_manager.c                        |    2 +-
 53 files changed, 1067 insertions(+), 640 deletions(-)

diff --git a/include/unk_020366A0.h b/include/unk_020366A0.h
index 07c3e06298f..da010785d72 100644
--- a/include/unk_020366A0.h
+++ b/include/unk_020366A0.h
@@ -45,38 +45,38 @@ void CommManager_SetState_MixRecords(void);
 void CommManager_StartMixRecordsClient(int param0);
 void CommManager_SetState_SpinTrade(void);
 void CommManager_StartSpinTradeClient(int param0);
-void sub_02037A78(int param0, int param1, void *param2, void *param3);
-void sub_02037AD8(int param0, int param1, void *param2, void *param3);
-int sub_02037B54(void);
+void CommManager_ValidateConfirmationMessage(int param0, int param1, void *param2, void *param3);
+void CommManager_ValidateConfirmationResponseMessage(int param0, int param1, void *param2, void *param3);
+int CommManager_ConfirmationMessage_sizeof(void);
 void CommManager_SetMaxNumConnections(int param0);
-void sub_02037BC0(SaveData *saveData);
-void sub_02037BFC(void);
-BOOL sub_02037C18(void);
-void sub_02037D48(SaveData *saveData);
-void sub_02037D84(void);
-u8 sub_02037DA0(void);
-BOOL sub_02037DB0(void);
-void sub_02037F94(int param0, int param1, int param2);
-int sub_020380A0(int param0);
-int sub_020380E4();
-void sub_02038240(int param0, int param1, void *param2, void *param3);
-BOOL sub_02038284(void);
-BOOL sub_02038294(void);
-BOOL sub_020382C0(void);
-UnkStruct_ov65_0222F6EC *sub_020382F8(void);
-void sub_02038350(void);
-void sub_02038378(void);
-void sub_02038398(void);
-void sub_020383D4(void);
-BOOL sub_020383E8(void);
-void sub_02038438(SaveData *saveData);
-void sub_0203848C(void);
-void sub_020384C0(SaveData *saveData);
-void sub_02038514(void);
-void sub_02038548(SaveData *saveData);
-void sub_0203859C(void);
-BOOL sub_020385D0(void);
-void *sub_0203871C(SaveData *saveData, int param1);
+void CommManager_InitializePoketchLinkSearch(SaveData *saveData);
+void CommManager_EndPoketchLinkSearch(void);
+BOOL CommManager_IsPoketchSearching(void);
+void CommManager_InitializeSearchParty(SaveData *saveData);
+void CommManager_EndSearchParty(void);
+u8 CommManager_GetUnk54(void);
+BOOL CommManager_ExitOrReset(void);
+void CommManager_SetUnk34(int param0, int param1, int param2);
+int CommManager_StartWifiBattle(int param0);
+int CommManager_GetMatchmakingState();
+void CommManager_DisconnectWifi(int param0, int param1, void *param2, void *param3);
+BOOL CommManager_GetDisconnectedWifi(void);
+BOOL CommManager_IsLoginBattleWifi(void);
+BOOL CommManager_IsLoginBattleMatchWifi(void);
+UnkStruct_ov65_0222F6EC *CommManager_GetUnk34(void);
+void CommManager_LogoutWifi(void);
+void CommManager_EndWifiMatch(void);
+void CommManager_EndTradeWifiMatch(void);
+void CommManager_EndBattleWifiMatch(void);
+BOOL CommManager_CheckWifiError(void);
+void CommManager_InitializeGlobalWifi(SaveData *saveData);
+void CommManager_EndGlobalWifi(void);
+void CommManager_StartMysteryGiftWifi(SaveData *saveData);
+void CommManager_EndMysteryGiftWifi(void);
+void CommManager_StartWifiMail(SaveData *saveData);
+void CommManager_EndWifiMail(void);
+BOOL CommManager_GetDWCError(void);
+void *CommManager_LoginWifiBattleServer(SaveData *saveData, int param1);
 void CommManager_LoginWifiLobby(SaveData *saveData, const void *param1);
 void CommManager_LogoutWifiLobby(void);
 BOOL CommManager_GetWifiLobbyLoginSuccess(void);
@@ -84,20 +84,20 @@ BOOL CommManager_IsWifiLobbyError(void);
 void CommManager_StartWifiP2P(UnkEnum_ov66_02232F38 param0);
 void CommManager_EndWifiP2P(void);
 u32 CommManager_GetWifiP2PConnectState(void);
-void *sub_020388E8(void);
-void CommMan_SetErrorHandling(BOOL param0, BOOL param1);
-BOOL sub_02038938(void);
+void *CommManager_GetUnk00(void);
+void CommManager_SetErrorHandling(BOOL param0, BOOL param1);
+BOOL CommManager_CheckError(void);
 int CommManager_GetCommType(void);
 int CommManager_GetContestRegulation(void);
-void sub_0203898C(u8 *param0);
-void sub_020389A0(u8 *param0);
-BOOL CommMan_IsConnectedToWifi(void);
-void sub_020389C4(u8 param0);
-u8 sub_020389D8(void);
-void sub_020389FC(int param0);
+void CommManager_SetParty(u8 *param0);
+void CommManager_GetParty(u8 *param0);
+BOOL CommManager_IsConnectedToWifi(void);
+void CommManager_SetResetType(u8 param0);
+u8 CommManager_GetResetType(void);
+void NetworkError_DisplayFatalError(int param0);
 void NetworkError_DisplayGTSCriticalError(void);
-void sub_02038A1C(int param0, BgConfig *param1);
-void sub_02038A20(int param0);
+void CommManager_deadstripped_02038A1C(int param0, BgConfig *param1);
+void CommManager_DisplayError(int param0);
 BOOL CommManager_CheckResetFinished(void);
 BOOL CommManager_SetCommError(int param0);
 void CommManager_SetState_WifiPoffin(void);
diff --git a/src/applications/poketch/link_searcher/main.c b/src/applications/poketch/link_searcher/main.c
index 59a5e6b22a3..2cfd0bde184 100644
--- a/src/applications/poketch/link_searcher/main.c
+++ b/src/applications/poketch/link_searcher/main.c
@@ -400,13 +400,13 @@ static void UpdateCommState(PoketchLinkSearcher *appData)
     case COMM_STATE_IDLE:
         break;
     case COMM_STATE_SEARCHING:
-        if (sub_02037C18()) {
+        if (CommManager_IsPoketchSearching()) {
             appData->commState = COMM_STATE_CONNECTED;
         }
         break;
     case COMM_STATE_CONNECTED:
         if (appData->killCommSys) {
-            sub_02037BFC();
+            CommManager_EndPoketchLinkSearch();
             appData->killCommSys = FALSE;
             appData->commState = COMM_STATE_CLOSE;
         }
@@ -422,7 +422,7 @@ static void UpdateCommState(PoketchLinkSearcher *appData)
 static void StartLinkSearch(PoketchLinkSearcher *appData)
 {
     if (appData->commState == COMM_STATE_IDLE) {
-        sub_02037BC0(PoketchSystem_GetSaveData(appData->poketchSys));
+        CommManager_InitializePoketchLinkSearch(PoketchSystem_GetSaveData(appData->poketchSys));
         appData->commState = COMM_STATE_SEARCHING;
     }
 }
diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c
index a4a3b93876b..e1ad13010dc 100644
--- a/src/battle/battle_main.c
+++ b/src/battle/battle_main.c
@@ -197,7 +197,7 @@ BOOL Battle_Main(ApplicationManager *appMan, int *state)
         ov16_0223D10C(appMan, dto);
         WiFiHistory_FlagGeonetLinkInfo(dto->wiFiHistory);
 
-        if (!CommMan_IsConnectedToWifi()) {
+        if (!CommManager_IsConnectedToWifi()) {
             GameRecords_IncrementRecordValue(dto->records, RECORD_UNK_020);
         } else {
             GameRecords_IncrementRecordValue(dto->records, RECORD_UNK_025);
@@ -791,7 +791,7 @@ static void BattleMain_CopyBattleSysToDTOAndFree(ApplicationManager *appMan)
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay11));
     Overlay_UnloadByID(FS_OVERLAY_ID(battle_anim));
 
-    if (!CommMan_IsConnectedToWifi()) {
+    if (!CommManager_IsConnectedToWifi()) {
         Overlay_UnloadByID(FS_OVERLAY_ID(pokedex));
     }
 }
@@ -1512,7 +1512,7 @@ static void SysTask_DrawSprites(SysTask *task, void *inBattleSys)
 {
     BattleSystem *battleSys = inBattleSys;
 
-    sub_02038A1C(HEAP_ID_BATTLE, battleSys->bgConfig);
+    CommManager_deadstripped_02038A1C(HEAP_ID_BATTLE, battleSys->bgConfig);
 
     if (battleSys->unk_23F9 == 0 || battleSys->unk_23F9 == 3) {
         if (battleSys->unk_23F9 == 0) {
@@ -1601,7 +1601,7 @@ static void SysTask_FlyInMessageBox(SysTask *task, void *inBattleSys)
 
 static void NitroStaticInit(void)
 {
-    if (!CommMan_IsConnectedToWifi()) {
+    if (!CommManager_IsConnectedToWifi()) {
         Overlay_LoadByID(FS_OVERLAY_ID(pokedex), OVERLAY_LOAD_ASYNC);
     }
 }
@@ -1708,7 +1708,7 @@ static BOOL ov16_0223D354(ApplicationManager *appMan)
 {
     UnkStruct_0207A778 *v0 = ApplicationManager_Data(appMan);
 
-    sub_02038A1C(HEAP_ID_BATTLE, v0->unk_04);
+    CommManager_deadstripped_02038A1C(HEAP_ID_BATTLE, v0->unk_04);
 
     BOOL result = 0;
 
@@ -2100,14 +2100,14 @@ static BOOL BattleMain_HandleLinkBattleResult(ApplicationManager *appMan)
 
     switch (dto->resultMask) {
     case BATTLE_RESULT_WIN:
-        if (!CommMan_IsConnectedToWifi()) {
+        if (!CommManager_IsConnectedToWifi()) {
             GameRecords_IncrementRecordValue(dto->records, RECORD_LOCAL_LINK_BATTLE_WINS);
         } else {
             GameRecords_IncrementRecordValue(dto->records, RECORD_WIFI_BATTLE_WINS);
         }
         break;
     case BATTLE_RESULT_LOSE:
-        if (!CommMan_IsConnectedToWifi()) {
+        if (!CommManager_IsConnectedToWifi()) {
             GameRecords_IncrementRecordValue(dto->records, RECORD_LOCAL_LINK_BATTLE_LOSSES);
         } else {
             GameRecords_IncrementRecordValue(dto->records, RECORD_WIFI_BATTLE_LOSSES);
@@ -2115,7 +2115,7 @@ static BOOL BattleMain_HandleLinkBattleResult(ApplicationManager *appMan)
         break;
     case BATTLE_RESULT_DRAW:
     case BATTLE_RESULT_PLAYER_FLED:
-        if (!CommMan_IsConnectedToWifi()) {
+        if (!CommManager_IsConnectedToWifi()) {
             GameRecords_IncrementRecordValue(dto->records, RECORD_UNK_023);
         } else {
             GameRecords_IncrementRecordValue(dto->records, RECORD_UNK_028);
@@ -2258,7 +2258,7 @@ static void BattleMain_SetNetworkIconStrength(void)
 {
     NetworkIcon_Init();
 
-    if (CommMan_IsConnectedToWifi()) {
+    if (CommManager_IsConnectedToWifi()) {
         NetworkIcon_SetStrength(WM_LINK_LEVEL_3 - DWC_GetLinkLevel());
     } else if (CommServerClient_IsInitialized()) {
         NetworkIcon_SetStrength(WM_LINK_LEVEL_3 - WM_GetLinkLevel());
diff --git a/src/communication_system.c b/src/communication_system.c
index 28cecbf1dd9..da7ccded060 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -546,7 +546,7 @@ BOOL CommSys_Update(void)
         sub_02033D94(0);
     }
 
-    sub_02038A20(0);
+    CommManager_DisplayError(0);
     sub_0203650C();
 
     return TRUE;
@@ -1769,7 +1769,7 @@ BOOL CommSys_CheckError(void)
     }
 
     if (sCommunicationSystem && sCommunicationSystem->unk_6B1) {
-        CommMan_SetErrorHandling(1, 1);
+        CommManager_SetErrorHandling(1, 1);
         return TRUE;
     }
 
diff --git a/src/error_message_reset.c b/src/error_message_reset.c
index 947bfb21d63..581079c0bfa 100644
--- a/src/error_message_reset.c
+++ b/src/error_message_reset.c
@@ -151,7 +151,7 @@ void ErrorMessageReset_PrintErrorAndReset(void)
     ResetScreenMasterBrightness(DS_SCREEN_MAIN);
     ResetScreenMasterBrightness(DS_SCREEN_SUB);
     BrightnessController_SetScreenBrightness(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, BRIGHTNESS_BOTH_SCREENS);
-    sub_02037DB0();
+    CommManager_ExitOrReset();
 
     while (TRUE) {
         HandleConsoleFold();
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 0ac71fbf6bb..40e5596872a 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -154,7 +154,7 @@ void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem)
 {
     SetupScreenFadeRegisters(DS_SCREEN_MAIN, COLOR_BLACK);
     SetupScreenFadeRegisters(DS_SCREEN_SUB, COLOR_BLACK);
-    CommMan_SetErrorHandling(1, 1);
+    CommManager_SetErrorHandling(1, 1);
 
     if (!CommMan_IsInitialized()) {
         return;
@@ -192,7 +192,7 @@ void FieldCommMan_EndBattle(void)
         return;
     }
 
-    CommMan_SetErrorHandling(0, 0);
+    CommManager_SetErrorHandling(0, 0);
     FieldCommMan_SetTask(Task_EndBattle, 5);
 }
 
@@ -413,7 +413,7 @@ static void sub_02059B74(void)
         }
     }
 
-    sub_02038A1C(4, sFieldCommMan->fieldSystem->bgConfig);
+    CommManager_deadstripped_02038A1C(4, sFieldCommMan->fieldSystem->bgConfig);
 }
 
 static void sub_02059BF4(void)
@@ -523,7 +523,7 @@ static void sub_02059D58(void)
         break;
     }
 
-    sub_020389A0(v2);
+    CommManager_GetParty(v2);
 
     if (sFieldCommMan->party == NULL) {
         Encounter_NewVsLinkWithRecording(sFieldCommMan->fieldSystem, v2, v1);
@@ -691,7 +691,7 @@ static void sub_02059FD4(void)
 static void sub_0205A018(void)
 {
     if (CommTiming_IsSyncState(91)) {
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
         CommPlayerMan_Delete(1);
         FieldCommMan_SetTask(sub_0205A058, 5);
     }
diff --git a/src/main.c b/src/main.c
index 47e0b999212..86d4db8853e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -228,7 +228,7 @@ static void TrySystemReset(enum OSResetParameter resetParam)
 
 static void CheckHeapCanary(void)
 {
-    int v0 = sub_020389D8();
+    int v0 = CommManager_GetResetType();
 
     switch (v0) {
     case 1:
@@ -248,7 +248,7 @@ static void SoftReset(enum OSResetParameter resetParam)
     SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_WHITE);
     SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
 
-    if (sub_02037DB0()) {
+    if (CommManager_ExitOrReset()) {
         SaveData_SaveStateCancel(SaveData_Ptr());
     }
 
@@ -265,20 +265,20 @@ static void HeapCanaryFailed(int resetParam, int param1)
     if (param1 == 3) {
         NetworkError_DisplayNetworkError(HEAP_ID_SYSTEM, 3, 0);
     } else if (resetParam == RESET_CLEAN) {
-        if (CommMan_IsConnectedToWifi() == TRUE) {
+        if (CommManager_IsConnectedToWifi() == TRUE) {
             NetworkError_DisplayNetworkError(HEAP_ID_SYSTEM, 6, 0);
         } else {
             NetworkError_DisplayNetworkError(HEAP_ID_SYSTEM, 2, 0);
         }
     } else {
-        if (CommMan_IsConnectedToWifi() == TRUE) {
+        if (CommManager_IsConnectedToWifi() == TRUE) {
             NetworkError_DisplayNetworkError(HEAP_ID_SYSTEM, 5, 0);
         } else {
             NetworkError_DisplayNetworkError(HEAP_ID_SYSTEM, 0, 0);
         }
     }
 
-    sub_02037DB0();
+    CommManager_ExitOrReset();
     WaitFrame();
     SoundSystem_Tick();
 
diff --git a/src/main_menu/main_menu.c b/src/main_menu/main_menu.c
index 014718c8cb4..2b0f444951f 100644
--- a/src/main_menu/main_menu.c
+++ b/src/main_menu/main_menu.c
@@ -414,7 +414,7 @@ static void DetectWirelessConnections(MainMenuAppData *appData)
         appData->wirelessCheckState = MAIN_MENU_WIRELESS_CHECK_INIT_WIRELESS;
         break;
     case MAIN_MENU_WIRELESS_CHECK_INIT_WIRELESS:
-        sub_02037D48(appData->saveData);
+        CommManager_InitializeSearchParty(appData->saveData);
 
         appData->wirelessCheckTimeout = 120;
         appData->wirelessCheckState = MAIN_MENU_WIRELESS_CHECK_CHECK_RESULT;
@@ -430,7 +430,7 @@ static void DetectWirelessConnections(MainMenuAppData *appData)
             break;
         }
 
-        int availableConnections = sub_02037DA0();
+        int availableConnections = CommManager_GetUnk54();
         availableConnections = ~appData->pendingAlerts & availableConnections;
 
         if (availableConnections && (appData->alertsState == MAIN_MENU_ALERTS_STATE_WAIT) && (appData->alertsPending == FALSE) && (appData->pendingAlerts != availableConnections)) {
@@ -456,12 +456,12 @@ static void DetectWirelessConnections(MainMenuAppData *appData)
         }
 
         if (--appData->wirelessCheckTimeout == 0) {
-            sub_02037D84();
+            CommManager_EndSearchParty();
             appData->wirelessCheckState = MAIN_MENU_WIRELESS_CHECK_IDLE;
         }
         break;
     case MAIN_MENU_WIRELESS_CHECK_STOP:
-        sub_02037D84();
+        CommManager_EndSearchParty();
         appData->wirelessCheckState = MAIN_MENU_WIRELESS_CHECK_IDLE;
         break;
     }
@@ -1211,7 +1211,7 @@ static BOOL MainMenu_Main(ApplicationManager *appMan, int *state)
                 if (appData->nextApplication == NEXT_APP_GBA_MIGRATION) {
                     if (CTRDG_IsPulledOut() == TRUE) {
                         if (appData->wirelessCheckState != MAIN_MENU_WIRELESS_CHECK_IDLE) {
-                            sub_02037D84();
+                            CommManager_EndSearchParty();
                         }
 
                         sub_0209A8E0(HEAP_ID_MAIN_MENU);
diff --git a/src/main_menu/mystery_gift_app.c b/src/main_menu/mystery_gift_app.c
index a74d3e1f89b..026dd073142 100644
--- a/src/main_menu/mystery_gift_app.c
+++ b/src/main_menu/mystery_gift_app.c
@@ -2171,7 +2171,7 @@ static BOOL MysteryGiftApp_Main(ApplicationManager *appMan, enum MysteryGiftAppS
         if (netID != 0 && CommSys_IsPlayerConnected(netID)) {
             if (CommTiming_IsSyncState(0xAB) == TRUE) {
                 ToggleWaitDial(appData, FALSE);
-                CommMan_SetErrorHandling(TRUE, TRUE);
+                CommManager_SetErrorHandling(TRUE, TRUE);
                 ShowMessageBox(appMan, &appData->messageBox, MysteryGiftMenu_Text_ReceivingGiftDontTurnOff);
                 SetDownloadArrowAnim(appData, 1);
                 ToggleWaitDial(appData, TRUE);
@@ -2213,7 +2213,7 @@ static BOOL MysteryGiftApp_Main(ApplicationManager *appMan, enum MysteryGiftAppS
         break;
     case MG_APP_STATE_SAVE_GIFT_FROM_FRIEND:
         MainMenuUtil_LoadGiftSprite(appData->bgConfig, GetReceivedWonderCard(appMan));
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
         SaveReceivedGift(appMan);
         *state = MG_APP_STATE_CHECK_FRIEND_CONNECTION_STILL_VALID;
         break;
@@ -2479,19 +2479,19 @@ static void ov97_02230224(MysteryGiftAppData *param0)
     case 29:
         break;
     case 28:
-        sub_02037D48(param0->saveData);
+        CommManager_InitializeSearchParty(param0->saveData);
         param0->unk_630 = 120;
         param0->unk_62C = 30;
         break;
     case 30:
-        v0 = sub_02037DA0();
+        v0 = CommManager_GetUnk54();
 
         if (v0 & 0x1) {
             param0->unk_634 = 1;
         }
 
         if (--param0->unk_630 == 0) {
-            sub_02037D84();
+            CommManager_EndSearchParty();
             param0->unk_62C = 29;
         }
         break;
diff --git a/src/main_menu/ov97_02238D74.c b/src/main_menu/ov97_02238D74.c
index a0b6e792a41..e28eeb682ce 100644
--- a/src/main_menu/ov97_02238D74.c
+++ b/src/main_menu/ov97_02238D74.c
@@ -178,7 +178,7 @@ static void ov97_02238E88(void)
 static void ov97_02238E94(void)
 {
     NetworkIcon_Destroy();
-    sub_02038514();
+    CommManager_EndMysteryGiftWifi();
     Overlay_UnloadHttpOverlay();
     Overlay_UnloadWFCOverlay();
     WirelessDriver_Shutdown();
@@ -206,7 +206,7 @@ int ov97_02238EAC(ApplicationManager *appMan, int *param1)
     case 4097:
         if (WirelessDriver_IsReady()) {
             DWC_SetMemFunc(ov97_02238D74, ov97_02238D94);
-            sub_020384C0(v2->saveData);
+            CommManager_StartMysteryGiftWifi(v2->saveData);
             *param1 = 4098;
         }
         break;
diff --git a/src/network_icon.c b/src/network_icon.c
index 7c95ee7eac2..e0760602137 100644
--- a/src/network_icon.c
+++ b/src/network_icon.c
@@ -254,7 +254,7 @@ void NetworkIcon_Update()
 void NetworkIcon_Init()
 {
     BOOL isWifi = FALSE;
-    if (CommMan_IsConnectedToWifi()) {
+    if (CommManager_IsConnectedToWifi()) {
         isWifi = TRUE;
     }
     InitGlobalNetworkIcon(240, 0, isWifi, NNS_G2D_VRAM_TYPE_2DMAIN);
@@ -298,10 +298,10 @@ void NetworkIcon_CreateOnSubScreen(BOOL isUpperScreen, u32 heapID)
 void NetworkIcon_InitIfConnected()
 {
     if (CommSys_IsInitialized()) {
-        if (CommSys_ConnectedCount() > 1 || CommMan_IsConnectedToWifi()) {
+        if (CommSys_ConnectedCount() > 1 || CommManager_IsConnectedToWifi()) {
             NetworkIcon_Init();
         }
-    } else if (CommMan_IsConnectedToWifi()) {
+    } else if (CommManager_IsConnectedToWifi()) {
         NetworkIcon_Init();
     }
 }
diff --git a/src/nintendo_wfc/main.c b/src/nintendo_wfc/main.c
index d38ce8413b9..e1f6162d7ee 100644
--- a/src/nintendo_wfc/main.c
+++ b/src/nintendo_wfc/main.c
@@ -834,7 +834,7 @@ int NintendoWFC_HandleError(void)
     }
 
     if (error != 0) {
-        sub_02037F94(errorCode, errorType, error);
+        CommManager_SetUnk34(errorCode, errorType, error);
     }
 
     return ret;
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index 4e16110672d..071dfc5c4de 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -1567,7 +1567,7 @@ static void ov7_0224B3A8(CommClubManager *commClubMan)
 {
     WirelessManager_SetEntry2(0);
     sCommClubMan->retCode = COMM_CLUB_RET_2;
-    CommMan_SetErrorHandling(1, 1);
+    CommManager_SetErrorHandling(1, 1);
     CommInfo_SendPlayerInfo();
     sub_02033EA8(1);
 }
diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c
index f3938d55ab5..19c44bd0752 100644
--- a/src/overlay017/ov17_0223B140.c
+++ b/src/overlay017/ov17_0223B140.c
@@ -403,7 +403,7 @@ static void ov17_0223B6F0(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    sub_02038A1C(21, v0->unk_0C.unk_24);
+    CommManager_deadstripped_02038A1C(21, v0->unk_0C.unk_24);
 }
 
 static void ov17_0223B728(BgConfig *param0)
diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c
index 81c9356ec31..04c7ab322fd 100644
--- a/src/overlay017/ov17_0223CB1C.c
+++ b/src/overlay017/ov17_0223CB1C.c
@@ -397,7 +397,7 @@ static void ov17_0223D164(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    sub_02038A1C(22, v0->unk_0C.unk_24);
+    CommManager_deadstripped_02038A1C(22, v0->unk_0C.unk_24);
 }
 
 static void ov17_0223D1B8(BgConfig *param0)
diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c
index 38276a08149..a0ffbb00bf1 100644
--- a/src/overlay017/ov17_0223DAD0.c
+++ b/src/overlay017/ov17_0223DAD0.c
@@ -557,7 +557,7 @@ static void ov17_0223E1FC(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    sub_02038A1C(23, v0->unk_14.unk_60);
+    CommManager_deadstripped_02038A1C(23, v0->unk_14.unk_60);
 }
 
 static void ov17_0223E250(BgConfig *param0)
diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c
index 2aadb4d50e6..8aa0af75d09 100644
--- a/src/overlay017/ov17_0224F4D4.c
+++ b/src/overlay017/ov17_0224F4D4.c
@@ -399,7 +399,7 @@ static void ov17_0224FAFC(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    sub_02038A1C(24, v0->unk_10.unk_20);
+    CommManager_deadstripped_02038A1C(24, v0->unk_10.unk_20);
 }
 
 static void ov17_0224FB34(BgConfig *param0)
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 37a7eddf8ce..5a68a01555e 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -205,7 +205,7 @@ int ov58_021D0D80(ApplicationManager *appMan, int *param1)
         GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN);
 
         sub_02095E98(v0);
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
 
         if (CommSys_CurNetId() == 0) {
             CommManager_SetMaxNumConnections(3);
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 3abfc196251..9a881b58c80 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -685,7 +685,7 @@ static void ov59_021D17C8(UnkStruct_020961E8 *param0)
 
 static int ov59_021D17F8(UnkStruct_020961E8 *param0, int param1)
 {
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     if (CommSys_CurNetId() == 0) {
         if (CommSys_ConnectedCount() >= 2) {
@@ -1182,7 +1182,7 @@ static int ov59_021D2044(UnkStruct_020961E8 *param0, int param1)
 static int ov59_021D2064(UnkStruct_020961E8 *param0, int param1)
 {
     if (CommTiming_IsSyncState(201)) {
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_CIRCLE_OUT, FADE_TYPE_CIRCLE_OUT, COLOR_BLACK, 16, 1, HEAP_ID_51);
 
         param1 = 3;
diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c
index 87270532164..e6827b182e8 100644
--- a/src/overlay061/ov61_0222B008.c
+++ b/src/overlay061/ov61_0222B008.c
@@ -136,7 +136,7 @@ static int ov61_0222B14C(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B13
     DWC_ClearError();
     DWC_CleanupInet();
 
-    sub_0203848C();
+    CommManager_EndGlobalWifi();
     param0->unk_3C8 = 0;
 
     return 1;
diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c
index 23bc98a5b34..ff830c6083d 100644
--- a/src/overlay061/ov61_0222BF44.c
+++ b/src/overlay061/ov61_0222BF44.c
@@ -644,7 +644,7 @@ static int ov61_0222CA20(UnkStruct_ov61_0222C664 *param0)
 {
     switch (param0->unk_90) {
     case 0:
-        sub_02038438(param0->unk_00->unk_00->saveData);
+        CommManager_InitializeGlobalWifi(param0->unk_00->unk_00->saveData);
         NetworkIcon_Init();
         ov61_0222C8B8(param0, param0->unk_28, 1, TEXT_SPEED_FAST, 0xf0f);
         ov61_0222C850(param0);
@@ -832,7 +832,7 @@ static int ov61_0222CC64(UnkStruct_ov61_0222C664 *param0)
 static int ov61_0222CCAC(UnkStruct_ov61_0222C664 *param0)
 {
     if (param0->unk_08 != 9) {
-        sub_0203848C();
+        CommManager_EndGlobalWifi();
     }
 
     NetworkIcon_Destroy();
@@ -882,7 +882,7 @@ static int ov61_0222CD58(UnkStruct_ov61_0222C664 *param0)
         break;
     case 1:
         if (ov61_0222C834(param0->unk_40) == 0) {
-            sub_0203848C();
+            CommManager_EndGlobalWifi();
             DWC_CleanupInet();
             param0->unk_90++;
         }
@@ -931,7 +931,7 @@ static int ov61_0222CE2C(UnkStruct_ov61_0222C664 *param0)
         break;
     case 1:
         DWC_CleanupInet();
-        sub_0203848C();
+        CommManager_EndGlobalWifi();
         param0->unk_90++;
         break;
     case 2:
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index c65c175d58a..c5b49da80c7 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -723,7 +723,7 @@ int ov65_0222E2A8(ApplicationManager *appMan, int *param1)
     case 0:
         v1 = ApplicationManager_Args(appMan);
 
-        if (CommMan_IsConnectedToWifi()) {
+        if (CommManager_IsConnectedToWifi()) {
             switch (v1->unk_04) {
             case 8:
             case 9:
@@ -773,7 +773,7 @@ int ov65_0222E2A8(ApplicationManager *appMan, int *param1)
 
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_54);
 
-        if (CommMan_IsConnectedToWifi()) {
+        if (CommManager_IsConnectedToWifi()) {
             NetworkIcon_Init();
         } else {
             Overlay_LoadWFCOverlay();
@@ -1583,9 +1583,9 @@ static int ov65_0222F010(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
     u32 v0;
 
-    if (CommMan_IsConnectedToWifi()) {
+    if (CommManager_IsConnectedToWifi()) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
-        param0->unk_04 = sub_020388E8();
+        param0->unk_04 = CommManager_GetUnk00();
         param0->unk_04->unk_00.unk_21 = param0->unk_04->unk_00.unk_22;
 
         v0 = ov65_0222DD20(param0, &param0->unk_04->unk_00);
@@ -1593,15 +1593,15 @@ static int ov65_0222F010(UnkStruct_ov65_0222EBE0 *param0, int param1)
         if ((v0 == 8) || (v0 == 18) || (v0 == 20) || (v0 == 22) || (v0 == 23) || (v0 == 24) || (v0 == 25) || (v0 == 26) || (v0 == 27) || (v0 == 19)) {
             ov65_02232E58(param0, 16);
             CommInfo_Delete();
-            sub_02038398();
+            CommManager_EndTradeWifiMatch();
 
-            param0->unk_04 = sub_020388E8();
+            param0->unk_04 = CommManager_GetUnk00();
             param0->unk_04->unk_00.unk_21 = param0->unk_04->unk_00.unk_22;
             param0->unk_3BC = 20;
             param0->unk_3A8 = 65;
         } else {
             ov65_02232B58(param0, 77, 0);
-            CommMan_SetErrorHandling(1, 1);
+            CommManager_SetErrorHandling(1, 1);
             CommTiming_StartSync(16);
             param0->unk_3A8 = 61;
         }
@@ -1650,7 +1650,7 @@ static int ov65_0222F1A8(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     } else {
         if (v1 == 0) {
-            param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
+            param0->unk_04 = CommManager_LoginWifiBattleServer(param0->saveData, sizeof(UnkStruct_0207DFAC));
             ov65_02232B58(param0, 23, 1);
             GF_ASSERT(param0->unk_188 == NULL);
             param0->unk_188 = Window_AddWaitDial(&param0->unk_330, 512 - (18 + 12));
@@ -1722,7 +1722,7 @@ static int ov65_0222F304(UnkStruct_ov65_0222EBE0 *param0, int param1)
             Email_Init(SaveData_SaveTable(param0->saveData, SAVE_TABLE_ENTRY_EMAIL));
             BattleFrontierStats_ClearAllWFCStats(SaveData_GetBattleFrontier(param0->saveData));
             param0->unk_3A8 = 14;
-            param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
+            param0->unk_04 = CommManager_LoginWifiBattleServer(param0->saveData, sizeof(UnkStruct_0207DFAC));
             ov65_02232B58(param0, 23, 1);
             GF_ASSERT(param0->unk_188 == NULL);
             param0->unk_188 = Window_AddWaitDial(&param0->unk_330, 512 - (18 + 12));
@@ -1752,7 +1752,7 @@ static int ov65_0222F3DC(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
         if (v1 == 0) {
             param0->unk_3A8 = 14;
-            param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
+            param0->unk_04 = CommManager_LoginWifiBattleServer(param0->saveData, sizeof(UnkStruct_0207DFAC));
             ov65_02232B58(param0, 23, 1);
             GF_ASSERT(param0->unk_188 == NULL);
             param0->unk_188 = Window_AddWaitDial(&param0->unk_330, 512 - (18 + 12));
@@ -1885,7 +1885,7 @@ static int ov65_0222F62C(UnkStruct_ov65_0222EBE0 *param0)
 
 static void ov65_0222F6EC(UnkStruct_ov65_0222EBE0 *param0)
 {
-    UnkStruct_ov65_0222F6EC *v0 = sub_020382F8();
+    UnkStruct_ov65_0222F6EC *v0 = CommManager_GetUnk34();
     int v1, v2 = v0->unk_00;
     int v3 = NintendoWFC_GetErrorCode(v0->unk_00, v0->unk_04);
 
@@ -1999,12 +1999,12 @@ static int ov65_0222F8AC(UnkStruct_ov65_0222EBE0 *param0, int param1)
     if (v1 == 0xffffffff) {
         return param1;
     } else if (v1 == 0) {
-        sub_02038350();
+        CommManager_LogoutWifi();
         ov65_02232E58(param0, 16);
         param0->unk_3A8 = 13;
     } else {
         ov65_02232E58(param0, 16);
-        sub_02038350();
+        CommManager_LogoutWifi();
         CommInfo_Delete();
         param0->unk_3AC = 8;
         param0->unk_3A8 = 34;
@@ -2070,7 +2070,7 @@ static int ov65_0222F90C(UnkStruct_ov65_0222EBE0 *param0, int param1)
         MI_CpuClear8(param0->unk_CC, 32 * sizeof(int));
 
         ov65_0222EE98(param0);
-        param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
+        param0->unk_04 = CommManager_LoginWifiBattleServer(param0->saveData, sizeof(UnkStruct_0207DFAC));
         ov65_02232B58(param0, 23, 1);
         GF_ASSERT(param0->unk_188 == NULL);
         param0->unk_188 = Window_AddWaitDial(&param0->unk_330, 512 - (18 + 12));
@@ -2093,7 +2093,7 @@ static int ov65_0222FAA0(UnkStruct_ov65_0222EBE0 *param0, int param1)
         param0->unk_188 = Window_AddWaitDial(&param0->unk_330, 512 - (18 + 12));
     }
 
-    if (sub_02038294()) {
+    if (CommManager_IsLoginBattleWifi()) {
         if (param0->unk_3C8) {
             param0->unk_3A8 = 16;
         } else {
@@ -2101,7 +2101,7 @@ static int ov65_0222FAA0(UnkStruct_ov65_0222EBE0 *param0, int param1)
             ov65_0222F5BC(param0);
             param0->unk_3A8 = ov65_0222EBB8();
         }
-    } else if (sub_020383E8() || sub_020380E4() == 3) {
+    } else if (CommManager_CheckWifiError() || CommManager_GetMatchmakingState() == 3) {
         ov65_0222F6EC(param0);
     }
 
@@ -2120,7 +2120,7 @@ static int ov65_0222FB44(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     }
 
-    if (sub_02038294()) {
+    if (CommManager_IsLoginBattleWifi()) {
         if (param0->unk_3C8) {
             param0->unk_3A8 = 16;
         } else {
@@ -2128,7 +2128,7 @@ static int ov65_0222FB44(UnkStruct_ov65_0222EBE0 *param0, int param1)
             ov65_0222F5BC(param0);
             param0->unk_3A8 = ov65_0222EBB8();
         }
-    } else if (sub_020383E8() || (sub_020380E4() == 3)) {
+    } else if (CommManager_CheckWifiError() || (CommManager_GetMatchmakingState() == 3)) {
         ov65_0222F6EC(param0);
     }
 
@@ -2147,7 +2147,7 @@ static int ov65_0222FBD0(UnkStruct_ov65_0222EBE0 *param0, int param1)
         }
     }
 
-    if (sub_02038294()) {
+    if (CommManager_IsLoginBattleWifi()) {
         if (param0->unk_3C8) {
             param0->unk_3A8 = 16;
         } else {
@@ -2155,7 +2155,7 @@ static int ov65_0222FBD0(UnkStruct_ov65_0222EBE0 *param0, int param1)
             ov65_0222F5BC(param0);
             param0->unk_3A8 = ov65_0222EBB8();
         }
-    } else if (sub_020383E8() || (sub_020380E4() == 3)) {
+    } else if (CommManager_CheckWifiError() || (CommManager_GetMatchmakingState() == 3)) {
         ov65_0222F6EC(param0);
     }
 
@@ -2171,12 +2171,12 @@ static int ov65_0222FC48(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     }
 
-    if (sub_020382C0()) {
+    if (CommManager_IsLoginBattleMatchWifi()) {
         param0->unk_3A8 = ov65_0222EBB8();
-    } else if (sub_020383E8() || (sub_020380E4() == 3)) {
+    } else if (CommManager_CheckWifiError() || (CommManager_GetMatchmakingState() == 3)) {
         ov65_0222F6EC(param0);
-    } else if ((sub_020380E4() >= 4) || sub_02038284() || !CommSys_IsPlayerConnected(0)) {
-        sub_02038378();
+    } else if ((CommManager_GetMatchmakingState() >= 4) || CommManager_GetDisconnectedWifi() || !CommSys_IsPlayerConnected(0)) {
+        CommManager_EndWifiMatch();
         param0->unk_3A8 = ov65_0222EBB8();
     }
 
@@ -2200,7 +2200,7 @@ static int ov65_0222FCDC(UnkStruct_ov65_0222EBE0 *param0, int param1)
         if (param0->unk_3B4 == 1) {
             param0->unk_3AC = 10;
             param0->unk_3A8 = 34;
-            sub_02038350();
+            CommManager_LogoutWifi();
         } else if (0 == sub_0202AF94(param0->unk_00)) {
             ov65_02232B58(param0, 26, 1);
             param0->unk_3A8 = 59;
@@ -2318,8 +2318,8 @@ static int ov65_0222FFAC(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     }
 
-    if (sub_020383E8() == 0) {
-        if (!sub_020382C0()) {
+    if (CommManager_CheckWifiError() == 0) {
+        if (!CommManager_IsLoginBattleMatchWifi()) {
             return param1;
         }
     }
@@ -2375,13 +2375,13 @@ static int ov65_0222FFAC(UnkStruct_ov65_0222EBE0 *param0, int param1)
     StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_54);
     param0->unk_3A8 = 19;
 
-    CommMan_SetErrorHandling(0, 0);
+    CommManager_SetErrorHandling(0, 0);
     return param1;
 }
 
 static int ov65_0223012C(UnkStruct_ov65_0222EBE0 *param0)
 {
-    if (sub_020380E4() == 1) {
+    if (CommManager_GetMatchmakingState() == 1) {
         return 1;
     }
 
@@ -2503,17 +2503,17 @@ static int ov65_022302C4(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     }
 
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
         return param1;
     }
 
-    if (sub_020380E4() == 4) {
+    if (CommManager_GetMatchmakingState() == 4) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 18, 0);
         param0->unk_3A8 = 29;
         ov65_02232E58(param0, 16);
-        sub_02038378();
+        CommManager_EndWifiMatch();
         return param1;
     }
 
@@ -2570,7 +2570,7 @@ static int ov65_022302C4(UnkStruct_ov65_0222EBE0 *param0, int param1)
         NintendoWFC_SetVoiceChatEnabled(0);
         ov65_02232DC0(param0, param0->unk_3D0);
         ov65_02232B58(param0, 18, 0);
-        sub_02038378();
+        CommManager_EndWifiMatch();
         param0->unk_3A8 = 27;
         return param1;
     }
@@ -2621,7 +2621,7 @@ static int ov65_022302C4(UnkStruct_ov65_0222EBE0 *param0, int param1)
             param0->unk_3A8 = 39;
         } else {
             if (v4 == 16) {
-                if (sub_020382C0() == 1) {
+                if (CommManager_IsLoginBattleMatchWifi() == 1) {
                     ov65_022355B0(&param0->unk_3EC);
                     param0->unk_3A8 = 36;
                 }
@@ -2680,19 +2680,19 @@ static int ov65_02230634(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
     if (param0->unk_3A0 < 0) {
         param0->unk_3A8 = 70;
-    } else if (sub_020380E4() == 5) {
+    } else if (CommManager_GetMatchmakingState() == 5) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 15, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020380E4() == 3) {
+    } else if (CommManager_GetMatchmakingState() == 3) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 18, 0);
         param0->unk_3A8 = 27;
-    } else if ((sub_020380E4() == 4) || (sub_02038284())) {
+    } else if ((CommManager_GetMatchmakingState() == 4) || (CommManager_GetDisconnectedWifi())) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 19, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020383E8()) {
+    } else if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
     } else if (v1 == 0) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
@@ -2702,7 +2702,7 @@ static int ov65_02230634(UnkStruct_ov65_0222EBE0 *param0, int param1)
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 16, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020380E4() == 1) {
+    } else if (CommManager_GetMatchmakingState() == 1) {
         ov65_02232DFC(param0);
         ov65_02232E58(param0, 1);
         param0->unk_3A8 = 24;
@@ -2731,7 +2731,7 @@ static int ov65_022307B0(UnkStruct_ov65_0222EBE0 *param0, int param1)
     int v1;
     int v2;
 
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
         return param1;
     }
@@ -2781,19 +2781,19 @@ static int ov65_02230860(UnkStruct_ov65_0222EBE0 *param0, int param1)
     ov65_022302B0(param0, HEAP_ID_54);
     ov65_022331E0(param0);
 
-    if (sub_020380E4() == 5) {
+    if (CommManager_GetMatchmakingState() == 5) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 15, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020380E4() == 3) {
+    } else if (CommManager_GetMatchmakingState() == 3) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 18, 0);
         param0->unk_3A8 = 27;
-    } else if ((sub_020380E4() == 4) || (sub_02038284())) {
+    } else if ((CommManager_GetMatchmakingState() == 4) || (CommManager_GetDisconnectedWifi())) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 19, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020383E8()) {
+    } else if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
     } else if ((v1 != 16) && (v1 != 1)) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
@@ -2815,7 +2815,7 @@ static int ov65_02230860(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
 static int ov65_022309D0(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
         return param1;
     }
@@ -2836,7 +2836,7 @@ static int ov65_02230A30(UnkStruct_ov65_0222EBE0 *param0, int param1)
     int v1 = Menu_ProcessInputAndHandleExit(param0->unk_184, 54);
 
     if (v1 == 0xffffffff) {
-        if ((sub_020380E4() >= 4) || sub_02038284() || !CommSys_IsPlayerConnected(0)) {
+        if ((CommManager_GetMatchmakingState() >= 4) || CommManager_GetDisconnectedWifi() || !CommSys_IsPlayerConnected(0)) {
             ov65_02232DFC(param0);
 
             ov65_02232E58(param0, 16);
@@ -2844,15 +2844,15 @@ static int ov65_02230A30(UnkStruct_ov65_0222EBE0 *param0, int param1)
             param0->unk_3D0 = -1;
             param0->unk_3BC = 20;
             param0->unk_3A8 = 65;
-        } else if (sub_020383E8()) {
+        } else if (CommManager_CheckWifiError()) {
             ov65_0222F6EC(param0);
         }
 
         return param1;
     } else if (v1 == 0) {
-        if (!sub_020383E8()) {
+        if (!CommManager_CheckWifiError()) {
             ov65_02232E58(param0, 16);
-            sub_020383D4();
+            CommManager_EndBattleWifiMatch();
             param0->unk_3D0 = -1;
             param0->unk_3BC = 20;
             param0->unk_3A8 = 65;
@@ -2871,7 +2871,7 @@ static int ov65_02230AF8(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
     u32 v0;
 
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
         return param1;
     }
@@ -2891,7 +2891,7 @@ static int ov65_02230AF8(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
     if ((gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) || (param0->unk_3BC == 0)) {
         ov65_02232DFC(param0);
-        sub_02038378();
+        CommManager_EndWifiMatch();
         CommManager_SetState_LoginWifi();
 
         if (ov65_02235194(&param0->unk_3EC) == 0) {
@@ -2920,7 +2920,7 @@ static int ov65_02230BB4(UnkStruct_ov65_0222EBE0 *param0, int param1)
     if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) {
         ov65_02232DFC(param0);
         ov65_02232E58(param0, 16);
-        sub_02038378();
+        CommManager_EndWifiMatch();
         param0->unk_3BC = 20;
         param0->unk_3A8 = 65;
     }
@@ -2930,7 +2930,7 @@ static int ov65_02230BB4(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
 static int ov65_02230C04(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
         return param1;
     }
@@ -3331,7 +3331,7 @@ static int ov65_02231200(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
     u32 v0;
 
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
         return param1;
     }
@@ -3342,8 +3342,8 @@ static int ov65_02231200(UnkStruct_ov65_0222EBE0 *param0, int param1)
         param0->unk_3A8 = 19;
     }
 
-    if (sub_020382C0()) {
-        CommMan_SetErrorHandling(0, 1);
+    if (CommManager_IsLoginBattleMatchWifi()) {
+        CommManager_SetErrorHandling(0, 1);
 
         sub_0203632C(0);
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_54);
@@ -3596,7 +3596,7 @@ static int ov65_022316F0(UnkStruct_ov65_0222EBE0 *param0, int param1)
     int v2, v3;
     UnkStruct_0207E060 *v4;
 
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
         return param1;
     }
@@ -3788,7 +3788,7 @@ static int ov65_02231A98(UnkStruct_ov65_0222EBE0 *param0, int param1)
     v2 = ov65_02235254(&param0->unk_3EC);
     v7 = ov65_0222E8D4(param0, v2);
 
-    if (sub_020383E8()) {
+    if (CommManager_CheckWifiError()) {
         Window_EraseStandardFrame(&param0->unk_380, 0);
         Window_Remove(&param0->unk_380);
         ListMenu_Free(param0->unk_158, NULL, NULL);
@@ -3979,21 +3979,21 @@ static int ov65_02231E64(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
     if (param0->unk_3A0 < 0) {
         param0->unk_3A8 = 70;
-    } else if (sub_020380E4() == 3) {
+    } else if (CommManager_GetMatchmakingState() == 3) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 18, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020380E4() == 5) {
+    } else if (CommManager_GetMatchmakingState() == 5) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 15, 0);
         param0->unk_3A8 = 27;
-    } else if ((sub_020380E4() == 4) || (sub_02038284())) {
+    } else if ((CommManager_GetMatchmakingState() == 4) || (CommManager_GetDisconnectedWifi())) {
         ov65_02232DC0(param0, NintendoWFC_GetHostFriendIdx());
         ov65_02232B58(param0, 18, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020383E8()) {
+    } else if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
-    } else if (sub_020380E4() == 1) {
+    } else if (CommManager_GetMatchmakingState() == 1) {
         v0 = ov65_0222DD20(param0, &param0->unk_04->unk_00);
 
         if (ov65_0222DD64(v0) == 0) {
@@ -4004,7 +4004,7 @@ static int ov65_02231E64(UnkStruct_ov65_0222EBE0 *param0, int param1)
         } else if (CommSys_IsPlayerConnected(0) == 1) {
             ov65_02232DFC(param0);
             CommInfo_Init(param0->saveData, NULL);
-            CommMan_SetErrorHandling(0, 1);
+            CommManager_SetErrorHandling(0, 1);
             ov65_0222DFD4(v0);
 
             param0->unk_3AC = ov65_0222DD94(v0);
@@ -4041,7 +4041,7 @@ static int ov65_02231FE8(UnkStruct_ov65_0222EBE0 *param0, int param1)
     ov65_02232F30(param0);
     ov65_02232E58(param0, 16);
 
-    sub_02038378();
+    CommManager_EndWifiMatch();
 
     param0->unk_3D0 = -1;
     param0->unk_3A8 = 19;
@@ -4106,7 +4106,7 @@ static int ov65_02232028(UnkStruct_ov65_0222EBE0 *param0, int param1)
         ov65_02232B58(param0, 18, 0);
         param0->unk_3A8 = 29;
         ov65_02232E58(param0, 16);
-        sub_02038378();
+        CommManager_EndWifiMatch();
         return param1;
     }
 
@@ -4123,11 +4123,11 @@ static int ov65_02232028(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
 static BOOL ov65_022321A8(UnkStruct_ov65_0222EBE0 *param0)
 {
-    if (sub_020380E4() >= 3) {
+    if (CommManager_GetMatchmakingState() >= 3) {
         ov65_02232DC0(param0, param0->unk_3D0);
         ov65_02232B58(param0, 18, 0);
         param0->unk_3A8 = 27;
-    } else if (sub_020383E8()) {
+    } else if (CommManager_CheckWifiError()) {
         ov65_0222F6EC(param0);
     } else {
         return 0;
@@ -4139,7 +4139,7 @@ static BOOL ov65_022321A8(UnkStruct_ov65_0222EBE0 *param0)
 
 static int ov65_022321F4(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
-    if ((sub_020380E4() >= 4) || sub_02038284() || !CommSys_IsPlayerConnected(0)) {
+    if ((CommManager_GetMatchmakingState() >= 4) || CommManager_GetDisconnectedWifi() || !CommSys_IsPlayerConnected(0)) {
         if (param0->unk_3E4) {
             ov65_02232B58(param0, 101, 0);
         } else {
@@ -4230,7 +4230,7 @@ static int ov65_02232358(UnkStruct_ov65_0222EBE0 *param0, int param1)
         (void)0;
     } else if (CommTiming_IsSyncState(15)) {
         CommInfo_SendPlayerInfo();
-        CommMan_SetErrorHandling(1, 1);
+        CommManager_SetErrorHandling(1, 1);
         CommTiming_StartSync(18);
 
         param0->unk_3A8 = 53;
@@ -4414,7 +4414,7 @@ static int ov65_02232698(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
     if (param0->unk_3BC == 1) {
         param0->unk_3BC = 0;
-        sub_02038350();
+        CommManager_LogoutWifi();
     }
 
     if (!CommMan_IsInitialized()) {
@@ -4451,7 +4451,7 @@ static int ov65_02232734(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     }
 
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     if (Text_IsPrinterActive(param0->unk_180) == 0) {
         param0->unk_184 = Menu_MakeYesNoChoice(param0->unk_15C, &Unk_ov65_0223894C, (512 - (18 + 12)) - 9, 11, 54);
@@ -4470,11 +4470,11 @@ static int ov65_0223278C(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     }
 
-    if (sub_02038294() || sub_02038284() || (sub_020380E4() >= 3)) {
+    if (CommManager_IsLoginBattleWifi() || CommManager_GetDisconnectedWifi() || (CommManager_GetMatchmakingState() >= 3)) {
         Menu_DestroyForExit(param0->unk_184, 54);
         ov65_02232B58(param0, 101, 0);
         param0->unk_3A8 = 28;
-    } else if (sub_020383E8()) {
+    } else if (CommManager_CheckWifiError()) {
         Menu_DestroyForExit(param0->unk_184, 54);
         ov65_0222F6EC(param0);
     } else {
@@ -4492,12 +4492,12 @@ static int ov65_0223278C(UnkStruct_ov65_0222EBE0 *param0, int param1)
         } else {
             ov65_02232DFC(param0);
             CommInfo_Delete();
-            sub_020383D4();
+            CommManager_EndBattleWifiMatch();
             param0->unk_3BC = 20;
             param0->unk_3A8 = 65;
         }
 
-        param0->unk_04 = sub_020388E8();
+        param0->unk_04 = CommManager_GetUnk00();
         param0->unk_04->unk_00.unk_21 = param0->unk_04->unk_00.unk_22;
     }
 
@@ -4575,13 +4575,13 @@ static int ov65_0223294C(UnkStruct_ov65_0222EBE0 *param0, int param1)
         }
     }
 
-    if (sub_020380E4() >= 3) {
+    if (CommManager_GetMatchmakingState() >= 3) {
         Menu_DestroyForExit(param0->unk_184, 54);
         ov65_02232B58(param0, 18, 0);
-        sub_02038378();
+        CommManager_EndWifiMatch();
         param0->unk_3A8 = 29;
         return param1;
-    } else if (sub_020383E8()) {
+    } else if (CommManager_CheckWifiError()) {
         Menu_DestroyForExit(param0->unk_184, 54);
         ov65_0222F6EC(param0);
     } else {
@@ -6126,7 +6126,7 @@ static BOOL ov65_02234FCC(UnkStruct_ov65_0222EBE0 *param0, int param1, int param
 
     sub_0209C3AC();
 
-    return sub_020380A0(param1);
+    return CommManager_StartWifiBattle(param1);
 }
 
 static void ov65_0223500C(UnkStruct_ov65_0222EBE0 *param0, BOOL param1)
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index bca76406e30..bfc1821a698 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -388,7 +388,7 @@ int ov65_0223648C(ApplicationManager *appMan, int *param1)
 
     Overlay_LoadByID(FS_OVERLAY_ID(overlay63), 2);
 
-    v2 = CommMan_IsConnectedToWifi();
+    v2 = CommManager_IsConnectedToWifi();
     GF_ASSERT(v2 == 1);
 
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_96, 0x18000);
@@ -402,7 +402,7 @@ int ov65_0223648C(ApplicationManager *appMan, int *param1)
 
     VramTransfer_New(16, HEAP_ID_96);
 
-    v0->unk_00.unk_00 = sub_020388E8();
+    v0->unk_00.unk_00 = CommManager_GetUnk00();
     v0->unk_00.unk_00->unk_00.unk_21 = v0->unk_00.unk_00->unk_00.unk_22;
     v0->unk_00.unk_04 = ov65_02236794(&v0->unk_00);
     v0->unk_00.unk_06 = 0xff;
@@ -1113,7 +1113,7 @@ static void ov65_02237370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
             return;
         }
 
-        if (sub_020380E4() <= 2) {
+        if (CommManager_GetMatchmakingState() <= 2) {
             if ((ov65_02237548(param0) <= 1) && (ov65_02237450(param0) == 0)) {
                 return;
             }
@@ -1133,7 +1133,7 @@ static void ov65_02237370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
         v1 = 0;
     }
 
-    if ((sub_020380E4() >= 3) || (sub_020383E8()) || sub_02038284() || (CommSys_IsPlayerConnected(0) == 0) || (ov65_02237450(param0) == 0) || (v1 == 1) || (v2 == 1) || (v0 == 1)) {
+    if ((CommManager_GetMatchmakingState() >= 3) || (CommManager_CheckWifiError()) || CommManager_GetDisconnectedWifi() || (CommSys_IsPlayerConnected(0) == 0) || (ov65_02237450(param0) == 0) || (v1 == 1) || (v2 == 1) || (v0 == 1)) {
         if (param0->unk_00.unk_04) {
             param0->unk_00.unk_05 = 27;
         } else {
@@ -1144,7 +1144,7 @@ static void ov65_02237370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
 static void ov65_0223742C(UnkStruct_ov65_022367A8 *param0)
 {
-    if ((sub_020380E4() > 3) || sub_02038284() || (sub_020383E8())) {
+    if ((CommManager_GetMatchmakingState() > 3) || CommManager_GetDisconnectedWifi() || (CommManager_CheckWifiError())) {
         param0->unk_00.unk_05 = 15;
     }
 }
@@ -1160,7 +1160,7 @@ static BOOL ov65_02237450(const UnkStruct_ov65_022367A8 *param0)
 
 static BOOL ov65_02237464(u32 param0, u32 param1)
 {
-    BOOL v0 = sub_020380A0(param0);
+    BOOL v0 = CommManager_StartWifiBattle(param0);
 
     if (v0 == 1) {
         switch (param1) {
@@ -1623,7 +1623,7 @@ static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
     }
 
     NintendoWFC_SetDisconnectIfAlone(0);
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
     ov65_022376D0(param0, CommSys_CurNetId(), heapID);
 
     param0->unk_00.unk_05 = 1;
@@ -1962,7 +1962,7 @@ static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
 static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID)
 {
-    CommMan_SetErrorHandling(1, 1);
+    CommManager_SetErrorHandling(1, 1);
     CommTiming_StartSync(18);
 
     param0->unk_00.unk_05 = 18;
@@ -2104,10 +2104,10 @@ static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
     param0->unk_00.unk_07 = 0;
 
-    sub_02038378();
+    CommManager_EndWifiMatch();
     ov65_022375CC(param0);
     CommManager_SetState_LoginWifi();
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     return 1;
 }
@@ -2143,11 +2143,11 @@ static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
         return 0;
     }
 
-    sub_02038378();
+    CommManager_EndWifiMatch();
     CommManager_SetState_LoginWifi();
     ov65_022375CC(param0);
     param0->unk_00.unk_07 = 0;
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     return 1;
 }
@@ -2203,7 +2203,7 @@ static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID)
 {
     CommInfo_SendPlayerInfo();
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
     param0->unk_00.unk_05 = 1;
     return 0;
 }
@@ -2303,7 +2303,7 @@ static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
     param0->unk_00.unk_05 = 7;
 
-    sub_02038378();
+    CommManager_EndWifiMatch();
     CommManager_SetState_LoginWifi();
 
     return 0;
@@ -2318,7 +2318,7 @@ static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
     }
 
     param0->unk_00.unk_07 = 0;
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     return 1;
 }
@@ -2457,7 +2457,7 @@ static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
 static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID)
 {
-    CommMan_SetErrorHandling(1, 1);
+    CommManager_SetErrorHandling(1, 1);
     CommTiming_StartSync(18);
 
     param0->unk_00.unk_05 = 14;
@@ -2510,12 +2510,12 @@ static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
         return 0;
     }
 
-    sub_02038378();
+    CommManager_EndWifiMatch();
     CommManager_SetState_LoginWifi();
 
     param0->unk_00.unk_07 = 0;
 
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     return 1;
 }
@@ -2599,7 +2599,7 @@ static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
     GF_ASSERT(param0->unk_00.unk_26 != 32);
     ov65_0223726C(&param0->unk_30, param1, 0, 0, heapID);
 
-    sub_02038378();
+    CommManager_EndWifiMatch();
     param0->unk_00.unk_27 = 0;
 
     ov65_02236E44(&param0->unk_30, param1, 132, heapID);
@@ -2676,7 +2676,7 @@ static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 {
     ov65_0223742C(param0);
 
-    if ((sub_020380E4() == 1) && (CommSys_IsPlayerConnected(0) == 1)) {
+    if ((CommManager_GetMatchmakingState() == 1) && (CommSys_IsPlayerConnected(0) == 1)) {
         sub_0203632C(0);
         ov65_022378C4(param0, param1, heapID);
         StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, heapID);
@@ -2739,11 +2739,11 @@ static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
 static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 heapID)
 {
-    sub_02038378();
+    CommManager_EndWifiMatch();
     CommManager_SetState_LoginWifi();
 
     param0->unk_00.unk_07 = 0;
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     return 1;
 }
diff --git a/src/overlay066/ov66_02231428.c b/src/overlay066/ov66_02231428.c
index 2a6109a9d5d..b210373a301 100644
--- a/src/overlay066/ov66_02231428.c
+++ b/src/overlay066/ov66_02231428.c
@@ -273,7 +273,7 @@ int ov66_02231718(int param0, int param1)
 
 BOOL ov66_02231760(void)
 {
-    if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
+    if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
         return 1;
     }
 
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index ed71e5472ff..731bd83f503 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -236,7 +236,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         (*param1)++;
         break;
     case 5:
-        if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
+        if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
             ov67_0225D310(&v0->unk_70);
             (*param1) = 9;
         }
@@ -247,12 +247,12 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         }
         break;
     case 6:
-        if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
+        if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
             ov67_0225D310(&v0->unk_70);
             (*param1) = 9;
         }
 
-        if (sub_02038294()) {
+        if (CommManager_IsLoginBattleWifi()) {
             ov67_0225D310(&v0->unk_70);
 
             {
@@ -274,8 +274,8 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         UnkStruct_ov65_0222F6EC *v5;
         int v6, v7;
 
-        if (sub_020383E8()) {
-            v5 = sub_020382F8();
+        if (CommManager_CheckWifiError()) {
+            v5 = CommManager_GetUnk34();
             v6 = ov66_022316F4(v5->unk_00, v5->unk_04);
             v7 = v5->unk_00;
         } else {
@@ -296,8 +296,8 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
             int v8;
             int v9;
 
-            if (sub_020383E8()) {
-                UnkStruct_ov65_0222F6EC *v10 = sub_020382F8();
+            if (CommManager_CheckWifiError()) {
+                UnkStruct_ov65_0222F6EC *v10 = CommManager_GetUnk34();
 
                 v8 = ov66_02231718(v10->unk_00, v10->unk_04);
 
@@ -437,7 +437,7 @@ int ov67_0225CC6C(ApplicationManager *appMan, int *param1)
     case 2:
         ov67_0225D210(&v0->unk_40, 26);
 
-        if (sub_020383E8() || CommManager_IsWifiLobbyError()) {
+        if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
             (*param1) = 5;
             ov67_0225D2EC(&v0->unk_40);
         } else {
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index c0c2dd6ec0d..a72f30b89a4 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -694,7 +694,7 @@ int ov70_0225DB90(ApplicationManager *appMan, int *param1)
         ov70_0225F024(&v0->unk_428);
         ov70_0225F100(&v0->unk_404);
 
-        if (sub_020383E8()) {
+        if (CommManager_CheckWifiError()) {
             ov70_0225F184(&v0->unk_3F4, &v0->unk_340);
         } else if (CommManager_IsWifiLobbyError()) {
             ov70_0225F1C0(&v0->unk_3F4, &v0->unk_340, ov66_022326DC());
@@ -1904,7 +1904,7 @@ static void ov70_0225F184(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F2
 {
     u32 v0;
     String *v1;
-    UnkStruct_ov65_0222F6EC *v2 = sub_020382F8();
+    UnkStruct_ov65_0222F6EC *v2 = CommManager_GetUnk34();
     v0 = ov66_022316F4(v2->unk_00, v2->unk_04);
 
     ov70_0225F2A8(param1, v2->unk_00, 5, 0, 2);
diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c
index 82f3f731f61..23e6c68c197 100644
--- a/src/overlay070/ov70_02265F38.c
+++ b/src/overlay070/ov70_02265F38.c
@@ -151,7 +151,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
     case 20:
     case 21:
     case 22:
-        switch (sub_020380E4()) {
+        switch (CommManager_GetMatchmakingState()) {
         case 2:
         case 3:
         case 4:
@@ -404,7 +404,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
         v12 = CommManager_GetWifiP2PConnectState();
         v13 = ov66_02233224(v1->unk_01);
 
-        switch (sub_020380E4()) {
+        switch (CommManager_GetMatchmakingState()) {
         case 3:
         case 4:
             v1->unk_00 = 4;
@@ -560,7 +560,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
         }
         break;
     case 15:
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
 
         if (ov66_02233374() == 1) {
             int v23;
@@ -742,9 +742,9 @@ BOOL ov70_022669B8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
 {
     switch (ov70_02262E84(param0)) {
     case 0:
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
 
-        if (sub_020382C0() == 0) {
+        if (CommManager_IsLoginBattleMatchWifi() == 0) {
             CommInfo_Delete();
             CommManager_EndWifiP2P();
         }
@@ -752,7 +752,7 @@ BOOL ov70_022669B8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
         ov70_02262E88(param0, 1);
         break;
     case 1:
-        if (sub_020382C0() == 1) {
+        if (CommManager_IsLoginBattleMatchWifi() == 1) {
             return 1;
         }
         break;
diff --git a/src/overlay082/ov82_0223B140.c b/src/overlay082/ov82_0223B140.c
index 26e1a8ebe9e..c628b988263 100644
--- a/src/overlay082/ov82_0223B140.c
+++ b/src/overlay082/ov82_0223B140.c
@@ -112,7 +112,7 @@ int ov82_0223B24C(ApplicationManager *appMan, int *param1)
             return 1;
         }
 
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
         CommTiming_StartSync(4);
         (*param1)++;
         break;
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index d9fa6206072..17810e28ca4 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -195,7 +195,7 @@ int ov83_0223B65C(ApplicationManager *appMan, int *param1)
     }
 
     ov83_0223CBA4(v3);
-    sub_02038A1C(v3->heapID, v3->unk_20);
+    CommManager_deadstripped_02038A1C(v3->heapID, v3->unk_20);
 
     if (v3->unk_04) {
         return 1;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index bcca592c95f..e3b6ae3f65a 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -314,7 +314,7 @@ int ov88_0223B140(ApplicationManager *appMan, int *param1)
     sub_02095CD4(v0->fieldSystem);
     Bg_ToggleLayer(BG_LAYER_MAIN_0, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
-    sub_02038A1C(26, v0->unk_174);
+    CommManager_deadstripped_02038A1C(26, v0->unk_174);
     NetworkIcon_Init();
 
     if (IsNight() == FALSE) {
@@ -485,7 +485,7 @@ int ov88_0223B57C(ApplicationManager *appMan, int *param1)
         SpriteList_Update(v0->unk_194);
     }
 
-    sub_02038A1C(26, v0->unk_174);
+    CommManager_deadstripped_02038A1C(26, v0->unk_174);
 
     return v1;
 }
diff --git a/src/overlay094/screens/wfc_init.c b/src/overlay094/screens/wfc_init.c
index f19542f8856..5458c76325d 100644
--- a/src/overlay094/screens/wfc_init.c
+++ b/src/overlay094/screens/wfc_init.c
@@ -115,7 +115,7 @@ int GTSApplication_InitWFC_Init(GTSApplicationState *appState, int unused1)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, TRUE);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, TRUE);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, TRUE);
-    sub_02038438(appState->playerData->saveData);
+    CommManager_InitializeGlobalWifi(appState->playerData->saveData);
 
     ov94_02245934(appState);
 
@@ -334,7 +334,7 @@ static int GTSApplication_WFCInit_ProcessSetupConfirmation(GTSApplicationState *
 
     if (menuInput != MENU_NOTHING_CHOSEN) {
         if (menuInput == MENU_CANCEL) {
-            sub_0203848C(); // free the network lock?
+            CommManager_EndGlobalWifi(); // free the network lock?
             GTSApplication_SetNextScreenWithArgument(appState, GTS_SCREEN_WFC_INIT, SCREEN_ARGUMENT_0);
             appState->currentScreenInstruction = 11;
         } else {
@@ -373,7 +373,7 @@ static int GTSApplication_WFCInit_RestartOrExit(GTSApplicationState *appState)
                 DWC_CleanupInet();
             }
 
-            sub_0203848C();
+            CommManager_EndGlobalWifi();
             GTSApplication_SetNextScreenWithArgument(appState, GTS_SCREEN_WFC_INIT, SCREEN_ARGUMENT_0);
             appState->currentScreenInstruction = 11;
         }
@@ -392,7 +392,7 @@ static int GTSApplication_WFCInit_ShowDisconnectingMessage(GTSApplicationState *
 
 static int GTSApplication_WFCInit_CleanupNetworking(GTSApplicationState *appState)
 {
-    sub_0203848C();
+    CommManager_EndGlobalWifi();
 
     DWC_CleanupInet();
     GTSApplication_SetNextScreenWithArgument(appState, GTS_SCREEN_WFC_INIT, SCREEN_ARGUMENT_0);
@@ -826,7 +826,7 @@ static int GTSApplication_WFCInit_FatalErrorDisconnectMessage(GTSApplicationStat
         break;
     case 1:
         if (Text_IsPrinterActive(appState->textPrinter) == FALSE) {
-            sub_0203848C();
+            CommManager_EndGlobalWifi();
             DWC_CleanupInet();
             appState->wfcDisconnectMessageIndex++;
         }
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index 8af13655a43..a1fa2d9c019 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -187,7 +187,7 @@ int ov96_0223BCE0(UnkStruct_ov96_0223BF40 *param0, int param1)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1);
-    sub_02038438(param0->unk_00->saveData);
+    CommManager_InitializeGlobalWifi(param0->unk_00->saveData);
     ov96_0223D948(param0);
 
     param0->unk_8C = sub_0202D2C0(param0->unk_00->unk_00, 0);
@@ -423,7 +423,7 @@ static int ov96_0223C420(UnkStruct_ov96_0223BF40 *param0)
 
     if (v0 != 0xffffffff) {
         if (v0 == 0xfffffffe) {
-            sub_0203848C();
+            CommManager_EndGlobalWifi();
             ov96_0223BC5C(param0, 0, 0);
             param0->unk_1C = 46;
         } else {
@@ -1426,7 +1426,7 @@ static int ov96_0223D524(UnkStruct_ov96_0223BF40 *param0)
 static int ov96_0223D528(UnkStruct_ov96_0223BF40 *param0)
 {
     NetworkIcon_Destroy();
-    sub_0203848C();
+    CommManager_EndGlobalWifi();
     StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_68);
 
     param0->unk_1C = 0;
@@ -1490,7 +1490,7 @@ static int ov96_0223D5FC(UnkStruct_ov96_0223BF40 *param0)
         break;
     case 1:
         if (Text_IsPrinterActive(param0->unk_BF0) == 0) {
-            sub_0203848C();
+            CommManager_EndGlobalWifi();
             DWC_CleanupInet();
             param0->unk_FF0++;
         }
diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c
index 44039542d45..0a584f71b16 100644
--- a/src/overlay098/ov98_022471C8.c
+++ b/src/overlay098/ov98_022471C8.c
@@ -326,7 +326,7 @@ int ov98_022471C8(ApplicationManager *appMan, int *param1)
     case 12:
         if (!DWC_CheckInet() && (WiFiList_HasValidLogin(v0->unk_00->saveData) == 1)) {
             v0->unk_08 = 12;
-            sub_02038548(v0->unk_00->saveData);
+            CommManager_StartWifiMail(v0->unk_00->saveData);
             NetworkIcon_Init();
         } else {
             v0->unk_08 = 0;
@@ -1227,7 +1227,7 @@ static int ov98_022488F8(UnkStruct_ov98_02247704 *param0)
 
     if (v0 != 0xffffffff) {
         if (v0 == 0xfffffffe) {
-            sub_0203859C();
+            CommManager_EndWifiMail();
             ov98_02246E88(param0->unk_00, 6, 0);
             param0->unk_08 = 29;
         } else {
@@ -1250,7 +1250,7 @@ static int ov98_02248954(UnkStruct_ov98_02247704 *param0)
 
 static int ov98_0224897C(UnkStruct_ov98_02247704 *param0)
 {
-    sub_0203859C();
+    CommManager_EndWifiMail();
 
     DWC_CleanupInet();
 
@@ -1279,7 +1279,7 @@ static int ov98_022489DC(UnkStruct_ov98_02247704 *param0)
 {
     switch (param0->unk_94) {
     case 0:
-        sub_02038548(param0->unk_00->saveData);
+        CommManager_StartWifiMail(param0->unk_00->saveData);
         NetworkIcon_Init();
         ov98_02249714(param0, param0->unk_2C, 1, TEXT_SPEED_FAST, 0xf0f);
         ov98_02247AF0(param0);
@@ -1323,7 +1323,7 @@ static int ov98_02248A68(UnkStruct_ov98_02247704 *param0)
             DWC_CleanupInet();
 
             NetworkIcon_Destroy();
-            sub_0203859C();
+            CommManager_EndWifiMail();
             SleepUnlock(4);
 
             if (param0->unk_00->unk_11C == 1) {
@@ -1399,7 +1399,7 @@ static int ov98_02248B24(UnkStruct_ov98_02247704 *param0)
             DWC_CleanupInet();
 
             NetworkIcon_Destroy();
-            sub_0203859C();
+            CommManager_EndWifiMail();
             SleepUnlock(4);
 
             if (param0->unk_00->unk_11C == 1) {
@@ -1855,7 +1855,7 @@ static int ov98_02249320(UnkStruct_ov98_02247704 *param0)
         DWC_CleanupInet();
 
         NetworkIcon_Destroy();
-        sub_0203859C();
+        CommManager_EndWifiMail();
         SleepUnlock(4);
 
         if (param0->unk_00->unk_11C == 1) {
@@ -1912,7 +1912,7 @@ static int ov98_02249438(UnkStruct_ov98_02247704 *param0)
 static int ov98_02249464(UnkStruct_ov98_02247704 *param0)
 {
     if (param0->unk_08 != 30) {
-        sub_0203859C();
+        CommManager_EndWifiMail();
     }
 
     NetworkIcon_Destroy();
@@ -2014,7 +2014,7 @@ static int ov98_022495C4(UnkStruct_ov98_02247704 *param0)
         break;
     case 1:
         if (ov98_0224977C(param0->unk_44) == 0) {
-            sub_0203859C();
+            CommManager_EndWifiMail();
 
             DWC_CleanupInet();
 
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 06134992632..06ce7f48037 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -425,7 +425,7 @@ int ov109_021D0D80(ApplicationManager *appMan, int *param1)
     UnkStruct_ov109_021D0F70 *v0;
     UnkStruct_0209C194 *v1 = ApplicationManager_Args(appMan);
 
-    CommMan_SetErrorHandling(1, 1);
+    CommManager_SetErrorHandling(1, 1);
     SetVBlankCallback(NULL, NULL);
     DisableHBlank();
     ResetLock(RESET_LOCK_0x2);
@@ -1410,7 +1410,7 @@ static int ov109_021D1B2C(UnkStruct_ov109_021D0F70 *param0)
 {
     if (param0->unk_18 == 0) {
         if (CommTiming_IsSyncState(202)) {
-            CommMan_SetErrorHandling(0, 0);
+            CommManager_SetErrorHandling(0, 0);
             CommManager_SetMaxNumConnections(1);
             CommManager_UnionRestartSearch();
             param0->unk_00 = 50;
@@ -1422,7 +1422,7 @@ static int ov109_021D1B2C(UnkStruct_ov109_021D0F70 *param0)
             param0->unk_0C = 0;
 
             if (param0->unk_D0->unk_3C == 0) {
-                CommMan_SetErrorHandling(0, 0);
+                CommManager_SetErrorHandling(0, 0);
                 CommManager_SetMaxNumConnections(1);
                 CommManager_UnionRestartSearch();
             }
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 79387edbca3..abc70a8ea81 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -699,7 +699,7 @@ static void ov109_021D471C(UnkStruct_ov109_021D5140 *param0)
 
 static int ov109_021D474C(UnkStruct_ov109_021D5140 *param0, int param1)
 {
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     if (CommSys_CurNetId() == 0) {
         if (CommSys_ConnectedCount() >= 2) {
@@ -1194,7 +1194,7 @@ static int ov109_021D4F4C(UnkStruct_ov109_021D5140 *param0, int param1)
 static int ov109_021D4F6C(UnkStruct_ov109_021D5140 *param0, int param1)
 {
     if (CommTiming_IsSyncState(202)) {
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_CIRCLE_OUT, FADE_TYPE_CIRCLE_OUT, COLOR_BLACK, 16, 1, HEAP_ID_95);
         param1 = 3;
     }
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 815e7f2152f..2b85ca5c9dc 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1040,11 +1040,11 @@ BOOL ov114_0225CA54(UnkStruct_ov114_0225C76C *param0)
             v0 = 1;
         }
 
-        if (sub_02038284() == 1) {
+        if (CommManager_GetDisconnectedWifi() == 1) {
             v0 = 1;
         }
 
-        if (sub_020380E4() >= 2) {
+        if (CommManager_GetMatchmakingState() >= 2) {
             v0 = 1;
         }
 
@@ -1069,7 +1069,7 @@ BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0)
         CommInfo_Delete();
         CommManager_EndWifiP2P();
     } else {
-        if (sub_020382C0() == 1) {
+        if (CommManager_IsLoginBattleMatchWifi() == 1) {
             return 1;
         }
     }
diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c
index e4d25ff9d26..3b35387c87f 100644
--- a/src/overlay115/ov115_02260440.c
+++ b/src/overlay115/ov115_02260440.c
@@ -379,7 +379,7 @@ int ov115_022608E4(ApplicationManager *appMan, int *param1)
 
         ApplicationManager_FreeData(appMan);
         Heap_Destroy(HEAP_ID_99);
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
 
         if (v2 == 1) {
             return 1;
diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c
index bc5345572a3..42c70c74aa6 100644
--- a/src/overlay116/ov116_022604C4.c
+++ b/src/overlay116/ov116_022604C4.c
@@ -733,7 +733,7 @@ int ov116_0226126C(ApplicationManager *appMan, int *param1)
 
         ApplicationManager_FreeData(appMan);
         Heap_Destroy(HEAP_ID_106);
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
 
         if (v0 != 0) {
             return 1;
diff --git a/src/overlay117/ov117_02260440.c b/src/overlay117/ov117_02260440.c
index 2ce89560a38..81039f8b385 100644
--- a/src/overlay117/ov117_02260440.c
+++ b/src/overlay117/ov117_02260440.c
@@ -105,7 +105,7 @@ int ov117_02260474(ApplicationManager *appMan, int *param1)
         }
         break;
     case 6:
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
         CommTiming_StartSync(222);
         (*param1)++;
         break;
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index 3e15ff4f70d..2cb0de643cd 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -621,7 +621,7 @@ static void ov117_02260F7C(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_28);
     SpriteSystem_UpdateTransfer();
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    sub_02038A1C(110, v0->unk_2C);
+    CommManager_deadstripped_02038A1C(110, v0->unk_2C);
 }
 
 static void ov117_022610D8(BgConfig *param0)
diff --git a/src/underground/traps.c b/src/underground/traps.c
index 4bf0cebe12a..1476b88e8aa 100644
--- a/src/underground/traps.c
+++ b/src/underground/traps.c
@@ -1757,7 +1757,7 @@ void Traps_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, vo
     TrapServerFunc trapEffectFunc = sTrapEffectServerSecondFuncs[*trapID];
 
     if (*trapID != trapsEnv->triggeredTrapIDs[netID]) {
-        sub_020389C4(1);
+        CommManager_SetResetType(1);
         return;
     }
 
diff --git a/src/unk_02032798.c b/src/unk_02032798.c
index a6057477f78..6e79319ef32 100644
--- a/src/unk_02032798.c
+++ b/src/unk_02032798.c
@@ -35,8 +35,8 @@ static const CommCmdTable Unk_020E5D64[] = {
     { CommInfo_RecvPlayerData, CommPlayerInfo_Size, NULL },
     { CommInfo_RecvPlayerDataArray, CommPlayerInfo_Size, NULL },
     { CommunicatitonInformaion_FinishReading, CommPacketSizeOf_Nothing, NULL },
-    { sub_02037A78, sub_02037B54, NULL },
-    { sub_02037AD8, sub_02037B54, NULL },
+    { CommManager_ValidateConfirmationMessage, CommManager_ConfirmationMessage_sizeof, NULL },
+    { CommManager_ValidateConfirmationResponseMessage, CommManager_ConfirmationMessage_sizeof, NULL },
     { NULL, NULL, NULL },
     { NULL, NULL, NULL },
     { sub_02036008, CommPacketSizeOf_NetId, NULL },
@@ -50,7 +50,7 @@ static const CommCmdTable Unk_020E5D64[] = {
     { CommCmd_18, sub_02032954, NULL },
     { sub_02036574, sub_02036590, NULL },
     { sub_02036670, CommTool_TempDataSize, NULL },
-    { sub_02038240, CommPacketSizeOf_Nothing, NULL }
+    { CommManager_DisconnectWifi, CommPacketSizeOf_Nothing, NULL }
 };
 
 static CommCmdManager *sCommCmdManager = NULL;
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index 340d867afef..e8621347e0c 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -648,7 +648,7 @@ static void sub_02033BDC(u16 param0)
     }
 
     if (25 == WirelessManager_GetErrorCode()) {
-        sub_020389FC(0);
+        NetworkError_DisplayFatalError(0);
     }
 
     switch (v0) {
diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c
index 31b4318206f..1567fabb0ec 100644
--- a/src/unk_020366A0.c
+++ b/src/unk_020366A0.c
@@ -31,7 +31,7 @@ typedef void (*CommTaskFunc)(void);
 
 typedef struct {
     void *unk_00;
-    u8 unk_04[6];
+    u8 party[6];
     MATHRandContext32 rand;
     CommTaskFunc task;
     SaveData *saveData;
@@ -42,23 +42,23 @@ typedef struct {
     u16 retryConnectionAttempts;
     u8 maxNumConnection;
     u8 connectedCount;
-    u8 unk_48;
+    u8 unionConnectState;
     u8 connectionID;
     u8 commType;
     u8 contestRegulation;
     u8 unk_4C;
-    s8 unk_4D;
+    s8 wifiTarget;
     u8 unk_4E;
     u8 errorDisconnect;
-    u8 unk_50;
-    u8 unk_51;
-    u8 unk_52;
+    u8 errorUnknown_50;
+    u8 globalWifi;
+    u8 resetType;
     u8 pauseUnion;
     u8 unk_54;
     u8 initializeAsServer; //always FALSE
     u8 unk_56;
     u8 doNotConnectUnderground;
-    u8 unk_58;
+    u8 disconnectedWifi;
     u8 commError;
     u8 pauseUnderground;
     const void *unk_5C;
@@ -68,59 +68,59 @@ typedef struct {
 
 static void CommManager_SetTask(CommTaskFunc param0, int param1);
 static void CommTask_StartUnderground(void);
-static void sub_02036E08(void);
+static void CommTask_ReinitUndergroundClient(void);
 static void CommTask_ReinitUnderground(void);
 static void CommTask_SearchUndergroundClient(void);
-static void sub_02036EDC(void);
-static void sub_02036F44(void);
+static void CommTask_ForceConnectUndergroundClient(void);
+static void CommTask_ConnectingUndergroundClient(void);
 static void CommTask_ConnectUndergroundClient(void);
 static void CommTask_ResetUnderground(void);
 static void CommTask_ResetUndergroundServer(void);
-static void sub_02036FBC(void);
+static void CommTask_ResetUndergroundClient(void);
 static void CommTask_InitUndergroundServer(void);
 static void CommTask_WaitUndergroundServer(void);
-static void sub_02037094(void);
+static void CommTask_InitConnectUndergroundServer(void);
 static void CommTask_ConnectUndergroundServer(void);
 static void CommManager_EndConnectionUnderground(void);
 static void CommTask_RestartSecretBase(void);
 static void CommTask_StartBattleServer(void);
 static void CommTask_WaitBattleServer(void);
-static void sub_0203718C(void);
+static void CommTask_ConnectingBattleServer(void);
 static void CommTask_StartBattleClient(void);
-static void sub_02037208(void);
+static void CommTask_ScanBattleClient(void);
 static void CommTask_ConnectBattleClient(void);
-static void sub_02037238(void);
+static void CommTask_ConnectingBattleClient(void);
 static void CommTask_WaitBattleClient(void);
-static void sub_020372DC(void);
-static void sub_020372F0(void);
-static void sub_02037270(void);
-static void sub_02037284(void);
-static void CommTask_StartWirelessClient(void);
+static void CommTask_RetryBattleClient(void);
+static void CommTask_ReinitBattleClient(void);
+static void CommTask_ResetBattleClient(void);
+static void CommTask_ReconnectBattleClient(void);
+static void CommTask_StartUndergroundWifiClient(void);
 static void CommTask_StartUnion(void);
 static void CommTask_SearchUnionClient(void);
 static void CommTask_EndUnionClient(void);
 static void CommTask_InitializeServerUnion(void);
-static void sub_020374F4(void);
+static void CommTask_WaitUnionServer(void);
 static void CommTask_RestartUnionClient(void);
-static void sub_020376A8(void);
-static void sub_020375A4(void);
-static void sub_020375BC(void);
-static void sub_020375E8(void);
-static void sub_0203764C(void);
+static void CommTask_ConnectUnionClient(void);
+static void CommTask_StartForceConnectUnion1(void);
+static void CommTask_StartForceConnectUnion2(void);
+static void CommTask_ForceConnectUnion(void);
+static void CommTask_ConnectingUnionClient(void);
 static void CommTask_SuccededConnectUnionClient(void);
 static void CommTask_FailedConnectUnionClient(void);
 static void CommTask_ResetUnionClient(void);
 static void CommTask_ConnectUnionServer(void);
 static void CommTask_PauseUnionServer(void);
 static void CommTask_StartRandomBattleServer(void);
-static void CommTask_StartMysteryGiftClient(void);
+static void CommTask_StartRandomBattleClient(void);
 static void CommTask_None(void);
 static void CommTask_End(void);
-static void sub_02037354(void);
-static void sub_0203739C(void);
+static void CommTask_WaitEndConnectionUnionClient(void);
+static void CommTask_EndConnectionUnionClient(void);
 static void CommTask_EndConnection(void);
-static void sub_02038164(void);
-static void sub_02038314(void);
+static void CommTask_WifiBattleLogin(void);
+static void CommTask_LogoutWifi(void);
 static void CommTask_StartWifiLobby(void);
 static void CommTask_LogInWifiLobby(void);
 static void CommTask_ConnectWifiLobby(void);
@@ -141,9 +141,9 @@ static void CommTask_ConnectDraw(void);
 static void CommTask_ConnectingDraw(void);
 
 static CommunicationManager *sCommMan = NULL;
-static u8 Unk_02100A20[] = { "FREAK" };
-static u8 Unk_02100A30[] = { " GAME" };
-static u8 Unk_02100A28[] = { " FULL" };
+static u8 sFreakConfirmationMessage[] = { "FREAK" };
+static u8 sGameConfirmationMessage[] = { " GAME" };
+static u8 sFullConfirmationMessage[] = { " FULL" };
 
 /**
  * @brief Initializes sCommMan with the given commType
@@ -168,7 +168,7 @@ static void CommManager_Initialize(SaveData *saveData, int commType)
     sCommMan->saveData = saveData;
     sCommMan->trainerInfo = SaveData_GetTrainerInfo(saveData);
     sCommMan->maxNumConnection = 1 + 1;
-    sCommMan->unk_48 = 0;
+    sCommMan->unionConnectState = 0;
     sCommMan->pauseUnion = FALSE;
     sCommMan->commType = commType;
 
@@ -195,7 +195,7 @@ static void CommMan_Free(void)
         Heap_Free(sCommMan->unk_00);
     }
 
-    if (CommMan_IsConnectedToWifi()) {
+    if (CommManager_IsConnectedToWifi()) {
         Heap_Destroy(HEAP_ID_NINTENDO_WFC);
     }
 
@@ -327,7 +327,7 @@ void CommManager_SetDoNotConnectUndergroundFlag(void)
 void CommMan_ReopenSecretBase(void)
 {
     WirelessDriver_Init();
-    CommManager_SetTask(CommTask_StartWirelessClient, 0);
+    CommManager_SetTask(CommTask_StartUndergroundWifiClient, 0);
 }
 
 /**
@@ -395,7 +395,7 @@ void CommManager_ConnectBattleClient(int connectionID)
 void CommManager_ResetBattleClient(void)
 {
     CommSys_ResetBattleClient();
-    CommManager_SetTask(sub_020372DC, 0);
+    CommManager_SetTask(CommTask_RetryBattleClient, 0);
 }
 
 /**
@@ -483,7 +483,7 @@ void CommManager_ConnectUnion(int connectionID)
 
     WirelessManager_SetPauseConnection(1);
     NetworkIcon_Init();
-    CommManager_SetTask(sub_020375A4, 0);
+    CommManager_SetTask(CommTask_StartForceConnectUnion1, 0);
 }
 
 /**
@@ -541,8 +541,8 @@ void CommManager_UnionRestartSearch(void)
 {
     WirelessManager_SetPauseConnection(0);
 
-    if (!((sCommMan->errorDisconnect == 1) && (sCommMan->unk_50 == 1)) || (sCommMan->commType == COMM_TYPE_UNION)) {
-        CommMan_SetErrorHandling(0, 0);
+    if (!((sCommMan->errorDisconnect == 1) && (sCommMan->errorUnknown_50 == 1)) || (sCommMan->commType == COMM_TYPE_UNION)) {
+        CommManager_SetErrorHandling(0, 0);
     }
 
     NetworkIcon_Destroy();
@@ -554,9 +554,9 @@ void CommManager_UnionRestartSearch(void)
 
     if (CommSys_CurNetId() == 0) {
         WirelessManager_SetPauseConnectionSystem(1);
-        CommManager_SetTask(sub_02037354, 15);
+        CommManager_SetTask(CommTask_WaitEndConnectionUnionClient, 15);
     } else {
-        CommManager_SetTask(sub_0203739C, 5);
+        CommManager_SetTask(CommTask_EndConnectionUnionClient, 5);
     }
 }
 
@@ -669,7 +669,7 @@ void CommManager_StartRandomBattleClient(SaveData *saveData, int commType)
 
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
     CommManager_Initialize(saveData, commType);
-    CommManager_SetTask(CommTask_StartMysteryGiftClient, 0);
+    CommManager_SetTask(CommTask_StartRandomBattleClient, 0);
 }
 
 /**
@@ -684,7 +684,7 @@ void CommManager_Update(void)
         }
     }
 
-    if (CommMan_IsConnectedToWifi()) {
+    if (CommManager_IsConnectedToWifi()) {
         NetworkIcon_SetStrength(WM_LINK_LEVEL_3 - DWC_GetLinkLevel());
     } else if (CommServerClient_IsInitialized()) {
         NetworkIcon_SetStrength(WM_LINK_LEVEL_3 - WM_GetLinkLevel());
@@ -772,7 +772,10 @@ static void CommTask_ReinitUnderground(void)
     }
 }
 
-static void sub_02036E08(void)
+/**
+ * @brief Reinitializes the Communication Manager for underground play. Only allows the Communication Manager to be initialized as a client.
+ */
+static void CommTask_ReinitUndergroundClient(void)
 {
     BOOL ret;
 
@@ -788,9 +791,12 @@ static void sub_02036E08(void)
     }
 }
 
+/**
+ * @brief Task indicating the client is searching for servers to connect to for underground play
+ */
 static void CommTask_SearchUndergroundClient(void)
 {
-    int v0;
+    int connectionID;
 
     sub_02033A5C();
 
@@ -798,11 +804,11 @@ static void CommTask_SearchUndergroundClient(void)
         return;
     }
 
-    v0 = sub_020338EC();
+    connectionID = sub_020338EC();
 
-    if (v0 != -1) {
-        sCommMan->connectionID = v0;
-        CommManager_SetTask(sub_02036EDC, 32);
+    if (connectionID != -1) {
+        sCommMan->connectionID = connectionID;
+        CommManager_SetTask(CommTask_ForceConnectUndergroundClient, 32);
         return;
     }
 
@@ -811,24 +817,27 @@ static void CommTask_SearchUndergroundClient(void)
         return;
     }
 
-    v0 = sub_0203394C();
+    connectionID = sub_0203394C();
 
-    if (v0 != -1) {
-        sCommMan->connectionID = v0;
-        CommManager_SetTask(sub_02036EDC, 32);
+    if (connectionID != -1) {
+        sCommMan->connectionID = connectionID;
+        CommManager_SetTask(CommTask_ForceConnectUndergroundClient, 32);
         return;
     }
 
     CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
 }
 
-static void sub_02036EDC(void)
+/**
+ * @brief Forcibly opens an underground connection by connecting a client to a found server or restarting the Communication Manager as a server if that isn't possible
+ */
+static void CommTask_ForceConnectUndergroundClient(void)
 {
     sub_02033A5C();
 
     if (sub_02033898(sCommMan->connectionID) != 0) {
         if (sub_02034984(sCommMan->connectionID)) {
-            CommManager_SetTask(sub_02036F44, 100);
+            CommManager_SetTask(CommTask_ConnectingUndergroundClient, 100);
             return;
         }
     }
@@ -842,7 +851,10 @@ static void sub_02036EDC(void)
     }
 }
 
-static void sub_02036F44(void)
+/**
+ * @brief Task indicating the client is connecting to a server for underground play
+ */
+static void CommTask_ConnectingUndergroundClient(void)
 {
     if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         CommSys_Reset();
@@ -865,6 +877,9 @@ static void sub_02036F44(void)
     CommManager_SetTask(CommTask_ResetUndergroundServer, 0);
 }
 
+/**
+ * @brief Switches to a server mode and initializes the Communication Manager as a server
+ */
 static void CommTask_ResetUndergroundServer(void)
 {
     if (!sub_020336D4()) {
@@ -874,15 +889,21 @@ static void CommTask_ResetUndergroundServer(void)
     CommManager_SetTask(CommTask_InitUndergroundServer, 0);
 }
 
-static void sub_02036FBC(void)
+/**
+ * @brief Switches to a client mode and initializes the Communication Manager as a client
+ */
+static void CommTask_ResetUndergroundClient(void)
 {
     if (!sub_020336D4()) {
         return;
     }
 
-    CommManager_SetTask(sub_02036E08, 0);
+    CommManager_SetTask(CommTask_ReinitUndergroundClient, 0);
 }
 
+/**
+ * @brief Initializes the Communication Manager as a server for underground play
+ */
 static void CommTask_InitUndergroundServer(void)
 {
     if (!sub_02033E30()) {
@@ -899,11 +920,14 @@ static void CommTask_InitUndergroundServer(void)
     }
 }
 
+/**
+ * @brief Wait task for the server for underground play. Times out if no clients connect.
+ */
 static void CommTask_WaitUndergroundServer(void)
 {
     if (CommSys_IsClientConnecting()) {
         sCommMan->unk_4E = 1;
-        CommManager_SetTask(sub_02037094, 0);
+        CommManager_SetTask(CommTask_InitConnectUndergroundServer, 0);
         return;
     }
 
@@ -917,11 +941,14 @@ static void CommTask_WaitUndergroundServer(void)
     }
 
     if (sub_020336D4()) {
-        CommManager_SetTask(sub_02036FBC, 2);
+        CommManager_SetTask(CommTask_ResetUndergroundClient, 2);
     }
 }
 
-static void sub_02037094(void)
+/**
+ * @brief Initializes all server variables for underground play as a server.
+ */
+static void CommTask_InitConnectUndergroundServer(void)
 {
     CommSys_SetAlone(0);
     sub_02033EA8(1);
@@ -929,19 +956,28 @@ static void sub_02037094(void)
     CommManager_SetTask(CommTask_ConnectUndergroundServer, 0);
 }
 
+/**
+ * @brief State task to indicate the Communication Manager is connected as a server for underground play. Does nothing when called.
+ */
 static void CommTask_ConnectUndergroundServer(void)
 {
     return;
 }
 
+/**
+ * @brief State task to indicate the Communication Manager is connected as a client for underground play. Does nothing when called.
+ */
 static void CommTask_ConnectUndergroundClient(void)
 {
     return;
 }
 
+/**
+ * @brief Starts a secret base connection. Only one person is allowed in the secret base at a time.
+ */
 static void CommTask_StartSecretBase(void)
 {
-    if (!CommMan_IsConnectedToWifi()) {
+    if (!CommManager_IsConnectedToWifi()) {
         if (!sub_02033E30()) {
             return;
         }
@@ -954,6 +990,9 @@ static void CommTask_StartSecretBase(void)
     CommManager_SetTask(CommTask_None, 0);
 }
 
+/**
+ * @brief Restarts a secret base connection and the communication system
+ */
 static void CommTask_RestartSecretBase(void)
 {
     if (!sub_020336D4()) {
@@ -964,7 +1003,10 @@ static void CommTask_RestartSecretBase(void)
     CommManager_SetTask(CommTask_StartSecretBase, 0);
 }
 
-static void CommTask_StartWirelessClient(void)
+/**
+ * @brief Starts the Communication Manager for underground online play as a client
+ */
+static void CommTask_StartUndergroundWifiClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
@@ -975,6 +1017,9 @@ static void CommTask_StartWirelessClient(void)
     CommManager_SetTask(CommTask_ReinitUnderground, 0);
 }
 
+/**
+ * @brief Resets and reinitializes the communication manager for underground play
+ */
 static void CommTask_ResetUnderground(void)
 {
     if (!sub_020336D4()) {
@@ -984,6 +1029,9 @@ static void CommTask_ResetUnderground(void)
     CommManager_SetTask(CommTask_ReinitUnderground, 0);
 }
 
+/**
+ * @brief Initializes the communication manager for battles as a server
+ */
 static void CommTask_StartBattleServer(void)
 {
     if (!WirelessDriver_IsReady()) {
@@ -995,11 +1043,14 @@ static void CommTask_StartBattleServer(void)
 
     if (CommSys_InitServer(1, 1, 512, 1)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_0203718C, 0);
+        CommManager_SetTask(CommTask_ConnectingBattleServer, 0);
     }
 }
 
-static void sub_0203718C(void)
+/**
+ * @brief Task that indicates the Communication Manager is connecting to a battle as a server
+ */
+static void CommTask_ConnectingBattleServer(void)
 {
     if (!CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         return;
@@ -1008,6 +1059,9 @@ static void sub_0203718C(void)
     CommManager_SetTask(CommTask_WaitBattleServer, 0);
 }
 
+/**
+ * @brief Task that indicates the Communication Manager is waiting during battle as a server
+ */
 static void CommTask_WaitBattleServer(void)
 {
     if (!CommSys_IsInitialized()) {
@@ -1015,6 +1069,9 @@ static void CommTask_WaitBattleServer(void)
     }
 }
 
+/**
+ * @brief Initializes the Communication Manager and System as a client for battles
+ */
 static void CommTask_StartBattleClient(void)
 {
     if (!WirelessDriver_IsReady()) {
@@ -1026,28 +1083,37 @@ static void CommTask_StartBattleClient(void)
 
     if (CommSys_InitClient(1, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_02037208, 0);
+        CommManager_SetTask(CommTask_ScanBattleClient, 0);
     }
 }
 
-static void sub_02037208(void)
+/**
+ * @brief Task that indicates the client is scanning for servers to connect to for battles
+ */
+static void CommTask_ScanBattleClient(void)
 {
     sub_02033A5C();
 }
 
+/**
+ * @brief Begins connecting the client for battles
+ */
 static void CommTask_ConnectBattleClient(void)
 {
     sub_02033A5C();
 
     if (sub_02034984(sCommMan->connectionID)) {
-        CommManager_SetTask(sub_02037238, 10);
+        CommManager_SetTask(CommTask_ConnectingBattleClient, 10);
     }
 }
 
-static void sub_02037238(void)
+/**
+ * @brief Task that indicates the Communication Manager is connecting to a battle as a client
+ */
+static void CommTask_ConnectingBattleClient(void)
 {
     if (CommSys_CheckError()) {
-        CommManager_SetTask(sub_02037270, 0);
+        CommManager_SetTask(CommTask_ResetBattleClient, 0);
     }
 
     if (CommSys_IsPlayerConnected(CommSys_CurNetId()) && (0 != CommSys_CurNetId())) {
@@ -1055,16 +1121,20 @@ static void sub_02037238(void)
     }
 }
 
-static void sub_02037270(void)
+/**
+ * @brief Resets the client's connection for battles
+ */
+static void CommTask_ResetBattleClient(void)
 {
     sub_020336D4();
-    CommManager_SetTask(sub_02037284, 2);
+    CommManager_SetTask(CommTask_ReconnectBattleClient, 2);
 }
 
-static void sub_02037284(void)
+/**
+ * @brief Task that indicates the Communication Manager is attempting to reconnect during battle as a client.
+ */
+static void CommTask_ReconnectBattleClient(void)
 {
-    TrainerInfo *v0;
-
     if (sCommMan->timer != 0) {
         sCommMan->timer--;
         return;
@@ -1080,6 +1150,9 @@ static void sub_02037284(void)
     }
 }
 
+/**
+ * @brief Task that indicates the Communication Manager is waiting during battle as a client
+ */
 static void CommTask_WaitBattleClient(void)
 {
     if (!CommSys_IsInitialized()) {
@@ -1087,13 +1160,19 @@ static void CommTask_WaitBattleClient(void)
     }
 }
 
-static void sub_020372DC(void)
+/**
+ * @brief Attempts to retry the connection for the battle client
+ */ 
+static void CommTask_RetryBattleClient(void)
 {
     sub_020336D4();
-    CommManager_SetTask(sub_020372F0, 2);
+    CommManager_SetTask(CommTask_ReinitBattleClient, 2);
 }
 
-static void sub_020372F0(void)
+/**
+ * @brief Task that indicates the Communication Manager is trying to reconnect during battle as a client, reinitializes the client if it fails
+ */
+static void CommTask_ReinitBattleClient(void)
 {
     if (sCommMan->timer != 0) {
         sCommMan->timer--;
@@ -1106,7 +1185,7 @@ static void sub_020372F0(void)
 
     if (CommSys_InitClient(0, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_02037208, 10);
+        CommManager_SetTask(CommTask_ScanBattleClient, 10);
     }
 }
 
@@ -1138,7 +1217,10 @@ static void CommManager_EndConnectionUnderground(void)
     CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
-static void sub_02037354(void)
+/**
+ * @brief Wait task to end the client's connection to the union
+ */
+static void CommTask_WaitEndConnectionUnionClient(void)
 {
     if (CommSys_ConnectedCount() <= 1) {
         WirelessManager_SetPauseConnectionSystem(0);
@@ -1156,7 +1238,10 @@ static void sub_02037354(void)
     CommManager_SetTask(CommTask_EndUnionClient, 0);
 }
 
-static void sub_0203739C(void)
+/**
+ * @brief Task to end the client's connection to the union, without wait
+ */
+static void CommTask_EndConnectionUnionClient(void)
 {
     if (!sub_020336D4()) {
         return;
@@ -1211,8 +1296,6 @@ static void CommTask_StartUnion(void)
  */
 static void CommTask_SearchUnionClient(void)
 {
-    int v0;
-
     sub_02033A5C();
 
     if (sCommMan->timer != 0) {
@@ -1227,6 +1310,9 @@ static void CommTask_SearchUnionClient(void)
     CommManager_SetTask(CommTask_InitializeServerUnion, 0);
 }
 
+/**
+ * @brief Ends the clients connection to the union. Reinitializes as a server if applicable.
+ */
 static void CommTask_EndUnionClient(void)
 {
     if (!sub_020336D4()) {
@@ -1250,14 +1336,17 @@ static void CommTask_InitializeServerUnion(void)
 
         CommSys_SwitchTransitionTypeToParallel();
         sCommMan->unk_4E = 0;
-        CommManager_SetTask(sub_020374F4, 10000);
+        CommManager_SetTask(CommTask_WaitUnionServer, 10000);
     }
 }
 
-static void sub_020374F4(void)
+/**
+ * @brief Wait task for the server's union connection
+ */
+static void CommTask_WaitUnionServer(void)
 {
     if (sub_02034148()) {
-        (void)0;
+        
     } else {
         if (CommSys_IsClientConnecting()) {
             sCommMan->unk_4E = 1;
@@ -1277,6 +1366,9 @@ static void sub_020374F4(void)
     }
 }
 
+/**
+ * @brief Restarts the communication manager and reinitializes it as a client for union play
+ */
 static void CommTask_RestartUnionClient(void)
 {
     u32 rand;
@@ -1292,16 +1384,22 @@ static void CommTask_RestartUnionClient(void)
     }
 }
 
-static void sub_020375A4(void)
+/**
+ * @brief Starts to force connects to the union. Part 1 waits for a potential internal swap between server and client.
+ */
+static void CommTask_StartForceConnectUnion1(void)
 {
     if (!sub_020336D4()) {
         return;
     }
 
-    CommManager_SetTask(sub_020375BC, 0);
+    CommManager_SetTask(CommTask_StartForceConnectUnion2, 0);
 }
 
-static void sub_020375BC(void)
+/**
+ * @brief Starts to force connects to the union. Part 2 initializes the Communication Manager as a client
+ */
+static void CommTask_StartForceConnectUnion2(void)
 {
     if (!sub_02033E30()) {
         return;
@@ -1309,15 +1407,18 @@ static void sub_020375BC(void)
 
     if (CommSys_InitClient(0, 0, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_020375E8, 100);
+        CommManager_SetTask(CommTask_ForceConnectUnion, 100);
     }
 }
 
-static void sub_020375E8(void)
+/**
+ * @brief Forces a connection to the union. If not possible, resets the communication manager as a client.
+ */
+static void CommTask_ForceConnectUnion(void)
 {
     if (sub_02033898(sCommMan->connectionID) != 0) {
         if (sub_02034984(sCommMan->connectionID)) {
-            CommManager_SetTask(sub_0203764C, 100);
+            CommManager_SetTask(CommTask_ConnectingUnionClient, 100);
             return;
         }
     }
@@ -1331,7 +1432,10 @@ static void sub_020375E8(void)
     }
 }
 
-static void sub_0203764C(void)
+/**
+ * @brief Task that indicates a client is connecting to the union. Resets on timeout or error.
+ */
+static void CommTask_ConnectingUnionClient(void)
 {
     if (CommSys_CheckError()) {
         CommManager_SetTask(CommTask_ResetUnionClient, 0);
@@ -1339,8 +1443,8 @@ static void sub_0203764C(void)
     }
 
     if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
-        sCommMan->unk_48 = 0;
-        CommManager_SetTask(sub_020376A8, 120);
+        sCommMan->unionConnectState = 0;
+        CommManager_SetTask(CommTask_ConnectUnionClient, 120);
         return;
     }
 
@@ -1352,26 +1456,29 @@ static void sub_0203764C(void)
     CommManager_SetTask(CommTask_ResetUnionClient, 0);
 }
 
-static void sub_020376A8(void)
+/**
+ * @brief Connects the client to the union server. Resets on error or timeout.
+ */
+static void CommTask_ConnectUnionClient(void)
 {
     if (CommSys_CheckError()) {
         CommManager_SetTask(CommTask_ResetUnionClient, 0);
         return;
     }
 
-    if (sCommMan->unk_48 == 2) {
+    if (sCommMan->unionConnectState == 2) {
         CommManager_SetTask(CommTask_FailedConnectUnionClient, 0);
         return;
     }
 
-    if (sCommMan->unk_48 == 1) {
+    if (sCommMan->unionConnectState == 1) {
         CommInfo_SendPlayerInfo();
         CommManager_SetTask(CommTask_SuccededConnectUnionClient, 0);
         return;
     }
 
     if (sCommMan->timer > (120 - 10)) {
-        CommSys_SendDataFixedSize(6, Unk_02100A20);
+        CommSys_SendDataFixedSize(6, sFreakConfirmationMessage);
     }
 
     if (sCommMan->timer != 0) {
@@ -1382,6 +1489,9 @@ static void sub_020376A8(void)
     CommManager_SetTask(CommTask_ResetUnionClient, 0);
 }
 
+/**
+ * @brief Task that indicates a client has sucessfully connected to the union. Monitors for errors and resets on error.
+ */
 static void CommTask_SuccededConnectUnionClient(void)
 {
     if (CommSys_CheckError()) {
@@ -1390,14 +1500,20 @@ static void CommTask_SuccededConnectUnionClient(void)
     }
 }
 
+/**
+ * @brief Task that indicates the client failed to connect to the union server. Does nothing when called.
+ */
 static void CommTask_FailedConnectUnionClient(void)
 {
     return;
 }
 
+/**
+ * @brief Resets the Communication Manager as a client for union play. Fails after retrying too many times.
+ */
 static void CommTask_ResetUnionClient(void)
 {
-    sCommMan->unk_48 = 0;
+    sCommMan->unionConnectState = 0;
 
     if (!sub_020336D4()) {
         return;
@@ -1405,16 +1521,19 @@ static void CommTask_ResetUnionClient(void)
 
     if (sCommMan->retryConnectionAttempts != 0) {
         sCommMan->retryConnectionAttempts--;
-        CommManager_SetTask(sub_020375BC, 0);
+        CommManager_SetTask(CommTask_StartForceConnectUnion2, 0);
     } else {
         CommManager_SetTask(CommTask_FailedConnectUnionClient, 0);
     }
 }
 
+/**
+ * @brief Connection task for the server for union play
+ */
 static void CommTask_ConnectUnionServer(void)
 {
     if (!CommSys_IsClientConnecting()) {
-        if (!sub_02038938()) {
+        if (!CommManager_CheckError()) {
             if (sub_020336D4()) {
                 CommManager_SetTask(CommTask_RestartUnionClient, 0);
             }
@@ -1426,13 +1545,16 @@ static void CommTask_ConnectUnionServer(void)
     }
 
     if (CommSys_CheckError()) {
-        if (!sub_02038938()) {
+        if (!CommManager_CheckError()) {
             CommManager_SetTask(CommTask_ResetUnionClient, 0);
             return;
         }
     }
 }
 
+/**
+ * @brief Task to indicate the connection is paused without causing errors. Reinitializes the connection when unpaused.
+ */
 static void CommTask_PauseUnionServer(void)
 {
     if (!sub_02033E30()) {
@@ -1445,39 +1567,55 @@ static void CommTask_PauseUnionServer(void)
     }
 }
 
+/**
+ * @brief Initializes the Communication Manager for the Drawing minigame in the union as a server
+ */
 void CommManager_StartDrawServer(void)
 {
     sCommMan->commType = COMM_TYPE_DRAW;
 
     if (CommSys_CurNetId() == 0) {
-        u8 v0 = 0;
-        CommSys_SendDataFixedSize(10, &v0);
+        u8 data = 0;
+        CommSys_SendDataFixedSize(10, &data);
     } else {
-        u8 v0 = 0;
-        CommSys_SendDataFixedSize(10, &v0);
+        u8 data = 0;
+        CommSys_SendDataFixedSize(10, &data);
     }
 }
 
-void CommManager_StartDrawClient(int param0)
+/**
+ * @brief Initializes the Communication Manager for the Drawing minigame in the union as a client
+ *
+ * @param connectionID
+ */
+void CommManager_StartDrawClient(int connectionID)
 {
-    sCommMan->connectionID = param0;
+    sCommMan->connectionID = connectionID;
     sCommMan->retryConnectionAttempts = 3;
     CommManager_SetTask(CommTask_StartDrawClient, 0);
 }
 
+/**
+ * @brief Sets the current commType to COMM_TYPE_MIX_RECORDS
+ */
 void CommManager_SetState_MixRecords(void)
 {
     sCommMan->commType = COMM_TYPE_MIX_RECORDS;
 }
 
-void CommManager_StartMixRecordsClient(int param0)
+/**
+ * @brief Initializes the Communication Manager to Mix Records as a client 
+ *
+ * @param connectionID
+ */
+void CommManager_StartMixRecordsClient(int connectionID)
 {
-    sCommMan->connectionID = param0;
+    sCommMan->connectionID = connectionID;
     sCommMan->commType = COMM_TYPE_MIX_RECORDS;
     sCommMan->retryConnectionAttempts = 3;
 
     NetworkIcon_Init();
-    CommManager_SetTask(sub_020375A4, 0);
+    CommManager_SetTask(CommTask_StartForceConnectUnion1, 0);
 }
 
 /**
@@ -1488,16 +1626,24 @@ void CommManager_SetState_SpinTrade(void)
     sCommMan->commType = COMM_TYPE_SPIN_TRADE;
 }
 
-void CommManager_StartSpinTradeClient(int param0)
+/**
+ * @brief Initializes the Communication Manager for Spin Trade as a client 
+ *
+ * @param connectionID
+ */
+void CommManager_StartSpinTradeClient(int connectionID)
 {
-    sCommMan->connectionID = param0;
+    sCommMan->connectionID = connectionID;
     sCommMan->commType = COMM_TYPE_SPIN_TRADE;
     sCommMan->retryConnectionAttempts = 3;
 
     NetworkIcon_Init();
-    CommManager_SetTask(sub_020375A4, 0);
+    CommManager_SetTask(CommTask_StartForceConnectUnion1, 0);
 }
 
+/**
+ * @brief Task to start the draw connection for clients
+ */
 static void CommTask_StartDrawClient(void)
 {
     if (sub_020336D4()) {
@@ -1505,6 +1651,9 @@ static void CommTask_StartDrawClient(void)
     }
 }
 
+/**
+ * @brief Task to initialize the Communication Manager for the union Draw minigame for clients
+ */
 static void CommTask_InitDrawClient(void)
 {
     if (!sub_02033E30()) {
@@ -1519,6 +1668,9 @@ static void CommTask_InitDrawClient(void)
     }
 }
 
+/**
+ * @brief Connects the Communication Manager to other players for the union Draw minigame.
+ */
 static void CommTask_ConnectDraw(void)
 {
     if (sub_02033898(sCommMan->connectionID) != 0) {
@@ -1541,6 +1693,9 @@ static void CommTask_ConnectDraw(void)
     }
 }
 
+/**
+ * @brief Task that indicates the Communication Manager is connecting to other players for the union Draw minigame
+ */
 static void CommTask_ConnectingDraw(void)
 {
     if (sCommMan->timer > 90) {
@@ -1579,98 +1734,132 @@ static void CommTask_ConnectingDraw(void)
     }
 }
 
-void sub_02037A78(int param0, int param1, void *param2, void *param3)
+/**
+ * @brief Validates a confirmation message that should be "FREAK" to ensure communication has been established. Sends a response with the user's netID based on the result
+ *
+ * @param netID
+ * @param unused_1
+ * @param confirmationMessage
+ * @param unused_3
+ */
+void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg, void *unused_3)
 {
-    int v0;
-    u8 *v1 = param2;
-    BOOL v2 = 1;
+    int i;
+    u8 *confirmation = msg;
+    BOOL success = 1;
 
     if (CommSys_CurNetId() != 0) {
         return;
     }
 
-    v2 = 1;
+    success = 1;
 
-    for (v0 = 0; v0 < sizeof(Unk_02100A20); v0++) {
-        if (v1[v0] != Unk_02100A20[v0]) {
-            v2 = 0;
+    for (i = 0; i < sizeof(sFreakConfirmationMessage); i++) {
+        if (confirmation[i] != sFreakConfirmationMessage[i]) {
+            success = 0;
             break;
         }
     }
 
-    if (v2 && (!sCommMan->pauseUnion)) {
-        Unk_02100A30[0] = param0;
-        CommSys_SendDataFixedSizeServer(7, Unk_02100A30);
+    if (success && (!sCommMan->pauseUnion)) {
+        sGameConfirmationMessage[0] = netID;
+        // "[netID]GAME" indicates a success
+        CommSys_SendDataFixedSizeServer(7, sGameConfirmationMessage);
         return;
     }
 
-    Unk_02100A28[0] = param0;
-    CommSys_SendDataFixedSizeServer(7, Unk_02100A28);
+    // "[netID]FULL" indicates a failure
+    sFullConfirmationMessage[0] = netID;
+    CommSys_SendDataFixedSizeServer(7, sFullConfirmationMessage);
 }
 
-void sub_02037AD8(int param0, int param1, void *param2, void *param3)
+/**
+ * @brief Validates a confirmation response message that should be "[netID]GAME" or "[netID]FULL" to ensure communication has been established. 
+ *
+ * @param unused_0
+ * @param unused_1
+ * @param confirmationMessage
+ * @param unused_3
+ */
+void CommManager_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *msg, void *unused_3)
 {
-    u8 v0;
-    int v1;
-    u8 *v2 = param2;
-    BOOL v3 = 1;
+    u8 netID;
+    int i;
+    u8 *response = msg;
+    BOOL noMismatch = 1;
 
-    for (v1 = 1; v1 < sizeof(Unk_02100A30); v1++) {
-        if (v2[v1] != Unk_02100A30[v1]) {
-            v3 = 0;
+    for (i = 1; i < sizeof(sGameConfirmationMessage); i++) {
+        if (response[i] != sGameConfirmationMessage[i]) {
+            noMismatch = 0;
             break;
         }
     }
 
-    if (v3) {
-        v0 = v2[0];
+    if (noMismatch) {
+        netID = response[0];
 
-        if (v0 == CommSys_CurNetId()) {
-            sCommMan->unk_48 = 1;
+        if (netID == CommSys_CurNetId()) {
+            sCommMan->unionConnectState = 1;
         }
 
         return;
     }
 
-    v3 = 1;
+    noMismatch = 1;
 
-    for (v1 = 1; v1 < sizeof(Unk_02100A28); v1++) {
-        if (v2[v1] != Unk_02100A28[v1]) {
-            v3 = 0;
+    for (i = 1; i < sizeof(sFullConfirmationMessage); i++) {
+        if (response[i] != sFullConfirmationMessage[i]) {
+            noMismatch = 0;
             break;
         }
     }
 
-    if (v3) {
-        v0 = v2[0];
+    if (noMismatch) {
+        netID = response[0];
 
-        if (v0 == (u8)CommSys_CurNetId()) {
-            sCommMan->unk_48 = 2;
+        if (netID == (u8)CommSys_CurNetId()) {
+            sCommMan->unionConnectState = 2;
         }
 
         return;
     }
 }
 
-int sub_02037B54(void)
+/**
+ * @brief Gets the size of the confirmation messages used to validate connections
+ *
+ * @return sizeof(sFreakConfirmationMessage)
+ */
+int CommManager_ConfirmationMessage_sizeof(void)
 {
-    return sizeof(Unk_02100A20);
+    return sizeof(sFreakConfirmationMessage);
 }
 
-void CommManager_SetMaxNumConnections(int param0)
+/**
+ * @brief Sets the max number of connections allowed by the Communication Manager
+ *
+ * @param maxNumConnection
+ */
+void CommManager_SetMaxNumConnections(int maxNumConnection)
 {
     if (sCommMan) {
-        sCommMan->maxNumConnection = param0;
-        WirelessManager_SetMaxNumConnections(param0);
+        sCommMan->maxNumConnection = maxNumConnection;
+        WirelessManager_SetMaxNumConnections(maxNumConnection);
     }
 }
 
-static void sub_02037B70(void)
+/**
+ * @brief Scans for other connections for the Poketch Link Search feature
+ */
+static void CommTask_ScanPoketch(void)
 {
     sub_02033A5C();
 }
 
-static void sub_02037B78(void)
+/**
+ * @brief Starts the connection for the Poketch Link Search feature as as client
+ */
+static void CommTask_StartPoketchClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
@@ -1681,11 +1870,16 @@ static void sub_02037B78(void)
 
     if (CommSys_InitClient(1, 1, 32)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_02037B70, 0);
+        CommManager_SetTask(CommTask_ScanPoketch, 0);
     }
 }
 
-void sub_02037BC0(SaveData *saveData)
+/**
+ * @brief Initializes the Communication Manager for the Link Search poketch app. Always initializes as a client.
+ *
+ * @param saveData
+ */
+void CommManager_InitializePoketchLinkSearch(SaveData *saveData)
 {
     if (CommSys_IsInitialized()) {
         return;
@@ -1696,10 +1890,13 @@ void sub_02037BC0(SaveData *saveData)
 
     sCommMan->contestRegulation = 0;
 
-    CommManager_SetTask(sub_02037B78, 0);
+    CommManager_SetTask(CommTask_StartPoketchClient, 0);
 }
 
-void sub_02037BFC(void)
+/**
+ * @brief Ends the connection used by the Poketch Link Search app
+ */
+void CommManager_EndPoketchLinkSearch(void)
 {
     if (sCommMan == NULL) {
         return;
@@ -1708,32 +1905,43 @@ void sub_02037BFC(void)
     CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
-BOOL sub_02037C18(void)
+/**
+ * @brief Checks if the communication manager is in a poketch search state
+ *
+ * @return TRUE if the current task is CommTask_ScanPoketch
+ */
+BOOL CommManager_IsPoketchSearching(void)
 {
-    int v0;
-    u32 v1[] = {
-        (u32)sub_02037B70, 0
+    int i;
+    u32 tasks[] = {
+        (u32)CommTask_ScanPoketch, 0
     };
-    u32 v2 = (u32)sCommMan->task;
+    u32 task = (u32)sCommMan->task;
 
     if (sCommMan == NULL) {
-        return 0;
+        return FALSE;
     }
 
-    for (v0 = 0; v1[v0] != 0; v0++) {
-        if (v2 == v1[v0]) {
-            return 1;
+    for (i = 0; tasks[i] != 0; i++) {
+        if (task == tasks[i]) {
+            return TRUE;
         }
     }
 
-    return 0;
+    return FALSE;
 }
 
-static void sub_02037C5C(u32 param0, int param1)
+/**
+ * @brief Callback used by WirelessManager_SetGGIDScanCallback
+ *
+ * @param ggid
+ * @param commType
+ */
+static void CommManager_GGIDScanCallback(u32 ggid, int commType)
 {
-    switch (param0) {
+    switch (ggid) {
     case 0x333:
-        if (param1 == 15) {
+        if (commType == COMM_TYPE_MYSTERY_GIFT) {
             sCommMan->unk_54 |= 0x1;
         }
         break;
@@ -1749,15 +1957,21 @@ static void sub_02037C5C(u32 param0, int param1)
     }
 }
 
-static void sub_02037CE4(void)
+/**
+ * @brief Initializes the communication system for the party search and switches to the scan mode used by the poketch
+ */
+static void CommTask_SearchPartyClient(void)
 {
     if (CommSys_InitClient(1, 1, 32)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_02037B70, 0);
+        CommManager_SetTask(CommTask_ScanPoketch, 0);
     }
 }
 
-static void sub_02037D08(void)
+/**
+ * @brief Task to initialize the party search as a client
+ */
+static void CommTask_InitSearchPartyClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
@@ -1765,11 +1979,16 @@ static void sub_02037D08(void)
 
     CommServerClient_Init(sCommMan->trainerInfo, 0);
     CommInfo_Init(sCommMan->saveData, NULL);
-    WirelessManager_SetGGIDScanCallback(sub_02037C5C);
-    CommManager_SetTask(sub_02037CE4, 0);
+    WirelessManager_SetGGIDScanCallback(CommManager_GGIDScanCallback);
+    CommManager_SetTask(CommTask_SearchPartyClient, 0);
 }
 
-void sub_02037D48(SaveData *saveData)
+/**
+ * @brief Initializes the Communication Manager to search for a party to join
+ *
+ * @param saveData
+ */
+void CommManager_InitializeSearchParty(SaveData *saveData)
 {
     if (CommSys_IsInitialized()) {
         return;
@@ -1778,10 +1997,13 @@ void sub_02037D48(SaveData *saveData)
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7000);
     CommManager_Initialize(saveData, COMM_TYPE_PARTY);
     sCommMan->contestRegulation = 0;
-    CommManager_SetTask(sub_02037D08, 0);
+    CommManager_SetTask(CommTask_InitSearchPartyClient, 0);
 }
 
-void sub_02037D84(void)
+/**
+ * @brief Ends the party searc communication
+ */
+void CommManager_EndSearchParty(void)
 {
     if (sCommMan == NULL) {
         return;
@@ -1790,35 +2012,48 @@ void sub_02037D84(void)
     CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
-u8 sub_02037DA0(void)
+/**
+ * @brief Gets the Communication Manager's unk_54
+ *
+ * @return sCommMan->unk_54
+ */
+u8 CommManager_GetUnk54(void)
 {
     return sCommMan->unk_54;
 }
 
-BOOL sub_02037DB0(void)
+/**
+ * @brief Shuts down or resets the Communication Manager, depending on commType
+ *
+ * @return TRUE if the CommManager shut down, FALSE if it reset
+ */
+BOOL CommManager_ExitOrReset(void)
 {
     CommSys_StartShutdown();
 
     if (sCommMan == NULL) {
-        return 1;
+        return TRUE;
     }
 
     if ((sCommMan->commType == COMM_TYPE_24) || (sCommMan->commType == COMM_TYPE_25) || (sCommMan->commType == COMM_TYPE_EMAIL_WIFI)) {
         NintendoWFC_Stop();
-        return 1;
-    } else if (CommMan_IsConnectedToWifi()) {
+        return TRUE;
+    } else if (CommManager_IsConnectedToWifi()) {
         if (sCommMan->commType == COMM_TYPE_LOBBY_WIFI) {
             CommManager_SetTask(CommTask_LogoutWifiLobby, 0);
         } else {
-            CommManager_SetTask(sub_02038314, 0);
+            CommManager_SetTask(CommTask_LogoutWifi, 0);
         }
     } else {
         CommManager_SetTask(CommTask_RestartSecretBase, 0);
     }
 
-    return 0;
+    return FALSE;
 }
 
+/**
+ * @brief Task to initialize the connection to a random battle as a server
+ */
 static void CommTask_StartRandomBattleServer(void)
 {
     if (!WirelessDriver_IsReady()) {
@@ -1830,11 +2065,14 @@ static void CommTask_StartRandomBattleServer(void)
 
     if (CommSys_InitServer(1, 1, 512, 1)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_0203718C, 0);
+        CommManager_SetTask(CommTask_ConnectingBattleServer, 0);
     }
 }
 
-static void CommTask_StartMysteryGiftClient(void)
+/**
+ * @brief Task to initialize the connection to a random battle as a client
+ */
+static void CommTask_StartRandomBattleClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
@@ -1845,57 +2083,70 @@ static void CommTask_StartMysteryGiftClient(void)
 
     if (CommSys_InitClient(1, 1, 512)) {
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(sub_02037208, 0);
+        CommManager_SetTask(CommTask_ScanBattleClient, 0);
     }
 }
 
+/**
+ * @brief Task that indicates there was an error during a wifi battle. Does nothing when called.
+ */
 static void CommTask_WifiBattleError(void)
 {
     return;
 }
 
-static void sub_02037EB4(void)
+/**
+ * @brief Task that indicates there was an timeout during a wifi battle. 
+ */
+static void CommTask_WifiBattleTimeout(void)
 {
-    int v0 = NintendoWFC_Process(0);
+    int ret = NintendoWFC_Process(0);
 
-    if (v0 < 0) {
+    if (ret < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
-    } else if (v0 == ((DWC_ERROR_NUM) + 3)) {
-        (void)0;
-    }
+    } 
 }
 
+/**
+ * @brief Task that indicates there was a disconnect during a wifi battle. 
+ */
 static void CommTask_DisconnectWifiBattle(void)
 {
     return;
 }
 
+/**
+ * @brief Task that indicates there was a failure during a wifi battle. 
+ */
 static void CommTask_WifiBattleFailed(void)
 {
     return;
 }
 
-static void sub_02037ED8(void)
+/**
+ * @brief Task that establishes a connection for the wifi battle
+ */
+static void CommTask_ConnectWifiBattle(void)
 {
-    int v0, v1;
+    int ret;
 
     CommSys_SetWifiConnected(1);
 
-    v0 = NintendoWFC_Process(0);
+    ret = NintendoWFC_Process(0);
 
-    if ((v0 >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > v0)) {
+    if ((ret >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > ret)) {
         CommManager_SetTask(CommTask_WifiBattleFailed, 0);
-    } else if (v0 < 0) {
+    } else if (ret < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
-    } else if (v0 == ((DWC_ERROR_NUM) + 3)) {
-        CommManager_SetTask(sub_02037EB4, 0);
-    } else if (v0 == ((DWC_ERROR_NUM) + 4)) {
+    } else if (ret == ((DWC_ERROR_NUM) + 3)) {
+        CommManager_SetTask(CommTask_WifiBattleTimeout, 0);
+    } else if (ret == ((DWC_ERROR_NUM) + 4)) {
         if (sCommMan->errorDisconnect) {
             CommManager_SetTask(CommTask_WifiBattleError, 0);
         } else {
             CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
         }
-    } else if (v0 == ((DWC_ERROR_NUM) + 1)) {
+    } else if (ret == ((DWC_ERROR_NUM) + 1)) {
         if (sCommMan->errorDisconnect) {
             CommManager_SetTask(CommTask_WifiBattleError, 0);
         } else {
@@ -1910,56 +2161,69 @@ static void sub_02037ED8(void)
     }
 }
 
-void sub_02037F94(int param0, int param1, int param2)
+/**
+ * @brief Sets sCommMan->unk34 struct with the given variables
+ *
+ * @param errorCode
+ * @param errorType
+ * @param error
+ */
+void CommManager_SetUnk34(int errorCode, int errorType, int error)
 {
-    int v0;
+    int correctedCode;
 
     if (sCommMan) {
-        if ((param0 == ((DWC_ERROR_NUM) + 6)) || (param0 == ((DWC_ERROR_NUM) + 5))) {
-            v0 = param0;
+        if ((errorCode == ((DWC_ERROR_NUM) + 6)) || (errorCode == ((DWC_ERROR_NUM) + 5))) {
+            correctedCode = errorCode;
         } else {
-            v0 = -param0;
+            correctedCode = -errorCode;
         }
 
-        sCommMan->unk_34.unk_00 = v0;
-        sCommMan->unk_34.unk_04 = param1;
-        sCommMan->unk_34.unk_08 = param2;
+        sCommMan->unk_34.unk_00 = correctedCode;
+        sCommMan->unk_34.unk_04 = errorType;
+        sCommMan->unk_34.unk_08 = error;
     }
 }
 
-static void sub_02037FBC(void)
+/**
+ * @brief Processes the matchmaking result from the internal libraries for battles
+ */
+static void CommTask_WifiBattleMatchmaking(void)
 {
-    int v0 = NintendoWFC_Process(0);
+    int ret = NintendoWFC_Process(0);
 
-    if ((v0 >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > v0)) {
+    if ((ret >= DWC_ERROR_FRIENDS_SHORTAGE) && ((DWC_ERROR_NUM) > ret)) {
         CommManager_SetTask(CommTask_WifiBattleFailed, 0);
-    } else if (v0 < 0) {
+    } else if (ret < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
-    } else if (v0 == NINTENDO_WFC_RESULT_MATCHMAKING_SUCCESS) {
-        CommManager_SetTask(sub_02037ED8, 0);
-    } else if (v0 == NINTENDO_WFC_RESULT_CONN_RESET) {
+    } else if (ret == NINTENDO_WFC_RESULT_MATCHMAKING_SUCCESS) {
+        CommManager_SetTask(CommTask_ConnectWifiBattle, 0);
+    } else if (ret == NINTENDO_WFC_RESULT_CONN_RESET) {
         CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
-    } else if (v0 == NINTENDO_WFC_RESULT_CONN_RESET_AFTER_HOST_LEFT) {
+    } else if (ret == NINTENDO_WFC_RESULT_CONN_RESET_AFTER_HOST_LEFT) {
         CommManager_SetTask(CommTask_WifiBattleFailed, 0);
-    } else if (v0 == NINTENDO_WFC_RESULT_CONNECTION_CLOSED) {
+    } else if (ret == NINTENDO_WFC_RESULT_CONNECTION_CLOSED) {
         CommManager_SetTask(CommTask_DisconnectWifiBattle, 0);
     }
 }
 
-static void sub_0203802C(void)
+/**
+ * @brief Cancels the wifi battle connection
+ */
+static void CommTask_CancelWifiBattle(void)
 {
-    int v0 = NintendoWFC_Process(1);
+    int ret = NintendoWFC_Process(1);
 
-    if (v0 < 0) {
+    if (ret < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
     } else {
-        int v1 = NintendoWFC_StartConnectionWithFriends(sCommMan->unk_4D, CommLocal_MaxMachines(sCommMan->commType) + 1, 0);
+        int result = NintendoWFC_StartConnectionWithFriends(sCommMan->wifiTarget, CommLocal_MaxMachines(sCommMan->commType) + 1, 0);
 
-        switch (v1) {
+        switch (result) {
         case 0:
             CommSys_Reset();
 
-            CommManager_SetTask(sub_02037FBC, 0);
+            CommManager_SetTask(CommTask_WifiBattleMatchmaking, 0);
             break;
         case -1:
         case -2:
@@ -1971,29 +2235,41 @@ static void sub_0203802C(void)
     }
 }
 
-int sub_020380A0(int param0)
+/**
+ * @brief Starts the Wifi Battle connection
+ *
+ * @param target
+ *
+ * @return FALSE if the Communication Manager is still matchmaking, TRUE on success
+ */
+int CommManager_StartWifiBattle(int target)
 {
-    if (sCommMan->task != sub_02037FBC) {
-        return 0;
+    if (sCommMan->task != CommTask_WifiBattleMatchmaking) {
+        return FALSE;
     }
 
     NintendoDWC_SetDataTransferCallbacks(sub_020351F8, sub_0203509C);
-    sCommMan->unk_4D = param0;
-    CommManager_SetTask(sub_0203802C, 0);
-    return 1;
+    sCommMan->wifiTarget = target;
+    CommManager_SetTask(CommTask_CancelWifiBattle, 0);
+    return TRUE;
 }
 
-int sub_020380E4(void)
+/**
+ * @brief Checks if the Communication Manager is in a battle matchmaking state and gets the result
+ *
+ * return 0 - matchmaking, 1 connecting, 2 - default, 3 - timeout, 4 - disconnect, 5 - failed
+ */
+int CommManager_GetMatchmakingState(void)
 {
-    if (sCommMan->task == sub_02037FBC) {
+    if (sCommMan->task == CommTask_WifiBattleMatchmaking) {
         return 0;
     }
 
-    if (sCommMan->task == sub_02037ED8) {
+    if (sCommMan->task == CommTask_ConnectWifiBattle) {
         return 1;
     }
 
-    if (sCommMan->task == sub_02037EB4) {
+    if (sCommMan->task == CommTask_WifiBattleTimeout) {
         return 3;
     }
 
@@ -2020,20 +2296,23 @@ int sub_020380E4(void)
     return 2;
 }
 
-static void sub_02038164(void)
+/**
+ * @brief Logs in to the wifi, sets data transfer callbacks, and prrocesses errors during battle
+ */
+static void CommTask_WifiBattleLogin(void)
 {
-    int v0;
-    int v1;
+    int ret;
+    int errorRet;
 
     NintendoDWC_SetDataTransferCallbacks(sub_020351F8, sub_0203509C);
 
-    v0 = NintendoWFC_StartConnectionWithFriends(-1, 4, 1);
+    ret = NintendoWFC_StartConnectionWithFriends(-1, 4, 1);
 
-    switch (v0) {
+    switch (ret) {
     case 0:
-        sCommMan->unk_58 = 0;
+        sCommMan->disconnectedWifi = 0;
         CommSys_Reset();
-        CommManager_SetTask(sub_02037FBC, 0);
+        CommManager_SetTask(CommTask_WifiBattleMatchmaking, 0);
         break;
     case -1:
     case -2:
@@ -2045,18 +2324,21 @@ static void sub_02038164(void)
         return;
     }
 
-    v1 = NintendoWFC_HandleError();
+    errorRet = NintendoWFC_HandleError();
 
-    if (v1 < 0) {
+    if (errorRet < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
-    } else if (v1 == ((DWC_ERROR_NUM) + 6)) {
+    } else if (errorRet == ((DWC_ERROR_NUM) + 6)) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 }
 
-static void sub_020381F0(void)
+/**
+ * @brief Wifi matchmaking end task
+ */
+static void CommTask_EndMatchmakingWifi(void)
 {
-    int v0;
+    int ret;
 
     CommSys_SetWifiConnected(0);
 
@@ -2064,79 +2346,105 @@ static void sub_020381F0(void)
         if (NintendoWFC_ReturnToReadyState()) {
             CommInfo_Delete();
 
-            CommManager_SetTask(sub_02038164, 0);
+            CommManager_SetTask(CommTask_WifiBattleLogin, 0);
             return;
         }
     }
 
-    v0 = NintendoWFC_Process(0);
+    ret = NintendoWFC_Process(0);
 
-    if (v0 < 0) {
+    if (ret < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 }
 
-void sub_02038240(int param0, int param1, void *param2, void *param3)
+/**
+ * @brief Ends wifi matchmaking and sets the disconnected from wifi flag. Params unused
+ */
+void CommManager_DisconnectWifi(int param0, int param1, void *param2, void *param3)
 {
     if (CommSys_CurNetId() == 0) {
         sCommMan->unk_4C = 0;
-        CommManager_SetTask(sub_020381F0, 0);
+        CommManager_SetTask(CommTask_EndMatchmakingWifi, 0);
     } else {
         sCommMan->unk_4C = 1;
-        CommManager_SetTask(sub_020381F0, 0);
+        CommManager_SetTask(CommTask_EndMatchmakingWifi, 0);
     }
 
-    sCommMan->unk_58 = 1;
+    sCommMan->disconnectedWifi = TRUE;
 }
 
-BOOL sub_02038284(void)
+/**
+ * @brief Gets the wifi disconnected flag
+ *
+ * @return sCommMan->disconnectedWifi
+ */
+BOOL CommManager_GetDisconnectedWifi(void)
 {
-    return sCommMan->unk_58;
+    return sCommMan->disconnectedWifi;
 }
 
-BOOL sub_02038294(void)
+/**
+ * @brief Checks if the current task is loging in to the wifi battle
+ *
+ * @return TRUE if task is CommTask_WifiBattleLogin, or CommTask_ConnectWifiLobby
+ */
+BOOL CommManager_IsLoginBattleWifi(void)
 {
-    u32 v0 = (u32)sCommMan->task;
+    u32 task = (u32)sCommMan->task;
 
-    if (v0 == (u32)sub_02038164) {
+    if (task == (u32)CommTask_WifiBattleLogin) {
         return 1;
     }
 
-    if (v0 == (u32)CommTask_ConnectWifiLobby) {
+    if (task == (u32)CommTask_ConnectWifiLobby) {
         return 1;
     }
 
     return 0;
 }
 
-BOOL sub_020382C0(void)
+/**
+ * @brief Checks if the current task is loging in to the wifi battle matchmaking
+ *
+ * @return TRUE if task is CommTask_WifiBattleMatchmaking, CommTask_WifiBattleLogin, or CommTask_ConnectWifiLobby
+ */
+BOOL CommManager_IsLoginBattleMatchWifi(void)
 {
-    u32 v0 = (u32)sCommMan->task;
+    u32 task = (u32)sCommMan->task;
 
-    if (v0 == (u32)sub_02037FBC) {
+    if (task == (u32)CommTask_WifiBattleMatchmaking) {
         return 1;
     }
 
-    if (v0 == (u32)sub_02038164) {
+    if (task == (u32)CommTask_WifiBattleLogin) {
         return 1;
     }
 
-    if (v0 == (u32)CommTask_ConnectWifiLobby) {
+    if (task == (u32)CommTask_ConnectWifiLobby) {
         return 1;
     }
 
     return 0;
 }
 
-UnkStruct_ov65_0222F6EC *sub_020382F8(void)
+/**
+ * @brief Gets sCommMan->unk_34. Related to wifi errors.
+ *
+ * @return &sCommMan->unk_34
+ */
+UnkStruct_ov65_0222F6EC *CommManager_GetUnk34(void)
 {
     GF_ASSERT(sCommMan);
     return &sCommMan->unk_34;
 }
 
-static void sub_02038314(void)
+/**
+ * @brief Wifi logout task. Handles errors and ends the connection.
+ */
+static void CommTask_LogoutWifi(void)
 {
-    int v0;
+    int ret;
 
     CommSys_SetWifiConnected(0);
 
@@ -2145,14 +2453,17 @@ static void sub_02038314(void)
         CommManager_SetTask(CommTask_EndConnection, 0);
     }
 
-    v0 = NintendoWFC_Process(0);
+    ret = NintendoWFC_Process(0);
 
-    if (v0 < 0) {
+    if (ret < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 }
 
-void sub_02038350(void)
+/**
+ * @brief Logs out of wifi and ends the connection
+ */
+void CommManager_LogoutWifi(void)
 {
     if (sCommMan == NULL) {
         return;
@@ -2163,23 +2474,29 @@ void sub_02038350(void)
     CommManager_SetTask(CommTask_EndConnection, 5);
 }
 
-void sub_02038378(void)
+/**
+ * @brief Ends wifi matchmaking 
+ */
+void CommManager_EndWifiMatch(void)
 {
     if (sCommMan == NULL) {
         return;
     }
 
     sCommMan->unk_4C = 0;
-    CommManager_SetTask(sub_020381F0, 0);
+    CommManager_SetTask(CommTask_EndMatchmakingWifi, 0);
 }
 
-void sub_02038398(void)
+/**
+ * @brief Ends trade wifi matchmaking and sets error handling
+ */
+void CommManager_EndTradeWifiMatch(void)
 {
     if (sCommMan == NULL) {
         return;
     }
 
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 
     if (CommSys_CurNetId() == 0) {
         sCommMan->unk_4C = 0;
@@ -2187,148 +2504,184 @@ void sub_02038398(void)
         sCommMan->unk_4C = 1;
     }
 
-    CommManager_SetTask(sub_020381F0, 0);
+    CommManager_SetTask(CommTask_EndMatchmakingWifi, 0);
 }
 
-void sub_020383D4(void)
+/**
+ * @brief Ends battle wifi matchmaking and sends the exit wifi message
+ */
+void CommManager_EndBattleWifiMatch(void)
 {
-    u8 v0 = CommSys_CurNetId();
+    u8 netID = CommSys_CurNetId();
 
-    CommSys_SendDataFixedSize(21, &v0);
+    CommSys_SendDataFixedSize(21, &netID);
 }
 
-BOOL sub_020383E8(void)
+/**
+ * @brief Checks if the Communication Manager is in a wifi error task
+ *
+ * @return TRUE if task is CommTask_WifiBattleError, CommTask_WifiBattleTimeout, or CommTask_WifiLobbyTimeout
+ */
+BOOL CommManager_CheckWifiError(void)
 {
     if (sCommMan) {
-        u32 v0 = (u32)sCommMan->task;
+        u32 task = (u32)sCommMan->task;
 
-        if (v0 == (u32)CommTask_WifiBattleError) {
-            return 1;
+        if (task == (u32)CommTask_WifiBattleError) {
+            return TRUE;
         }
 
-        if ((v0 == (u32)sub_02037EB4) && sCommMan->errorDisconnect) {
-            return 1;
+        if ((task == (u32)CommTask_WifiBattleTimeout) && sCommMan->errorDisconnect) {
+            return TRUE;
         }
 
-        if ((v0 == (u32)CommTask_WifiLobbyTimeout) && sCommMan->errorDisconnect) {
-            return 1;
+        if ((task == (u32)CommTask_WifiLobbyTimeout) && sCommMan->errorDisconnect) {
+            return TRUE;
         }
     }
 
-    return 0;
+    return FALSE;
 }
 
-void sub_02038438(SaveData *saveData)
+/**
+ * @brief Initializes the Communication Manager for the GTS and Global Matchmaking
+ *
+ * @param saveData
+ */
+void CommManager_InitializeGlobalWifi(SaveData *saveData)
 {
     if (!sCommMan) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
         sCommMan = (CommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationManager));
         MI_CpuFill8(sCommMan, 0, sizeof(CommunicationManager));
         sCommMan->commType = COMM_TYPE_24;
-        sCommMan->unk_51 = 1;
+        sCommMan->globalWifi = 1;
         sCommMan->saveData = saveData;
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
         ResetLock(RESET_LOCK_0x1);
     }
 }
 
-void sub_0203848C(void)
+/**
+ * @brief Ends the Communication Manager for the GTS and Global Matchmaking
+ */
+void CommManager_EndGlobalWifi(void)
 {
     if (sCommMan) {
         ResetUnlock(RESET_LOCK_0x1);
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
         Heap_Free(sCommMan);
         sCommMan = NULL;
         Heap_Destroy(HEAP_ID_COMMUNICATION);
     }
 }
 
-void sub_020384C0(SaveData *saveData)
+/**
+ * @brief Starts the mystery gift wifi connection
+ */
+void CommManager_StartMysteryGiftWifi(SaveData *saveData)
 {
     if (!sCommMan) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
         sCommMan = (CommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationManager));
         MI_CpuFill8(sCommMan, 0, sizeof(CommunicationManager));
         sCommMan->commType = COMM_TYPE_25;
-        sCommMan->unk_51 = 1;
+        sCommMan->globalWifi = 1;
         sCommMan->saveData = saveData;
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
         ResetLock(RESET_LOCK_0x1);
     }
 }
 
-void sub_02038514(void)
+/**
+ * @brief Ends the mystery gift wifi connection
+ */
+void CommManager_EndMysteryGiftWifi(void)
 {
     if (sCommMan) {
         ResetUnlock(RESET_LOCK_0x1);
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
         Heap_Free(sCommMan);
         sCommMan = NULL;
         Heap_Destroy(HEAP_ID_COMMUNICATION);
     }
 }
 
-void sub_02038548(SaveData *saveData)
+/**
+ * @brief Starts the mail wifi connection
+ */
+void CommManager_StartWifiMail(SaveData *saveData)
 {
     if (!sCommMan) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
         sCommMan = (CommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationManager));
         MI_CpuFill8(sCommMan, 0, sizeof(CommunicationManager));
         sCommMan->commType = COMM_TYPE_EMAIL_WIFI;
-        sCommMan->unk_51 = 1;
+        sCommMan->globalWifi = 1;
         sCommMan->saveData = saveData;
-        CommMan_SetErrorHandling(0, 1);
+        CommManager_SetErrorHandling(0, 1);
         ResetLock(RESET_LOCK_0x1);
     }
 }
 
-void sub_0203859C(void)
+/**
+ * @brief Ends the mail wifi connection
+ */
+void CommManager_EndWifiMail(void)
 {
     if (sCommMan) {
         ResetUnlock(RESET_LOCK_0x1);
-        CommMan_SetErrorHandling(0, 0);
+        CommManager_SetErrorHandling(0, 0);
         Heap_Free(sCommMan);
         sCommMan = NULL;
         Heap_Destroy(HEAP_ID_COMMUNICATION);
     }
 }
 
-BOOL sub_020385D0(void)
+/**
+ * @brief Checks if there is a DWC error. Only applicable to certain wifi comm types (24, 25, email)
+ *
+ * @return TRUE if there is a DWC error, FALSE otherwise
+ */
+BOOL CommManager_GetDWCError(void)
 {
-    int v0, v1;
-    DWCErrorType v2;
+    int errorCode, ret;
+    DWCErrorType dwcError;
 
     if (!sCommMan) {
-        return 0;
+        return FALSE;
     }
 
     if ((sCommMan->commType == COMM_TYPE_24) || (sCommMan->commType == COMM_TYPE_EMAIL_WIFI)) {
-        v1 = DWC_GetLastErrorEx(&v0, &v2);
+        ret = DWC_GetLastErrorEx(&errorCode, &dwcError);
 
-        if (v1 != 0) {
+        if (ret != 0) {
             DWC_ClearError();
-            return 1;
+            return TRUE;
         }
     } else if (sCommMan->commType == COMM_TYPE_25) {
-        v1 = DWC_GetLastErrorEx(&v0, &v2);
+        ret = DWC_GetLastErrorEx(&errorCode, &dwcError);
 
-        if (v1 != 0) {
-            if (v2 == DWC_ETYPE_FATAL) {
-                return 1;
+        if (ret != 0) {
+            if (dwcError == DWC_ETYPE_FATAL) {
+                return TRUE;
             }
         }
     }
 
-    return 0;
+    return FALSE;
 }
 
-static void CommTask_ConnectWifiBattle(void)
+/**
+ * @brief Task to indicate the Communication Manager is connecting to a wifi battle. Errors on timeout
+ */
+static void CommTask_ConnectingWifiBattle(void)
 {
-    int v0 = NintendoWFC_ConnectToDWCServer();
+    int ret = NintendoWFC_ConnectToDWCServer();
 
     sCommMan->timer--;
 
-    if (v0 == NINTENDO_WFC_RESULT_CONNECTED_TO_SERVER) {
+    if (ret == NINTENDO_WFC_RESULT_CONNECTED_TO_SERVER) {
         if (sCommMan->commType == COMM_TYPE_LOBBY_WIFI) {
             BOOL v1;
 
@@ -2343,10 +2696,10 @@ static void CommTask_ConnectWifiBattle(void)
                 return;
             }
         } else {
-            CommManager_SetTask(sub_02038164, 0);
+            CommManager_SetTask(CommTask_WifiBattleLogin, 0);
             return;
         }
-    } else if (v0 != 0) {
+    } else if (ret != 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 
@@ -2355,6 +2708,9 @@ static void CommTask_ConnectWifiBattle(void)
     }
 }
 
+/**
+ * @brief Initializes the Communication Manager as a server for wifi battles
+ */
 static void CommTask_StartWifiBattleServer(void)
 {
     if (!WirelessDriver_IsReady()) {
@@ -2365,15 +2721,23 @@ static void CommTask_StartWifiBattleServer(void)
     
     if (CommSys_InitServer(1, 1, 512, 1)) {
         NintendoWFC_Init(sCommMan->saveData, HEAP_ID_NINTENDO_WFC, (0x2B000 + 0x1400), CommLocal_MaxMachines(sCommMan->commType) + 1);
-        NintendoWFC_SetFatalErrorCallback(sub_020389FC);
+        NintendoWFC_SetFatalErrorCallback(NetworkError_DisplayFatalError);
         CommSys_SwitchTransitionTypeToParallel();
-        CommManager_SetTask(CommTask_ConnectWifiBattle, (30 * 60 * 2));
+        CommManager_SetTask(CommTask_ConnectingWifiBattle, (30 * 60 * 2));
     }
 }
 
-void *sub_0203871C(SaveData *saveData, int param1)
+/**
+ * @brief Initializes the Communication Manager and logs in for wifi battles as a server
+ *
+ * @param saveData
+ * @param size
+ *
+ * @return sCommMan->unk_00
+ */
+void *CommManager_LoginWifiBattleServer(SaveData *saveData, int size)
 {
-    TrainerInfo *v0 = SaveData_GetTrainerInfo(saveData);
+    SaveData_GetTrainerInfo(saveData);
     
     if (CommSys_IsInitialized()) {
         return NULL;
@@ -2382,8 +2746,8 @@ void *sub_0203871C(SaveData *saveData, int param1)
     ResetLock(RESET_LOCK_0x1);
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
     CommManager_Initialize(saveData, COMM_TYPE_LOGIN_WIFI);
-    sCommMan->unk_00 = Heap_Alloc(HEAP_ID_COMMUNICATION, param1);
-    MI_CpuFill8(sCommMan->unk_00, 0, param1);
+    sCommMan->unk_00 = Heap_Alloc(HEAP_ID_COMMUNICATION, size);
+    MI_CpuFill8(sCommMan->unk_00, 0, size);
 
     sCommMan->contestRegulation = 0;
     sCommMan->saveData = saveData;
@@ -2470,7 +2834,7 @@ BOOL CommManager_IsWifiLobbyError(void)
 void CommManager_StartWifiP2P(UnkEnum_ov66_02232F38 param0)
 {
     GF_ASSERT(sCommMan);
-    GF_ASSERT(sub_020382C0() == 1);
+    GF_ASSERT(CommManager_IsLoginBattleMatchWifi() == 1);
 
     if (ov66_02233184(param0) == 0) {
         ov66_02232F38(param0, 4);
@@ -2494,6 +2858,11 @@ void CommManager_EndWifiP2P(void)
     CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
 }
 
+/**
+ * @brief Gets the current p2p connection state based on the current task
+ *
+ * @return 0 - none, 1 - wait, 2 - connect, 3 - disconnect
+ */
 u32 CommManager_GetWifiP2PConnectState(void)
 {
     if (sCommMan) {
@@ -2511,16 +2880,27 @@ u32 CommManager_GetWifiP2PConnectState(void)
     return 0;
 }
 
-void *sub_020388E8(void)
+/**
+ * @brief Gets unk_00
+ *
+ * @return sCommMan->unk_00
+ */
+void *CommManager_GetUnk00(void)
 {
     return sCommMan->unk_00;
 }
 
-void CommMan_SetErrorHandling(BOOL errorDisconnect, BOOL param1)
+/**
+ * @brief Sets and handles errors for the Communication Manager
+ *
+ * @param errorDisconnect
+ * @param errorUnknown
+ */
+void CommManager_SetErrorHandling(BOOL errorDisconnect, BOOL errorUnknown)
 {
     if (sCommMan) {
         sCommMan->errorDisconnect = errorDisconnect;
-        sCommMan->unk_50 = param1;
+        sCommMan->errorUnknown_50 = errorUnknown;
 
         if (errorDisconnect) {
             sCommMan->connectedCount = CommSys_ConnectedCount();
@@ -2533,14 +2913,19 @@ void CommMan_SetErrorHandling(BOOL errorDisconnect, BOOL param1)
     sub_02033ED4(errorDisconnect);
 }
 
-BOOL sub_02038938(void)
+/**
+ * @brief Checks if the communication manager has a reported error
+ *
+ * @return TRUE if commError is not COMM_ERROR_NONE, errorUnknown_50 otherwise
+ */
+BOOL CommManager_CheckError(void)
 {
     if (sCommMan) {
-        if (sCommMan->commError != 0) {
+        if (sCommMan->commError != COMM_ERROR_NONE) {
             return TRUE;
         }
 
-        return sCommMan->unk_50;
+        return sCommMan->errorUnknown_50;
     }
 
     return FALSE;
@@ -2574,42 +2959,70 @@ int CommManager_GetContestRegulation(void)
     return 0;
 }
 
-void sub_0203898C(u8 *param0)
+/**
+ * @brief Sets the party species list for battle preview
+ *
+ * @return src
+ */
+void CommManager_SetParty(u8 *src)
 {
-    MI_CpuCopy8(param0, sCommMan->unk_04, NELEMS(sCommMan->unk_04));
+    MI_CpuCopy8(src, sCommMan->party, NELEMS(sCommMan->party));
 }
 
-void sub_020389A0(u8 *param0)
+/**
+ * @brief Gets the party species list for battle preview
+ *
+ * @return dest
+ */
+void CommManager_GetParty(u8 *dest)
 {
-    MI_CpuCopy8(sCommMan->unk_04, param0, NELEMS(sCommMan->unk_04));
+    MI_CpuCopy8(sCommMan->party, dest, NELEMS(sCommMan->party));
 }
 
-BOOL CommMan_IsConnectedToWifi(void)
+/**
+ * @brief Checks if the Communication Manager is connected to the proper wifi group
+ *
+ * @return CommLocal_IsWifiGroup(CommManager_GetCommType())
+ */
+BOOL CommManager_IsConnectedToWifi(void)
 {
     return CommLocal_IsWifiGroup(CommManager_GetCommType());
 }
 
-void sub_020389C4(u8 param0)
+/**
+ * @brief Sets the Communication Manager's resetType
+ *
+ * @param resetType
+ */
+void CommManager_SetResetType(u8 resetType)
 {
     if (sCommMan) {
-        sCommMan->unk_52 = param0;
+        sCommMan->resetType = resetType;
     }
 }
 
-u8 sub_020389D8(void)
+/**
+ * @brief Gets the Communication Manager's resetType
+ *
+ * @return sCommMan->resetType (default 0)
+ */
+u8 CommManager_GetResetType(void)
 {
     if (HeapCanaryOK()) {
         return 0;
     }
 
     if (sCommMan) {
-        return sCommMan->unk_52;
+        return sCommMan->resetType;
     }
 
     return 0;
 }
 
-void sub_020389FC(int param0)
+/**
+ * @brief Displays the Fatal Error screen and halts the game
+ */
+void NetworkError_DisplayFatalError(int param0)
 {
     int i = 0;
 
@@ -2634,28 +3047,39 @@ void NetworkError_DisplayGTSCriticalError(void)
     }
 }
 
-void sub_02038A1C(int param0, BgConfig *param1)
+/**
+ * @brief Deadstripped function. Does nothing when called
+ *
+ * @param unused_int
+ * @param unused_BgConfig
+ */
+void CommManager_deadstripped_02038A1C(int unused_int, BgConfig *bgConfig)
 {
     return;
 }
 
-void sub_02038A20(int param0)
+/**
+ * @brief Checks for a communication error and displays an error message
+ *
+ * @param unused
+ */
+void CommManager_DisplayError(int unused)
 {
-    if (sub_02038938()) {
-        if (CommSys_CheckError() || sub_020383E8() || sub_020385D0()
+    if (CommManager_CheckError()) {
+        if (CommSys_CheckError() || CommManager_CheckWifiError() || CommManager_GetDWCError()
             || (sCommMan->commError != COMM_ERROR_NONE) || CommManager_IsWifiLobbyError()) {
             if (!HeapCanaryOK()) {
-                if (!sub_020389D8()) {
+                if (!CommManager_GetResetType()) {
                     Sound_StopWaveOutAndSequences();
                     SaveData_SaveStateCancel(sCommMan->saveData);
                     gSystem.touchAutoSampling = TRUE;
 
                     if (sCommMan->commError == COMM_ERROR_3) {
-                        sub_020389C4(COMM_ERROR_3);
+                        CommManager_SetResetType(COMM_ERROR_3);
                     } else if ((sCommMan->commType == COMM_TYPE_25) || (sCommMan->commType == COMM_TYPE_MYSTERY_GIFT) || (sCommMan->commType == COMM_TYPE_EMAIL_WIFI)) {
-                        sub_020389C4(COMM_ERROR_RESET_TITLE);
+                        CommManager_SetResetType(COMM_ERROR_RESET_TITLE);
                     } else {
-                        sub_020389C4(COMM_ERROR_RESET_SAVEPOINT);
+                        CommManager_SetResetType(COMM_ERROR_RESET_SAVEPOINT);
                     }
                 }
             }
@@ -2757,11 +3181,11 @@ static void CommTask_StartWifiLobby(void)
 
     if (CommSys_InitServer(1, 1, 512, 1)) {
         NintendoWFC_Init(sCommMan->saveData, HEAP_ID_NINTENDO_WFC, 0x58000, CommLocal_MaxMachines(sCommMan->commType) + 1);
-        NintendoWFC_SetFatalErrorCallback(sub_020389FC);
+        NintendoWFC_SetFatalErrorCallback(NetworkError_DisplayFatalError);
         CommSys_SwitchTransitionTypeToParallel();
         NintendoWFC_SetVoiceChatEnabled(0);
         sub_0203632C(0);
-        CommManager_SetTask(CommTask_ConnectWifiBattle, (30 * 60 * 2));
+        CommManager_SetTask(CommTask_ConnectingWifiBattle, (30 * 60 * 2));
     }
 }
 
@@ -2799,9 +3223,9 @@ static void CommTask_LogInWifiLobby(void)
  */
 static void CommTask_ConnectWifiLobby(void)
 {
-    BOOL v0 = CommManager_UpdateWifiLobbyCommon();
+    BOOL ret = CommManager_UpdateWifiLobbyCommon();
 
-    if (v0 == 0) {
+    if (ret == 0) {
         return;
     }
 }
@@ -2851,12 +3275,12 @@ static BOOL CommManager_ProcessWifiLobbyDWCError(int dwcError)
  */
 static BOOL CommManager_UpdateWifiLobby(void)
 {
-    UnkEnum_ov66_0223287C v0;
+    UnkEnum_ov66_0223287C ret;
     BOOL noError = TRUE;
 
-    v0 = ov66_022325D8(); //Wifi lobby update function
+    ret = ov66_022325D8(); //Wifi lobby update function
 
-    switch (v0) {
+    switch (ret) {
     case UnkEnum_ov66_0223287C_00: //none
     case UnkEnum_ov66_0223287C_01: //login wait
     case UnkEnum_ov66_0223287C_02: //connect
@@ -2879,12 +3303,12 @@ static BOOL CommManager_UpdateWifiLobby(void)
  */
 static BOOL CommManager_UpdateWifiLobbyCommon(void)
 {
-    int v0;
+    int errorCode;
     BOOL ret;
 
-    v0 = NintendoWFC_Process(0);
+    errorCode = NintendoWFC_Process(0);
 
-    ret = CommManager_ProcessWifiLobbyDWCError(v0);
+    ret = CommManager_ProcessWifiLobbyDWCError(errorCode);
 
     if (ret == 0) {
         return ret;
@@ -2966,25 +3390,28 @@ static void CommTask_WifiLobbyError(void)
  */
 static void CommTask_ConnectWifiLobbyP2P(void)
 {
-    BOOL v0;
+    BOOL ret;
     CommManager_UpdateWifiLobbyCommon();
 
-    v0 = ov66_02233164();
+    ret = ov66_02233164();
 
-    if (v0 == 1) {
+    if (ret == 1) {
         ov66_0223361C();
         CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
     }
 }
 
+/**
+ * @brief Task that indicates the server is waiting for a p2p connection for wifi lobby matchmaking. Disconnects if there's an error.
+ */
 static void CommTask_WaitWifiLobbyMatchServerP2P(void)
 {
-    BOOL v0;
+    BOOL ret;
     u32 v1;
 
-    v0 = ov66_02233164();
+    ret = ov66_02233164();
 
-    if (v0 == 1) {
+    if (ret == 1) {
         ov66_0223361C();
         CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
         return;
diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c
index 2a86116a12c..59140120176 100644
--- a/src/unk_0203909C.c
+++ b/src/unk_0203909C.c
@@ -97,7 +97,7 @@ BOOL sub_020391DC(SaveData *saveData, int *param1, enum HeapID heapID)
             sub_02039298(saveData, v0, v2, heapID, 2);
             CommInfo_SavePlayerRecord(saveData);
         } else if (param1[v0] == 1) {
-            if (!CommMan_IsConnectedToWifi()) {
+            if (!CommManager_IsConnectedToWifi()) {
                 sub_02039298(saveData, v0, v2, heapID, 1);
                 MI_CpuCopy8(v4, &v3[v2], sizeof(DWCFriendData));
 
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index db6277799ef..c6086e0d73c 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -967,7 +967,7 @@ BOOL sub_0203DBF0(FieldTask *taskMan)
 
     switch (taskEnv->unk_00) {
     case 0:
-        if (!CommMan_IsConnectedToWifi()) {
+        if (!CommManager_IsConnectedToWifi()) {
             FieldTransition_FinishMap(taskMan);
         }
 
@@ -1011,7 +1011,7 @@ BOOL sub_0203DBF0(FieldTask *taskMan)
             break;
         }
 
-        if (CommMan_IsConnectedToWifi()) {
+        if (CommManager_IsConnectedToWifi()) {
             taskEnv->unk_48.background = TRADE_BACKGROUND_WIFI;
         }
 
@@ -1047,7 +1047,7 @@ BOOL sub_0203DBF0(FieldTask *taskMan)
             GameRecords *gameRecords = SaveData_GetGameRecords(fieldSystem->saveData);
             GameRecords_IncrementTrainerScore(gameRecords, TRAINER_SCORE_EVENT_UNK_16);
 
-            if (CommMan_IsConnectedToWifi()) {
+            if (CommManager_IsConnectedToWifi()) {
                 GameRecords_IncrementRecordValue(gameRecords, RECORD_UNK_113);
             }
         }
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 2f747ae05ba..1517eee96e6 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -392,7 +392,7 @@ static BOOL sub_0205A324(FieldTask *param0)
         }
         break;
     case 21:
-        sub_0203898C(v0->unk_3D);
+        CommManager_SetParty(v0->unk_3D);
 
         if (sub_0205A2DC(v0)) {
             v0->unk_43 = 5;
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index bd1ccb8c2a1..0e338cb9e69 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -255,7 +255,7 @@ static void sub_0205B4F8(UnkStruct_0205B43C *param0)
 
     if (CommSys_IsClientConnecting() && (sub_0205B4D4() == 1) && (v0->unk_1C != 4)) {
         CommInfo_SendPlayerInfo();
-        CommMan_SetErrorHandling(1, 1);
+        CommManager_SetErrorHandling(1, 1);
         sub_0205BEA8(11);
         sub_0205B5B4(param0, sub_0205B578, 0);
     }
@@ -270,7 +270,7 @@ static void sub_0205B4F8(UnkStruct_0205B43C *param0)
 
 static void sub_0205B578(UnkStruct_0205B43C *param0)
 {
-    if (sub_02038938() && (0 == CommSys_IsClientConnecting())) {
+    if (CommManager_CheckError() && (0 == CommSys_IsClientConnecting())) {
         return;
     }
 
@@ -374,7 +374,7 @@ static void sub_0205B6C4(UnkStruct_0205B43C *param0)
             param0->unk_1C = 1;
             param0->unk_44 = 0;
 
-            CommMan_SetErrorHandling(1, 1);
+            CommManager_SetErrorHandling(1, 1);
             sub_0205B5B4(param0, sub_0205B72C, 3);
         }
     } else if (0 == CommManager_IsConnectedUnionClientSuccess()) {
@@ -1016,7 +1016,7 @@ int UnionRoom_GetMessage(UnkStruct_0205B43C *param0, int param1, int msgType, St
     TrainerInfo *trainerInfo = sub_02033FB0(param1);
 
     if (trainerInfo == NULL) {
-        CommMan_SetErrorHandling(1, 1);
+        CommManager_SetErrorHandling(1, 1);
         CommManager_SetCommError(1);
         return 0;
     }
diff --git a/src/unk_0207DFAC.c b/src/unk_0207DFAC.c
index 29ac79d4837..a736fdc58c9 100644
--- a/src/unk_0207DFAC.c
+++ b/src/unk_0207DFAC.c
@@ -11,7 +11,7 @@ BOOL sub_0207DFAC(int param0)
 {
     int v0;
     int v1;
-    UnkStruct_0207DFAC *v2 = sub_020388E8();
+    UnkStruct_0207DFAC *v2 = CommManager_GetUnk00();
 
     v0 = v2->unk_00.unk_1B;
     v1 = v2->unk_24[param0].unk_1B;
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 5700e3fdc5d..341bf055f47 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -318,7 +318,7 @@ void sub_0209612C(int param0, int param1, void *param2, void *param3)
         }
     }
 
-    CommMan_SetErrorHandling(0, 1);
+    CommManager_SetErrorHandling(0, 1);
 }
 
 static void sub_02096170(int param0, int param1, void *param2, void *param3)
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index c33005633fe..90285659391 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -186,7 +186,7 @@ void sub_0209621C(int param0, int param1, void *param2, void *param3)
     ov59_021D1D40(v0);
     ov59_021D2204(v0, 25, param0);
 
-    CommMan_SetErrorHandling(1, 1);
+    CommManager_SetErrorHandling(1, 1);
     Sound_PlayEffect(SEQ_SE_DP_F209);
 }
 
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index 730dfd508d9..57af76f0e41 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -104,7 +104,7 @@ static BOOL sub_0209C280(UnkStruct_0209C1EC *param0)
         if (sub_0209C1E8(param0->unk_28) == 0) {
             param0->unk_00 = 5;
         } else {
-            CommMan_SetErrorHandling(1, 1);
+            CommManager_SetErrorHandling(1, 1);
 
             param0->partyMenu = FieldSystem_OpenPartyMenu_SelectForSpinTrade(param0->fieldSystem, param0->unk_04);
             param0->unk_28->unk_00 = 1;
diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index 5133be84d19..10ddfc91b80 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -669,7 +669,7 @@ static void WirelessManager_FinishStartClient(void *wm_connectcallback)
             WirelessManager_SetState(WIRELESS_STATE_ERROR);
             return;
         } else if (callback->errcode == WM_ERRCODE_FAILED) {
-            if (sub_02038938()) {
+            if (CommManager_CheckError()) {
                 WirelessManager_SetState(WIRELESS_STATE_ERROR);
             } else {
                 WirelessManager_SetState(WIRELESS_STATE_BAD_CONNECTION);

From f61be18fbb7e67e6e66d4f3b1354c14b2ab8f1c8 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 15 May 2026 00:12:06 -0400
Subject: [PATCH 11/39] Rename files to comm_manager

---
 include/{unk_020366A0.h => comm_manager.h}    | 6 +++---
 platinum.us/main.lsf                          | 2 +-
 src/applications/poketch/link_searcher/main.c | 2 +-
 src/battle/battle_lib.c                       | 2 +-
 src/battle/battle_main.c                      | 2 +-
 src/{unk_020366A0.c => comm_manager.c}        | 4 ++--
 src/comm_player_manager.c                     | 2 +-
 src/communication_system.c                    | 2 +-
 src/error_handling.c                          | 2 +-
 src/error_message_reset.c                     | 2 +-
 src/field_battle_data_transfer.c              | 2 +-
 src/field_comm_manager.c                      | 2 +-
 src/heap.c                                    | 2 +-
 src/main.c                                    | 2 +-
 src/main_menu/main_menu.c                     | 2 +-
 src/main_menu/mystery_gift_app.c              | 2 +-
 src/main_menu/ov97_0222D04C.c                 | 2 +-
 src/main_menu/ov97_02238D74.c                 | 2 +-
 src/main_menu/wonder_cards_app.c              | 2 +-
 src/meson.build                               | 2 +-
 src/network_icon.c                            | 2 +-
 src/nintendo_wfc/main.c                       | 2 +-
 src/nintendo_wfc/voice_chat.c                 | 2 +-
 src/overlay005/field_control.c                | 2 +-
 src/overlay005/land_data.c                    | 2 +-
 src/overlay005/save_info_window.c             | 2 +-
 src/overlay007/communication_club.c           | 2 +-
 src/overlay010/ov10_0221F800.c                | 2 +-
 src/overlay017/ov17_0223B140.c                | 2 +-
 src/overlay017/ov17_0223CB1C.c                | 2 +-
 src/overlay017/ov17_0223DAD0.c                | 2 +-
 src/overlay017/ov17_0224F4D4.c                | 2 +-
 src/overlay058/ov58_021D0D80.c                | 2 +-
 src/overlay059/ov59_021D0D80.c                | 2 +-
 src/overlay061/ov61_0222B008.c                | 2 +-
 src/overlay061/ov61_0222BF44.c                | 2 +-
 src/overlay065/ov65_0222DCE0.c                | 2 +-
 src/overlay065/ov65_0223648C.c                | 2 +-
 src/overlay066/ov66_02231428.c                | 2 +-
 src/overlay067/ov67_0225C700.c                | 2 +-
 src/overlay070/ov70_0225D9A4.c                | 2 +-
 src/overlay070/ov70_02265F38.c                | 2 +-
 src/overlay082/ov82_0223B140.c                | 2 +-
 src/overlay083/ov83_0223B5A0.c                | 2 +-
 src/overlay083/ov83_0223D4CC.c                | 2 +-
 src/overlay088/ov88_0223B140.c                | 2 +-
 src/overlay094/screens/network_handler.c      | 2 +-
 src/overlay094/screens/search.c               | 2 +-
 src/overlay094/screens/wfc_init.c             | 2 +-
 src/overlay096/ov96_0223BCE0.c                | 2 +-
 src/overlay098/ov98_022471C8.c                | 2 +-
 src/overlay104/frscrcmd.c                     | 2 +-
 src/overlay109/ov109_021D0D80.c               | 2 +-
 src/overlay109/ov109_021D3D50.c               | 2 +-
 src/overlay114/ov114_0225C700.c               | 2 +-
 src/overlay115/ov115_02260440.c               | 2 +-
 src/overlay116/ov116_022604C4.c               | 2 +-
 src/overlay117/ov117_02260440.c               | 2 +-
 src/overlay117/ov117_02260668.c               | 2 +-
 src/scrcmd.c                                  | 2 +-
 src/start_menu.c                              | 2 +-
 src/underground/comm_manager.c                | 2 +-
 src/underground/manager.c                     | 2 +-
 src/underground/secret_bases.c                | 2 +-
 src/underground/traps.c                       | 2 +-
 src/unk_02032798.c                            | 2 +-
 src/unk_02033200.c                            | 2 +-
 src/unk_0203909C.c                            | 2 +-
 src/unk_0203D1B8.c                            | 2 +-
 src/unk_0205A0D8.c                            | 2 +-
 src/unk_0205B33C.c                            | 2 +-
 src/unk_0205C22C.c                            | 2 +-
 src/unk_0207DFAC.c                            | 2 +-
 src/unk_02095E98.c                            | 2 +-
 src/unk_020961E8.c                            | 2 +-
 src/unk_0209BDF8.c                            | 2 +-
 src/unk_0209C194.c                            | 2 +-
 src/wireless_manager.c                        | 2 +-
 78 files changed, 81 insertions(+), 81 deletions(-)
 rename include/{unk_020366A0.h => comm_manager.h} (97%)
 rename src/{unk_020366A0.c => comm_manager.c} (99%)

diff --git a/include/unk_020366A0.h b/include/comm_manager.h
similarity index 97%
rename from include/unk_020366A0.h
rename to include/comm_manager.h
index da010785d72..d3875cedd7f 100644
--- a/include/unk_020366A0.h
+++ b/include/comm_manager.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_020366A0_H
-#define POKEPLATINUM_UNK_020366A0_H
+#ifndef POKEPLATINUM_COMM_MANAGER_H
+#define POKEPLATINUM_COMM_MANAGER_H
 
 #include "overlay065/struct_ov65_0222F6EC.h"
 
@@ -108,4 +108,4 @@ void CommManager_SetState_SingleBattleWifi(void);
 void CommManager_SetState_FrontierWifi(void);
 BOOL CommManager_IsInitializedNotPoketch(void);
 
-#endif // POKEPLATINUM_UNK_020366A0_H
+#endif // POKEPLATINUM_COMM_MANAGER_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 7bc75311efb..f51d8d5a1fb 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -160,7 +160,7 @@ Static main
 	Object main.nef.p/src_unk_02033200.c.o
 	Object main.nef.p/src_communication_system.c.o
 	Object main.nef.p/src_unk_020363E8.c.o
-	Object main.nef.p/src_unk_020366A0.c.o
+	Object main.nef.p/src_comm_manager.c.o
 	Object main.nef.p/src_unk_02038ED4.c.o
 	Object main.nef.p/src_unk_02038F8C.c.o
 	Object main.nef.p/src_unk_02038FFC.c.o
diff --git a/src/applications/poketch/link_searcher/main.c b/src/applications/poketch/link_searcher/main.c
index 2cfd0bde184..c288ead471e 100644
--- a/src/applications/poketch/link_searcher/main.c
+++ b/src/applications/poketch/link_searcher/main.c
@@ -15,7 +15,7 @@
 #include "sys_task_manager.h"
 #include "touch_screen.h"
 #include "unk_02033200.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #define COMM_STATE_IDLE      0
 #define COMM_STATE_SEARCHING 1
diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c
index 5cedb4d7b30..25b0dc8678a 100644
--- a/src/battle/battle_lib.c
+++ b/src/battle/battle_lib.c
@@ -42,7 +42,7 @@
 #include "string_gf.h"
 #include "trainer_data.h"
 #include "trainer_info.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0208C098.h"
 
 #include "res/battle/scripts/sub_seq.naix"
diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c
index e1ad13010dc..e1b82508ff4 100644
--- a/src/battle/battle_main.c
+++ b/src/battle/battle_main.c
@@ -82,7 +82,7 @@
 #include "unk_0202F1D4.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038F8C.h"
 #include "unk_0207A6DC.h"
 #include "unk_0208C098.h"
diff --git a/src/unk_020366A0.c b/src/comm_manager.c
similarity index 99%
rename from src/unk_020366A0.c
rename to src/comm_manager.c
index 1567fabb0ec..6a2e0dc8465 100644
--- a/src/unk_020366A0.c
+++ b/src/comm_manager.c
@@ -1,4 +1,4 @@
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #include <dwc.h>
 #include <nitro.h>
@@ -66,7 +66,7 @@ typedef struct {
     u8 unk_61[3];
 } CommunicationManager;
 
-static void CommManager_SetTask(CommTaskFunc param0, int param1);
+static void CommManager_SetTask(CommTaskFunc task, int timer);
 static void CommTask_StartUnderground(void);
 static void CommTask_ReinitUndergroundClient(void);
 static void CommTask_ReinitUnderground(void);
diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index 0b4f4e40d18..4fc1a07954b 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -41,7 +41,7 @@
 #include "trainer_info.h"
 #include "tv_segment.h"
 #include "underground.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0205F180.h"
 #include "unk_020655F4.h"
 
diff --git a/src/communication_system.c b/src/communication_system.c
index da7ccded060..fad5b9c8f21 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -24,7 +24,7 @@
 #include "unk_02032798.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "wireless_manager.h"
 
 enum TransmissionType {
diff --git a/src/error_handling.c b/src/error_handling.c
index f0e9423568f..f4b3faffe56 100644
--- a/src/error_handling.c
+++ b/src/error_handling.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "error_message_reset.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 void ErrorHandling_AssertFail(void);
 
diff --git a/src/error_message_reset.c b/src/error_message_reset.c
index 581079c0bfa..e8714cb54a1 100644
--- a/src/error_message_reset.c
+++ b/src/error_message_reset.c
@@ -19,7 +19,7 @@
 #include "string_gf.h"
 #include "system.h"
 #include "text.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 static const GXBanks sErrorMessageBanksConfig = {
     GX_VRAM_BG_256_AB,
diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c
index 801971b6018..7fef4f41c0a 100644
--- a/src/field_battle_data_transfer.c
+++ b/src/field_battle_data_transfer.c
@@ -52,7 +52,7 @@
 #include "trainer_info.h"
 #include "tv_segment.h"
 #include "unk_0203266C.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_020559DC.h"
 #include "vars_flags.h"
 
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 40e5596872a..29670a734fb 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -29,7 +29,7 @@
 #include "underground.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0205A0D8.h"
 #include "unk_02099500.h"
 
diff --git a/src/heap.c b/src/heap.c
index a100b5dd875..e6a6258a8f3 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "error_message_reset.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 typedef struct HeapInfo {
     NNSFndHeapHandle *heapHandles;
diff --git a/src/main.c b/src/main.c
index 86d4db8853e..fbc5caa5bf3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 #include "timer.h"
 #include "touch_pad.h"
 #include "unk_0202419C.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "unk_02039814.h"
 #include "unk_02039A64.h"
diff --git a/src/main_menu/main_menu.c b/src/main_menu/main_menu.c
index 2b0f444951f..8552d2b413d 100644
--- a/src/main_menu/main_menu.c
+++ b/src/main_menu/main_menu.c
@@ -44,7 +44,7 @@
 #include "system_data.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0209A74C.h"
 #include "vram_transfer.h"
 
diff --git a/src/main_menu/mystery_gift_app.c b/src/main_menu/mystery_gift_app.c
index 026dd073142..5f1f5f5df50 100644
--- a/src/main_menu/mystery_gift_app.c
+++ b/src/main_menu/mystery_gift_app.c
@@ -57,7 +57,7 @@
 #include "text.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #include "res/graphics/main_menu/main_menu_graphics.naix"
 #include "res/text/bank/mystery_gift_menu.h"
diff --git a/src/main_menu/ov97_0222D04C.c b/src/main_menu/ov97_0222D04C.c
index 729bb2bbf6f..2f0092dc9bb 100644
--- a/src/main_menu/ov97_0222D04C.c
+++ b/src/main_menu/ov97_0222D04C.c
@@ -18,7 +18,7 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 typedef void (*UnkFuncPtr_ov97_0222D0A4)(void);
 
diff --git a/src/main_menu/ov97_02238D74.c b/src/main_menu/ov97_02238D74.c
index e28eeb682ce..b817e91607f 100644
--- a/src/main_menu/ov97_02238D74.c
+++ b/src/main_menu/ov97_02238D74.c
@@ -14,7 +14,7 @@
 #include "overlay_manager.h"
 #include "system.h"
 #include "unk_02033200.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "wifi_overlays.h"
 
 static BOOL Unk_ov97_02240400;
diff --git a/src/main_menu/wonder_cards_app.c b/src/main_menu/wonder_cards_app.c
index 239f105640e..bc0dc135fbc 100644
--- a/src/main_menu/wonder_cards_app.c
+++ b/src/main_menu/wonder_cards_app.c
@@ -49,7 +49,7 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #include "res/graphics/main_menu/main_menu_graphics.naix"
 #include "res/text/bank/mystery_gift_menu.h"
diff --git a/src/meson.build b/src/meson.build
index e8fc57cc81c..3685f7b9ad5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -149,7 +149,7 @@ pokeplatinum_c = files(
     'unk_02033200.c',
     'communication_system.c',
     'unk_020363E8.c',
-    'unk_020366A0.c',
+    'comm_manager.c',
     'unk_02038ED4.c',
     'unk_02038F8C.c',
     'unk_02038FFC.c',
diff --git a/src/network_icon.c b/src/network_icon.c
index e0760602137..578b27fb8ea 100644
--- a/src/network_icon.c
+++ b/src/network_icon.c
@@ -10,7 +10,7 @@
 #include "sys_task_manager.h"
 #include "system.h"
 #include "unk_02033200.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #define UPPER_SCREEN 1
 #define LOWER_SCREEN 2
diff --git a/src/nintendo_wfc/main.c b/src/nintendo_wfc/main.c
index e1f6162d7ee..bb6bdd046ed 100644
--- a/src/nintendo_wfc/main.c
+++ b/src/nintendo_wfc/main.c
@@ -19,7 +19,7 @@
 #include "heap.h"
 #include "savedata.h"
 #include "unk_0203266C.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "wifi_list.h"
 
 #define RECEIVE_BUFFER_SIZE 4096
diff --git a/src/nintendo_wfc/voice_chat.c b/src/nintendo_wfc/voice_chat.c
index c286b62b919..021b7fd41b7 100644
--- a/src/nintendo_wfc/voice_chat.c
+++ b/src/nintendo_wfc/voice_chat.c
@@ -9,7 +9,7 @@
 
 #include "heap.h"
 #include "unk_0203266C.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #define VOICE_CHAT_BUFFER_SIZE    ((8000 * VCT_AUDIO_FRAME_LENGTH * 2 * 2) / 1000)
 #define FRAME_LENGTH_MICROSECONDS (1000000 / 60)
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index 2982086de35..a67439820f6 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -60,7 +60,7 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "trainer_see.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0203C954.h"
 #include "unk_02054884.h"
 #include "unk_02056B30.h"
diff --git a/src/overlay005/land_data.c b/src/overlay005/land_data.c
index f01c8d6b0fd..284f0c4c160 100644
--- a/src/overlay005/land_data.c
+++ b/src/overlay005/land_data.c
@@ -25,7 +25,7 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #define MAP_LAZY_LOADER_SLOT_COUNT            2
 #define MAP_LAZY_LOADER_MANAGER_COUNT         2
diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c
index 859c68facc2..f3d0da68a69 100644
--- a/src/overlay005/save_info_window.c
+++ b/src/overlay005/save_info_window.c
@@ -25,7 +25,7 @@
 #include "string_gf.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 static void FieldSystem_SaveObjectsAndLocation(FieldSystem *fieldSystem);
 
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index 071dfc5c4de..53e10e18716 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -32,7 +32,7 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #include "res/text/bank/unk_0353.h"
 
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index b4363adad9e..277b2451580 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -53,7 +53,7 @@
 #include "unk_0202419C.h"
 #include "unk_0202F1D4.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0208C098.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c
index 19c44bd0752..fb9563ff3a4 100644
--- a/src/overlay017/ov17_0223B140.c
+++ b/src/overlay017/ov17_0223B140.c
@@ -47,7 +47,7 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_02012744.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c
index 04c7ab322fd..8d172c2ac44 100644
--- a/src/overlay017/ov17_0223CB1C.c
+++ b/src/overlay017/ov17_0223CB1C.c
@@ -39,7 +39,7 @@
 #include "sys_task_manager.h"
 #include "system.h"
 #include "touch_pad.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c
index a0ffbb00bf1..765c42ff9ec 100644
--- a/src/overlay017/ov17_0223DAD0.c
+++ b/src/overlay017/ov17_0223DAD0.c
@@ -48,7 +48,7 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_02012744.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c
index 8aa0af75d09..b9cbda754f8 100644
--- a/src/overlay017/ov17_0224F4D4.c
+++ b/src/overlay017/ov17_0224F4D4.c
@@ -36,7 +36,7 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_02012744.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 5a68a01555e..14b4af9d78e 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -45,7 +45,7 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
 #include "unk_02095E98.h"
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 9a881b58c80..f97bd9381d9 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -50,7 +50,7 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c
index e6827b182e8..388b44c16c7 100644
--- a/src/overlay061/ov61_0222B008.c
+++ b/src/overlay061/ov61_0222B008.c
@@ -34,7 +34,7 @@
 #include "string_template.h"
 #include "system.h"
 #include "unk_0202F1D4.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 typedef int (*UnkFuncPtr_ov61_0222E48C)(UnkStruct_ov62_022349A8 *, UnkStruct_ov61_0222B138 *);
 
diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c
index ff830c6083d..7b41606b761 100644
--- a/src/overlay061/ov61_0222BF44.c
+++ b/src/overlay061/ov61_0222BF44.c
@@ -38,7 +38,7 @@
 #include "system_data.h"
 #include "text.h"
 #include "touch_pad.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index c5b49da80c7..b974b761872 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -80,7 +80,7 @@
 #include "unk_02030CE8.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0203909C.h"
 #include "unk_0207DFAC.h"
 #include "unk_0209C390.h"
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index bfc1821a698..6eac27e8817 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -54,7 +54,7 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0209C390.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay066/ov66_02231428.c b/src/overlay066/ov66_02231428.c
index b210373a301..6bd9b4ac940 100644
--- a/src/overlay066/ov66_02231428.c
+++ b/src/overlay066/ov66_02231428.c
@@ -8,7 +8,7 @@
 #include "overlay066/struct_ov66_02231428.h"
 #include "overlay066/struct_ov66_02231560.h"
 
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_020996D0.h"
 
 void ov66_02231428(UnkStruct_ov66_02231428 *param0, const s64 *param1)
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index 731bd83f503..2f19794ebfb 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -37,7 +37,7 @@
 #include "string_template.h"
 #include "system.h"
 #include "text.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 typedef struct {
     StringTemplate *unk_00;
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index a72f30b89a4..f449a6575d6 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -72,7 +72,7 @@
 #include "trainer_info.h"
 #include "type_icon.h"
 #include "unk_0202419C.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "vram_transfer.h"
 
 typedef struct {
diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c
index 23e6c68c197..0aa95aeaaf9 100644
--- a/src/overlay070/ov70_02265F38.c
+++ b/src/overlay070/ov70_02265F38.c
@@ -25,7 +25,7 @@
 #include "string_gf.h"
 #include "system.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 typedef struct {
     u8 unk_00;
diff --git a/src/overlay082/ov82_0223B140.c b/src/overlay082/ov82_0223B140.c
index c628b988263..96456124d66 100644
--- a/src/overlay082/ov82_0223B140.c
+++ b/src/overlay082/ov82_0223B140.c
@@ -14,7 +14,7 @@
 #include "heap.h"
 #include "overlay_manager.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 BOOL ov82_0223B140(ApplicationManager **appManPtr)
 {
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index 17810e28ca4..55a2ace2a6d 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -38,7 +38,7 @@
 #include "system.h"
 #include "tv_segment.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0203909C.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"
diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c
index 09772669672..90422a85561 100644
--- a/src/overlay083/ov83_0223D4CC.c
+++ b/src/overlay083/ov83_0223D4CC.c
@@ -12,7 +12,7 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "unk_02032798.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 typedef struct {
     BOOL unk_00;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index e3b6ae3f65a..d967498990a 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -72,7 +72,7 @@
 #include "unk_0202D778.h"
 #include "unk_0202F180.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_02038F8C.h"
 #include "unk_0203909C.h"
diff --git a/src/overlay094/screens/network_handler.c b/src/overlay094/screens/network_handler.c
index e2a06e8019c..fb5c4cc5fb4 100644
--- a/src/overlay094/screens/network_handler.c
+++ b/src/overlay094/screens/network_handler.c
@@ -46,7 +46,7 @@
 #include "text.h"
 #include "tv_segment.h"
 #include "unk_0202F180.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038F8C.h"
 #include "unk_02039814.h"
 #include "vars_flags.h"
diff --git a/src/overlay094/screens/search.c b/src/overlay094/screens/search.c
index e7dad4fa066..5897bca114c 100644
--- a/src/overlay094/screens/search.c
+++ b/src/overlay094/screens/search.c
@@ -36,7 +36,7 @@
 #include "string_list.h"
 #include "system.h"
 #include "text.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 #include "res/text/bank/gts.h"
 
diff --git a/src/overlay094/screens/wfc_init.c b/src/overlay094/screens/wfc_init.c
index 5458c76325d..5d8d7cae8e4 100644
--- a/src/overlay094/screens/wfc_init.c
+++ b/src/overlay094/screens/wfc_init.c
@@ -29,7 +29,7 @@
 #include "system_data.h"
 #include "text.h"
 #include "unk_02030CE8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "wifi_list.h"
 
 #include "res/text/bank/gts.h"
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index a1fa2d9c019..7a02c0cd653 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -39,7 +39,7 @@
 #include "text.h"
 #include "unk_0202D05C.h"
 #include "unk_02030CE8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02073700.h"
 
 static void ov96_0223BE38(BgConfig *param0);
diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c
index 0a584f71b16..06f965cb4c0 100644
--- a/src/overlay098/ov98_022471C8.c
+++ b/src/overlay098/ov98_022471C8.c
@@ -45,7 +45,7 @@
 #include "text.h"
 #include "touch_pad.h"
 #include "unk_02030CE8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"
diff --git a/src/overlay104/frscrcmd.c b/src/overlay104/frscrcmd.c
index b5d8251e419..95cca28dc04 100644
--- a/src/overlay104/frscrcmd.c
+++ b/src/overlay104/frscrcmd.c
@@ -85,7 +85,7 @@
 #include "unk_0202F1D4.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0205DFC4.h"
 #include "unk_0209B6F8.h"
 #include "vars_flags.h"
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 06ce7f48037..d6833a58291 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -50,7 +50,7 @@
 #include "trainer_info.h"
 #include "unk_0202419C.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_02092494.h"
 #include "unk_0209BDF8.h"
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index abc70a8ea81..8c253064b4c 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -51,7 +51,7 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
 #include "unk_0209BDF8.h"
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 2b85ca5c9dc..fa7148b1aa3 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -49,7 +49,7 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0203909C.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c
index 3b35387c87f..0ec6ae0c0f0 100644
--- a/src/overlay115/ov115_02260440.c
+++ b/src/overlay115/ov115_02260440.c
@@ -31,7 +31,7 @@
 #include "screen_fade.h"
 #include "system.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "vram_transfer.h"
 
 typedef struct UnkStruct_ov115_0226095C_t {
diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c
index 42c70c74aa6..5f0266bac86 100644
--- a/src/overlay116/ov116_022604C4.c
+++ b/src/overlay116/ov116_022604C4.c
@@ -40,7 +40,7 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "vram_transfer.h"
 
 static void ov116_022612CC(UnkStruct_ov116_0226139C *param0);
diff --git a/src/overlay117/ov117_02260440.c b/src/overlay117/ov117_02260440.c
index 81039f8b385..a53e81a450d 100644
--- a/src/overlay117/ov117_02260440.c
+++ b/src/overlay117/ov117_02260440.c
@@ -16,7 +16,7 @@
 #include "heap.h"
 #include "overlay_manager.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 static const ApplicationManagerTemplate Unk_ov117_022668F8 = {
     ov117_02260668,
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index 2cb0de643cd..b7c0e9e2cbf 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -51,7 +51,7 @@
 #include "unk_02012744.h"
 #include "unk_0202419C.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "vram_transfer.h"
 
 static void ov117_02260DA0(void *param0);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index dca02c9f981..f7c663cb607 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -190,7 +190,7 @@
 #include "unk_0202C9F4.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "unk_0203D1B8.h"
 #include "unk_02048614.h"
diff --git a/src/start_menu.c b/src/start_menu.c
index 3fbe3f4676a..730fbf59800 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -77,7 +77,7 @@
 #include "unk_02014A84.h"
 #include "unk_0202D778.h"
 #include "unk_02033200.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0203D1B8.h"
 #include "unk_020559DC.h"
 #include "unk_0205B33C.h"
diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c
index 92975342e96..9b6abd3062a 100644
--- a/src/underground/comm_manager.c
+++ b/src/underground/comm_manager.c
@@ -24,7 +24,7 @@
 #include "sys_task_manager.h"
 #include "system_flags.h"
 #include "unk_02033200.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "vars_flags.h"
 
 static void CommManUnderground_SetFieldCommManTask(FieldCommTask task, int timer);
diff --git a/src/underground/manager.c b/src/underground/manager.c
index 19bf65c4746..8def708dc62 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -45,7 +45,7 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "underground.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "vars_flags.h"
 #include "wireless_manager.h"
 
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index 9e09b9f4c3b..86f8e92fff4 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -59,7 +59,7 @@
 #include "trainer_info.h"
 #include "underground.h"
 #include "unk_02033200.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0205F180.h"
 #include "unk_020655F4.h"
 #include "vars_flags.h"
diff --git a/src/underground/traps.c b/src/underground/traps.c
index 1476b88e8aa..3865804a766 100644
--- a/src/underground/traps.c
+++ b/src/underground/traps.c
@@ -55,7 +55,7 @@
 #include "trainer_info.h"
 #include "tv_segment.h"
 #include "underground.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "vars_flags.h"
 
 #include "res/graphics/trap_effects/trap_effects.naix"
diff --git a/src/unk_02032798.c b/src/unk_02032798.c
index 6e79319ef32..e9adf011392 100644
--- a/src/unk_02032798.c
+++ b/src/unk_02032798.c
@@ -13,7 +13,7 @@
 #include "communication_system.h"
 #include "heap.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 typedef struct {
     const CommCmdTable *cmdTable;
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index e8621347e0c..bfec76168b0 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -17,7 +17,7 @@
 #include "trainer_info.h"
 #include "unk_02014A84.h"
 #include "unk_0203266C.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "wireless_manager.h"
 
 typedef struct {
diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c
index 59140120176..f39d3e176c4 100644
--- a/src/unk_0203909C.c
+++ b/src/unk_0203909C.c
@@ -11,7 +11,7 @@
 #include "savedata.h"
 #include "string_gf.h"
 #include "trainer_info.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "wifi_list.h"
 
 int sub_0203909C(SaveData *saveData, DWCFriendData *param1, int *param2)
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index c6086e0d73c..a4b827eef8b 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -120,7 +120,7 @@
 #include "unk_020298BC.h"
 #include "unk_0202D05C.h"
 #include "unk_0202D778.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "unk_020559DC.h"
 #include "unk_0205B33C.h"
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 1517eee96e6..8ae103120e4 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -41,7 +41,7 @@
 #include "trainer_info.h"
 #include "unk_0202D778.h"
 #include "unk_020363E8.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0203D1B8.h"
 #include "unk_020655F4.h"
 
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index 0e338cb9e69..cf98bb3dd9a 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -34,7 +34,7 @@
 #include "unk_02014A84.h"
 #include "unk_02014D38.h"
 #include "unk_02033200.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02095E98.h"
 #include "unk_02099500.h"
 
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index 863cc18b1b4..c113e526263 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -33,7 +33,7 @@
 #include "sys_task_manager.h"
 #include "trainer_info.h"
 #include "unk_02014A84.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0205B33C.h"
 #include "unk_020655F4.h"
 
diff --git a/src/unk_0207DFAC.c b/src/unk_0207DFAC.c
index a736fdc58c9..0faa3520131 100644
--- a/src/unk_0207DFAC.c
+++ b/src/unk_0207DFAC.c
@@ -5,7 +5,7 @@
 
 #include "struct_defs/struct_0207DFAC.h"
 
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 BOOL sub_0207DFAC(int param0)
 {
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 341bf055f47..999f5aad092 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -14,7 +14,7 @@
 #include "bg_window.h"
 #include "communication_system.h"
 #include "unk_02032798.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index 90285659391..5388a03ddac 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -14,7 +14,7 @@
 #include "math_util.h"
 #include "sound_playback.h"
 #include "unk_02032798.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 68c6e85c2c4..aa680bb97a2 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -19,7 +19,7 @@
 #include "communication_system.h"
 #include "heap.h"
 #include "unk_02032798.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
 #include "unk_02099500.h"
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index 57af76f0e41..a4b860123ba 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -19,7 +19,7 @@
 #include "heap.h"
 #include "journal.h"
 #include "save_player.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 #include "unk_0203D1B8.h"
 #include "unk_0209BDF8.h"
 
diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index 10ddfc91b80..c1911ec7e41 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -10,7 +10,7 @@
 #include "constants/communication/comm_error.h"
 
 #include "unk_0203266C.h"
-#include "unk_020366A0.h"
+#include "comm_manager.h"
 
 /**
  * @struct WirelessManager

From 5fbbc70fbaf4b9ff209b738e05748c25672810dd Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 15 May 2026 00:18:54 -0400
Subject: [PATCH 12/39] Update parameters, run make format

---
 include/comm_manager.h                        | 50 ++++++++--------
 include/constants/battle.h                    |  2 +-
 include/constants/communication/comm_error.h  | 10 ++--
 include/constants/communication/comm_type.h   | 50 ++++++++--------
 src/applications/poketch/link_searcher/main.c |  2 +-
 src/battle/battle_lib.c                       |  2 +-
 src/battle/battle_main.c                      |  2 +-
 src/comm_manager.c                            | 57 ++++++++++---------
 src/comm_player_manager.c                     |  2 +-
 src/communication_system.c                    |  2 +-
 src/error_handling.c                          |  2 +-
 src/error_message_reset.c                     |  2 +-
 src/field_battle_data_transfer.c              |  2 +-
 src/field_comm_manager.c                      |  2 +-
 src/heap.c                                    |  2 +-
 src/main.c                                    |  2 +-
 src/main_menu/main_menu.c                     |  2 +-
 src/main_menu/mystery_gift_app.c              |  2 +-
 src/main_menu/ov97_0222D04C.c                 |  2 +-
 src/main_menu/ov97_02238D74.c                 |  2 +-
 src/main_menu/wonder_cards_app.c              |  2 +-
 src/network_icon.c                            |  2 +-
 src/nintendo_wfc/main.c                       |  5 +-
 src/nintendo_wfc/voice_chat.c                 |  2 +-
 src/overlay005/field_control.c                |  2 +-
 src/overlay005/land_data.c                    |  2 +-
 src/overlay005/save_info_window.c             |  2 +-
 src/overlay007/communication_club.c           |  2 +-
 src/overlay010/ov10_0221F800.c                |  2 +-
 src/overlay017/ov17_0223B140.c                |  2 +-
 src/overlay017/ov17_0223CB1C.c                |  2 +-
 src/overlay017/ov17_0223DAD0.c                |  2 +-
 src/overlay017/ov17_0224F4D4.c                |  2 +-
 src/overlay058/ov58_021D0D80.c                |  2 +-
 src/overlay059/ov59_021D0D80.c                |  2 +-
 src/overlay061/ov61_0222B008.c                |  2 +-
 src/overlay061/ov61_0222BF44.c                |  2 +-
 src/overlay065/ov65_0222DCE0.c                |  2 +-
 src/overlay065/ov65_0223648C.c                |  2 +-
 src/overlay067/ov67_0225C700.c                |  2 +-
 src/overlay070/ov70_0225D9A4.c                |  2 +-
 src/overlay070/ov70_02265F38.c                |  2 +-
 src/overlay082/ov82_0223B140.c                |  2 +-
 src/overlay083/ov83_0223B5A0.c                |  2 +-
 src/overlay083/ov83_0223D4CC.c                |  2 +-
 src/overlay088/ov88_0223B140.c                |  4 +-
 src/overlay094/screens/network_handler.c      |  2 +-
 src/overlay094/screens/search.c               |  2 +-
 src/overlay094/screens/wfc_init.c             |  2 +-
 src/overlay096/ov96_0223BCE0.c                |  2 +-
 src/overlay098/ov98_022471C8.c                |  2 +-
 src/overlay104/frscrcmd.c                     |  2 +-
 src/overlay109/ov109_021D0D80.c               |  2 +-
 src/overlay109/ov109_021D3D50.c               |  2 +-
 src/overlay114/ov114_0225C700.c               |  2 +-
 src/overlay115/ov115_02260440.c               |  2 +-
 src/overlay116/ov116_022604C4.c               |  2 +-
 src/overlay117/ov117_02260440.c               |  2 +-
 src/overlay117/ov117_02260668.c               |  2 +-
 src/scrcmd.c                                  |  2 +-
 src/start_menu.c                              |  2 +-
 src/underground/comm_manager.c                |  2 +-
 src/underground/manager.c                     |  2 +-
 src/underground/secret_bases.c                |  2 +-
 src/underground/traps.c                       |  2 +-
 src/unk_02032798.c                            |  2 +-
 src/unk_02033200.c                            |  2 +-
 src/unk_0203909C.c                            |  2 +-
 src/unk_0203D1B8.c                            |  2 +-
 src/unk_0205A0D8.c                            |  2 +-
 src/unk_0205B33C.c                            |  2 +-
 src/unk_0205C22C.c                            |  2 +-
 src/unk_02095E98.c                            |  2 +-
 src/unk_020961E8.c                            |  2 +-
 src/unk_0209BDF8.c                            |  2 +-
 src/unk_0209C194.c                            |  2 +-
 src/wireless_manager.c                        |  6 +-
 77 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/include/comm_manager.h b/include/comm_manager.h
index d3875cedd7f..cc101d6644d 100644
--- a/include/comm_manager.h
+++ b/include/comm_manager.h
@@ -12,21 +12,21 @@ BOOL CommMan_IsInitialized(void);
 void CommManager_StartUnderground(SaveData *saveData);
 void CommManager_EndUnderground(void);
 void CommManager_ResetUnderground(void);
-void CommManager_SetPauseUnderground(BOOL param0);
+void CommManager_SetPauseUnderground(BOOL pause);
 void CommManager_ResetUndergroundServer(void);
 BOOL CommManager_IsConnectingUnderground(void);
 void CommManager_CloseSecretBase(void);
 void CommManager_SetDoNotConnectUndergroundFlag(void);
 void CommMan_ReopenSecretBase(void);
-void CommMan_StartBattleServer(SaveData *saveData, int param1, int param2, const BattleRegulation *param3, BOOL param4);
-void CommMan_StartBattleClient(SaveData *saveData, int param1, int param2, const BattleRegulation *param3, BOOL param4);
-void CommManager_ConnectBattleClient(int param0);
+void CommMan_StartBattleServer(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool);
+void CommMan_StartBattleClient(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool);
+void CommManager_ConnectBattleClient(int connectionID);
 void CommManager_ResetBattleClient(void);
 void CommManager_EndBattle(void);
-void WirelessManager_SetEntry2(BOOL param0);
+void WirelessManager_SetEntry2(BOOL entry);
 BOOL CommManager_IsWaitingBattle(void);
 void CommManager_StartUnion(SaveData *saveData);
-void CommManager_ConnectUnion(int param0);
+void CommManager_ConnectUnion(int connectionID);
 int CommManager_IsConnectedUnionClientSuccess(void);
 BOOL CommManager_IsConnectUnionServer(void);
 void CommManager_UnionRestartSearch(void);
@@ -36,19 +36,19 @@ void CommManager_PauseUnionClient(void);
 void CommManager_PauseUnionServer(void);
 void CommManager_SetState_UnionApp(void);
 void CommManager_SetState_Union(void);
-void CommManager_StartRandomBattleServer(SaveData *saveData, int param1);
-void CommManager_StartRandomBattleClient(SaveData *saveData, int param1);
+void CommManager_StartRandomBattleServer(SaveData *saveData, int commType);
+void CommManager_StartRandomBattleClient(SaveData *saveData, int commType);
 void CommManager_Update(void);
 void CommManager_StartDrawServer(void);
-void CommManager_StartDrawClient(int param0);
+void CommManager_StartDrawClient(int connectionID);
 void CommManager_SetState_MixRecords(void);
-void CommManager_StartMixRecordsClient(int param0);
+void CommManager_StartMixRecordsClient(int connectionID);
 void CommManager_SetState_SpinTrade(void);
-void CommManager_StartSpinTradeClient(int param0);
-void CommManager_ValidateConfirmationMessage(int param0, int param1, void *param2, void *param3);
-void CommManager_ValidateConfirmationResponseMessage(int param0, int param1, void *param2, void *param3);
+void CommManager_StartSpinTradeClient(int connectionID);
+void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *confirmationMessage, void *unused_3);
+void CommManager_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *confirmationMessage, void *unused_3);
 int CommManager_ConfirmationMessage_sizeof(void);
-void CommManager_SetMaxNumConnections(int param0);
+void CommManager_SetMaxNumConnections(int maxNumConnection);
 void CommManager_InitializePoketchLinkSearch(SaveData *saveData);
 void CommManager_EndPoketchLinkSearch(void);
 BOOL CommManager_IsPoketchSearching(void);
@@ -56,10 +56,10 @@ void CommManager_InitializeSearchParty(SaveData *saveData);
 void CommManager_EndSearchParty(void);
 u8 CommManager_GetUnk54(void);
 BOOL CommManager_ExitOrReset(void);
-void CommManager_SetUnk34(int param0, int param1, int param2);
-int CommManager_StartWifiBattle(int param0);
+void CommManager_SetUnk34(int errorCode, int errorType, int error);
+int CommManager_StartWifiBattle(int target);
 int CommManager_GetMatchmakingState();
-void CommManager_DisconnectWifi(int param0, int param1, void *param2, void *param3);
+void CommManager_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3);
 BOOL CommManager_GetDisconnectedWifi(void);
 BOOL CommManager_IsLoginBattleWifi(void);
 BOOL CommManager_IsLoginBattleMatchWifi(void);
@@ -76,7 +76,7 @@ void CommManager_EndMysteryGiftWifi(void);
 void CommManager_StartWifiMail(SaveData *saveData);
 void CommManager_EndWifiMail(void);
 BOOL CommManager_GetDWCError(void);
-void *CommManager_LoginWifiBattleServer(SaveData *saveData, int param1);
+void *CommManager_LoginWifiBattleServer(SaveData *saveData, int size);
 void CommManager_LoginWifiLobby(SaveData *saveData, const void *param1);
 void CommManager_LogoutWifiLobby(void);
 BOOL CommManager_GetWifiLobbyLoginSuccess(void);
@@ -85,21 +85,21 @@ void CommManager_StartWifiP2P(UnkEnum_ov66_02232F38 param0);
 void CommManager_EndWifiP2P(void);
 u32 CommManager_GetWifiP2PConnectState(void);
 void *CommManager_GetUnk00(void);
-void CommManager_SetErrorHandling(BOOL param0, BOOL param1);
+void CommManager_SetErrorHandling(BOOL errorDisconnect, BOOL errorUnknown);
 BOOL CommManager_CheckError(void);
 int CommManager_GetCommType(void);
 int CommManager_GetContestRegulation(void);
-void CommManager_SetParty(u8 *param0);
-void CommManager_GetParty(u8 *param0);
+void CommManager_SetParty(u8 *src);
+void CommManager_GetParty(u8 *dest);
 BOOL CommManager_IsConnectedToWifi(void);
-void CommManager_SetResetType(u8 param0);
+void CommManager_SetResetType(u8 resetType);
 u8 CommManager_GetResetType(void);
 void NetworkError_DisplayFatalError(int param0);
 void NetworkError_DisplayGTSCriticalError(void);
-void CommManager_deadstripped_02038A1C(int param0, BgConfig *param1);
-void CommManager_DisplayError(int param0);
+void CommManager_deadstripped_02038A1C(int unused_0, BgConfig *bgConfig);
+void CommManager_DisplayError(int unused);
 BOOL CommManager_CheckResetFinished(void);
-BOOL CommManager_SetCommError(int param0);
+BOOL CommManager_SetCommError(int error);
 void CommManager_SetState_WifiPoffin(void);
 void CommManager_SetState_WifiClub(void);
 void CommManager_SetState_WifiLobby(void);
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 565d2fcda5e..9212819ba2c 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -137,7 +137,7 @@
 #define STRUGGLING_MOVE_4 (1 << 3)
 #define STRUGGLING_ALL    (STRUGGLING_MOVE_1 | STRUGGLING_MOVE_2 | STRUGGLING_MOVE_3 | STRUGGLING_MOVE_4)
 
-#define LINK_BATTLE_TIMEOUT         (60 * 30)
+#define LINK_BATTLE_TIMEOUT (60 * 30)
 
 #define PAYDAY_MAX       0xFFFF
 #define NUM_SCREEN_TURNS 5
diff --git a/include/constants/communication/comm_error.h b/include/constants/communication/comm_error.h
index 2c5537d6eae..a65c6c518b3 100644
--- a/include/constants/communication/comm_error.h
+++ b/include/constants/communication/comm_error.h
@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_CONSTANTS_COMM_PACKETS_H
 #define POKEPLATINUM_CONSTANTS_COMM_PACKETS_H
 
-#define COMM_ERROR_NONE 0
+#define COMM_ERROR_NONE            0
 #define COMM_ERROR_RESET_SAVEPOINT 1
-#define COMM_ERROR_RESET_TITLE 2
-#define COMM_ERROR_3 3
-#define COMM_ERROR_4 4
+#define COMM_ERROR_RESET_TITLE     2
+#define COMM_ERROR_3               3
+#define COMM_ERROR_4               4
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/constants/communication/comm_type.h b/include/constants/communication/comm_type.h
index e7528fc11bb..0f40b3415ac 100644
--- a/include/constants/communication/comm_type.h
+++ b/include/constants/communication/comm_type.h
@@ -1,37 +1,37 @@
 #ifndef POKEPLATINUM_CONSTANTS_COMM_TYPE_H
 #define POKEPLATINUM_CONSTANTS_COMM_TYPE_H
 
-#define COMM_TYPE_TRADE          0
-#define COMM_TYPE_SINGLE_BATTLE  1
-#define COMM_TYPE_DOUBLE_BATTLE  2
-#define COMM_TYPE_MIX_BATTLE     3
-#define COMM_TYPE_MULTI_BATTLE_1 4
-#define COMM_TYPE_MULTI_BATTLE_2 5
-#define COMM_TYPE_POFFIN_MAKING  6
-#define COMM_TYPE_MIX_RECORDS    7
-#define COMM_TYPE_CONTEST        8
-#define COMM_TYPE_UNION          9
-#define COMM_TYPE_UNDERGROUND   10
-#define COMM_TYPE_11            11
-#define COMM_TYPE_12            12
-#define COMM_TYPE_DRAW            13
-#define COMM_TYPE_POKETCH            14
-#define COMM_TYPE_MYSTERY_GIFT  15
-#define COMM_TYPE_MULTI_BATTLE_FRONTIER  16
-#define COMM_TYPE_PARTY  17
-#define COMM_TYPE_UNION_APP  18
-#define COMM_TYPE_SINGLE_BATTLE_WIFI  19
+#define COMM_TYPE_TRADE                 0
+#define COMM_TYPE_SINGLE_BATTLE         1
+#define COMM_TYPE_DOUBLE_BATTLE         2
+#define COMM_TYPE_MIX_BATTLE            3
+#define COMM_TYPE_MULTI_BATTLE_1        4
+#define COMM_TYPE_MULTI_BATTLE_2        5
+#define COMM_TYPE_POFFIN_MAKING         6
+#define COMM_TYPE_MIX_RECORDS           7
+#define COMM_TYPE_CONTEST               8
+#define COMM_TYPE_UNION                 9
+#define COMM_TYPE_UNDERGROUND           10
+#define COMM_TYPE_11                    11
+#define COMM_TYPE_12                    12
+#define COMM_TYPE_DRAW                  13
+#define COMM_TYPE_POKETCH               14
+#define COMM_TYPE_MYSTERY_GIFT          15
+#define COMM_TYPE_MULTI_BATTLE_FRONTIER 16
+#define COMM_TYPE_PARTY                 17
+#define COMM_TYPE_UNION_APP             18
+#define COMM_TYPE_SINGLE_BATTLE_WIFI    19
 
 #define COMM_TYPE_LOGIN_WIFI 23
-#define COMM_TYPE_24 24
-#define COMM_TYPE_25 25
+#define COMM_TYPE_24         24
+#define COMM_TYPE_25         25
 #define COMM_TYPE_SPIN_TRADE 26
 
 #define COMM_TYPE_POFFIN_WIFI 29
 
-#define COMM_TYPE_LOBBY_WIFI 33
+#define COMM_TYPE_LOBBY_WIFI    33
 #define COMM_TYPE_FRONTIER_WIFI 34
-#define COMM_TYPE_CLUB_WIFI 35
-#define COMM_TYPE_EMAIL_WIFI 36
+#define COMM_TYPE_CLUB_WIFI     35
+#define COMM_TYPE_EMAIL_WIFI    36
 
 #endif
diff --git a/src/applications/poketch/link_searcher/main.c b/src/applications/poketch/link_searcher/main.c
index c288ead471e..1b03ed560ca 100644
--- a/src/applications/poketch/link_searcher/main.c
+++ b/src/applications/poketch/link_searcher/main.c
@@ -8,6 +8,7 @@
 #include "field/field_system.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "map_header.h"
@@ -15,7 +16,6 @@
 #include "sys_task_manager.h"
 #include "touch_screen.h"
 #include "unk_02033200.h"
-#include "comm_manager.h"
 
 #define COMM_STATE_IDLE      0
 #define COMM_STATE_SEARCHING 1
diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c
index 25b0dc8678a..b62312596e8 100644
--- a/src/battle/battle_lib.c
+++ b/src/battle/battle_lib.c
@@ -30,6 +30,7 @@
 #include "battle/common.h"
 
 #include "charcode_util.h"
+#include "comm_manager.h"
 #include "flags.h"
 #include "heap.h"
 #include "item.h"
@@ -42,7 +43,6 @@
 #include "string_gf.h"
 #include "trainer_data.h"
 #include "trainer_info.h"
-#include "comm_manager.h"
 #include "unk_0208C098.h"
 
 #include "res/battle/scripts/sub_seq.naix"
diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c
index e1b82508ff4..96ec90b022b 100644
--- a/src/battle/battle_main.c
+++ b/src/battle/battle_main.c
@@ -37,6 +37,7 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "cell_transfer.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "evolution.h"
 #include "field_battle_data_transfer.h"
@@ -82,7 +83,6 @@
 #include "unk_0202F1D4.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_02038F8C.h"
 #include "unk_0207A6DC.h"
 #include "unk_0208C098.h"
diff --git a/src/comm_manager.c b/src/comm_manager.c
index 6a2e0dc8465..0bd85771174 100644
--- a/src/comm_manager.c
+++ b/src/comm_manager.c
@@ -4,8 +4,9 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "constants/communication/comm_type.h"
 #include "constants/communication/comm_error.h"
+#include "constants/communication/comm_type.h"
+
 #include "nintendo_wfc/main.h"
 #include "overlay065/struct_ov65_0222F6EC.h"
 #include "overlay066/ov66_022324F0.h"
@@ -55,7 +56,7 @@ typedef struct {
     u8 resetType;
     u8 pauseUnion;
     u8 unk_54;
-    u8 initializeAsServer; //always FALSE
+    u8 initializeAsServer; // always FALSE
     u8 unk_56;
     u8 doNotConnectUnderground;
     u8 disconnectedWifi;
@@ -494,7 +495,7 @@ void CommManager_ConnectUnion(int connectionID)
 int CommManager_IsConnectedUnionClientSuccess(void)
 {
     u32 task;
-    
+
     if (sCommMan == NULL) {
         return -1;
     }
@@ -515,12 +516,12 @@ int CommManager_IsConnectedUnionClientSuccess(void)
 /**
  * @brief Checks if the current CommManager task is the union server connect task
  *
- * @return TRUE if the task is CommTask_ConnectUnionServer, FALSE otherwise or if sCommMan isn't initialized or the current task 
+ * @return TRUE if the task is CommTask_ConnectUnionServer, FALSE otherwise or if sCommMan isn't initialized or the current task
  */
 BOOL CommManager_IsConnectUnionServer(void)
 {
     u32 task;
-    
+
     if (sCommMan == NULL) {
         return FALSE;
     }
@@ -1162,7 +1163,7 @@ static void CommTask_WaitBattleClient(void)
 
 /**
  * @brief Attempts to retry the connection for the battle client
- */ 
+ */
 static void CommTask_RetryBattleClient(void)
 {
     sub_020336D4();
@@ -1346,7 +1347,7 @@ static void CommTask_InitializeServerUnion(void)
 static void CommTask_WaitUnionServer(void)
 {
     if (sub_02034148()) {
-        
+
     } else {
         if (CommSys_IsClientConnecting()) {
             sCommMan->unk_4E = 1;
@@ -1604,7 +1605,7 @@ void CommManager_SetState_MixRecords(void)
 }
 
 /**
- * @brief Initializes the Communication Manager to Mix Records as a client 
+ * @brief Initializes the Communication Manager to Mix Records as a client
  *
  * @param connectionID
  */
@@ -1627,7 +1628,7 @@ void CommManager_SetState_SpinTrade(void)
 }
 
 /**
- * @brief Initializes the Communication Manager for Spin Trade as a client 
+ * @brief Initializes the Communication Manager for Spin Trade as a client
  *
  * @param connectionID
  */
@@ -1774,7 +1775,7 @@ void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg,
 }
 
 /**
- * @brief Validates a confirmation response message that should be "[netID]GAME" or "[netID]FULL" to ensure communication has been established. 
+ * @brief Validates a confirmation response message that should be "[netID]GAME" or "[netID]FULL" to ensure communication has been established.
  *
  * @param unused_0
  * @param unused_1
@@ -2096,7 +2097,7 @@ static void CommTask_WifiBattleError(void)
 }
 
 /**
- * @brief Task that indicates there was an timeout during a wifi battle. 
+ * @brief Task that indicates there was an timeout during a wifi battle.
  */
 static void CommTask_WifiBattleTimeout(void)
 {
@@ -2104,11 +2105,11 @@ static void CommTask_WifiBattleTimeout(void)
 
     if (ret < 0) {
         CommManager_SetTask(CommTask_WifiBattleError, 0);
-    } 
+    }
 }
 
 /**
- * @brief Task that indicates there was a disconnect during a wifi battle. 
+ * @brief Task that indicates there was a disconnect during a wifi battle.
  */
 static void CommTask_DisconnectWifiBattle(void)
 {
@@ -2116,7 +2117,7 @@ static void CommTask_DisconnectWifiBattle(void)
 }
 
 /**
- * @brief Task that indicates there was a failure during a wifi battle. 
+ * @brief Task that indicates there was a failure during a wifi battle.
  */
 static void CommTask_WifiBattleFailed(void)
 {
@@ -2361,7 +2362,7 @@ static void CommTask_EndMatchmakingWifi(void)
 /**
  * @brief Ends wifi matchmaking and sets the disconnected from wifi flag. Params unused
  */
-void CommManager_DisconnectWifi(int param0, int param1, void *param2, void *param3)
+void CommManager_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3)
 {
     if (CommSys_CurNetId() == 0) {
         sCommMan->unk_4C = 0;
@@ -2475,7 +2476,7 @@ void CommManager_LogoutWifi(void)
 }
 
 /**
- * @brief Ends wifi matchmaking 
+ * @brief Ends wifi matchmaking
  */
 void CommManager_EndWifiMatch(void)
 {
@@ -2716,9 +2717,9 @@ static void CommTask_StartWifiBattleServer(void)
     if (!WirelessDriver_IsReady()) {
         return;
     }
-    
+
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, (0x2A000 + 0xA000 + 0x1400));
-    
+
     if (CommSys_InitServer(1, 1, 512, 1)) {
         NintendoWFC_Init(sCommMan->saveData, HEAP_ID_NINTENDO_WFC, (0x2B000 + 0x1400), CommLocal_MaxMachines(sCommMan->commType) + 1);
         NintendoWFC_SetFatalErrorCallback(NetworkError_DisplayFatalError);
@@ -2738,7 +2739,7 @@ static void CommTask_StartWifiBattleServer(void)
 void *CommManager_LoginWifiBattleServer(SaveData *saveData, int size)
 {
     SaveData_GetTrainerInfo(saveData);
-    
+
     if (CommSys_IsInitialized()) {
         return NULL;
     }
@@ -2758,7 +2759,7 @@ void *CommManager_LoginWifiBattleServer(SaveData *saveData, int size)
 }
 
 /**
- * @brief Initializes the Communication Manager for the Wifi Lobby 
+ * @brief Initializes the Communication Manager for the Wifi Lobby
  *
  * @param saveData
  * @param param1
@@ -3110,7 +3111,7 @@ BOOL CommManager_CheckResetFinished(void)
  *
  * @param error
  *
- * @return TRUE if sCommMan is initialized 
+ * @return TRUE if sCommMan is initialized
  */
 BOOL CommManager_SetCommError(int error)
 {
@@ -3189,7 +3190,7 @@ static void CommTask_StartWifiLobby(void)
     }
 }
 
-/** 
+/**
  * @brief Task while logging in to the wifi lobby, errors if timed out
  */
 static void CommTask_LogInWifiLobby(void)
@@ -3278,16 +3279,16 @@ static BOOL CommManager_UpdateWifiLobby(void)
     UnkEnum_ov66_0223287C ret;
     BOOL noError = TRUE;
 
-    ret = ov66_022325D8(); //Wifi lobby update function
+    ret = ov66_022325D8(); // Wifi lobby update function
 
     switch (ret) {
-    case UnkEnum_ov66_0223287C_00: //none
-    case UnkEnum_ov66_0223287C_01: //login wait
-    case UnkEnum_ov66_0223287C_02: //connect
-    case UnkEnum_ov66_0223287C_03: //logout wait
+    case UnkEnum_ov66_0223287C_00: // none
+    case UnkEnum_ov66_0223287C_01: // login wait
+    case UnkEnum_ov66_0223287C_02: // connect
+    case UnkEnum_ov66_0223287C_03: // logout wait
         break;
 
-    case UnkEnum_ov66_0223287C_04: //error
+    case UnkEnum_ov66_0223287C_04: // error
         CommManager_SetTask(CommTask_WifiLobbyError, 0);
         noError = FALSE;
         break;
diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index 4fc1a07954b..706685dd27d 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -24,6 +24,7 @@
 #include "underground/secret_bases.h"
 #include "underground/traps.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "field_system.h"
@@ -41,7 +42,6 @@
 #include "trainer_info.h"
 #include "tv_segment.h"
 #include "underground.h"
-#include "comm_manager.h"
 #include "unk_0205F180.h"
 #include "unk_020655F4.h"
 
diff --git a/src/communication_system.c b/src/communication_system.c
index fad5b9c8f21..34746b65d6c 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -12,6 +12,7 @@
 
 #include "nintendo_wfc/main.h"
 
+#include "comm_manager.h"
 #include "comm_ring.h"
 #include "communication_information.h"
 #include "heap.h"
@@ -24,7 +25,6 @@
 #include "unk_02032798.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "wireless_manager.h"
 
 enum TransmissionType {
diff --git a/src/error_handling.c b/src/error_handling.c
index f4b3faffe56..cf929623dfe 100644
--- a/src/error_handling.c
+++ b/src/error_handling.c
@@ -3,8 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "error_message_reset.h"
 #include "comm_manager.h"
+#include "error_message_reset.h"
 
 void ErrorHandling_AssertFail(void);
 
diff --git a/src/error_message_reset.c b/src/error_message_reset.c
index e8714cb54a1..20d6edf273c 100644
--- a/src/error_message_reset.c
+++ b/src/error_message_reset.c
@@ -7,6 +7,7 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "font.h"
 #include "graphics.h"
@@ -19,7 +20,6 @@
 #include "string_gf.h"
 #include "system.h"
 #include "text.h"
-#include "comm_manager.h"
 
 static const GXBanks sErrorMessageBanksConfig = {
     GX_VRAM_BG_256_AB,
diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c
index 7fef4f41c0a..f5dc930e9f3 100644
--- a/src/field_battle_data_transfer.c
+++ b/src/field_battle_data_transfer.c
@@ -25,6 +25,7 @@
 #include "battle_regulation.h"
 #include "charcode_util.h"
 #include "chatot_cry.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "field_overworld_state.h"
 #include "game_options.h"
@@ -52,7 +53,6 @@
 #include "trainer_info.h"
 #include "tv_segment.h"
 #include "unk_0203266C.h"
-#include "comm_manager.h"
 #include "unk_020559DC.h"
 #include "vars_flags.h"
 
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 29670a734fb..f1bb6f320cd 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -12,6 +12,7 @@
 #include "underground/manager.h"
 
 #include "appearance.h"
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -29,7 +30,6 @@
 #include "underground.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0205A0D8.h"
 #include "unk_02099500.h"
 
diff --git a/src/heap.c b/src/heap.c
index e6a6258a8f3..e980cb05ca1 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -3,8 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "error_message_reset.h"
 #include "comm_manager.h"
+#include "error_message_reset.h"
 
 typedef struct HeapInfo {
     NNSFndHeapHandle *heapHandles;
diff --git a/src/main.c b/src/main.c
index fbc5caa5bf3..bbe1f1e92ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,6 +8,7 @@
 #include "assert.h"
 #include "brightness_controller.h"
 #include "chatot_cry.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "font.h"
 #include "game_overlay.h"
@@ -26,7 +27,6 @@
 #include "timer.h"
 #include "touch_pad.h"
 #include "unk_0202419C.h"
-#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "unk_02039814.h"
 #include "unk_02039A64.h"
diff --git a/src/main_menu/main_menu.c b/src/main_menu/main_menu.c
index 8552d2b413d..149481a6fd9 100644
--- a/src/main_menu/main_menu.c
+++ b/src/main_menu/main_menu.c
@@ -17,6 +17,7 @@
 
 #include "bg_window.h"
 #include "boot.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_start.h"
 #include "graphics.h"
@@ -44,7 +45,6 @@
 #include "system_data.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "comm_manager.h"
 #include "unk_0209A74C.h"
 #include "vram_transfer.h"
 
diff --git a/src/main_menu/mystery_gift_app.c b/src/main_menu/mystery_gift_app.c
index 5f1f5f5df50..7a6ed7502b9 100644
--- a/src/main_menu/mystery_gift_app.c
+++ b/src/main_menu/mystery_gift_app.c
@@ -21,6 +21,7 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "font.h"
 #include "game_options.h"
@@ -57,7 +58,6 @@
 #include "text.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 #include "res/graphics/main_menu/main_menu_graphics.naix"
 #include "res/text/bank/mystery_gift_menu.h"
diff --git a/src/main_menu/ov97_0222D04C.c b/src/main_menu/ov97_0222D04C.c
index 2f0092dc9bb..f9ee973faae 100644
--- a/src/main_menu/ov97_0222D04C.c
+++ b/src/main_menu/ov97_0222D04C.c
@@ -6,6 +6,7 @@
 #include "main_menu/mystery_gift_app.h"
 #include "main_menu/ov97_0222D2F8.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
@@ -18,7 +19,6 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 typedef void (*UnkFuncPtr_ov97_0222D0A4)(void);
 
diff --git a/src/main_menu/ov97_02238D74.c b/src/main_menu/ov97_02238D74.c
index b817e91607f..6d94c9ed5c3 100644
--- a/src/main_menu/ov97_02238D74.c
+++ b/src/main_menu/ov97_02238D74.c
@@ -9,12 +9,12 @@
 #include "main_menu/mystery_gift_app.h"
 #include "nintendo_wfc/main.h"
 
+#include "comm_manager.h"
 #include "heap.h"
 #include "network_icon.h"
 #include "overlay_manager.h"
 #include "system.h"
 #include "unk_02033200.h"
-#include "comm_manager.h"
 #include "wifi_overlays.h"
 
 static BOOL Unk_ov97_02240400;
diff --git a/src/main_menu/wonder_cards_app.c b/src/main_menu/wonder_cards_app.c
index bc0dc135fbc..6cf638c42fa 100644
--- a/src/main_menu/wonder_cards_app.c
+++ b/src/main_menu/wonder_cards_app.c
@@ -15,6 +15,7 @@
 
 #include "bg_window.h"
 #include "buffer_manager.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -49,7 +50,6 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 #include "res/graphics/main_menu/main_menu_graphics.naix"
 #include "res/text/bank/mystery_gift_menu.h"
diff --git a/src/network_icon.c b/src/network_icon.c
index 578b27fb8ea..caea8a317d5 100644
--- a/src/network_icon.c
+++ b/src/network_icon.c
@@ -4,13 +4,13 @@
 
 #include "constants/graphics.h"
 
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system.h"
 #include "unk_02033200.h"
-#include "comm_manager.h"
 
 #define UPPER_SCREEN 1
 #define LOWER_SCREEN 2
diff --git a/src/nintendo_wfc/main.c b/src/nintendo_wfc/main.c
index bb6bdd046ed..9a91e105556 100644
--- a/src/nintendo_wfc/main.c
+++ b/src/nintendo_wfc/main.c
@@ -6,20 +6,19 @@
 #include <string.h>
 #include <vct.h>
 
+#include "constants/communication/comm_error.h"
 #include "constants/net.h"
 
 #include "global/assert.h"
 #include "nintendo_wfc/voice_chat.h"
 
-#include "constants/communication/comm_error.h"
-
 #include "battle_frontier_stats.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "dwc_error.h"
 #include "heap.h"
 #include "savedata.h"
 #include "unk_0203266C.h"
-#include "comm_manager.h"
 #include "wifi_list.h"
 
 #define RECEIVE_BUFFER_SIZE 4096
diff --git a/src/nintendo_wfc/voice_chat.c b/src/nintendo_wfc/voice_chat.c
index 021b7fd41b7..1c5b3ead58c 100644
--- a/src/nintendo_wfc/voice_chat.c
+++ b/src/nintendo_wfc/voice_chat.c
@@ -7,9 +7,9 @@
 
 #include "nintendo_wfc/main.h"
 
+#include "comm_manager.h"
 #include "heap.h"
 #include "unk_0203266C.h"
-#include "comm_manager.h"
 
 #define VOICE_CHAT_BUFFER_SIZE    ((8000 * VCT_AUDIO_FRAME_LENGTH * 2 * 2) / 1000)
 #define FRAME_LENGTH_MICROSECONDS (1000000 / 60)
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index a67439820f6..a394c62965b 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -29,6 +29,7 @@
 #include "underground/manager.h"
 
 #include "catching_show.h"
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -60,7 +61,6 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "trainer_see.h"
-#include "comm_manager.h"
 #include "unk_0203C954.h"
 #include "unk_02054884.h"
 #include "unk_02056B30.h"
diff --git a/src/overlay005/land_data.c b/src/overlay005/land_data.c
index 284f0c4c160..e2f9db1626e 100644
--- a/src/overlay005/land_data.c
+++ b/src/overlay005/land_data.c
@@ -18,6 +18,7 @@
 #include "overlay005/map_prop_animation.h"
 #include "overlay005/model_attributes.h"
 
+#include "comm_manager.h"
 #include "easy3d.h"
 #include "heap.h"
 #include "map_matrix.h"
@@ -25,7 +26,6 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system.h"
-#include "comm_manager.h"
 
 #define MAP_LAZY_LOADER_SLOT_COUNT            2
 #define MAP_LAZY_LOADER_MANAGER_COUNT         2
diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c
index f3d0da68a69..737a1adfead 100644
--- a/src/overlay005/save_info_window.c
+++ b/src/overlay005/save_info_window.c
@@ -12,6 +12,7 @@
 #include "overlay005/save_info_window.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "field_overworld_state.h"
 #include "font.h"
 #include "location.h"
@@ -25,7 +26,6 @@
 #include "string_gf.h"
 #include "text.h"
 #include "trainer_info.h"
-#include "comm_manager.h"
 
 static void FieldSystem_SaveObjectsAndLocation(FieldSystem *fieldSystem);
 
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index 53e10e18716..a03f1cac909 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -9,6 +9,7 @@
 #include "field/field_system.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "field_comm_manager.h"
@@ -32,7 +33,6 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 #include "res/text/bank/unk_0353.h"
 
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index 277b2451580..bda5d6e53b3 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -14,6 +14,7 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "camera.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -53,7 +54,6 @@
 #include "unk_0202419C.h"
 #include "unk_0202F1D4.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0208C098.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c
index fb9563ff3a4..df37ca3e943 100644
--- a/src/overlay017/ov17_0223B140.c
+++ b/src/overlay017/ov17_0223B140.c
@@ -21,6 +21,7 @@
 #include "overlay017/struct_ov17_02246F24.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "contest.h"
 #include "font.h"
 #include "game_overlay.h"
@@ -47,7 +48,6 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_02012744.h"
-#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c
index 8d172c2ac44..7eabacc4f5a 100644
--- a/src/overlay017/ov17_0223CB1C.c
+++ b/src/overlay017/ov17_0223CB1C.c
@@ -13,6 +13,7 @@
 #include "overlay022/ov22_0225AF8C.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "contest.h"
 #include "font.h"
 #include "game_options.h"
@@ -39,7 +40,6 @@
 #include "sys_task_manager.h"
 #include "system.h"
 #include "touch_pad.h"
-#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c
index 765c42ff9ec..16f4b40f055 100644
--- a/src/overlay017/ov17_0223DAD0.c
+++ b/src/overlay017/ov17_0223DAD0.c
@@ -20,6 +20,7 @@
 
 #include "bg_window.h"
 #include "camera.h"
+#include "comm_manager.h"
 #include "contest.h"
 #include "font.h"
 #include "game_options.h"
@@ -48,7 +49,6 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_02012744.h"
-#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c
index b9cbda754f8..0c37fb6bfb4 100644
--- a/src/overlay017/ov17_0224F4D4.c
+++ b/src/overlay017/ov17_0224F4D4.c
@@ -12,6 +12,7 @@
 #include "overlay017/struct_ov17_0224FECC.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "contest.h"
 #include "font.h"
 #include "game_overlay.h"
@@ -36,7 +37,6 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_02012744.h"
-#include "comm_manager.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 14b4af9d78e..ef205b71883 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -13,6 +13,7 @@
 
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -45,7 +46,6 @@
 #include "trainer_info.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
 #include "unk_02095E98.h"
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index f97bd9381d9..f9e41194653 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -16,6 +16,7 @@
 #include "appearance.h"
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -50,7 +51,6 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c
index 388b44c16c7..92c7646a921 100644
--- a/src/overlay061/ov61_0222B008.c
+++ b/src/overlay061/ov61_0222B008.c
@@ -24,6 +24,7 @@
 #include "overlay062/struct_ov62_0223D518_sub1_sub1.h"
 #include "overlay062/struct_ov62_02241130.h"
 
+#include "comm_manager.h"
 #include "gds.h"
 #include "heap.h"
 #include "message.h"
@@ -34,7 +35,6 @@
 #include "string_template.h"
 #include "system.h"
 #include "unk_0202F1D4.h"
-#include "comm_manager.h"
 
 typedef int (*UnkFuncPtr_ov61_0222E48C)(UnkStruct_ov62_022349A8 *, UnkStruct_ov61_0222B138 *);
 
diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c
index 7b41606b761..92868b4be6d 100644
--- a/src/overlay061/ov61_0222BF44.c
+++ b/src/overlay061/ov61_0222BF44.c
@@ -14,6 +14,7 @@
 #include "overlay061/struct_ov61_0222C3B0.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -38,7 +39,6 @@
 #include "system_data.h"
 #include "text.h"
 #include "touch_pad.h"
-#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index b974b761872..627d073e42e 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -29,6 +29,7 @@
 #include "battle_frontier_stats.h"
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "enums.h"
@@ -80,7 +81,6 @@
 #include "unk_02030CE8.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0203909C.h"
 #include "unk_0207DFAC.h"
 #include "unk_0209C390.h"
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index 6eac27e8817..6f3c67d49dd 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -23,6 +23,7 @@
 
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "enums.h"
@@ -54,7 +55,6 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0209C390.h"
 #include "vram_transfer.h"
 
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index 2f19794ebfb..4bb970f5384 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -15,6 +15,7 @@
 #include "overlay066/struct_ov66_02231300.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_options.h"
 #include "game_records.h"
@@ -37,7 +38,6 @@
 #include "string_template.h"
 #include "system.h"
 #include "text.h"
-#include "comm_manager.h"
 
 typedef struct {
     StringTemplate *unk_00;
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index f449a6575d6..35e5cfc1877 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -34,6 +34,7 @@
 #include "bg_window.h"
 #include "cell_transfer.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "enums.h"
 #include "error_handling.h"
 #include "font.h"
@@ -72,7 +73,6 @@
 #include "trainer_info.h"
 #include "type_icon.h"
 #include "unk_0202419C.h"
-#include "comm_manager.h"
 #include "vram_transfer.h"
 
 typedef struct {
diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c
index 0aa95aeaaf9..1e5a1720246 100644
--- a/src/overlay070/ov70_02265F38.c
+++ b/src/overlay070/ov70_02265F38.c
@@ -17,6 +17,7 @@
 #include "overlay070/struct_ov70_02263344_decl.h"
 #include "overlay070/struct_ov70_02265F38.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "enums.h"
@@ -25,7 +26,6 @@
 #include "string_gf.h"
 #include "system.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 typedef struct {
     u8 unk_00;
diff --git a/src/overlay082/ov82_0223B140.c b/src/overlay082/ov82_0223B140.c
index 96456124d66..29a7b0afaee 100644
--- a/src/overlay082/ov82_0223B140.c
+++ b/src/overlay082/ov82_0223B140.c
@@ -9,12 +9,12 @@
 #include "overlay083/struct_ov83_0223C344.h"
 
 #include "bag.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "overlay_manager.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 BOOL ov82_0223B140(ApplicationManager **appManPtr)
 {
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index 55a2ace2a6d..43fc1cae2c1 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -21,6 +21,7 @@
 #include "savedata/save_table.h"
 
 #include "bag.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "game_options.h"
@@ -38,7 +39,6 @@
 #include "system.h"
 #include "tv_segment.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0203909C.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"
diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c
index 90422a85561..fed0101fda0 100644
--- a/src/overlay083/ov83_0223D4CC.c
+++ b/src/overlay083/ov83_0223D4CC.c
@@ -7,12 +7,12 @@
 
 #include "nintendo_wfc/main.h"
 
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "unk_02032798.h"
-#include "comm_manager.h"
 
 typedef struct {
     BOOL unk_00;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index d967498990a..fbd7f921edd 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_error.h"
 #include "generated/game_records.h"
 #include "generated/species.h"
 
@@ -16,7 +17,6 @@
 #include "overlay088/struct_ov88_0223C370.h"
 #include "overlay088/struct_ov88_0223C8AC.h"
 
-#include "constants/communication/comm_error.h"
 #include "bag.h"
 #include "battle_frontier_stats.h"
 #include "bg_window.h"
@@ -25,6 +25,7 @@
 #include "character_sprite.h"
 #include "charcode_util.h"
 #include "chatot_cry.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -72,7 +73,6 @@
 #include "unk_0202D778.h"
 #include "unk_0202F180.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_02038F8C.h"
 #include "unk_0203909C.h"
diff --git a/src/overlay094/screens/network_handler.c b/src/overlay094/screens/network_handler.c
index fb5c4cc5fb4..2e0020556f0 100644
--- a/src/overlay094/screens/network_handler.c
+++ b/src/overlay094/screens/network_handler.c
@@ -24,6 +24,7 @@
 
 #include "bg_window.h"
 #include "chatot_cry.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_options.h"
 #include "game_records.h"
@@ -46,7 +47,6 @@
 #include "text.h"
 #include "tv_segment.h"
 #include "unk_0202F180.h"
-#include "comm_manager.h"
 #include "unk_02038F8C.h"
 #include "unk_02039814.h"
 #include "vars_flags.h"
diff --git a/src/overlay094/screens/search.c b/src/overlay094/screens/search.c
index 5897bca114c..e796e772eb5 100644
--- a/src/overlay094/screens/search.c
+++ b/src/overlay094/screens/search.c
@@ -16,6 +16,7 @@
 #include "overlay094/struct_ov94_0223BA24.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_options.h"
 #include "global_trade.h"
@@ -36,7 +37,6 @@
 #include "string_list.h"
 #include "system.h"
 #include "text.h"
-#include "comm_manager.h"
 
 #include "res/text/bank/gts.h"
 
diff --git a/src/overlay094/screens/wfc_init.c b/src/overlay094/screens/wfc_init.c
index 5d8d7cae8e4..134c1eb0817 100644
--- a/src/overlay094/screens/wfc_init.c
+++ b/src/overlay094/screens/wfc_init.c
@@ -12,6 +12,7 @@
 #include "overlay094/networking.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -29,7 +30,6 @@
 #include "system_data.h"
 #include "text.h"
 #include "unk_02030CE8.h"
-#include "comm_manager.h"
 #include "wifi_list.h"
 
 #include "res/text/bank/gts.h"
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index 7a02c0cd653..e7a18e5dece 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -18,6 +18,7 @@
 #include "overlay096/struct_ov96_0223BF40_t.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -39,7 +40,6 @@
 #include "text.h"
 #include "unk_0202D05C.h"
 #include "unk_02030CE8.h"
-#include "comm_manager.h"
 #include "unk_02073700.h"
 
 static void ov96_0223BE38(BgConfig *param0);
diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c
index 06f965cb4c0..0a1a15471e3 100644
--- a/src/overlay098/ov98_022471C8.c
+++ b/src/overlay098/ov98_022471C8.c
@@ -18,6 +18,7 @@
 
 #include "bg_window.h"
 #include "colored_arrow.h"
+#include "comm_manager.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -45,7 +46,6 @@
 #include "text.h"
 #include "touch_pad.h"
 #include "unk_02030CE8.h"
-#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"
diff --git a/src/overlay104/frscrcmd.c b/src/overlay104/frscrcmd.c
index 95cca28dc04..a6519a8f0f3 100644
--- a/src/overlay104/frscrcmd.c
+++ b/src/overlay104/frscrcmd.c
@@ -51,6 +51,7 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "enums.h"
@@ -85,7 +86,6 @@
 #include "unk_0202F1D4.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0205DFC4.h"
 #include "unk_0209B6F8.h"
 #include "vars_flags.h"
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index d6833a58291..8e86a1e0624 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -18,6 +18,7 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "camera.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -50,7 +51,6 @@
 #include "trainer_info.h"
 #include "unk_0202419C.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_02092494.h"
 #include "unk_0209BDF8.h"
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 8c253064b4c..0872a836d13 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -16,6 +16,7 @@
 #include "appearance.h"
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -51,7 +52,6 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
 #include "unk_0209BDF8.h"
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index fa7148b1aa3..165c4a2b315 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -17,6 +17,7 @@
 #include "bg_window.h"
 #include "buffer_manager.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "enums.h"
@@ -49,7 +50,6 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0203909C.h"
 #include "unk_02094EDC.h"
 #include "vram_transfer.h"
diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c
index 0ec6ae0c0f0..a5826f0b158 100644
--- a/src/overlay115/ov115_02260440.c
+++ b/src/overlay115/ov115_02260440.c
@@ -21,6 +21,7 @@
 #include "overlay115/struct_ov115_02265AD0.h"
 #include "overlay115/struct_ov115_02265AD4.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "graphics.h"
@@ -31,7 +32,6 @@
 #include "screen_fade.h"
 #include "system.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "vram_transfer.h"
 
 typedef struct UnkStruct_ov115_0226095C_t {
diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c
index 5f0266bac86..159b9ad9fb3 100644
--- a/src/overlay116/ov116_022604C4.c
+++ b/src/overlay116/ov116_022604C4.c
@@ -22,6 +22,7 @@
 
 #include "bg_window.h"
 #include "camera.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "easy3d_object.h"
@@ -40,7 +41,6 @@
 #include "system.h"
 #include "touch_pad.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "vram_transfer.h"
 
 static void ov116_022612CC(UnkStruct_ov116_0226139C *param0);
diff --git a/src/overlay117/ov117_02260440.c b/src/overlay117/ov117_02260440.c
index a53e81a450d..05e7c555cce 100644
--- a/src/overlay117/ov117_02260440.c
+++ b/src/overlay117/ov117_02260440.c
@@ -11,12 +11,12 @@
 #include "overlay117/struct_ov117_02260440.h"
 #include "overlay117/struct_ov117_022605C0.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "overlay_manager.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 static const ApplicationManagerTemplate Unk_ov117_022668F8 = {
     ov117_02260668,
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index b7c0e9e2cbf..36ffce4f622 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -20,6 +20,7 @@
 
 #include "bg_window.h"
 #include "camera.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "easy3d_object.h"
 #include "enums.h"
@@ -51,7 +52,6 @@
 #include "unk_02012744.h"
 #include "unk_0202419C.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "vram_transfer.h"
 
 static void ov117_02260DA0(void *param0);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f7c663cb607..eec7649c1e1 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -97,6 +97,7 @@
 #include "binoculars_vista_lighthouse.h"
 #include "camera.h"
 #include "clear_game.h"
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_system.h"
 #include "daycare_save.h"
@@ -190,7 +191,6 @@
 #include "unk_0202C9F4.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "unk_0203D1B8.h"
 #include "unk_02048614.h"
diff --git a/src/start_menu.c b/src/start_menu.c
index 730fbf59800..865bead83ce 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -32,6 +32,7 @@
 #include "bag_context.h"
 #include "bg_window.h"
 #include "catching_show.h"
+#include "comm_manager.h"
 #include "dexmode_checker.h"
 #include "evolution.h"
 #include "field_bgm.h"
@@ -77,7 +78,6 @@
 #include "unk_02014A84.h"
 #include "unk_0202D778.h"
 #include "unk_02033200.h"
-#include "comm_manager.h"
 #include "unk_0203D1B8.h"
 #include "unk_020559DC.h"
 #include "unk_0205B33C.h"
diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c
index 9b6abd3062a..3e1221a056f 100644
--- a/src/underground/comm_manager.c
+++ b/src/underground/comm_manager.c
@@ -13,6 +13,7 @@
 #include "underground/secret_bases.h"
 #include "underground/traps.h"
 
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -24,7 +25,6 @@
 #include "sys_task_manager.h"
 #include "system_flags.h"
 #include "unk_02033200.h"
-#include "comm_manager.h"
 #include "vars_flags.h"
 
 static void CommManUnderground_SetFieldCommManTask(FieldCommTask task, int timer);
diff --git a/src/underground/manager.c b/src/underground/manager.c
index 8def708dc62..b666614e665 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -24,6 +24,7 @@
 #include "underground/traps.h"
 #include "underground/vendors.h"
 
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -45,7 +46,6 @@
 #include "terrain_collision_manager.h"
 #include "trainer_info.h"
 #include "underground.h"
-#include "comm_manager.h"
 #include "vars_flags.h"
 #include "wireless_manager.h"
 
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index 86f8e92fff4..be6ebd1a976 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -27,6 +27,7 @@
 #include "underground/traps.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -59,7 +60,6 @@
 #include "trainer_info.h"
 #include "underground.h"
 #include "unk_02033200.h"
-#include "comm_manager.h"
 #include "unk_0205F180.h"
 #include "unk_020655F4.h"
 #include "vars_flags.h"
diff --git a/src/underground/traps.c b/src/underground/traps.c
index 3865804a766..cb76ee2f557 100644
--- a/src/underground/traps.c
+++ b/src/underground/traps.c
@@ -24,6 +24,7 @@
 #include "brightness_controller.h"
 #include "camera.h"
 #include "char_transfer.h"
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -55,7 +56,6 @@
 #include "trainer_info.h"
 #include "tv_segment.h"
 #include "underground.h"
-#include "comm_manager.h"
 #include "vars_flags.h"
 
 #include "res/graphics/trap_effects/trap_effects.naix"
diff --git a/src/unk_02032798.c b/src/unk_02032798.c
index e9adf011392..a0bdca69b76 100644
--- a/src/unk_02032798.c
+++ b/src/unk_02032798.c
@@ -9,11 +9,11 @@
 #include "functypes/funcptr_0203290C.h"
 #include "functypes/funcptr_020F8E60.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 
 typedef struct {
     const CommCmdTable *cmdTable;
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index bfec76168b0..7f7b2856e68 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -10,6 +10,7 @@
 #include "struct_defs/struct_02034168.h"
 
 #include "battle_regulation.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
@@ -17,7 +18,6 @@
 #include "trainer_info.h"
 #include "unk_02014A84.h"
 #include "unk_0203266C.h"
-#include "comm_manager.h"
 #include "wireless_manager.h"
 
 typedef struct {
diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c
index f39d3e176c4..da866e3d8c1 100644
--- a/src/unk_0203909C.c
+++ b/src/unk_0203909C.c
@@ -6,12 +6,12 @@
 
 #include "struct_decls/wi_fi_list.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "savedata.h"
 #include "string_gf.h"
 #include "trainer_info.h"
-#include "comm_manager.h"
 #include "wifi_list.h"
 
 int sub_0203909C(SaveData *saveData, DWCFriendData *param1, int *param2)
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index a4b827eef8b..f0301dcabfa 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -76,6 +76,7 @@
 #include "bag.h"
 #include "bag_context.h"
 #include "coins.h"
+#include "comm_manager.h"
 #include "dexmode_checker.h"
 #include "egg_hatch.h"
 #include "evolution.h"
@@ -120,7 +121,6 @@
 #include "unk_020298BC.h"
 #include "unk_0202D05C.h"
 #include "unk_0202D778.h"
-#include "comm_manager.h"
 #include "unk_02038FFC.h"
 #include "unk_020559DC.h"
 #include "unk_0205B33C.h"
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 8ae103120e4..50ad6122322 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -14,6 +14,7 @@
 #include "battle_regulation.h"
 #include "bg_window.h"
 #include "colored_arrow.h"
+#include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -41,7 +42,6 @@
 #include "trainer_info.h"
 #include "unk_0202D778.h"
 #include "unk_020363E8.h"
-#include "comm_manager.h"
 #include "unk_0203D1B8.h"
 #include "unk_020655F4.h"
 
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index cf98bb3dd9a..16cce707e59 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -15,6 +15,7 @@
 #include "global/pm_version.h"
 
 #include "appearance.h"
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "field_system.h"
@@ -34,7 +35,6 @@
 #include "unk_02014A84.h"
 #include "unk_02014D38.h"
 #include "unk_02033200.h"
-#include "comm_manager.h"
 #include "unk_02095E98.h"
 #include "unk_02099500.h"
 
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index c113e526263..e1933b3d22d 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -20,6 +20,7 @@
 #include "overlay005/ov5_021F134C.h"
 #include "overlay005/ov5_021F600C.h"
 
+#include "comm_manager.h"
 #include "field_task.h"
 #include "heap.h"
 #include "map_object.h"
@@ -33,7 +34,6 @@
 #include "sys_task_manager.h"
 #include "trainer_info.h"
 #include "unk_02014A84.h"
-#include "comm_manager.h"
 #include "unk_0205B33C.h"
 #include "unk_020655F4.h"
 
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 999f5aad092..8805495a4ff 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -12,9 +12,9 @@
 #include "overlay058/struct_ov58_021D2820.h"
 
 #include "bg_window.h"
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "unk_02032798.h"
-#include "comm_manager.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index 5388a03ddac..da54d56dc4a 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -10,11 +10,11 @@
 #include "overlay059/ov59_021D0D80.h"
 #include "overlay059/struct_ov59_021D30E0.h"
 
+#include "comm_manager.h"
 #include "communication_system.h"
 #include "math_util.h"
 #include "sound_playback.h"
 #include "unk_02032798.h"
-#include "comm_manager.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index aa680bb97a2..a35b117b8f1 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -15,11 +15,11 @@
 #include "overlay109/struct_ov109_021D1048.h"
 #include "overlay109/struct_ov109_021D17EC.h"
 
+#include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "unk_02032798.h"
-#include "comm_manager.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
 #include "unk_02099500.h"
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index a4b860123ba..771f1ec693f 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -12,6 +12,7 @@
 #include "overlay109/ov109_021D0D80.h"
 #include "overlay109/ov109_021D3D50.h"
 
+#include "comm_manager.h"
 #include "field_system.h"
 #include "field_task.h"
 #include "game_options.h"
@@ -19,7 +20,6 @@
 #include "heap.h"
 #include "journal.h"
 #include "save_player.h"
-#include "comm_manager.h"
 #include "unk_0203D1B8.h"
 #include "unk_0209BDF8.h"
 
diff --git a/src/wireless_manager.c b/src/wireless_manager.c
index c1911ec7e41..632abe4b04d 100644
--- a/src/wireless_manager.c
+++ b/src/wireless_manager.c
@@ -5,12 +5,12 @@
 #include <nitro/wm.h>
 #include <string.h>
 
-#include "struct_defs/struct_0203330C.h"
-
 #include "constants/communication/comm_error.h"
 
-#include "unk_0203266C.h"
+#include "struct_defs/struct_0203330C.h"
+
 #include "comm_manager.h"
+#include "unk_0203266C.h"
 
 /**
  * @struct WirelessManager

From 9d5ad3937d11ba4297ced91d822d877a45e654fe Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Sun, 17 May 2026 10:15:19 -0400
Subject: [PATCH 13/39] Document field_comm_manager.c

55 functions that gave me a lot of clarity
---
 include/constants/communication/comm_sync.h |  21 +
 include/field/field_system.h                |   2 +-
 include/field_comm_manager.h                |  44 +-
 src/encounter.c                             |   6 +-
 src/field_battle_data_transfer.c            |   2 +-
 src/field_comm_manager.c                    | 635 +++++++++++++-------
 src/overlay005/field_control.c              |   2 +-
 src/overlay005/ov5_021D5BC0.c               |   4 +-
 src/overlay005/secret_base_props.c          |   2 +-
 src/overlay007/communication_club.c         |  20 +-
 src/overlay007/ov7_0224B4E8.c               |  16 +-
 src/overlay104/frscrcmd.c                   |   2 +-
 src/scrcmd.c                                |   6 +-
 src/underground/comm_manager.c              |  54 +-
 src/unk_0205A0D8.c                          |  10 +-
 src/unk_02099500.c                          |   4 +-
 16 files changed, 529 insertions(+), 301 deletions(-)
 create mode 100644 include/constants/communication/comm_sync.h

diff --git a/include/constants/communication/comm_sync.h b/include/constants/communication/comm_sync.h
new file mode 100644
index 00000000000..58cfe6504c7
--- /dev/null
+++ b/include/constants/communication/comm_sync.h
@@ -0,0 +1,21 @@
+#ifndef POKEPLATINUM_CONSTANTS_COMM_SYNC_H
+#define POKEPLATINUM_CONSTANTS_COMM_SYNC_H
+
+enum CommSync {
+    SYNC_INIT_VS_LINK_BATTLE = 3,
+    SYNC_START_VS_LINK_BATTLE,
+    SYNC_5,
+
+    SYNC_BATTLE_ROOM_RETURN = 30,
+
+    SYNC_BATTLE_END_CONNECTION = 91,
+    SYNC_PAUSE_BATTLE,
+
+    SYNC_94 = 94,
+    SYNC_SEND_TRAINER_CASE,
+    
+    SYNC_SWITCH_TRANSITION = 97,
+    SYNC_CHANGE_TO_BATTLE_ROOM,
+};
+
+#endif POKEPLATINUM_CONSTANTS_COMM_SYNC_H
diff --git a/include/field/field_system.h b/include/field/field_system.h
index d797e51f166..1c527a10ba0 100644
--- a/include/field/field_system.h
+++ b/include/field/field_system.h
@@ -111,7 +111,7 @@ typedef struct FieldSystem_t {
     MapPropManager *mapPropManager;
     HoneyTreeShakeList *unk_A8;
     BattleTower *battleTower;
-    const BattleRegulation *unk_B0;
+    const BattleRegulation *battleRegulation;
     PokedexMemory *pokedexMemory;
     BOOL unk_B8;
     u8 *battleSubscreenCursorOn;
diff --git a/include/field_comm_manager.h b/include/field_comm_manager.h
index 7b29ec79445..32da513ce3d 100644
--- a/include/field_comm_manager.h
+++ b/include/field_comm_manager.h
@@ -14,38 +14,38 @@
 
 typedef struct FieldCommunicationManager {
     TrainerCase *trainerCase[4];
-    u8 unk_10[4];
+    u8 trainerCaseCopied[4];
     u8 padding_14[4];
     FieldSystem *fieldSystem;
-    MATHRandContext32 unk_1C;
+    MATHRandContext32 rand;
     FieldCommTask task;
     SysTask *sysTask;
     u16 timer;
-    u8 unk_3E;
+    u8 connectID;
     u8 padding_3F;
-    u8 unk_40;
+    u8 pauseTask;
     u8 isUnderground;
     u8 isReturningFromBattle;
-    u8 unk_43;
+    u8 battleRoomMovement;
     Party *party;
 } FieldCommunicationManager;
 
-FieldCommunicationManager *FieldCommMan_Get(void);
-void FieldCommMan_Init(FieldSystem *fieldSystem);
-void FieldCommMan_Delete(void);
-void FieldCommMan_StartBattleServer(FieldSystem *fieldSystem, int param1, int param2);
-void FieldCommMan_StartBattleClient(FieldSystem *fieldSystem, int param1, int param2);
-void FieldCommMan_ConnectBattleClient(int param0);
-void FieldCommMan_ReconnectBattleClient(void);
-void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem);
-void FieldCommMan_EndBattle(void);
-void sub_020598A0(void);
-void sub_02059D0C(int unused0, int unused1, void *param2, void *unused3);
-BOOL sub_02059D2C(void);
-void sub_02059EAC(int param0, int unused1, void *unused2, void *unused3);
-u8 *sub_02059EBC(int param0, void *unused1, int unused2);
-SecretBase *FieldCommMan_GetCurrentOccupiedSecretBase(SaveData *saveData);
-void sub_0205A0A0(void);
-void sub_0205A0BC(void);
+FieldCommunicationManager *FieldCommManager_Get(void);
+void FieldCommManager_Init(FieldSystem *fieldSystem);
+void FieldCommManager_Delete(void);
+void FieldCommManager_StartBattleServer(FieldSystem *fieldSystem, int commType, int regulation);
+void FieldCommManager_StartBattleClient(FieldSystem *fieldSystem, int commType, int regulation);
+void FieldCommManager_ConnectBattleClient(int connectID);
+void FieldCommManager_ReconnectBattleClient(void);
+void FieldCommManager_EnterBattleRoom(FieldSystem *fieldSystem);
+void FieldCommManager_EndBattleNoSync(void);
+void FieldCommManager_EndBattleSync(void);
+void FieldCommManager_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3);
+BOOL FieldCommManager_IsInMovementState(void);
+void FieldCommManager_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3);
+u8 *FieldCommManager_GetTrainerCase(int netId, void *unused1, int unused2);
+SecretBase *FieldCommManager_GetCurrentOccupiedSecretBase(SaveData *saveData);
+void FieldCommManager_PauseUndergroundResources(void);
+void FieldCommManager_UnpauseUndergroundResources(void);
 
 #endif // POKEPLATINUM_UNK_0205964C_H
diff --git a/src/encounter.c b/src/encounter.c
index e7584305dcf..22ca94f7a4d 100644
--- a/src/encounter.c
+++ b/src/encounter.c
@@ -841,7 +841,7 @@ static BOOL FieldTask_LinkEncounterWithRecording(FieldTask *task)
             BattleRecording_Free();
         }
 
-        FieldCommMan_EnterBattleRoom(fieldSystem);
+        FieldCommManager_EnterBattleRoom(fieldSystem);
         return TRUE;
     }
 
@@ -855,7 +855,7 @@ void Encounter_NewVsLinkWithRecording(FieldSystem *fieldSystem, const u8 *partyO
 
     int recordingResultCode;
     BattleRecording_New(fieldSystem->saveData, HEAP_ID_FIELD2, &recordingResultCode);
-    dto->unk_18A = sub_020516C8(fieldSystem->unk_B0, battleType);
+    dto->unk_18A = sub_020516C8(fieldSystem->battleRegulation, battleType);
 
     Encounter *encounter = NewEncounter(dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), NULL);
     FieldSystem_CreateTask(fieldSystem, FieldTask_LinkEncounterWithRecording, encounter);
@@ -868,7 +868,7 @@ void Encounter_NewVsLinkWithRecordingAndParty(FieldSystem *fieldSystem, const Pa
 
     int recordingResultCode;
     BattleRecording_New(fieldSystem->saveData, HEAP_ID_FIELD2, &recordingResultCode);
-    dto->unk_18A = sub_020516C8(fieldSystem->unk_B0, battleType);
+    dto->unk_18A = sub_020516C8(fieldSystem->battleRegulation, battleType);
 
     Encounter *encounter = NewEncounter(dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), NULL);
     FieldSystem_CreateTask(fieldSystem, FieldTask_LinkEncounterWithRecording, encounter);
diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c
index f5dc930e9f3..247232b4dc6 100644
--- a/src/field_battle_data_transfer.c
+++ b/src/field_battle_data_transfer.c
@@ -340,7 +340,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f
     Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData);
     ChatotCry *chatotCry = SaveData_GetChatotCry(fieldSystem->saveData);
     Options *options = SaveData_GetOptions(fieldSystem->saveData);
-    const BattleRegulation *regulation = fieldSystem->unk_B0;
+    const BattleRegulation *regulation = fieldSystem->battleRegulation;
     int i;
     Pokemon *mon;
 
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index f1bb6f320cd..9d6b11ae03b 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_sync.h"
+#include "constants/communication/comm_type.h"
 #include "constants/graphics.h"
 #include "constants/heap.h"
 
@@ -33,47 +35,60 @@
 #include "unk_0205A0D8.h"
 #include "unk_02099500.h"
 
-static void FieldCommMan_RunTask(SysTask *task, void *unused);
-static void FieldCommMan_SetTask(FieldCommTask task, int time);
-static void Task_StartBattleServer(void);
-static void Task_ServerWait(void);
-static void Task_StartBattleClient(void);
-static void Task_ClientWait(void);
-static void Task_ConnectBattleClient(void);
-static void sub_02059964(void);
-static void sub_02059980(void);
-static void sub_02059AB4(void);
-static void sub_02059B10(void);
-static void sub_02059984(void);
-static void sub_020599E4(void);
-static void sub_02059A70(void);
-static void sub_02059BF4(void);
-static void sub_02059CD8(void);
-static void sub_02059E80(void);
-static void sub_02059E94(void);
-static void sub_02059E50(void);
-static void sub_02059D58(void);
+static void FieldCommManager_RunTask(SysTask *task, void *unused);
+static void FieldCommManager_SetTask(FieldCommTask task, int time);
+static void FieldCommTask_StartBattleServer(void);
+static void FieldCommTask_WaitBattleServer(void);
+static void FieldCommTask_StartBattleClient(void);
+static void FieldCommTask_ScanBattleClient(void);
+static void FieldCommTask_ConnectBattleClient(void);
+static void FieldCommTask_SendPlayerInfoClient(void);
+static void FieldCommTask_WaitBattleClient(void);
+static void FieldCommTask_EnterBattleRoom(void);
+static void FieldCommTask_EnterBattleRoom_SendPos(void);
+static void FieldCommTask_ReturnToBattleRoom(void);
+static void FieldCommTask_ReturnToBattleRoom_SendPos(void);
+static void FieldCommTask_ReturnToBattleRoom_WaitForScreenFade(void);
+static void FieldCommTask_WaitBattleRoomMovement(void);
+static void FieldCommTask_BattleRoomMovement(void);
+static void FieldCommTask_ResetBattleClient(void);
+static void FieldCommTask_ReinitBattleClient(void);
+static void FieldCommTask_InitializeVsBattle(void);
+static void FieldCommTask_StartVsLinkBattle(void);
 static void FieldCommTask_CopyTrainerCase(void);
-static void sub_02059FB8(void);
+static void FieldCommTask_SwitchTransitionType(void);
 static void FieldCommTask_StartCopyTrainerCase(void);
-static void sub_02059FD4(void);
-static void sub_0205A018(void);
-static void Task_EndBattle(void);
-static void sub_0205A058(void);
+static void FieldCommTask_ChangeToBattleRoom(void);
+static void FieldCommTask_EndBattleSync(void);
+static void FieldCommTask_EndBattleNoSync(void);
+static void FieldCommTask_EndConnection(void);
 
 static FieldCommunicationManager *sFieldCommMan = NULL;
 
-FieldCommunicationManager *FieldCommMan_Get(void)
+/**
+ * @brief Gets the pointer to the field communication manager
+ *
+ * @return sFieldCommMan
+ */
+FieldCommunicationManager *FieldCommManager_Get(void)
 {
     return sFieldCommMan;
 }
 
-static void sub_02059658(void)
+/**
+ * @brief Deadstripped function. Does nothing when called.
+ */
+static void FieldCommManager_deadstripped_02059658(void)
 {
     return;
 }
 
-void FieldCommMan_Init(FieldSystem *fieldSystem)
+/**
+ * @brief Initializes the field communication manager
+ *
+ * @param fieldSystem
+ */
+void FieldCommManager_Init(FieldSystem *fieldSystem)
 {
     if (sFieldCommMan != NULL) {
         return;
@@ -85,15 +100,18 @@ void FieldCommMan_Init(FieldSystem *fieldSystem)
     MI_CpuFill8(sFieldCommMan, 0, sizeof(FieldCommunicationManager));
 
     sFieldCommMan->timer = 50;
-    sFieldCommMan->sysTask = SysTask_Start(FieldCommMan_RunTask, NULL, 10);
+    sFieldCommMan->sysTask = SysTask_Start(FieldCommManager_RunTask, NULL, 10);
     sFieldCommMan->fieldSystem = fieldSystem;
     sFieldCommMan->party = NULL;
 
-    sub_02059658();
-    CommSys_Seed(&sFieldCommMan->unk_1C);
+    FieldCommManager_deadstripped_02059658();
+    CommSys_Seed(&sFieldCommMan->rand);
 }
 
-void FieldCommMan_Delete(void)
+/**
+ * @brief Frees the field communication manager.
+ */
+void FieldCommManager_Delete(void)
 {
     int i;
 
@@ -117,40 +135,65 @@ void FieldCommMan_Delete(void)
     sFieldCommMan = NULL;
 }
 
-void FieldCommMan_StartBattleServer(FieldSystem *fieldSystem, int param1, int param2)
+/**
+ * @brief Initializes the Field Communication Manager for battles as a server
+ *
+ * @param fieldSystem
+ * @param commType
+ * @param regulation
+ */
+void FieldCommManager_StartBattleServer(FieldSystem *fieldSystem, int commType, int regulation)
 {
     if (CommSys_IsInitialized()) {
         return;
     }
 
-    CommMan_StartBattleServer(FieldSystem_GetSaveData(fieldSystem), param1, param2, fieldSystem->unk_B0, 0);
-    FieldCommMan_Init(fieldSystem);
-    FieldCommMan_SetTask(Task_StartBattleServer, 0);
+    CommMan_StartBattleServer(FieldSystem_GetSaveData(fieldSystem), commType, regulation, fieldSystem->battleRegulation, FALSE);
+    FieldCommManager_Init(fieldSystem);
+    FieldCommManager_SetTask(FieldCommTask_StartBattleServer, 0);
 }
 
-void FieldCommMan_StartBattleClient(FieldSystem *fieldSystem, int param1, int param2)
+/**
+ * @brief Initializes the Field Communication Manager for battles as a client
+ *
+ * @param fieldSystem
+ * @param commType
+ * @param regulation
+ */
+void FieldCommManager_StartBattleClient(FieldSystem *fieldSystem, int commType, int regulation)
 {
     if (CommSys_IsInitialized()) {
         return;
     }
 
-    CommMan_StartBattleClient(FieldSystem_GetSaveData(fieldSystem), param1, param2, fieldSystem->unk_B0, 0);
-    FieldCommMan_Init(fieldSystem);
-    FieldCommMan_SetTask(Task_StartBattleClient, 0);
+    CommMan_StartBattleClient(FieldSystem_GetSaveData(fieldSystem), commType, regulation, fieldSystem->battleRegulation, 0);
+    FieldCommManager_Init(fieldSystem);
+    FieldCommManager_SetTask(FieldCommTask_StartBattleClient, 0);
 }
 
-void FieldCommMan_ConnectBattleClient(int param0)
+/**
+ * @brief Begins connecting a client to the battle
+ *
+ * @param connectID
+ */
+void FieldCommManager_ConnectBattleClient(int connectID)
 {
-    sFieldCommMan->unk_3E = param0;
-    FieldCommMan_SetTask(Task_ConnectBattleClient, 0);
+    sFieldCommMan->connectID = connectID;
+    FieldCommManager_SetTask(FieldCommTask_ConnectBattleClient, 0);
 }
 
-void FieldCommMan_ReconnectBattleClient(void)
+/**
+ * @brief Attempts to reconnect the client to a battle
+ */
+void FieldCommManager_ReconnectBattleClient(void)
 {
-    FieldCommMan_SetTask(sub_02059E80, 0);
+    FieldCommManager_SetTask(FieldCommTask_ResetBattleClient, 0);
 }
 
-void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem)
+/**
+ * @brief Launches the Union's Battle Room / Colosseum and begins the overworld connection tasks
+ */
+void FieldCommManager_EnterBattleRoom(FieldSystem *fieldSystem)
 {
     SetupScreenFadeRegisters(DS_SCREEN_MAIN, COLOR_BLACK);
     SetupScreenFadeRegisters(DS_SCREEN_SUB, COLOR_BLACK);
@@ -161,13 +204,13 @@ void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem)
     }
 
     if (sFieldCommMan == NULL) {
-        FieldCommMan_Init(fieldSystem);
+        FieldCommManager_Init(fieldSystem);
         sFieldCommMan->isReturningFromBattle = TRUE;
     } else {
         sFieldCommMan->isReturningFromBattle = FALSE;
     }
 
-    sFieldCommMan->unk_43 = 0;
+    sFieldCommMan->battleRoomMovement = FALSE;
 
     {
         int netJd, netId = CommSys_CurNetId();
@@ -182,52 +225,73 @@ void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem)
         TrainerCase_Init(FALSE, FALSE, 0, TRAINER_APPEARANCE_DEFAULT, sFieldCommMan->fieldSystem, sFieldCommMan->trainerCase[netId]);
     }
 
-    CommTiming_StartSync(95);
-    FieldCommMan_SetTask(FieldCommTask_StartCopyTrainerCase, 0);
+    CommTiming_StartSync(SYNC_SEND_TRAINER_CASE);
+    FieldCommManager_SetTask(FieldCommTask_StartCopyTrainerCase, 0);
 }
 
-void FieldCommMan_EndBattle(void)
+/**
+ * @brief Forcibly ends the battle and connection without sync checking or error handling
+ */
+void FieldCommManager_EndBattleNoSync(void)
 {
     if (sFieldCommMan == NULL) {
         return;
     }
 
-    CommManager_SetErrorHandling(0, 0);
-    FieldCommMan_SetTask(Task_EndBattle, 5);
+    CommManager_SetErrorHandling(FALSE, FALSE);
+    FieldCommManager_SetTask(FieldCommTask_EndBattleNoSync, 5);
 }
 
-void sub_020598A0(void)
+/**
+ * @brief Ends the battle and connection with sync checking and error handling
+ */
+void FieldCommManager_EndBattleSync(void)
 {
     if (sFieldCommMan == NULL) {
         return;
     }
 
-    CommTiming_StartSync(91);
-    FieldCommMan_SetTask(sub_0205A018, 5);
+    CommTiming_StartSync(SYNC_BATTLE_END_CONNECTION);
+    FieldCommManager_SetTask(FieldCommTask_EndBattleSync, 5);
 }
 
-void FieldCommMan_RunTask(SysTask *task, void *unused)
+/**
+ * @brief Ends the given task and runs the internal sFieldCommMan->task
+ *
+ * @param task
+ * @param unused
+ */
+void FieldCommManager_RunTask(SysTask *task, void *unused)
 {
     if (sFieldCommMan == NULL) {
         SysTask_Done(task);
     } else {
         if (sFieldCommMan->task != NULL) {
-            FieldCommTask task = sFieldCommMan->task;
+            FieldCommTask commTask = sFieldCommMan->task;
 
-            if (!sFieldCommMan->unk_40) {
-                task();
+            if (!sFieldCommMan->pauseTask) {
+                commTask();
             }
         }
     }
 }
 
-static void FieldCommMan_SetTask(FieldCommTask task, int time)
+/**
+ * @brief Sets the current task with a time before it gets executed, if that task has a timer
+ *
+ * @param task
+ * @param time
+ */
+static void FieldCommManager_SetTask(FieldCommTask task, int time)
 {
     sFieldCommMan->task = task;
     sFieldCommMan->timer = time;
 }
 
-static void Task_StartBattleServer(void)
+/**
+ * @brief Task to start the initialize the communication manager as a server for battles
+ */
+static void FieldCommTask_StartBattleServer(void)
 {
     if (!CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         return;
@@ -236,61 +300,82 @@ static void Task_StartBattleServer(void)
     ov7_0224B4B8();
 
     CommInfo_SendPlayerInfo();
-    FieldCommMan_SetTask(Task_ServerWait, 0);
+    FieldCommManager_SetTask(FieldCommTask_WaitBattleServer, 0);
 }
 
-static void Task_ServerWait(void)
+/**
+ * @brief Inidicator task that the Field Communication Manager initialized as a server is waiting for battles. Does nothing when called.
+ */
+static void FieldCommTask_WaitBattleServer(void)
 {
     return;
 }
 
-static void Task_StartBattleClient(void)
+/**
+ * @brief Task to start the initialize the communication manager as a client for battles
+ */
+static void FieldCommTask_StartBattleClient(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
     }
 
     CommClub_PrintChooseJoinMsg();
-    FieldCommMan_SetTask(Task_ClientWait, 0);
+    FieldCommManager_SetTask(FieldCommTask_ScanBattleClient, 0);
 }
 
-static void Task_ClientWait(void)
+/**
+ * @brief Inidicator task that the Field Communication Manager initialized as a client is scanning for battles. Does nothing when called.
+ */
+static void FieldCommTask_ScanBattleClient(void)
 {
     return;
 }
 
-static void Task_ConnectBattleClient(void)
+/**
+ * @brief Task to open a client connection for battles
+ */
+static void FieldCommTask_ConnectBattleClient(void)
 {
-    CommManager_ConnectBattleClient(sFieldCommMan->unk_3E);
-    FieldCommMan_SetTask(sub_02059964, 0);
+    CommManager_ConnectBattleClient(sFieldCommMan->connectID);
+    FieldCommManager_SetTask(FieldCommTask_SendPlayerInfoClient, 0);
 }
 
-static void sub_02059964(void)
+/**
+ * @brief Task to send the Player Info of the client to the server
+ */
+static void FieldCommTask_SendPlayerInfoClient(void)
 {
     if (!CommManager_IsWaitingBattle()) {
         return;
     }
 
     CommInfo_SendPlayerInfo();
-    FieldCommMan_SetTask(sub_02059980, 0);
+    FieldCommManager_SetTask(FieldCommTask_WaitBattleClient, 0);
 }
 
-static void sub_02059980(void)
+/**
+ * @brief Inidicator task that the Field Communication Manager initialized as a client is waiting for battles. Does nothing when called.
+ */
+static void FieldCommTask_WaitBattleClient(void)
 {
     return;
 }
 
-static void sub_02059984(void)
+/**
+ * @brief Task used when returning to the overworld battle room from a battle
+ */
+static void FieldCommTask_ReturnToBattleRoom(void)
 {
-    void *v0;
+    void *commPlayerData;
 
-    if (CommTiming_IsSyncState(98)) {
-        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
-        CommPlayerMan_Init(v0, sFieldCommMan->fieldSystem, 0);
+    if (CommTiming_IsSyncState(SYNC_CHANGE_TO_BATTLE_ROOM)) {
+        commPlayerData = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        CommPlayerMan_Init(commPlayerData, sFieldCommMan->fieldSystem, 0);
         sub_02059524();
         CommSys_DisableSendMovementData();
-        CommTiming_StartSync(92);
-        FieldCommMan_SetTask(sub_020599E4, 0);
+        CommTiming_StartSync(SYNC_PAUSE_BATTLE);
+        FieldCommManager_SetTask(FieldCommTask_ReturnToBattleRoom_SendPos, 0);
         return;
     }
 
@@ -298,40 +383,49 @@ static void sub_02059984(void)
         sFieldCommMan->timer--;
     } else {
         sFieldCommMan->timer = 30;
-        CommTiming_StartSync(98);
+        CommTiming_StartSync(SYNC_CHANGE_TO_BATTLE_ROOM);
     }
 }
 
-static void sub_020599E4(void)
+/**
+ * @brief Part of the Return to Battle Room sequence. Reinitializes the CommPlayerManager and sends the player's position
+ */
+static void FieldCommTask_ReturnToBattleRoom_SendPos(void)
 {
     if (CommSys_CurNetId() == 0) {
         CommInfo_ServerSendArray();
     }
 
-    if (CommTiming_IsSyncState(92)) {
+    if (CommTiming_IsSyncState(SYNC_PAUSE_BATTLE)) {
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
         ResetVisibleHardwareWindows(DS_SCREEN_SUB);
         CommPlayerMan_Restart();
-        CommPlayer_SendPos(0);
-        FieldCommMan_SetTask(sub_02059A70, 1);
+        CommPlayer_SendPos(FALSE);
+        FieldCommManager_SetTask(FieldCommTask_ReturnToBattleRoom_WaitForScreenFade, 1);
     }
 }
 
-static void sub_02059A3C(void)
+/**
+ * @brief Part of the Return to Battle Room sequence. Renables the sending of movement data
+ */
+static void FieldCommTask_ReturnToBattleRoom_EnableSendMovementData(void)
 {
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
         return;
     }
 
-    if (CommTiming_IsSyncState(30)) {
+    if (CommTiming_IsSyncState(SYNC_BATTLE_ROOM_RETURN)) {
         CommSys_EnableSendMovementData();
-        FieldCommMan_SetTask(sub_02059BF4, 0);
+        FieldCommManager_SetTask(FieldCommTask_WaitBattleRoomMovement, 0);
     }
 }
 
-static void sub_02059A70(void)
+/**
+ * @brief Part of the Return to Battle Room sequence. Waits for the screen fade to finish before changing the sync state.
+ */
+static void FieldCommTask_ReturnToBattleRoom_WaitForScreenFade(void)
 {
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
@@ -343,24 +437,27 @@ static void sub_02059A70(void)
             return;
         }
 
-        CommTiming_StartSync(30);
+        CommTiming_StartSync(SYNC_BATTLE_ROOM_RETURN);
     } else {
-        CommTiming_StartSync(30);
+        CommTiming_StartSync(SYNC_BATTLE_ROOM_RETURN);
     }
 
-    FieldCommMan_SetTask(sub_02059A3C, 20);
+    FieldCommManager_SetTask(FieldCommTask_ReturnToBattleRoom_EnableSendMovementData, 20);
 }
 
-static void sub_02059AB4(void)
+/**
+ * @brief Task to initialize the union room when entering for the first time
+ */
+static void FieldCommTask_EnterBattleRoom(void)
 {
-    void *v0;
+    void *commPlayerData;
 
-    if (CommTiming_IsSyncState(98)) {
-        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
-        CommPlayerMan_Init(v0, sFieldCommMan->fieldSystem, 0);
+    if (CommTiming_IsSyncState(SYNC_CHANGE_TO_BATTLE_ROOM)) {
+        commPlayerData = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        CommPlayerMan_Init(commPlayerData, sFieldCommMan->fieldSystem, 0);
         sub_02059524();
-        CommTiming_StartSync(92);
-        FieldCommMan_SetTask(sub_02059B10, 0);
+        CommTiming_StartSync(SYNC_PAUSE_BATTLE);
+        FieldCommManager_SetTask(FieldCommTask_EnterBattleRoom_SendPos, 0);
         return;
     }
 
@@ -368,37 +465,43 @@ static void sub_02059AB4(void)
         sFieldCommMan->timer--;
     } else {
         sFieldCommMan->timer = 30;
-        CommTiming_StartSync(98);
+        CommTiming_StartSync(SYNC_CHANGE_TO_BATTLE_ROOM);
     }
 }
 
-static void sub_02059B10(void)
+/**
+ * @brief Part of the Enter Battle Room sequence. Reinitializes the CommPlayerManager and sends the player's position
+ */
+static void FieldCommTask_EnterBattleRoom_SendPos(void)
 {
     if (CommSys_CurNetId() == 0) {
         CommInfo_ServerSendArray();
     }
 
-    if (CommTiming_IsSyncState(92)) {
+    if (CommTiming_IsSyncState(SYNC_PAUSE_BATTLE)) {
         CommPlayerMan_Restart();
-        CommPlayer_SendPos(0);
+        CommPlayer_SendPos(FALSE);
 
-        u8 v0 = 1;
-        CommSys_SendDataFixedSize(94, &v0);
+        u8 data = 1;
+        CommSys_SendDataFixedSize(94, &data);
 
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
         ResetVisibleHardwareWindows(DS_SCREEN_SUB);
-        FieldCommMan_SetTask(sub_02059CD8, 0);
+        FieldCommManager_SetTask(FieldCommTask_BattleRoomMovement, 0);
     }
 }
 
-static void sub_02059B74(void)
+/**
+ * @brief Checks if the current Field System task is NULL, indicating the room has been left. Frees trainer case data on exit.
+ */
+static void FieldCommManager_CheckExitRoom(void)
 {
-    int i, j;
+    int netId, j;
 
-    for (i = 0; i < CommSys_ConnectedCount(); i++) {
-        if (i != CommSys_CurNetId()) {
-            if (CommTool_GetSyncNo(i) == 94) {
+    for (netId = 0; netId < CommSys_ConnectedCount(); netId++) {
+        if (netId != CommSys_CurNetId()) {
+            if (CommTool_GetSyncNo(netId) == SYNC_94) {
                 if (sFieldCommMan->fieldSystem->task == NULL) {
                     for (j = 0; j < 4; j++) {
                         if (sFieldCommMan->trainerCase[j]) {
@@ -416,21 +519,30 @@ static void sub_02059B74(void)
     CommManager_deadstripped_02038A1C(4, sFieldCommMan->fieldSystem->bgConfig);
 }
 
-static void sub_02059BF4(void)
+/**
+ * @brief Task for when a player is waiting in the battle room / colosseum. Checks for a battle starting or a player exiting the room. Movement allowed.
+ */
+static void FieldCommTask_WaitBattleRoomMovement(void)
 {
     if (!sub_020590C4()) {
-        sFieldCommMan->unk_43 = 0;
+        sFieldCommMan->battleRoomMovement = FALSE;
 
-        u8 v0 = 1;
-        CommSys_SendDataFixedSize(94, &v0);
+        u8 data = 1;
+        CommSys_SendDataFixedSize(94, &data);
 
-        FieldCommMan_SetTask(sub_02059CD8, 0);
+        FieldCommManager_SetTask(FieldCommTask_BattleRoomMovement, 0);
     }
 
-    sub_02059B74();
+    FieldCommManager_CheckExitRoom();
 }
 
-static void sub_02059C2C(BOOL param0, const Party *party)
+/**
+ * @brief Callback for sub_0205AB10. Effectively acts like a task, as it changes the task when called.
+ *
+ * @param param0
+ * @param party
+ */
+static void FieldCommManager_UnknownCallback(BOOL param0, const Party *party)
 {
     if (party) {
         sFieldCommMan->party = Party_New(HEAP_ID_FIELD2);
@@ -438,21 +550,27 @@ static void sub_02059C2C(BOOL param0, const Party *party)
     }
 
     if (param0) {
-        FieldCommMan_SetTask(sub_02059E50, 3);
+        FieldCommManager_SetTask(FieldCommTask_InitializeVsBattle, 3);
     } else {
-        u8 v0 = 3;
-        CommSys_SendDataFixedSize(94, &v0);
+        u8 data = 3;
+        CommSys_SendDataFixedSize(94, &data);
 
-        FieldCommMan_SetTask(sub_02059BF4, 0);
+        FieldCommManager_SetTask(FieldCommTask_WaitBattleRoomMovement, 0);
     }
 }
 
-static void sub_02059C7C(void)
+/**
+ * @brief Task that sets the task to FieldCommTask_WaitBattleRoomMovement and does nothing else.
+ */
+static void FieldCommTask_StartWaitBattleRoom(void)
 {
-    FieldCommMan_SetTask(sub_02059BF4, 0);
+    FieldCommManager_SetTask(FieldCommTask_WaitBattleRoomMovement, 0);
 }
 
-static void sub_02059C8C(void)
+/**
+ * @brief Difficult to tell what this does without documenting further into unk_0205A0D8.c. Related to the 4 tiles of field events in the battle room.
+ */
+static void FieldCommTask_02059C8C(void)
 {
     if (sub_020363A0() || (0 != CommPlayer_GetMovementTimer(CommSys_CurNetId()))) {
         return;
@@ -464,35 +582,51 @@ static void sub_02059C8C(void)
     }
 
     CommPlayerMan_PauseFieldSystem();
-    sub_0205AB10(sFieldCommMan->fieldSystem, sub_02059C2C);
-    FieldCommMan_SetTask(sub_02059C7C, 0);
+    sub_0205AB10(sFieldCommMan->fieldSystem, FieldCommManager_UnknownCallback);
+    FieldCommManager_SetTask(FieldCommTask_StartWaitBattleRoom, 0);
 }
 
-static void sub_02059CD8(void)
+/**
+ * @brief Task that checks for battle room movement and exiting the room.
+ */
+static void FieldCommTask_BattleRoomMovement(void)
 {
-    if (sFieldCommMan->unk_43) {
-        FieldCommMan_SetTask(sub_02059C8C, 5);
+    if (sFieldCommMan->battleRoomMovement) {
+        FieldCommManager_SetTask(FieldCommTask_02059C8C, 5);
 
-        u8 v0 = 0;
-        CommSys_SendDataFixedSize(94, &v0);
+        u8 data = 0;
+        CommSys_SendDataFixedSize(94, &data);
     }
 
-    sub_02059B74();
+    FieldCommManager_CheckExitRoom();
 }
 
-void sub_02059D0C(int unused0, int unused1, void *param2, void *unused3)
+/**
+ * @brief Sets the update movement flag to TRUE if message's first element is the user's NetId
+ *
+ * @param unused0
+ * @param unused1
+ * @param message
+ * @param unused3
+ */
+void FieldCommManager_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3)
 {
-    u8 *v0 = param2;
+    u8 *data = message;
 
-    if (v0[0] == CommSys_CurNetId()) {
-        sFieldCommMan->unk_43 = 1;
+    if (data[0] == CommSys_CurNetId()) {
+        sFieldCommMan->battleRoomMovement = TRUE;
     }
 }
 
-BOOL sub_02059D2C(void)
+/**
+ * @brief Checks if the current task is movement or waiting for movement
+ *
+ * @return TRUE if the current task is FieldCommTask_BattleRoomMovement or FieldCommTask_WaitBattleRoomMovement
+ */
+BOOL FieldCommManager_IsInMovementState(void)
 {
     if (sFieldCommMan) {
-        if ((sFieldCommMan->task == sub_02059CD8) || (sFieldCommMan->task == sub_02059BF4)) {
+        if ((sFieldCommMan->task == FieldCommTask_BattleRoomMovement) || (sFieldCommMan->task == FieldCommTask_WaitBattleRoomMovement)) {
             return TRUE;
         }
     }
@@ -500,43 +634,48 @@ BOOL sub_02059D2C(void)
     return FALSE;
 }
 
-static void sub_02059D58(void)
+/**
+ * @brief Task that sets the preview party and starts a Vs battle, then deletes the Field Communication Manager
+ */
+static void FieldCommTask_StartVsLinkBattle(void)
 {
-    BOOL v0 = TRUE;
-    int v1;
-    u8 v2[6];
+    int battleType;
+    u8 party[6];
 
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
         return;
     }
 
-    v1 = (0x4 | 0x1);
+    battleType = BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER;
 
     switch (CommManager_GetCommType()) {
-    case 4:
-    case 5:
-        v1 = (((0x4 | 0x1) | 0x2) | 0x8);
+    case COMM_TYPE_MULTI_BATTLE_1:
+    case COMM_TYPE_MULTI_BATTLE_2:
+        battleType = BATTLE_TYPE_LINK_DOUBLES | BATTLE_TYPE_2vs2;
         break;
-    case 2:
-        v1 = ((0x4 | 0x1) | 0x2);
+    case COMM_TYPE_DOUBLE_BATTLE:
+        battleType = BATTLE_TYPE_LINK_DOUBLES;
         break;
     }
 
-    CommManager_GetParty(v2);
+    CommManager_GetParty(party);
 
     if (sFieldCommMan->party == NULL) {
-        Encounter_NewVsLinkWithRecording(sFieldCommMan->fieldSystem, v2, v1);
+        Encounter_NewVsLinkWithRecording(sFieldCommMan->fieldSystem, party, battleType);
     } else {
-        Encounter_NewVsLinkWithRecordingAndParty(sFieldCommMan->fieldSystem, sFieldCommMan->party, v1);
+        Encounter_NewVsLinkWithRecordingAndParty(sFieldCommMan->fieldSystem, sFieldCommMan->party, battleType);
         Heap_Free(sFieldCommMan->party);
         sFieldCommMan->party = NULL;
     }
 
-    FieldCommMan_Delete();
+    FieldCommManager_Delete();
 }
 
-static void sub_02059DC8(void)
+/**
+ * @brief Waits for the timer to stop before starting the Vs Link battle
+ */
+static void FieldCommTask_WaitStartVsLinkBattle(void)
 {
     if (CommSys_TransitionTypeIsParallel()) {
         if (sFieldCommMan->timer != 0) {
@@ -544,16 +683,19 @@ static void sub_02059DC8(void)
         }
 
         if (sFieldCommMan->timer == 90) {
-            CommTiming_StartSync(4);
+            CommTiming_StartSync(SYNC_START_VS_LINK_BATTLE);
         }
 
-        if (CommTiming_IsSyncState(4)) {
-            FieldCommMan_SetTask(sub_02059D58, 0);
+        if (CommTiming_IsSyncState(SYNC_START_VS_LINK_BATTLE)) {
+            FieldCommManager_SetTask(FieldCommTask_StartVsLinkBattle, 0);
         }
     }
 }
 
-static void sub_02059E0C(void)
+/**
+ * @brief Switches the transition type to parallel and starts the wait vs link battle task
+ */
+static void FieldCommTask_SwitchTransitionToParallelAndStartVsLinkBattle(void)
 {
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
@@ -561,83 +703,117 @@ static void sub_02059E0C(void)
     }
 
     CommSys_SwitchTransitionTypeToParallel();
-    FieldCommMan_SetTask(sub_02059DC8, 120);
+    FieldCommManager_SetTask(FieldCommTask_WaitStartVsLinkBattle, 120);
 }
 
-static void sub_02059E34(void)
+/**
+ * @brief Changes the task to FieldCommTask_SwitchTransitionToParallelAndStartVsLinkBattle
+ */
+static void FieldCommTask_StartSwitchTransitionToParallelAndStartVsLinkBattle(void)
 {
-    BOOL v0 = TRUE;
-
-    if (CommTiming_IsSyncState(3)) {
-        FieldCommMan_SetTask(sub_02059E0C, 2);
+    if (CommTiming_IsSyncState(SYNC_INIT_VS_LINK_BATTLE)) {
+        FieldCommManager_SetTask(FieldCommTask_SwitchTransitionToParallelAndStartVsLinkBattle, 2);
     }
 }
 
-static void sub_02059E50(void)
+/**
+ * @brief Task to delete the Communication Player Manager and start the versus battle
+ */
+static void FieldCommTask_InitializeVsBattle(void)
 {
-    BOOL v0 = TRUE;
-
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
         return;
     }
 
-    CommPlayerMan_Delete(0);
-    CommTiming_StartSync(3);
-    FieldCommMan_SetTask(sub_02059E34, 0);
+    CommPlayerMan_Delete(FALSE);
+    CommTiming_StartSync(SYNC_INIT_VS_LINK_BATTLE);
+    FieldCommManager_SetTask(FieldCommTask_StartSwitchTransitionToParallelAndStartVsLinkBattle, 0);
 }
 
-static void sub_02059E80(void)
+/**
+ * @brief Task that resets the client for battles and reinitializes the Field Comm Manager
+ */
+static void FieldCommTask_ResetBattleClient(void)
 {
     CommManager_ResetBattleClient();
-    FieldCommMan_SetTask(sub_02059E94, 2);
+    FieldCommManager_SetTask(FieldCommTask_ReinitBattleClient, 2);
 }
 
-static void sub_02059E94(void)
+/**
+ * @brief Task that reinitializes the client for battles without reinitializing the Field Comm Manager
+ */
+static void FieldCommTask_ReinitBattleClient(void)
 {
     if (!sub_02033E30()) {
         return;
     }
 
-    FieldCommMan_SetTask(sub_02059964, 10);
+    FieldCommManager_SetTask(FieldCommTask_SendPlayerInfoClient, 10);
 }
 
-void sub_02059EAC(int param0, int unused1, void *unused2, void *unused3)
+/**
+ * @brief Sets the flag that indicates the player indicated by the netId had their trainer case successfuly copied
+ *
+ * @param netId
+ * @param unused1
+ * @param unused2
+ * @param unused3
+ */
+void FieldCommManager_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3)
 {
-    sFieldCommMan->unk_10[param0] = 1;
+    sFieldCommMan->trainerCaseCopied[netId] = 1;
 }
 
-u8 *sub_02059EBC(int param0, void *unused1, int unused2)
+/**
+ * @brief Gets the trainer case from the netId player
+ *
+ * @param netId
+ * @param unused1
+ * @param unused2
+ *
+ * @return sFieldCommMan->trainerCase[netId];
+ */
+u8 *FieldCommManager_GetTrainerCase(int netId, void *unused1, int unused2)
 {
-    GF_ASSERT(param0 < 4);
-    return (u8 *)sFieldCommMan->trainerCase[param0];
+    GF_ASSERT(netId < 4);
+    return (u8 *)sFieldCommMan->trainerCase[netId];
 }
 
+/**
+ * @brief Task that sends the current player's trainer case info and waits for a response
+ */
 static void FieldCommTask_StartCopyTrainerCase(void)
 {
-    int v1 = CommSys_CurNetId();
+    int netId = CommSys_CurNetId();
 
-    if (CommTiming_IsSyncState(95)) {
-        CommSys_SendDataHuge(88, sFieldCommMan->trainerCase[v1], sizeof(TrainerCase));
-        FieldCommMan_SetTask(FieldCommTask_CopyTrainerCase, 0);
+    if (CommTiming_IsSyncState(SYNC_SEND_TRAINER_CASE)) {
+        CommSys_SendDataHuge(88, sFieldCommMan->trainerCase[netId], sizeof(TrainerCase));
+        FieldCommManager_SetTask(FieldCommTask_CopyTrainerCase, 0);
     }
 }
 
+/**
+ * @brief Task that copies each other player's trainer case info
+ */
 static void FieldCommTask_CopyTrainerCase(void)
 {
-    int i;
+    int netId;
 
-    for (i = 0; i < CommSys_ConnectedCount(); i++) {
-        if (!sFieldCommMan->unk_10[i]) {
+    for (netId = 0; netId < CommSys_ConnectedCount(); netId++) {
+        if (!sFieldCommMan->trainerCaseCopied[netId]) {
             return;
         }
     }
 
-    CommTiming_StartSync(97);
-    FieldCommMan_SetTask(sub_02059FB8, 0);
+    CommTiming_StartSync(SYNC_SWITCH_TRANSITION);
+    FieldCommManager_SetTask(FieldCommTask_SwitchTransitionType, 0);
 }
 
-static void sub_02059F4C(void)
+/**
+ * @brief Task that waits for the transition type to switch to parallel before changing to the battle room
+ */
+static void CommFieldTask_WaitSwitchTransitionTypeAndChangeToBattleRoom(void)
 {
     if (!CommSys_TransitionTypeIsParallel()) {
         if (sFieldCommMan->timer != 0) {
@@ -645,16 +821,19 @@ static void sub_02059F4C(void)
         }
 
         if (sFieldCommMan->timer == 90) {
-            CommTiming_StartSync(5);
+            CommTiming_StartSync(SYNC_5);
         }
 
-        if (CommTiming_IsSyncState(5)) {
-            FieldCommMan_SetTask(sub_02059FD4, 0);
+        if (CommTiming_IsSyncState(SYNC_5)) {
+            FieldCommManager_SetTask(FieldCommTask_ChangeToBattleRoom, 0);
         }
     }
 }
 
-static void sub_02059F90(void)
+/**
+ * @brief Task that switches the transition type to server-client
+ */
+static void FieldCommTask_SwitchTransitionTypeToServerClient(void)
 {
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
@@ -662,48 +841,63 @@ static void sub_02059F90(void)
     }
 
     CommSys_SwitchTransitionTypeToServerClient();
-    FieldCommMan_SetTask(sub_02059F4C, 120);
+    FieldCommManager_SetTask(CommFieldTask_WaitSwitchTransitionTypeAndChangeToBattleRoom, 120);
 }
 
-static void sub_02059FB8(void)
+/**
+ * @brief Task that sets the current task to FieldCommTask_SwitchTransitionTypeToServerClient
+ */
+static void FieldCommTask_SwitchTransitionType(void)
 {
-    if (CommTiming_IsSyncState(97)) {
-        FieldCommMan_SetTask(sub_02059F90, 2);
+    if (CommTiming_IsSyncState(SYNC_SWITCH_TRANSITION)) {
+        FieldCommManager_SetTask(FieldCommTask_SwitchTransitionTypeToServerClient, 2);
     }
 }
 
-static void sub_02059FD4(void)
+/**
+ * @brief Task to change the player to the battle room / colosseum. Will call different tasks depending on if the player is returning from battle or entering from elsewhere.
+ */
+static void FieldCommTask_ChangeToBattleRoom(void)
 {
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
         return;
     }
 
-    CommTiming_StartSync(98);
+    CommTiming_StartSync(SYNC_CHANGE_TO_BATTLE_ROOM);
 
     if (sFieldCommMan->isReturningFromBattle) {
-        FieldCommMan_SetTask(sub_02059984, 30);
+        FieldCommManager_SetTask(FieldCommTask_ReturnToBattleRoom, 30);
     } else {
-        FieldCommMan_SetTask(sub_02059AB4, 30);
+        FieldCommManager_SetTask(FieldCommTask_EnterBattleRoom, 30);
     }
 }
 
-static void sub_0205A018(void)
+/**
+ * @brief Task to delete the Communication Player Manager and end the connection considering a sync state and error handling
+ */
+static void FieldCommTask_EndBattleSync(void)
 {
-    if (CommTiming_IsSyncState(91)) {
-        CommManager_SetErrorHandling(0, 0);
-        CommPlayerMan_Delete(1);
-        FieldCommMan_SetTask(sub_0205A058, 5);
+    if (CommTiming_IsSyncState(SYNC_BATTLE_END_CONNECTION)) {
+        CommManager_SetErrorHandling(FALSE, FALSE);
+        CommPlayerMan_Delete(TRUE);
+        FieldCommManager_SetTask(FieldCommTask_EndConnection, 5);
     }
 }
 
-static void Task_EndBattle(void)
+/**
+ * @brief Task to delete the Communication Player Manager and end the connection without considering a sync state or error handling
+ */
+static void FieldCommTask_EndBattleNoSync(void)
 {
-    CommPlayerMan_Delete(1);
-    FieldCommMan_SetTask(sub_0205A058, 5);
+    CommPlayerMan_Delete(TRUE);
+    FieldCommManager_SetTask(FieldCommTask_EndConnection, 5);
 }
 
-static void sub_0205A058(void)
+/**
+ * @brief Task to end the connection. Deletes the Communication Manager and Field Communication Manager
+ */
+static void FieldCommTask_EndConnection(void)
 {
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
@@ -711,10 +905,17 @@ static void sub_0205A058(void)
     }
 
     CommManager_EndBattle();
-    FieldCommMan_SetTask(FieldCommMan_Delete, 0);
+    FieldCommManager_SetTask(FieldCommManager_Delete, 0);
 }
 
-SecretBase *FieldCommMan_GetCurrentOccupiedSecretBase(SaveData *saveData)
+/**
+ * @brief Gets the current secret base specified by UndergroundMan_GetCurrentOccupiedSecretBase(saveData)
+ *
+ * @param saveData
+ *
+ * @return The current SecretBase* if underground, NULL if not underground
+ */
+SecretBase *FieldCommManager_GetCurrentOccupiedSecretBase(SaveData *saveData)
 {
     if (!sFieldCommMan || !sFieldCommMan->isUnderground) {
         return NULL;
@@ -723,14 +924,20 @@ SecretBase *FieldCommMan_GetCurrentOccupiedSecretBase(SaveData *saveData)
     return UndergroundMan_GetCurrentOccupiedSecretBase(saveData);
 }
 
-void sub_0205A0A0(void)
+/**
+ * @brief Calls UndergroundMan_PauseResources(), if underground
+ */
+void FieldCommManager_PauseUndergroundResources(void)
 {
     if (sFieldCommMan && sFieldCommMan->isUnderground) {
         UndergroundMan_PauseResources();
     }
 }
 
-void sub_0205A0BC(void)
+/**
+ * @brief Calls UndergroundMan_UnpauseResources(), if underground
+ */
+void FieldCommManager_UnpauseUndergroundResources(void)
 {
     if (sFieldCommMan && sFieldCommMan->isUnderground) {
         UndergroundMan_UnpauseResources();
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index b059fc0327c..b1d360d1dd5 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -395,7 +395,7 @@ BOOL FieldInput_Process_Colosseum(FieldInput *input, FieldSystem *fieldSystem)
         return TRUE;
     }
 
-    if (sub_020363A0() || CommPlayer_GetMovementTimer(CommSys_CurNetId()) != 0 || !sub_02059D2C()) {
+    if (sub_020363A0() || CommPlayer_GetMovementTimer(CommSys_CurNetId()) != 0 || !FieldCommManager_IsInMovementState()) {
         return FALSE;
     }
 
diff --git a/src/overlay005/ov5_021D5BC0.c b/src/overlay005/ov5_021D5BC0.c
index 8c2b14b953a..75f83bc141a 100644
--- a/src/overlay005/ov5_021D5BC0.c
+++ b/src/overlay005/ov5_021D5BC0.c
@@ -85,7 +85,7 @@ static void ov5_021D5C4C(FieldSystem *fieldSystem)
 
 static void ov5_021D5C54(FieldSystem *fieldSystem)
 {
-    sub_0205A0BC();
+    FieldCommManager_UnpauseUndergroundResources();
 }
 
 static void ov5_021D5C5C(FieldSystem *fieldSystem)
@@ -101,7 +101,7 @@ static void ov5_021D5C78(FieldSystem *fieldSystem)
 
 static void ov5_021D5C80(FieldSystem *fieldSystem)
 {
-    sub_0205A0A0();
+    FieldCommManager_PauseUndergroundResources();
 }
 
 static void ov5_021D5C88(FieldSystem *fieldSystem)
diff --git a/src/overlay005/secret_base_props.c b/src/overlay005/secret_base_props.c
index 42cb8f4f914..ca72152eef9 100644
--- a/src/overlay005/secret_base_props.c
+++ b/src/overlay005/secret_base_props.c
@@ -18,7 +18,7 @@
 
 void SecretBase_LoadProps(FieldSystem *fieldSystem)
 {
-    SecretBase *secretBase = FieldCommMan_GetCurrentOccupiedSecretBase(fieldSystem->saveData);
+    SecretBase *secretBase = FieldCommManager_GetCurrentOccupiedSecretBase(fieldSystem->saveData);
 
     if (secretBase == NULL) {
         return;
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index a03f1cac909..3944e66c889 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -269,7 +269,7 @@ static void CommClubMan_Delete(void)
 
 static void CommClubMan_StartBattleClient(CommClubManager *man)
 {
-    FieldCommMan_StartBattleClient(man->fieldSystem, man->commType, CommClubMan_Regulation());
+    FieldCommManager_StartBattleClient(man->fieldSystem, man->commType, CommClubMan_Regulation());
 }
 
 static const ListMenuTemplate Unk_ov7_0224ED34 = {
@@ -473,7 +473,7 @@ static void ov7_02249FFC(SysTask *task, void *param1)
             if (sub_02033808() > commClubMan->connectIndex) {
                 ov7_0224A0C8(commClubMan);
                 commClubMan->connectIndex = sub_0203383C(commClubMan->connectIndex);
-                FieldCommMan_ConnectBattleClient(commClubMan->connectIndex);
+                FieldCommManager_ConnectBattleClient(commClubMan->connectIndex);
                 CommList_Refresh();
                 CommClubMan_SetTask(CommClubTask_SelectServerList);
             }
@@ -661,12 +661,12 @@ static void ov7_0224A438(ListMenu *param0, u32 param1, u8 param2)
 
 static void CommClubMan_StartBattleServer(CommClubManager *commClubMan)
 {
-    FieldCommMan_StartBattleServer(commClubMan->fieldSystem, commClubMan->commType, CommClubMan_Regulation());
+    FieldCommManager_StartBattleServer(commClubMan->fieldSystem, commClubMan->commType, CommClubMan_Regulation());
 }
 
 static void CommClubMan_Disconnect(void)
 {
-    FieldCommMan_EndBattle();
+    FieldCommManager_EndBattleNoSync();
 }
 
 static void CommClubMan_SetTask(CommClubManTaskFunc stateFunc)
@@ -1224,7 +1224,7 @@ static void ov7_0224AD68(SysTask *task, void *param1)
         CommClubMan_PrintMessage(v1[commClubMan->commType], 0);
     }
 
-    FieldCommMan_EndBattle();
+    FieldCommManager_EndBattleNoSync();
     SysTask_Start(ov7_0224ADD8, commClubMan, 0);
 }
 
@@ -1525,7 +1525,7 @@ static void CommClubMan_PlayerRefused(CommClubManager *commClubMan)
 
     CommClubMan_PrintMessage(pl_msg_00000353_00005, 1); //{Player Name} refused...
 
-    FieldCommMan_ReconnectBattleClient();
+    FieldCommManager_ReconnectBattleClient();
     SysTask_Start(ov7_0224B31C, commClubMan, 0);
 }
 
@@ -1534,7 +1534,7 @@ static void ov7_0224B31C(SysTask *task, void *param1)
     CommClubManager *commClubMan = (CommClubManager *)param1;
 
     if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
-        FieldCommMan_ReconnectBattleClient();
+        FieldCommManager_ReconnectBattleClient();
         CommClubMan_PrintChooseJoinMsg(commClubMan);
         SysTask_Done(task);
     }
@@ -1542,7 +1542,7 @@ static void ov7_0224B31C(SysTask *task, void *param1)
 
 static void ov7_0224B348(CommClubManager *commClubMan)
 {
-    FieldCommMan_ReconnectBattleClient();
+    FieldCommManager_ReconnectBattleClient();
 
     for (int netId = 0; netId < (7 + 1); netId++) {
         CommInfo_InitPlayer(netId);
@@ -1593,7 +1593,7 @@ void CommClub_StartBattleClient(FieldSystem *fieldSystem, int commType, int para
     sCommClubMan->commType = commType;
 
     if (commType == COMM_TYPE_MIX_BATTLE || commType == COMM_TYPE_MULTI_BATTLE_1) {
-        fieldSystem->unk_B0 = NULL;
+        fieldSystem->battleRegulation = NULL;
     }
 
     sCommClubMan->unk_92 = param2;
@@ -1624,7 +1624,7 @@ void CommClub_StartBattleServer(FieldSystem *fieldSystem, int commType, int para
     sCommClubMan->commType = commType;
 
     if (commType == COMM_TYPE_MIX_BATTLE || commType == COMM_TYPE_MULTI_BATTLE_1) {
-        fieldSystem->unk_B0 = NULL;
+        fieldSystem->battleRegulation = NULL;
     }
 
     sCommClubMan->unk_92 = param2;
diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c
index 5dc8dd54d75..6c4386c0ef7 100644
--- a/src/overlay007/ov7_0224B4E8.c
+++ b/src/overlay007/ov7_0224B4E8.c
@@ -188,17 +188,17 @@ static int ov7_0224B6E8(UnkStruct_ov7_0224B4E8 *param0)
         return 0;
     case 12:
         Sound_PlayEffect(SEQ_SE_CONFIRM);
-        param0->fieldSystem->unk_B0 = NULL;
+        param0->fieldSystem->battleRegulation = NULL;
         ov7_0224B6AC(param0);
         return 2;
     case 0xfffffffe:
         Sound_PlayEffect(SEQ_SE_CONFIRM);
-        param0->fieldSystem->unk_B0 = NULL;
+        param0->fieldSystem->battleRegulation = NULL;
         ov7_0224B6AC(param0);
         return -1;
     default:
         Sound_PlayEffect(SEQ_SE_CONFIRM);
-        param0->fieldSystem->unk_B0 = BattleRegulation_GetByIndex(param0->fieldSystem->saveData, v0);
+        param0->fieldSystem->battleRegulation = BattleRegulation_GetByIndex(param0->fieldSystem->saveData, v0);
         break;
     }
 
@@ -345,7 +345,7 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0)
     }
 
     for (v5 = 0; v5 < 9; v5++) {
-        v6 = BattleRegulation_GetRuleValue(param0->fieldSystem->unk_B0, Unk_ov7_0224F4C0[v5]);
+        v6 = BattleRegulation_GetRuleValue(param0->fieldSystem->battleRegulation, Unk_ov7_0224F4C0[v5]);
         v7 = Unk_ov7_0224F4CC[v5];
 
         switch (Unk_ov7_0224F4C0[v5]) {
@@ -422,7 +422,7 @@ static void ov7_0224BBA0(UnkStruct_ov7_0224B4E8 *param0)
 static BOOL ov7_0224BBC4(UnkStruct_ov7_0224B4E8 *param0)
 {
     Party *v0 = SaveData_GetParty(param0->fieldSystem->saveData);
-    int v1 = BattleRegulation_SelectValidPokemon(param0->fieldSystem->unk_B0, v0, param0->unk_6C);
+    int v1 = BattleRegulation_SelectValidPokemon(param0->fieldSystem->battleRegulation, v0, param0->unk_6C);
     int v2;
 
     switch (v1) {
@@ -431,7 +431,7 @@ static BOOL ov7_0224BBC4(UnkStruct_ov7_0224B4E8 *param0)
     case 4:
         Sound_PlayEffect(SEQ_SE_DP_BOX03);
         ov7_0224B57C(param0, param0->unk_78 - 1);
-        v2 = BattleRegulation_GetRuleValue(param0->fieldSystem->unk_B0, BATTLE_REGULATION_RULE_TEAM_SIZE);
+        v2 = BattleRegulation_GetRuleValue(param0->fieldSystem->battleRegulation, BATTLE_REGULATION_RULE_TEAM_SIZE);
         StringTemplate_SetNumber(param0->unk_64, 1, v2, 1, 1, 1);
         ov7_0224B4E8(param0, 107);
         break;
@@ -439,7 +439,7 @@ static BOOL ov7_0224BBC4(UnkStruct_ov7_0224B4E8 *param0)
     case 1:
         Sound_PlayEffect(SEQ_SE_DP_BOX03);
         ov7_0224B57C(param0, param0->unk_78 - 1);
-        v2 = BattleRegulation_GetRuleValue(param0->fieldSystem->unk_B0, BATTLE_REGULATION_RULE_MAX_TOTAL_LEVEL);
+        v2 = BattleRegulation_GetRuleValue(param0->fieldSystem->battleRegulation, BATTLE_REGULATION_RULE_MAX_TOTAL_LEVEL);
         StringTemplate_SetNumber(param0->unk_64, 1, v2, 3, 0, 1);
         ov7_0224B4E8(param0, 121);
         break;
@@ -555,7 +555,7 @@ static UnkStruct_ov7_0224B4E8 *ov7_0224BE10(FieldSystem *fieldSystem)
 
     v0->unk_7C = 0;
     v0->fieldSystem = fieldSystem;
-    v0->fieldSystem->unk_B0 = NULL;
+    v0->fieldSystem->battleRegulation = NULL;
     v0->unk_64 = StringTemplate_Default(HEAP_ID_FIELD1);
     v0->unk_68 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEMON_CENTER_2F_ATTENDANTS, HEAP_ID_FIELD1);
     v0->unk_14 = String_Init((90 * 2), HEAP_ID_FIELD1);
diff --git a/src/overlay104/frscrcmd.c b/src/overlay104/frscrcmd.c
index 728f1221ce4..9b1dc86726e 100644
--- a/src/overlay104/frscrcmd.c
+++ b/src/overlay104/frscrcmd.c
@@ -1623,7 +1623,7 @@ static BOOL FrontierScrCmd_ClearReceivedTempDataAllPlayers(FrontierScriptContext
 
 static BOOL FrontierScrCmd_EndCommunication(FrontierScriptContext *ctx)
 {
-    FieldCommMan_EndBattle();
+    FieldCommManager_EndBattleNoSync();
     FrontierScriptContext_Pause(ctx, WaitForCommManIsDeleted);
 
     return TRUE;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index ed2650a303e..7b0181766e5 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -4521,7 +4521,7 @@ static BOOL ScrCmd_Dummy14F(ScriptContext *ctx)
 
 static BOOL ScrCmd_EndCommunication(ScriptContext *ctx)
 {
-    FieldCommMan_EndBattle();
+    FieldCommManager_EndBattleNoSync();
     ScriptContext_Pause(ctx, ScriptContext_WaitForCommManIsDeleted);
     return TRUE;
 }
@@ -4539,14 +4539,14 @@ static BOOL ScriptContext_WaitForCommManIsDeleted(ScriptContext *ctx)
 
 static BOOL ScrCmd_2BB(ScriptContext *ctx)
 {
-    sub_020598A0();
+    FieldCommManager_EndBattleSync();
     ScriptContext_Pause(ctx, ScriptContext_WaitForCommManIsDeleted);
     return TRUE;
 }
 
 static BOOL ScrCmd_FieldCommEnterBattleRoom(ScriptContext *ctx)
 {
-    FieldCommMan_EnterBattleRoom(ctx->fieldSystem);
+    FieldCommManager_EnterBattleRoom(ctx->fieldSystem);
     return FALSE;
 }
 
diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c
index 3e1221a056f..8223b9a4a03 100644
--- a/src/underground/comm_manager.c
+++ b/src/underground/comm_manager.c
@@ -67,16 +67,16 @@ static void CommManUnderground_DebugPrintDummy(char *string)
 
 void CommManUnderground_InitUnderground(FieldSystem *fieldSystem)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan != NULL) {
         return;
     }
 
     CommManager_StartUnderground(FieldSystem_GetSaveData(fieldSystem));
-    FieldCommMan_Init(fieldSystem);
+    FieldCommManager_Init(fieldSystem);
 
-    fieldCommMan = FieldCommMan_Get();
+    fieldCommMan = FieldCommManager_Get();
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_UNDERGROUND, HEAP_SIZE_UNDERGROUND);
 
     if (!SystemFlag_CheckHasSeenUndergroundRoarkIntro(SaveData_GetVarsFlags(fieldCommMan->fieldSystem->saveData))) {
@@ -86,7 +86,7 @@ void CommManUnderground_InitUnderground(FieldSystem *fieldSystem)
 
 void CommManUnderground_EnterUnderground(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     fieldCommMan->isUnderground = TRUE;
     GameRecords_IncrementTrainerScore(SaveData_GetGameRecords(fieldCommMan->fieldSystem->saveData), TRAINER_SCORE_EVENT_UNDERGROUND_ENTERED);
@@ -97,7 +97,7 @@ void CommManUnderground_EnterUnderground(void)
 
 void CommManUnderground_ExitUnderground(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan == NULL) {
         return;
@@ -128,7 +128,7 @@ void CommManUnderground_ReopenSecretBase(void)
 
 BOOL CommManUnderground_TryEnterBaseTransitionState(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     u32 currentTask = (u32)fieldCommMan->task;
     u32 mainTaskServer = (u32)CommManUnderground_MainTaskServer;
@@ -167,7 +167,7 @@ BOOL CommManUnderground_TryEnterBaseTransitionState(void)
 
 BOOL CommManUnderground_TryExitBaseTransitionState(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
     u32 currentTask = (u32)fieldCommMan->task;
     u32 moveTaskServer = (u32)CommManUnderground_BaseTransitionTaskServer;
     u32 moveTaskClient = (u32)CommManUnderground_BaseTransitionTaskClient;
@@ -193,7 +193,7 @@ BOOL CommManUnderground_TryExitBaseTransitionState(void)
 
 BOOL CommManUnderground_IsInputAllowed(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     u32 inputAllowedTasks[] = {
         (u32)CommManUnderground_MainTaskClient,
@@ -227,7 +227,7 @@ BOOL CommManUnderground_IsInputAllowed(void)
 
 static void CommManUnderground_SetFieldCommManTask(FieldCommTask task, int timer)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     fieldCommMan->task = task;
     fieldCommMan->timer = timer;
@@ -235,7 +235,7 @@ static void CommManUnderground_SetFieldCommManTask(FieldCommTask task, int timer
 
 static void CommManUnderground_SendInitialDataTask(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan->timer != 0) {
         fieldCommMan->timer--;
@@ -264,7 +264,7 @@ static void CommManUnderground_SendInitialDataTask(void)
 
 static void CommManUnderground_WaitForRoarkSceneTask(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (!SystemFlag_CheckHasSeenUndergroundRoarkIntro(SaveData_GetVarsFlags(fieldCommMan->fieldSystem->saveData))) {
         return;
@@ -278,7 +278,7 @@ static void CommManUnderground_WaitForRoarkSceneTask(void)
 
 static void CommManUnderground_DelayTask(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan->timer != 0) {
         fieldCommMan->timer--;
@@ -305,7 +305,7 @@ static void CommManUnderground_CheckForConnectionsTask(void)
 
 static void CommManUnderground_ConnectTaskClient(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan->timer != 0) {
         fieldCommMan->timer--;
@@ -340,7 +340,7 @@ static void CommManUnderground_ConnectTaskClient(void)
 
 static void CommManUnderground_ConnectTaskServer(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     UndergroundMan_Process();
 
@@ -368,7 +368,7 @@ static void CommManUnderground_ConnectTaskServer(void)
 
 static void CommManUnderground_MainTaskServer(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     UndergroundMan_Process();
 
@@ -405,7 +405,7 @@ static void CommManUnderground_BaseTransitionTaskServer(void)
 
 static void CommManUnderground_BaseTransitionEndTaskServer(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     SecretBases_RequestClearTransitioningStatus();
     CommPlayerMan_Restart();
@@ -414,7 +414,7 @@ static void CommManUnderground_BaseTransitionEndTaskServer(void)
 
 static void CommManUnderground_WaitForDataReadTaskClient(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan->timer == 9) {
         CommInfo_SendPlayerInfo();
@@ -442,7 +442,7 @@ static void CommManUnderground_WaitForDataReadTaskClient(void)
 
 static void CommManUnderground_WaitForFlagDataReceiptTaskClient(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (UndergroundPlayer_HaveLinksReceivedHeldFlagData()) {
         Traps_SendPlacedTraps();
@@ -497,7 +497,7 @@ static void CommManUnderground_WaitUntilAloneTaskServer(void)
 
 static void CommManUnderground_RestartTaskServer(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan->timer != 0) {
         fieldCommMan->timer--;
@@ -511,7 +511,7 @@ static void CommManUnderground_RestartTaskServer(void)
 
 static void CommManUnderground_RestartTaskClient(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan->timer != 0) {
         fieldCommMan->timer--;
@@ -530,7 +530,7 @@ static void CommManUnderground_ClosedBaseTask(void)
 
 static void CommManUnderground_CloseSecretBaseTask(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (CommSys_CurNetId() == 0) {
         UndergroundMan_ResetResources(fieldCommMan->fieldSystem);
@@ -556,7 +556,7 @@ static void CommManUnderground_RestartClient(void)
 
 static void CommManUnderground_MainTaskClient(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     UndergroundMan_Process();
     sub_02059524();
@@ -583,7 +583,7 @@ static void CommManUnderground_BaseTransitionTaskClient(void)
 
 static void CommManUnderground_BaseTransitionEndTaskClient(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     SecretBases_RequestClearTransitioningStatus();
     CommPlayerMan_Restart();
@@ -613,7 +613,7 @@ static void CommManUnderground_BaseTransitionTaskAlone(void)
 
 static void CommManUnderground_BaseTransitionEndTaskAlone(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     SecretBases_RequestClearTransitioningStatus();
     CommPlayerMan_Restart();
@@ -633,7 +633,7 @@ static void CommManUnderground_ClosedBaseTransitionTask(void)
 
 static void CommManUnderground_ClosedBaseTransitionEndTask(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     SecretBases_RequestClearTransitioningStatus();
     CommPlayerMan_Restart();
@@ -642,7 +642,7 @@ static void CommManUnderground_ClosedBaseTransitionEndTask(void)
 
 static void CommManUnderground_ExitUndergroundTask(void)
 {
-    FieldCommunicationManager *fieldCommMan = FieldCommMan_Get();
+    FieldCommunicationManager *fieldCommMan = FieldCommManager_Get();
 
     if (fieldCommMan->timer != 0) {
         fieldCommMan->timer--;
@@ -656,5 +656,5 @@ static void CommManUnderground_ExitUndergroundTask(void)
 
     fieldCommMan->isUnderground = FALSE;
 
-    FieldCommMan_Delete();
+    FieldCommManager_Delete();
 }
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 50ad6122322..f8c6da7bdb5 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -158,14 +158,14 @@ static void sub_0205A164(UnkStruct_0205A0D8 *param0, enum HeapID heapID)
     MI_CpuClear8(partyMenu, sizeof(PartyMenu));
 
     partyMenu->options = SaveData_GetOptions(param0->fieldSystem->saveData);
-    partyMenu->battleRegulation = (void *)param0->fieldSystem->unk_B0;
+    partyMenu->battleRegulation = (void *)param0->fieldSystem->battleRegulation;
     partyMenu->party = SaveData_GetParty(param0->fieldSystem->saveData);
     partyMenu->bag = SaveData_GetBag(param0->fieldSystem->saveData);
     partyMenu->type = PARTY_MENU_TYPE_BASIC;
     partyMenu->mode = PARTY_MENU_MODE_SELECT_CONFIRM;
 
-    if (param0->fieldSystem->unk_B0) {
-        partyMenu->minSelectionSlots = BattleRegulation_GetRuleValue(param0->fieldSystem->unk_B0, BATTLE_REGULATION_RULE_TEAM_SIZE);
+    if (param0->fieldSystem->battleRegulation) {
+        partyMenu->minSelectionSlots = BattleRegulation_GetRuleValue(param0->fieldSystem->battleRegulation, BATTLE_REGULATION_RULE_TEAM_SIZE);
         partyMenu->maxSelectionSlots = partyMenu->minSelectionSlots;
     } else {
         partyMenu->minSelectionSlots = 3;
@@ -698,7 +698,7 @@ void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1)
         v0->unk_34 = 9;
         break;
     default:
-        if (v0->fieldSystem->unk_B0) {
+        if (v0->fieldSystem->battleRegulation) {
             v0->unk_34 = 9;
         } else {
             v0->unk_34 = 0;
@@ -1002,7 +1002,7 @@ static BOOL sub_0205B140(FieldTask *param0)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
     UnkStruct_0205B2D4 *v1 = FieldTask_GetEnv(param0);
-    TrainerCase *v2 = (TrainerCase *)sub_02059EBC(v1->unk_24, NULL, 0);
+    TrainerCase *v2 = (TrainerCase *)FieldCommManager_GetTrainerCase(v1->unk_24, NULL, 0);
 
     switch (v1->unk_28) {
     case 0:
diff --git a/src/unk_02099500.c b/src/unk_02099500.c
index f5b442a0a75..b1ef1f4c8f4 100644
--- a/src/unk_02099500.c
+++ b/src/unk_02099500.c
@@ -112,14 +112,14 @@ static const CommCmdTable Unk_020F68A4[] = {
     { UndergroundPlayer_ProcessFlagEvent, CommPacketSizeOf_FlagEvent, NULL },
     { SecretBases_ProcessBaseCreateRequest, CommPacketSizeOf_NetId, NULL },
     { SecretBases_ProcessBaseCreateEvent, CommPacketSizeOf_SecretBaseCreateEvent, NULL },
-    { sub_02059EAC, CommPacketSizeOf_TrainerCase, sub_02059EBC },
+    { FieldCommManager_SetTrainerCaseCopiedFlag, CommPacketSizeOf_TrainerCase, FieldCommManager_GetTrainerCase },
     { UndergroundPC_ProcessTakeFlagAttempt, CommPacketSizeOf_PCInteraction, NULL },
     { UndergroundPC_ProcessTakenFlag, CommPacketSizeOf_PCInteraction, NULL }, // 90
     { UndergroundPlayer_ProcessHeldFlagOwnerInfo, CommPacketSizeOf_TrainerInfo, NULL },
     { UndergroundPlayer_ProcessHeldFlagOwnerInfoServer, CommPacketSizeOf_HeldFlagInfo, UndergroundPlayer_GetHeldFlagInfoBuffer },
     { UndergroundPlayer_ProcessHeldFlagOwnerInfoAck, CommPacketSizeOf_NetId, NULL },
     { sub_02059180, CommPacketSizeOf_NetId, NULL },
-    { sub_02059D0C, CommPacketSizeOf_NetId, NULL }, // 95
+    { FieldCommManager_UpdateBattleRoomMovement, CommPacketSizeOf_NetId, NULL }, // 95
     { SecretBases_ProcessFlagRankUp, CommPacketSizeOf_NetId, NULL },
     { SecretBases_ProcessFlagRankUpEvent, CommPacketSizeOf_FlagRankUpEvent, NULL },
     { sub_0205B988, TrainerInfo_Size, NULL },

From 25e7f692c04d92de0fbe6733dbc8a5c4ae5297a3 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Sun, 17 May 2026 10:45:42 -0400
Subject: [PATCH 14/39] Update comm_sync.h

---
 include/constants/communication/comm_sync.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/constants/communication/comm_sync.h b/include/constants/communication/comm_sync.h
index 58cfe6504c7..cea2b73baaa 100644
--- a/include/constants/communication/comm_sync.h
+++ b/include/constants/communication/comm_sync.h
@@ -13,7 +13,7 @@ enum CommSync {
 
     SYNC_94 = 94,
     SYNC_SEND_TRAINER_CASE,
-    
+
     SYNC_SWITCH_TRANSITION = 97,
     SYNC_CHANGE_TO_BATTLE_ROOM,
 };

From dda0c9014a1b07c41bfb66d8e4e0f865a7033da8 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 18 May 2026 13:34:18 -0400
Subject: [PATCH 15/39] Requested Changes

---
 include/comm_manager.h                        |  14 +-
 .../comm_avaliable_connections.h              |   8 +
 include/constants/communication/comm_error.h  |   4 +-
 include/constants/communication/comm_type.h   |   2 +-
 src/comm_manager.c                            | 277 +++++++++---------
 src/main_menu/main_menu.c                     |  38 ++-
 src/main_menu/mystery_gift_app.c              |   2 +-
 src/nintendo_wfc/main.c                       |   3 +-
 src/overlay007/communication_club.c           |   6 +-
 src/overlay066/ov66_02231428.c                |   2 +-
 src/overlay067/ov67_0225C700.c                |  16 +-
 src/overlay070/ov70_0225D9A4.c                |   2 +-
 src/overlay070/ov70_02265F38.c                |   2 +-
 13 files changed, 192 insertions(+), 184 deletions(-)
 create mode 100644 include/constants/communication/comm_avaliable_connections.h

diff --git a/include/comm_manager.h b/include/comm_manager.h
index cc101d6644d..9c61632ec1b 100644
--- a/include/comm_manager.h
+++ b/include/comm_manager.h
@@ -23,7 +23,7 @@ void CommMan_StartBattleClient(SaveData *saveData, int commType, int contestRegu
 void CommManager_ConnectBattleClient(int connectionID);
 void CommManager_ResetBattleClient(void);
 void CommManager_EndBattle(void);
-void WirelessManager_SetEntry2(BOOL entry);
+void CommManager_SetWirelessEntry(BOOL entry);
 BOOL CommManager_IsWaitingBattle(void);
 void CommManager_StartUnion(SaveData *saveData);
 void CommManager_ConnectUnion(int connectionID);
@@ -54,7 +54,7 @@ void CommManager_EndPoketchLinkSearch(void);
 BOOL CommManager_IsPoketchSearching(void);
 void CommManager_InitializeSearchParty(SaveData *saveData);
 void CommManager_EndSearchParty(void);
-u8 CommManager_GetUnk54(void);
+u8 CommManager_GetAvailableConnections(void);
 BOOL CommManager_ExitOrReset(void);
 void CommManager_SetUnk34(int errorCode, int errorType, int error);
 int CommManager_StartWifiBattle(int target);
@@ -77,10 +77,10 @@ void CommManager_StartWifiMail(SaveData *saveData);
 void CommManager_EndWifiMail(void);
 BOOL CommManager_GetDWCError(void);
 void *CommManager_LoginWifiBattleServer(SaveData *saveData, int size);
-void CommManager_LoginWifiLobby(SaveData *saveData, const void *param1);
-void CommManager_LogoutWifiLobby(void);
-BOOL CommManager_GetWifiLobbyLoginSuccess(void);
-BOOL CommManager_IsWifiLobbyError(void);
+void CommManager_LoginWifiPlaza(SaveData *saveData, const void *param1);
+void CommManager_LogoutWifiPlaza(void);
+BOOL CommManager_GetWifiPlazaLoginSuccess(void);
+BOOL CommManager_IsWifiPlazaError(void);
 void CommManager_StartWifiP2P(UnkEnum_ov66_02232F38 param0);
 void CommManager_EndWifiP2P(void);
 u32 CommManager_GetWifiP2PConnectState(void);
@@ -102,7 +102,7 @@ BOOL CommManager_CheckResetFinished(void);
 BOOL CommManager_SetCommError(int error);
 void CommManager_SetState_WifiPoffin(void);
 void CommManager_SetState_WifiClub(void);
-void CommManager_SetState_WifiLobby(void);
+void CommManager_SetState_WifiPlaza(void);
 void CommManager_SetState_LoginWifi(void);
 void CommManager_SetState_SingleBattleWifi(void);
 void CommManager_SetState_FrontierWifi(void);
diff --git a/include/constants/communication/comm_avaliable_connections.h b/include/constants/communication/comm_avaliable_connections.h
new file mode 100644
index 00000000000..854537e0a58
--- /dev/null
+++ b/include/constants/communication/comm_avaliable_connections.h
@@ -0,0 +1,8 @@
+#ifndef POKEPLATINUM_CONSTANTS_COMM_AVALIABLE_CONNECTIONS_H
+#define POKEPLATINUM_CONSTANTS_COMM_AVALIABLE_CONNECTIONS_H
+
+#define AV_CONNECT_MYSTERY_GIFT (1 << 0)
+#define AV_CONNECT_RANGER_LINK  (1 << 1)
+#define AV_CONNECT_WII          (1 << 2)
+
+#endif
diff --git a/include/constants/communication/comm_error.h b/include/constants/communication/comm_error.h
index a65c6c518b3..178c1558689 100644
--- a/include/constants/communication/comm_error.h
+++ b/include/constants/communication/comm_error.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_CONSTANTS_COMM_PACKETS_H
-#define POKEPLATINUM_CONSTANTS_COMM_PACKETS_H
+#ifndef POKEPLATINUM_CONSTANTS_COMM_ERROR_H
+#define POKEPLATINUM_CONSTANTS_COMM_ERROR_H
 
 #define COMM_ERROR_NONE            0
 #define COMM_ERROR_RESET_SAVEPOINT 1
diff --git a/include/constants/communication/comm_type.h b/include/constants/communication/comm_type.h
index 0f40b3415ac..23d6000701a 100644
--- a/include/constants/communication/comm_type.h
+++ b/include/constants/communication/comm_type.h
@@ -29,7 +29,7 @@
 
 #define COMM_TYPE_POFFIN_WIFI 29
 
-#define COMM_TYPE_LOBBY_WIFI    33
+#define COMM_TYPE_WIFI_PLAZA    33
 #define COMM_TYPE_FRONTIER_WIFI 34
 #define COMM_TYPE_CLUB_WIFI     35
 #define COMM_TYPE_EMAIL_WIFI    36
diff --git a/src/comm_manager.c b/src/comm_manager.c
index 0bd85771174..fdfd204b69d 100644
--- a/src/comm_manager.c
+++ b/src/comm_manager.c
@@ -4,6 +4,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_avaliable_connections.h"
 #include "constants/communication/comm_error.h"
 #include "constants/communication/comm_type.h"
 
@@ -46,7 +47,7 @@ typedef struct {
     u8 unionConnectState;
     u8 connectionID;
     u8 commType;
-    u8 contestRegulation;
+    u8 contestRegulation; // double check when documenting unk_02033200.c (replace.sh should hit this when renaming the file)
     u8 unk_4C;
     s8 wifiTarget;
     u8 unk_4E;
@@ -55,7 +56,7 @@ typedef struct {
     u8 globalWifi;
     u8 resetType;
     u8 pauseUnion;
-    u8 unk_54;
+    u8 availableConnections;
     u8 initializeAsServer; // always FALSE
     u8 unk_56;
     u8 doNotConnectUnderground;
@@ -63,7 +64,7 @@ typedef struct {
     u8 commError;
     u8 pauseUnderground;
     const void *unk_5C;
-    u8 lobbyLoginSuccess;
+    u8 plazaLoginSuccess;
     u8 unk_61[3];
 } CommunicationManager;
 
@@ -108,7 +109,7 @@ static void CommTask_StartForceConnectUnion1(void);
 static void CommTask_StartForceConnectUnion2(void);
 static void CommTask_ForceConnectUnion(void);
 static void CommTask_ConnectingUnionClient(void);
-static void CommTask_SuccededConnectUnionClient(void);
+static void CommTask_SucceededConnectUnionClient(void);
 static void CommTask_FailedConnectUnionClient(void);
 static void CommTask_ResetUnionClient(void);
 static void CommTask_ConnectUnionServer(void);
@@ -122,20 +123,20 @@ static void CommTask_EndConnectionUnionClient(void);
 static void CommTask_EndConnection(void);
 static void CommTask_WifiBattleLogin(void);
 static void CommTask_LogoutWifi(void);
-static void CommTask_StartWifiLobby(void);
-static void CommTask_LogInWifiLobby(void);
-static void CommTask_ConnectWifiLobby(void);
-static void CommTask_LogoutWifiLobby(void);
-static void CommTask_WaitLogoutWifiLobby(void);
-static void CommTask_WifiLobbyError(void);
-static void CommTask_ConnectWifiLobbyP2P(void);
-static void CommTask_WaitWifiLobbyMatchServerP2P(void);
-static void CommTask_DisconnectWifiLobbyP2P(void);
-static void CommTask_WifiLobbyTimeout(void);
-static BOOL CommManager_ProcessWifiLobbyDWCError(int param0);
-static BOOL CommManager_UpdateWifiLobby(void);
-static BOOL CommManager_UpdateWifiLobbyCommon(void);
-static BOOL CommManager_UpdateWifiLobbyMatchmaking(u32 *param0);
+static void CommTask_StartWifiPlaza(void);
+static void CommTask_LogInWifiPlaza(void);
+static void CommTask_ConnectWifiPlaza(void);
+static void CommTask_LogoutWifiPlaza(void);
+static void CommTask_WaitLogoutWifiPlaza(void);
+static void CommTask_WifiPlazaError(void);
+static void CommTask_ConnectWifiPlazaP2P(void);
+static void CommTask_WaitWifiPlazaMatchServerP2P(void);
+static void CommTask_DisconnectWifiPlazaP2P(void);
+static void CommTask_WifiPlazaTimeout(void);
+static BOOL CommManager_ProcessWifiPlazaDWCError(int param0);
+static BOOL CommManager_UpdateWifiPlaza(void);
+static BOOL CommManager_UpdateWifiPlazaCommon(void);
+static BOOL CommManager_UpdateWifiPlazaMatchmaking(u32 *param0);
 static void CommTask_StartDrawClient(void);
 static void CommTask_InitDrawClient(void);
 static void CommTask_ConnectDraw(void);
@@ -416,7 +417,7 @@ void CommManager_EndBattle(void)
  *
  * @param entry
  */
-void WirelessManager_SetEntry2(BOOL entry)
+void CommManager_SetWirelessEntry(BOOL entry)
 {
     WirelessManager_SetEntry(entry);
 }
@@ -490,7 +491,7 @@ void CommManager_ConnectUnion(int connectionID)
 /**
  * @brief Checks if the current CommManager task is the union client connection success task
  *
- * @return TRUE if the task is CommTask_SuccededConnectUnionClient, -1 if sCommMan isn't initialized or the current task is CommTask_FailedConnectUnionClient, FALSE otherwise
+ * @return TRUE if the task is CommTask_SucceededConnectUnionClient, -1 if sCommMan isn't initialized or the current task is CommTask_FailedConnectUnionClient, FALSE otherwise
  */
 int CommManager_IsConnectedUnionClientSuccess(void)
 {
@@ -502,7 +503,7 @@ int CommManager_IsConnectedUnionClientSuccess(void)
 
     task = (u32)sCommMan->task;
 
-    if (task == (u32)CommTask_SuccededConnectUnionClient) {
+    if (task == (u32)CommTask_SucceededConnectUnionClient) {
         return TRUE;
     }
 
@@ -720,7 +721,7 @@ static void CommTask_StartUnderground(void)
 
     CommServerClient_Init(sCommMan->trainerInfo, 1);
     CommInfo_Init(sCommMan->saveData, NULL);
-    CommSys_SetAlone(1);
+    CommSys_SetAlone(TRUE);
     CommSys_EnableSendMovementData();
 
     if (sCommMan->initializeAsServer) {
@@ -752,7 +753,7 @@ static void CommTask_ReinitUnderground(void)
         return;
     }
 
-    CommSys_SetAlone(1);
+    CommSys_SetAlone(TRUE);
     CommSys_EnableSendMovementData();
 
     if (sCommMan->initializeAsServer) {
@@ -859,7 +860,7 @@ static void CommTask_ConnectingUndergroundClient(void)
 {
     if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         CommSys_Reset();
-        CommSys_SetAlone(0);
+        CommSys_SetAlone(FALSE);
         CommSys_EnableSendMovementData();
         CommManager_SetTask(CommTask_ConnectUndergroundClient, 0);
         return;
@@ -911,7 +912,7 @@ static void CommTask_InitUndergroundServer(void)
         return;
     }
 
-    CommSys_SetAlone(1);
+    CommSys_SetAlone(TRUE);
 
     if (CommSys_InitServer(0, sCommMan->unk_4E, 500, 1)) {
         u32 rand = MATH_Rand32(&sCommMan->rand, 40 / 2);
@@ -951,7 +952,7 @@ static void CommTask_WaitUndergroundServer(void)
  */
 static void CommTask_InitConnectUndergroundServer(void)
 {
-    CommSys_SetAlone(0);
+    CommSys_SetAlone(FALSE);
     sub_02033EA8(1);
     CommSys_EnableSendMovementData();
     CommManager_SetTask(CommTask_ConnectUndergroundServer, 0);
@@ -983,7 +984,7 @@ static void CommTask_StartSecretBase(void)
             return;
         }
 
-        CommSys_SetAlone(1);
+        CommSys_SetAlone(TRUE);
         CommSys_EnableSendMovementData();
         CommServerClient_SetSecretBaseClosedState(TRUE);
     }
@@ -1474,7 +1475,7 @@ static void CommTask_ConnectUnionClient(void)
 
     if (sCommMan->unionConnectState == 1) {
         CommInfo_SendPlayerInfo();
-        CommManager_SetTask(CommTask_SuccededConnectUnionClient, 0);
+        CommManager_SetTask(CommTask_SucceededConnectUnionClient, 0);
         return;
     }
 
@@ -1493,7 +1494,7 @@ static void CommTask_ConnectUnionClient(void)
 /**
  * @brief Task that indicates a client has sucessfully connected to the union. Monitors for errors and resets on error.
  */
-static void CommTask_SuccededConnectUnionClient(void)
+static void CommTask_SucceededConnectUnionClient(void)
 {
     if (CommSys_CheckError()) {
         CommManager_SetTask(CommTask_ResetUnionClient, 0);
@@ -1717,7 +1718,7 @@ static void CommTask_ConnectingDraw(void)
     }
 
     if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
-        CommManager_SetTask(CommTask_SuccededConnectUnionClient, 0);
+        CommManager_SetTask(CommTask_SucceededConnectUnionClient, 0);
         return;
     }
 
@@ -1747,17 +1748,17 @@ void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg,
 {
     int i;
     u8 *confirmation = msg;
-    BOOL success = 1;
+    BOOL success = TRUE;
 
     if (CommSys_CurNetId() != 0) {
         return;
     }
 
-    success = 1;
+    success = TRUE;
 
     for (i = 0; i < sizeof(sFreakConfirmationMessage); i++) {
         if (confirmation[i] != sFreakConfirmationMessage[i]) {
-            success = 0;
+            success = FALSE;
             break;
         }
     }
@@ -1933,7 +1934,7 @@ BOOL CommManager_IsPoketchSearching(void)
 }
 
 /**
- * @brief Callback used by WirelessManager_SetGGIDScanCallback
+ * @brief Callback used by WirelessManager_SetGGIDScanCallback. Sets the avaliable connections.
  *
  * @param ggid
  * @param commType
@@ -1943,17 +1944,17 @@ static void CommManager_GGIDScanCallback(u32 ggid, int commType)
     switch (ggid) {
     case 0x333:
         if (commType == COMM_TYPE_MYSTERY_GIFT) {
-            sCommMan->unk_54 |= 0x1;
+            sCommMan->availableConnections |= AV_CONNECT_MYSTERY_GIFT;
         }
         break;
     case 0x400318:
-        sCommMan->unk_54 |= 0x1;
+        sCommMan->availableConnections |= AV_CONNECT_MYSTERY_GIFT;
         break;
     case 0x400131:
-        sCommMan->unk_54 |= 0x2;
+        sCommMan->availableConnections |= AV_CONNECT_RANGER_LINK;
         break;
     case 0x400286:
-        sCommMan->unk_54 |= 0x4;
+        sCommMan->availableConnections |= AV_CONNECT_WII;
         break;
     }
 }
@@ -2014,13 +2015,13 @@ void CommManager_EndSearchParty(void)
 }
 
 /**
- * @brief Gets the Communication Manager's unk_54
+ * @brief Gets the Communication Manager's avaliable connections
  *
- * @return sCommMan->unk_54
+ * @return sCommMan->availableConnections
  */
-u8 CommManager_GetUnk54(void)
+u8 CommManager_GetAvailableConnections(void)
 {
-    return sCommMan->unk_54;
+    return sCommMan->availableConnections;
 }
 
 /**
@@ -2040,8 +2041,8 @@ BOOL CommManager_ExitOrReset(void)
         NintendoWFC_Stop();
         return TRUE;
     } else if (CommManager_IsConnectedToWifi()) {
-        if (sCommMan->commType == COMM_TYPE_LOBBY_WIFI) {
-            CommManager_SetTask(CommTask_LogoutWifiLobby, 0);
+        if (sCommMan->commType == COMM_TYPE_WIFI_PLAZA) {
+            CommManager_SetTask(CommTask_LogoutWifiPlaza, 0);
         } else {
             CommManager_SetTask(CommTask_LogoutWifi, 0);
         }
@@ -2131,7 +2132,7 @@ static void CommTask_ConnectWifiBattle(void)
 {
     int ret;
 
-    CommSys_SetWifiConnected(1);
+    CommSys_SetWifiConnected(TRUE);
 
     ret = NintendoWFC_Process(0);
 
@@ -2282,15 +2283,15 @@ int CommManager_GetMatchmakingState(void)
         return 5;
     }
 
-    if (sCommMan->task == CommTask_WaitWifiLobbyMatchServerP2P) {
+    if (sCommMan->task == CommTask_WaitWifiPlazaMatchServerP2P) {
         return 0;
     }
 
-    if (sCommMan->task == CommTask_ConnectWifiLobbyP2P) {
+    if (sCommMan->task == CommTask_ConnectWifiPlazaP2P) {
         return 1;
     }
 
-    if (sCommMan->task == CommTask_WifiLobbyTimeout) {
+    if (sCommMan->task == CommTask_WifiPlazaTimeout) {
         return 3;
     }
 
@@ -2341,7 +2342,7 @@ static void CommTask_EndMatchmakingWifi(void)
 {
     int ret;
 
-    CommSys_SetWifiConnected(0);
+    CommSys_SetWifiConnected(FALSE);
 
     if (NintendoWFC_EndConnection(sCommMan->unk_4C)) {
         if (NintendoWFC_ReturnToReadyState()) {
@@ -2388,7 +2389,7 @@ BOOL CommManager_GetDisconnectedWifi(void)
 /**
  * @brief Checks if the current task is loging in to the wifi battle
  *
- * @return TRUE if task is CommTask_WifiBattleLogin, or CommTask_ConnectWifiLobby
+ * @return TRUE if task is CommTask_WifiBattleLogin, or CommTask_ConnectWifiPlaza
  */
 BOOL CommManager_IsLoginBattleWifi(void)
 {
@@ -2398,7 +2399,7 @@ BOOL CommManager_IsLoginBattleWifi(void)
         return 1;
     }
 
-    if (task == (u32)CommTask_ConnectWifiLobby) {
+    if (task == (u32)CommTask_ConnectWifiPlaza) {
         return 1;
     }
 
@@ -2408,7 +2409,7 @@ BOOL CommManager_IsLoginBattleWifi(void)
 /**
  * @brief Checks if the current task is loging in to the wifi battle matchmaking
  *
- * @return TRUE if task is CommTask_WifiBattleMatchmaking, CommTask_WifiBattleLogin, or CommTask_ConnectWifiLobby
+ * @return TRUE if task is CommTask_WifiBattleMatchmaking, CommTask_WifiBattleLogin, or CommTask_ConnectWifiPlaza
  */
 BOOL CommManager_IsLoginBattleMatchWifi(void)
 {
@@ -2422,7 +2423,7 @@ BOOL CommManager_IsLoginBattleMatchWifi(void)
         return 1;
     }
 
-    if (task == (u32)CommTask_ConnectWifiLobby) {
+    if (task == (u32)CommTask_ConnectWifiPlaza) {
         return 1;
     }
 
@@ -2447,7 +2448,7 @@ static void CommTask_LogoutWifi(void)
 {
     int ret;
 
-    CommSys_SetWifiConnected(0);
+    CommSys_SetWifiConnected(FALSE);
 
     if (NintendoWFC_EndConnection(0)) {
         NintendoWFC_ReturnToReadyState();
@@ -2521,7 +2522,7 @@ void CommManager_EndBattleWifiMatch(void)
 /**
  * @brief Checks if the Communication Manager is in a wifi error task
  *
- * @return TRUE if task is CommTask_WifiBattleError, CommTask_WifiBattleTimeout, or CommTask_WifiLobbyTimeout
+ * @return TRUE if task is CommTask_WifiBattleError, CommTask_WifiBattleTimeout, or CommTask_WifiPlazaTimeout
  */
 BOOL CommManager_CheckWifiError(void)
 {
@@ -2536,7 +2537,7 @@ BOOL CommManager_CheckWifiError(void)
             return TRUE;
         }
 
-        if ((task == (u32)CommTask_WifiLobbyTimeout) && sCommMan->errorDisconnect) {
+        if ((task == (u32)CommTask_WifiPlazaTimeout) && sCommMan->errorDisconnect) {
             return TRUE;
         }
     }
@@ -2683,17 +2684,17 @@ static void CommTask_ConnectingWifiBattle(void)
     sCommMan->timer--;
 
     if (ret == NINTENDO_WFC_RESULT_CONNECTED_TO_SERVER) {
-        if (sCommMan->commType == COMM_TYPE_LOBBY_WIFI) {
+        if (sCommMan->commType == COMM_TYPE_WIFI_PLAZA) {
             BOOL v1;
 
             v1 = ov66_02232714(sCommMan->unk_5C);
 
             if (v1 == TRUE) {
-                sCommMan->lobbyLoginSuccess = TRUE;
-                CommManager_SetTask(CommTask_LogInWifiLobby, sCommMan->timer);
+                sCommMan->plazaLoginSuccess = TRUE;
+                CommManager_SetTask(CommTask_LogInWifiPlaza, sCommMan->timer);
                 return;
             } else {
-                CommManager_SetTask(CommTask_WifiLobbyError, 0);
+                CommManager_SetTask(CommTask_WifiPlazaError, 0);
                 return;
             }
         } else {
@@ -2759,12 +2760,12 @@ void *CommManager_LoginWifiBattleServer(SaveData *saveData, int size)
 }
 
 /**
- * @brief Initializes the Communication Manager for the Wifi Lobby
+ * @brief Initializes the Communication Manager for the Wifi Plaza
  *
  * @param saveData
  * @param param1
  */
-void CommManager_LoginWifiLobby(SaveData *saveData, const void *param1)
+void CommManager_LoginWifiPlaza(SaveData *saveData, const void *param1)
 {
     TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(saveData);
 
@@ -2774,54 +2775,54 @@ void CommManager_LoginWifiLobby(SaveData *saveData, const void *param1)
 
     ResetLock(RESET_LOCK_0x1);
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
-    CommManager_Initialize(saveData, COMM_TYPE_LOBBY_WIFI);
+    CommManager_Initialize(saveData, COMM_TYPE_WIFI_PLAZA);
 
     sCommMan->unk_00 = NULL;
     sCommMan->unk_5C = param1;
-    sCommMan->lobbyLoginSuccess = FALSE;
+    sCommMan->plazaLoginSuccess = FALSE;
     sCommMan->contestRegulation = 0;
     sCommMan->saveData = saveData;
 
-    CommManager_SetTask(CommTask_StartWifiLobby, 0);
+    CommManager_SetTask(CommTask_StartWifiPlaza, 0);
 }
 
 /**
- * @brief Begins the Communication Manager's log out of wifi lobby task
+ * @brief Begins the Communication Manager's log out of wifi Plaza task
  */
-void CommManager_LogoutWifiLobby(void)
+void CommManager_LogoutWifiPlaza(void)
 {
     if (sCommMan == NULL) {
         return;
     }
 
-    CommManager_SetTask(CommTask_LogoutWifiLobby, 0);
+    CommManager_SetTask(CommTask_LogoutWifiPlaza, 0);
 }
 
 /**
  * @brief Gets the flag for whether the login task has been reached successfully
  *
- * @return sCommMan->lobbyLoginSuccess
+ * @return sCommMan->plazaLoginSuccess
  */
-BOOL CommManager_GetWifiLobbyLoginSuccess(void)
+BOOL CommManager_GetWifiPlazaLoginSuccess(void)
 {
     if (sCommMan == NULL) {
         return 0;
     }
 
-    return sCommMan->lobbyLoginSuccess;
+    return sCommMan->plazaLoginSuccess;
 }
 
 /**
- * @brief Checks if the current Communication Manager is in a Wifi Lobby Error state
+ * @brief Checks if the current Communication Manager is in a Wifi Plaza Error state
  *
- * @return TRUE if the current task is CommTask_WifiLobbyError
+ * @return TRUE if the current task is CommTask_WifiPlazaError
  */
-BOOL CommManager_IsWifiLobbyError(void)
+BOOL CommManager_IsWifiPlazaError(void)
 {
     if (sCommMan) {
         u32 task = (u32)sCommMan->task;
 
-        if (task == (u32)CommTask_WifiLobbyError) {
+        if (task == (u32)CommTask_WifiPlazaError) {
             return TRUE;
         }
     }
@@ -2839,10 +2840,10 @@ void CommManager_StartWifiP2P(UnkEnum_ov66_02232F38 param0)
 
     if (ov66_02233184(param0) == 0) {
         ov66_02232F38(param0, 4);
-        CommManager_SetTask(CommTask_WaitWifiLobbyMatchServerP2P, 0);
+        CommManager_SetTask(CommTask_WaitWifiPlazaMatchServerP2P, 0);
     } else {
         ov66_02233260(param0);
-        CommManager_SetTask(CommTask_WaitWifiLobbyMatchServerP2P, 0);
+        CommManager_SetTask(CommTask_WaitWifiPlazaMatchServerP2P, 0);
     }
 }
 
@@ -2856,7 +2857,7 @@ void CommManager_EndWifiP2P(void)
     }
 
     ov66_0223361C();
-    CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
+    CommManager_SetTask(CommTask_DisconnectWifiPlazaP2P, 0);
 }
 
 /**
@@ -2869,11 +2870,11 @@ u32 CommManager_GetWifiP2PConnectState(void)
     if (sCommMan) {
         u32 task = (u32)sCommMan->task;
 
-        if (task == (u32)CommTask_ConnectWifiLobbyP2P) {
+        if (task == (u32)CommTask_ConnectWifiPlazaP2P) {
             return 2;
-        } else if (task == (u32)CommTask_WaitWifiLobbyMatchServerP2P) {
+        } else if (task == (u32)CommTask_WaitWifiPlazaMatchServerP2P) {
             return 1;
-        } else if (task == (u32)CommTask_DisconnectWifiLobbyP2P) {
+        } else if (task == (u32)CommTask_DisconnectWifiPlazaP2P) {
             return 3;
         }
     }
@@ -3068,7 +3069,7 @@ void CommManager_DisplayError(int unused)
 {
     if (CommManager_CheckError()) {
         if (CommSys_CheckError() || CommManager_CheckWifiError() || CommManager_GetDWCError()
-            || (sCommMan->commError != COMM_ERROR_NONE) || CommManager_IsWifiLobbyError()) {
+            || (sCommMan->commError != COMM_ERROR_NONE) || CommManager_IsWifiPlazaError()) {
             if (!HeapCanaryOK()) {
                 if (!CommManager_GetResetType()) {
                     Sound_StopWaveOutAndSequences();
@@ -3143,11 +3144,11 @@ void CommManager_SetState_WifiClub(void)
 }
 
 /**
- * @brief Sets sCommMan->commType to COMM_TYPE_LOBBY_WIFI and updates the data transfer callbacks
+ * @brief Sets sCommMan->commType to COMM_TYPE_WIFI_PLAZA and updates the data transfer callbacks
  */
-void CommManager_SetState_WifiLobby(void)
+void CommManager_SetState_WifiPlaza(void)
 {
-    sCommMan->commType = COMM_TYPE_LOBBY_WIFI;
+    sCommMan->commType = COMM_TYPE_WIFI_PLAZA;
     NintendoDWC_SetDataTransferCallbacks(sub_020352C0, sub_020352C0);
 }
 
@@ -3170,9 +3171,9 @@ void CommManager_SetState_SingleBattleWifi(void)
 }
 
 /**
- * @brief Task to initialize the Communication Manager for the Wifi Lobby and battle
+ * @brief Task to initialize the Communication Manager for the Wifi Plaza and battle
  */
-static void CommTask_StartWifiLobby(void)
+static void CommTask_StartWifiPlaza(void)
 {
     if (!WirelessDriver_IsReady()) {
         return;
@@ -3191,9 +3192,9 @@ static void CommTask_StartWifiLobby(void)
 }
 
 /**
- * @brief Task while logging in to the wifi lobby, errors if timed out
+ * @brief Task while logging in to the wifi Plaza, errors if timed out
  */
-static void CommTask_LogInWifiLobby(void)
+static void CommTask_LogInWifiPlaza(void)
 {
     BOOL result;
 
@@ -3204,9 +3205,9 @@ static void CommTask_LogInWifiLobby(void)
         return;
     }
 
-    CommSys_SetWifiConnected(1);
+    CommSys_SetWifiConnected(TRUE);
 
-    result = CommManager_UpdateWifiLobbyCommon();
+    result = CommManager_UpdateWifiPlazaCommon();
 
     if (result == 0) {
         return;
@@ -3215,16 +3216,16 @@ static void CommTask_LogInWifiLobby(void)
     result = ov66_02232804();
 
     if (result) {
-        CommManager_SetTask(CommTask_ConnectWifiLobby, 0);
+        CommManager_SetTask(CommTask_ConnectWifiPlaza, 0);
     }
 }
 
 /**
- * @brief Task while connecting to the wifi lobby. Internal process handled entirely by CommManager_UpdateWifiLobbyCommon
+ * @brief Task while connecting to the wifi Plaza. Internal process handled entirely by CommManager_UpdateWifiPlazaCommon
  */
-static void CommTask_ConnectWifiLobby(void)
+static void CommTask_ConnectWifiPlaza(void)
 {
-    BOOL ret = CommManager_UpdateWifiLobbyCommon();
+    BOOL ret = CommManager_UpdateWifiPlazaCommon();
 
     if (ret == 0) {
         return;
@@ -3232,11 +3233,11 @@ static void CommTask_ConnectWifiLobby(void)
 }
 
 /**
- * @brief Processes any DWC Error when handling the wifi connection for the wifi lobby
+ * @brief Processes any DWC Error when handling the wifi connection for the wifi Plaza
  *
  * @return TRUE if no error occured
  */
-static BOOL CommManager_ProcessWifiLobbyDWCError(int dwcError)
+static BOOL CommManager_ProcessWifiPlazaDWCError(int dwcError)
 {
     BOOL ret = TRUE;
 
@@ -3247,7 +3248,7 @@ static BOOL CommManager_ProcessWifiLobbyDWCError(int dwcError)
         CommManager_SetTask(CommTask_WifiBattleError, 0);
         ret = FALSE;
     } else if (dwcError == ((DWC_ERROR_NUM) + 3)) {
-        CommManager_SetTask(CommTask_WifiLobbyTimeout, 0);
+        CommManager_SetTask(CommTask_WifiPlazaTimeout, 0);
         ret = FALSE;
     } else if (dwcError == ((DWC_ERROR_NUM) + 4)) {
         ret = FALSE;
@@ -3270,16 +3271,16 @@ static BOOL CommManager_ProcessWifiLobbyDWCError(int dwcError)
 }
 
 /**
- * @brief Calls the updates wifi lobby function
+ * @brief Calls the updates wifi Plaza function
  *
- * @return TRUE if no error occured processing the lobby
+ * @return TRUE if no error occured processing the Plaza
  */
-static BOOL CommManager_UpdateWifiLobby(void)
+static BOOL CommManager_UpdateWifiPlaza(void)
 {
     UnkEnum_ov66_0223287C ret;
     BOOL noError = TRUE;
 
-    ret = ov66_022325D8(); // Wifi lobby update function
+    ret = ov66_022325D8(); // Wifi Plaza update function
 
     switch (ret) {
     case UnkEnum_ov66_0223287C_00: // none
@@ -3289,7 +3290,7 @@ static BOOL CommManager_UpdateWifiLobby(void)
         break;
 
     case UnkEnum_ov66_0223287C_04: // error
-        CommManager_SetTask(CommTask_WifiLobbyError, 0);
+        CommManager_SetTask(CommTask_WifiPlazaError, 0);
         noError = FALSE;
         break;
     }
@@ -3298,35 +3299,35 @@ static BOOL CommManager_UpdateWifiLobby(void)
 }
 
 /**
- * @brief Calls the update wifi lobby function and wifi connection process function
+ * @brief Calls the update wifi Plaza function and wifi connection process function
  *
- * @return TRUE if no error occured processing the lobby or handling the connection
+ * @return TRUE if no error occured processing the Plaza or handling the connection
  */
-static BOOL CommManager_UpdateWifiLobbyCommon(void)
+static BOOL CommManager_UpdateWifiPlazaCommon(void)
 {
     int errorCode;
     BOOL ret;
 
     errorCode = NintendoWFC_Process(0);
 
-    ret = CommManager_ProcessWifiLobbyDWCError(errorCode);
+    ret = CommManager_ProcessWifiPlazaDWCError(errorCode);
 
     if (ret == 0) {
         return ret;
     }
 
-    ret = CommManager_UpdateWifiLobby();
+    ret = CommManager_UpdateWifiPlaza();
     return ret;
 }
 
 /**
- * @brief Updates the wifi lobby matchmaking
+ * @brief Updates the wifi Plaza matchmaking
  *
  * @param matchmakingRet
  *
- * @return TRUE if no errors occurred while updating the lobby or while processing matchmaking
+ * @return TRUE if no errors occurred while updating the Plaza or while processing matchmaking
  */
-static BOOL CommManager_UpdateWifiLobbyMatchmaking(u32 *matchmakingRet)
+static BOOL CommManager_UpdateWifiPlazaMatchmaking(u32 *matchmakingRet)
 {
     int wfcResult;
     BOOL ret;
@@ -3338,35 +3339,35 @@ static BOOL CommManager_UpdateWifiLobbyMatchmaking(u32 *matchmakingRet)
     } else {
         *matchmakingRet = 0;
 
-        ret = CommManager_ProcessWifiLobbyDWCError(wfcResult);
+        ret = CommManager_ProcessWifiPlazaDWCError(wfcResult);
 
         if (ret == 0) {
             return ret;
         }
     }
 
-    ret = CommManager_UpdateWifiLobby();
+    ret = CommManager_UpdateWifiPlaza();
     return ret;
 }
 
 /**
- * @brief Calls the Wifi Lobby logout function and waits
+ * @brief Calls the Wifi Plaza logout function and waits
  */
-static void CommTask_LogoutWifiLobby(void)
+static void CommTask_LogoutWifiPlaza(void)
 {
     ov66_0223282C();
-    CommManager_SetTask(CommTask_WaitLogoutWifiLobby, 0);
+    CommManager_SetTask(CommTask_WaitLogoutWifiPlaza, 0);
 }
 
 /**
  * @brief Waits until the Wifi logout function is complete, then ends communication
  */
-static void CommTask_WaitLogoutWifiLobby(void)
+static void CommTask_WaitLogoutWifiPlaza(void)
 {
     BOOL result;
 
     NintendoWFC_Process(0);
-    CommManager_UpdateWifiLobby();
+    CommManager_UpdateWifiPlaza();
 
     result = ov66_02232854();
 
@@ -3374,38 +3375,38 @@ static void CommTask_WaitLogoutWifiLobby(void)
         ResetUnlock(RESET_LOCK_0x1);
         CommInfo_Delete();
         CommManager_SetTask(CommTask_EndConnection, 5);
-        CommSys_SetWifiConnected(0);
+        CommSys_SetWifiConnected(FALSE);
     }
 }
 
 /**
- * @brief Task the Comm Manager uses to indicate that an error has occured in the wifi lobby. Does nothing when called.
+ * @brief Task the Comm Manager uses to indicate that an error has occured in the wifi Plaza. Does nothing when called.
  */
-static void CommTask_WifiLobbyError(void)
+static void CommTask_WifiPlazaError(void)
 {
     return;
 }
 
 /**
- * @brief Connects to the Wifi Lobby using a p2p connection
+ * @brief Connects to the Wifi Plaza using a p2p connection
  */
-static void CommTask_ConnectWifiLobbyP2P(void)
+static void CommTask_ConnectWifiPlazaP2P(void)
 {
     BOOL ret;
-    CommManager_UpdateWifiLobbyCommon();
+    CommManager_UpdateWifiPlazaCommon();
 
     ret = ov66_02233164();
 
     if (ret == 1) {
         ov66_0223361C();
-        CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
+        CommManager_SetTask(CommTask_DisconnectWifiPlazaP2P, 0);
     }
 }
 
 /**
- * @brief Task that indicates the server is waiting for a p2p connection for wifi lobby matchmaking. Disconnects if there's an error.
+ * @brief Task that indicates the server is waiting for a p2p connection for wifi Plaza matchmaking. Disconnects if there's an error.
  */
-static void CommTask_WaitWifiLobbyMatchServerP2P(void)
+static void CommTask_WaitWifiPlazaMatchServerP2P(void)
 {
     BOOL ret;
     u32 v1;
@@ -3414,29 +3415,29 @@ static void CommTask_WaitWifiLobbyMatchServerP2P(void)
 
     if (ret == 1) {
         ov66_0223361C();
-        CommManager_SetTask(CommTask_DisconnectWifiLobbyP2P, 0);
+        CommManager_SetTask(CommTask_DisconnectWifiPlazaP2P, 0);
         return;
     }
 
-    CommManager_UpdateWifiLobbyMatchmaking(&v1);
+    CommManager_UpdateWifiPlazaMatchmaking(&v1);
 
     switch (v1) {
     case 0:
         break;
     case (DWC_ERROR_NUM):
-        CommManager_SetTask(CommTask_ConnectWifiLobbyP2P, 0);
+        CommManager_SetTask(CommTask_ConnectWifiPlazaP2P, 0);
         break;
     default:
         ov66_0223361C();
-        CommManager_SetTask(CommTask_ConnectWifiLobby, 0);
+        CommManager_SetTask(CommTask_ConnectWifiPlaza, 0);
         break;
     }
 }
 
 /**
- * @brief Handles a wifi lobby p2p disconnect and updates the wifi lobby
+ * @brief Handles a wifi Plaza p2p disconnect and updates the wifi Plaza
  */
-static void CommTask_DisconnectWifiLobbyP2P(void)
+static void CommTask_DisconnectWifiPlazaP2P(void)
 {
     BOOL updateResult;
     int ret = NintendoWFC_Process(1);
@@ -3446,7 +3447,7 @@ static void CommTask_DisconnectWifiLobbyP2P(void)
         return;
     }
 
-    updateResult = CommManager_UpdateWifiLobby();
+    updateResult = CommManager_UpdateWifiPlaza();
 
     if (updateResult == 0) {
         return;
@@ -3458,15 +3459,15 @@ static void CommTask_DisconnectWifiLobbyP2P(void)
         if (ret) {
             CommSys_Reset();
             sub_0203632C(0);
-            CommManager_SetTask(CommTask_ConnectWifiLobby, 0);
+            CommManager_SetTask(CommTask_ConnectWifiPlaza, 0);
         }
     }
 }
 
 /**
- * @brief Handles a wifi lobby timeout and updates the wifi lobby
+ * @brief Handles a wifi Plaza timeout and updates the wifi Plaza
  */
-static void CommTask_WifiLobbyTimeout(void)
+static void CommTask_WifiPlazaTimeout(void)
 {
     int ret = NintendoWFC_Process(0);
 
@@ -3474,7 +3475,7 @@ static void CommTask_WifiLobbyTimeout(void)
         CommManager_SetTask(CommTask_WifiBattleError, 0);
     }
 
-    CommManager_UpdateWifiLobby();
+    CommManager_UpdateWifiPlaza();
 }
 
 /**
diff --git a/src/main_menu/main_menu.c b/src/main_menu/main_menu.c
index 149481a6fd9..c7f1a636a05 100644
--- a/src/main_menu/main_menu.c
+++ b/src/main_menu/main_menu.c
@@ -1,6 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_avaliable_connections.h"
 #include "constants/graphics.h"
 #include "constants/narc.h"
 #include "generated/genders.h"
@@ -86,10 +87,7 @@ FS_EXTERN_OVERLAY(overlay98);
 #define DIRECTION_UP   (-1)
 #define DIRECTION_DOWN 1
 
-#define MYSTERY_GIFT   0b00000001
-#define RANGER_LINK    0b00000010
-#define WII_CONNECTION 0b00000100
-#define NEW_GAME_WARN  0b10000000
+#define NEW_GAME_WARN 0b10000000
 
 enum MainMenuNextApp {
     NEXT_APP_TITLE_SCREEN = 0,
@@ -421,8 +419,8 @@ static void DetectWirelessConnections(MainMenuAppData *appData)
         appData->pendingAlerts = 0;
 
         if (MysteryGift_GetMysteryGiftUnlockedFlag(appData->mysteryGift) == TRUE) {
-            appData->pendingAlerts |= MYSTERY_GIFT;
-            appData->shownAlerts |= MYSTERY_GIFT;
+            appData->pendingAlerts |= AV_CONNECT_MYSTERY_GIFT;
+            appData->shownAlerts |= AV_CONNECT_MYSTERY_GIFT;
         }
         break;
     case MAIN_MENU_WIRELESS_CHECK_CHECK_RESULT:
@@ -430,25 +428,25 @@ static void DetectWirelessConnections(MainMenuAppData *appData)
             break;
         }
 
-        int availableConnections = CommManager_GetUnk54();
+        int availableConnections = CommManager_GetAvailableConnections();
         availableConnections = ~appData->pendingAlerts & availableConnections;
 
         if (availableConnections && (appData->alertsState == MAIN_MENU_ALERTS_STATE_WAIT) && (appData->alertsPending == FALSE) && (appData->pendingAlerts != availableConnections)) {
             appData->shouldUpdateOptions = TRUE;
 
-            if (availableConnections & MYSTERY_GIFT) {
-                appData->mysteryGiftUnlocked = TRUE, availableConnections = MYSTERY_GIFT;
+            if (availableConnections & AV_CONNECT_MYSTERY_GIFT) {
+                appData->mysteryGiftUnlocked = TRUE, availableConnections = AV_CONNECT_MYSTERY_GIFT;
             }
 
-            if (availableConnections & RANGER_LINK) {
-                appData->rangerLinkAvailable = TRUE, availableConnections = RANGER_LINK;
+            if (availableConnections & AV_CONNECT_RANGER_LINK) {
+                appData->rangerLinkAvailable = TRUE, availableConnections = AV_CONNECT_RANGER_LINK;
             }
 
-            if (availableConnections & WII_CONNECTION) {
-                appData->wiiConnectionAvailable = TRUE, availableConnections = WII_CONNECTION;
+            if (availableConnections & AV_CONNECT_WII) {
+                appData->wiiConnectionAvailable = TRUE, availableConnections = AV_CONNECT_WII;
             }
 
-            if (availableConnections & (MYSTERY_GIFT | RANGER_LINK)) {
+            if (availableConnections & (AV_CONNECT_MYSTERY_GIFT | AV_CONNECT_RANGER_LINK)) {
                 appData->newAlerts = TRUE;
             }
 
@@ -494,14 +492,14 @@ static BOOL ShowAlerts(MainMenuAppData *appData)
 
         MainMenuAlertTemplate *alertTemplate;
 
-        if (pendingAlerts & MYSTERY_GIFT) {
-            if (appData->extraUnlockedOptions & MYSTERY_GIFT) {
+        if (pendingAlerts & AV_CONNECT_MYSTERY_GIFT) {
+            if (appData->extraUnlockedOptions & AV_CONNECT_MYSTERY_GIFT) {
                 alertTemplate = &sMainMenuAlerts[MAIN_MENU_ALERT_MYSTERY_GIFT_OK];
             } else {
                 alertTemplate = &sMainMenuAlerts[MAIN_MENU_ALERT_MYSTERY_GIFT_NO_DEX];
             }
-        } else if (pendingAlerts & RANGER_LINK) {
-            if (appData->extraUnlockedOptions & RANGER_LINK) {
+        } else if (pendingAlerts & AV_CONNECT_RANGER_LINK) {
+            if (appData->extraUnlockedOptions & AV_CONNECT_RANGER_LINK) {
                 alertTemplate = &sMainMenuAlerts[MAIN_MENU_ALERT_RANGER_MSG_OK];
             } else {
                 alertTemplate = &sMainMenuAlerts[MAIN_MENU_ALERT_RANGER_MSG_NO_DEX];
@@ -829,7 +827,7 @@ static BOOL RenderMysteryGiftOption(MainMenuAppData *appData, enum MainMenuOptio
         ClearWirelessIcon(appData, OPTION_WINDOW_WIDTH, yPos);
 
         appData->optionApps[option] = sOptions[option].appToLoad;
-        appData->extraUnlockedOptions |= MYSTERY_GIFT;
+        appData->extraUnlockedOptions |= AV_CONNECT_MYSTERY_GIFT;
 
         MysteryGift_SetMysteryGiftUnlockedFlag(appData->mysteryGift);
         return TRUE;
@@ -846,7 +844,7 @@ static BOOL RenderRangerLinkOption(MainMenuAppData *appData, enum MainMenuOption
 
         appData->optionWirelessIconTypes[option] = WIRELESS_ICON_LOCAL;
         appData->optionApps[option] = sOptions[option].appToLoad;
-        appData->extraUnlockedOptions |= RANGER_LINK;
+        appData->extraUnlockedOptions |= AV_CONNECT_RANGER_LINK;
 
         return TRUE;
     }
diff --git a/src/main_menu/mystery_gift_app.c b/src/main_menu/mystery_gift_app.c
index 7a6ed7502b9..572a3ac28d5 100644
--- a/src/main_menu/mystery_gift_app.c
+++ b/src/main_menu/mystery_gift_app.c
@@ -2484,7 +2484,7 @@ static void ov97_02230224(MysteryGiftAppData *param0)
         param0->unk_62C = 30;
         break;
     case 30:
-        v0 = CommManager_GetUnk54();
+        v0 = CommManager_GetAvailableConnections();
 
         if (v0 & 0x1) {
             param0->unk_634 = 1;
diff --git a/src/nintendo_wfc/main.c b/src/nintendo_wfc/main.c
index 9a91e105556..321777af850 100644
--- a/src/nintendo_wfc/main.c
+++ b/src/nintendo_wfc/main.c
@@ -7,6 +7,7 @@
 #include <vct.h>
 
 #include "constants/communication/comm_error.h"
+#include "constants/communication/comm_type.h"
 #include "constants/net.h"
 
 #include "global/assert.h"
@@ -802,7 +803,7 @@ int NintendoWFC_HandleError(void)
                 case WFC_STATE_INIT:
                 case WFC_STATE_WAIT_CONNECTION:
                 case WFC_STATE_INIT_LOGIN:
-                    if (CommManager_GetCommType() != 33) {
+                    if (CommManager_GetCommType() != COMM_TYPE_WIFI_PLAZA) {
                         DWC_CleanupInet();
                     }
                 default:
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index a03f1cac909..6c15e05eadd 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -1129,7 +1129,7 @@ static void ov7_0224AC48(SysTask *task, void *param1)
 
     ov7_0224A64C(commClubMan);
 
-    WirelessManager_SetEntry2(0);
+    CommManager_SetWirelessEntry(0);
     ListMenu_ProcessInput(commClubMan->unk_5C);
 
     if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
@@ -1169,7 +1169,7 @@ static void ov7_0224ACA4(SysTask *task, void *param1)
         CommTiming_StartSync(10);
         CommClubMan_SetTask(ov7_0224AF2C);
     } else if (v1 != 0xffffffff) {
-        WirelessManager_SetEntry2(1);
+        CommManager_SetWirelessEntry(1);
         CommClubMan_Disconnect();
         CommClubMan_DestroyList(task, commClubMan);
         sCommClubMan->retCode = COMM_CLUB_RET_CANCEL;
@@ -1565,7 +1565,7 @@ static void ov7_0224B370(SysTask *task, void *param1)
 
 static void ov7_0224B3A8(CommClubManager *commClubMan)
 {
-    WirelessManager_SetEntry2(0);
+    CommManager_SetWirelessEntry(0);
     sCommClubMan->retCode = COMM_CLUB_RET_2;
     CommManager_SetErrorHandling(1, 1);
     CommInfo_SendPlayerInfo();
diff --git a/src/overlay066/ov66_02231428.c b/src/overlay066/ov66_02231428.c
index 6bd9b4ac940..17780abef15 100644
--- a/src/overlay066/ov66_02231428.c
+++ b/src/overlay066/ov66_02231428.c
@@ -273,7 +273,7 @@ int ov66_02231718(int param0, int param1)
 
 BOOL ov66_02231760(void)
 {
-    if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
+    if (CommManager_CheckWifiError() || CommManager_IsWifiPlazaError()) {
         return 1;
     }
 
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index 4bb970f5384..1afce6a822b 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -228,7 +228,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         UnkStruct_ov66_0222E71C *v3;
 
         v3 = ov66_0222E3BC(v1->unk_04);
-        CommManager_LoginWifiLobby(v0->saveData, v3);
+        CommManager_LoginWifiPlaza(v0->saveData, v3);
     }
 
         ov67_0225D210(&v0->unk_70, 23);
@@ -236,18 +236,18 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         (*param1)++;
         break;
     case 5:
-        if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
+        if (CommManager_CheckWifiError() || CommManager_IsWifiPlazaError()) {
             ov67_0225D310(&v0->unk_70);
             (*param1) = 9;
         }
 
-        if (CommManager_GetWifiLobbyLoginSuccess() == 1) {
+        if (CommManager_GetWifiPlazaLoginSuccess() == 1) {
             ov66_0222F16C(v1->unk_04);
             (*param1)++;
         }
         break;
     case 6:
-        if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
+        if (CommManager_CheckWifiError() || CommManager_IsWifiPlazaError()) {
             ov67_0225D310(&v0->unk_70);
             (*param1) = 9;
         }
@@ -324,7 +324,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
 
         switch (v11) {
         case 0:
-            CommManager_LogoutWifiLobby();
+            CommManager_LogoutWifiPlaza();
             (*param1) = 13;
             break;
         case 0xfffffffe:
@@ -341,7 +341,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         ov67_0225D294(&v0->unk_40);
         ov67_0225D294(&v0->unk_70);
         ov67_0225D294(&v0->unk_A0);
-        CommManager_LogoutWifiLobby();
+        CommManager_LogoutWifiPlaza();
         (*param1)++;
         break;
     case 15:
@@ -437,7 +437,7 @@ int ov67_0225CC6C(ApplicationManager *appMan, int *param1)
     case 2:
         ov67_0225D210(&v0->unk_40, 26);
 
-        if (CommManager_CheckWifiError() || CommManager_IsWifiLobbyError()) {
+        if (CommManager_CheckWifiError() || CommManager_IsWifiPlazaError()) {
             (*param1) = 5;
             ov67_0225D2EC(&v0->unk_40);
         } else {
@@ -461,7 +461,7 @@ int ov67_0225CC6C(ApplicationManager *appMan, int *param1)
         }
         break;
     case 5:
-        CommManager_LogoutWifiLobby();
+        CommManager_LogoutWifiPlaza();
         (*param1) = 6;
         break;
     case 6:
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 35e5cfc1877..be0b268b9d8 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -696,7 +696,7 @@ int ov70_0225DB90(ApplicationManager *appMan, int *param1)
 
         if (CommManager_CheckWifiError()) {
             ov70_0225F184(&v0->unk_3F4, &v0->unk_340);
-        } else if (CommManager_IsWifiLobbyError()) {
+        } else if (CommManager_IsWifiPlazaError()) {
             ov70_0225F1C0(&v0->unk_3F4, &v0->unk_340, ov66_022326DC());
         } else {
             ov70_0225F1F0(&v0->unk_3F4, &v0->unk_340, ov66_0222DFF8(v0->unk_34));
diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c
index 1e5a1720246..338e6b65305 100644
--- a/src/overlay070/ov70_02265F38.c
+++ b/src/overlay070/ov70_02265F38.c
@@ -438,7 +438,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par
         ov70_02266CF0(&v0->unk_3C, param1, 0);
         ov66_0222E3E4(ov70_0225DEE8(param1), v1->unk_03);
 
-        CommManager_SetState_WifiLobby();
+        CommManager_SetState_WifiPlaza();
         CommInfo_Init(ov66_0222E0C4(ov70_0225DEE8(param1)), NULL);
         CommInfo_SetPersonalTrainerInfo(ov66_0222E918(v2));
         sub_0203632C(0);

From 8a945a982176f8a266dd1a5184bd66ea2e229470 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 18 May 2026 14:04:46 -0400
Subject: [PATCH 16/39] Update field_control.c

---
 src/overlay005/field_control.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index 423cfc8ca18..84e90e026a1 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -61,7 +61,6 @@
 #include "terrain_collision_manager.h"
 #include "trainer_encounter.h"
 #include "trainer_info.h"
-#include "trainer_see.h"
 #include "unk_0203C954.h"
 #include "unk_02054884.h"
 #include "unk_02056B30.h"

From f6b28f32d95ad1ae1a3841876409439c2ade29a0 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 04:25:57 -0400
Subject: [PATCH 17/39] Document comm_command functions

---
 include/comm_manager.h                        |   6 +-
 include/communication_information.h           |   6 +-
 .../constants/communication/comm_command.h    |  34 +++
 include/functypes/funcptr_02032868.h          |   2 +-
 include/functypes/funcptr_0203290C.h          |   2 +-
 include/functypes/funcptr_020F8E60.h          |   2 +-
 include/struct_defs/comm_cmd_table.h          |   6 +-
 include/unk_02032798.h                        |  12 +-
 src/comm_manager.c                            |  10 +-
 src/communication_information.c               |   6 +-
 src/communication_system.c                    |   8 +-
 src/main_menu/ov97_0222D2F8.c                 |   2 +-
 src/overlay083/ov83_0223D4CC.c                |   6 +-
 src/overlay114/ov114_02260044.c               |   4 +-
 src/overlay115/ov115_02265A24.c               |   2 +-
 src/overlay116/ov116_02260440.c               |   2 +-
 src/overlay117/ov117_022665FC.c               |   2 +-
 src/unk_020322D8.c                            |   6 +-
 src/unk_02032798.c                            | 271 ++++++++++++------
 src/unk_0207A6DC.c                            |   4 +-
 src/unk_02095AF0.c                            |   2 +-
 src/unk_02095CD4.c                            |   2 +-
 src/unk_02095E98.c                            |   2 +-
 src/unk_020961E8.c                            |   2 +-
 src/unk_02099500.c                            |   2 +-
 src/unk_0209BA80.c                            |   2 +-
 src/unk_0209BDF8.c                            |   6 +-
 src/unk_0209C390.c                            |   4 +-
 28 files changed, 266 insertions(+), 149 deletions(-)
 create mode 100644 include/constants/communication/comm_command.h

diff --git a/include/comm_manager.h b/include/comm_manager.h
index 9c61632ec1b..5cbf5e37e65 100644
--- a/include/comm_manager.h
+++ b/include/comm_manager.h
@@ -45,8 +45,8 @@ void CommManager_SetState_MixRecords(void);
 void CommManager_StartMixRecordsClient(int connectionID);
 void CommManager_SetState_SpinTrade(void);
 void CommManager_StartSpinTradeClient(int connectionID);
-void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *confirmationMessage, void *unused_3);
-void CommManager_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *confirmationMessage, void *unused_3);
+void CommCmd_ValidateConfirmationMessage(int netID, int unused_1, void *confirmationMessage, void *unused_3);
+void CommCmd_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *confirmationMessage, void *unused_3);
 int CommManager_ConfirmationMessage_sizeof(void);
 void CommManager_SetMaxNumConnections(int maxNumConnection);
 void CommManager_InitializePoketchLinkSearch(SaveData *saveData);
@@ -59,7 +59,7 @@ BOOL CommManager_ExitOrReset(void);
 void CommManager_SetUnk34(int errorCode, int errorType, int error);
 int CommManager_StartWifiBattle(int target);
 int CommManager_GetMatchmakingState();
-void CommManager_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3);
+void CommCmd_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3);
 BOOL CommManager_GetDisconnectedWifi(void);
 BOOL CommManager_IsLoginBattleWifi(void);
 BOOL CommManager_IsLoginBattleMatchWifi(void);
diff --git a/include/communication_information.h b/include/communication_information.h
index 3af7feb8212..6fdec8bb3b7 100644
--- a/include/communication_information.h
+++ b/include/communication_information.h
@@ -12,10 +12,10 @@ void CommInfo_Delete(void);
 BOOL CommInfo_IsInitialized(void);
 void CommInfo_SendPlayerInfo(void);
 int CommPlayerInfo_Size(void);
-void CommunicatitonInformaion_FinishReading(int unused0, int unused1, void *unused2, void *unused3);
+void CommCmd_FinishRecvPlayerInfo(int unused0, int unused1, void *unused2, void *unused3);
 BOOL CommInfo_IsDataFinishedReading(void);
-void CommInfo_RecvPlayerDataArray(int netId, int unused1, void *src, void *unused3);
-void CommInfo_RecvPlayerData(int netId, int unused1, void *src, void *unused3);
+void CommCmd_RecvPlayerInfoArray(int netId, int unused1, void *src, void *unused3);
+void CommCmd_RecvPlayerInfo(int netId, int unused1, void *src, void *unused3);
 BOOL CommInfo_ServerSendArray(void);
 BOOL CommInfo_IsReceivingData(void);
 void CommInfo_InitPlayer(int netId);
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
new file mode 100644
index 00000000000..4076d557ad1
--- /dev/null
+++ b/include/constants/communication/comm_command.h
@@ -0,0 +1,34 @@
+#ifndef POKEPLATINUM_CONSTANTS_COMM_COMMAND_H
+#define POKEPLATINUM_CONSTANTS_COMM_COMMAND_H
+
+/*
+ * Base Communication Commands used globally.
+ */
+
+enum CommCommand_Common {
+    COMM_CMD_NONE = 0,
+    COMM_CMD_1,
+    COMM_CMD_2,
+    COMM_CMD_RECV_PLAYER_INFO,
+    COMM_CMD_RECV_PLAYER_INFO_ARRAY,
+    COMM_CMD_RECV_PLAYER_INFO_FINISH,
+    COMM_CMD_VALIDATE_CONFIRMATION,
+    COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE,
+    COMM_CMD_8,
+    COMM_CMD_9,
+    COMM_CMD_10,
+    COMM_CMD_11,
+    COMM_CMD_12,
+    COMM_CMD_SWAP_CMD_TABLE,
+    COMM_CMD_DEINIT_MANAGER,
+    COMM_CMD_FINISH_SWAP_CMD_TABLE,
+    COMM_CMD_16,
+    COMM_CMD_17,
+    COMM_CMD_18,
+    COMM_CMD_19,
+    COMM_CMD_20,
+    COMM_CMD_DISCONNECT_WIFI,
+    COMM_CMD_MAX_COMMON,
+};
+
+#endif
diff --git a/include/functypes/funcptr_02032868.h b/include/functypes/funcptr_02032868.h
index 84668d8dd0b..109ac981f4d 100644
--- a/include/functypes/funcptr_02032868.h
+++ b/include/functypes/funcptr_02032868.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_FUNCPTR_02032868_H
 #define POKEPLATINUM_FUNCPTR_02032868_H
 
-typedef int (*UnkFuncPtr_02032868)(void);
+typedef int (*CommCmdSizeFunc)(void);
 
 #endif // POKEPLATINUM_FUNCPTR_02032868_H
diff --git a/include/functypes/funcptr_0203290C.h b/include/functypes/funcptr_0203290C.h
index 568141fa3e5..964132edbec 100644
--- a/include/functypes/funcptr_0203290C.h
+++ b/include/functypes/funcptr_0203290C.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_FUNCPTR_0203290C_H
 #define POKEPLATINUM_FUNCPTR_0203290C_H
 
-typedef u8 *(*UnkFuncPtr_0203290C)(int, void *, int);
+typedef u8 *(*CommCmdBuffFunc)(int, void *, int);
 
 #endif // POKEPLATINUM_FUNCPTR_0203290C_H
diff --git a/include/functypes/funcptr_020F8E60.h b/include/functypes/funcptr_020F8E60.h
index e68a92510f6..2d182abfd62 100644
--- a/include/functypes/funcptr_020F8E60.h
+++ b/include/functypes/funcptr_020F8E60.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_FUNCPTR_020F8E60_H
 #define POKEPLATINUM_FUNCPTR_020F8E60_H
 
-typedef void (*UnkFuncPtr_020F8E60)(int, int, void *, void *);
+typedef void (*CommCmdRecvFunc)(int, int, void *, void *);
 
 #endif // POKEPLATINUM_FUNCPTR_020F8E60_H
diff --git a/include/struct_defs/comm_cmd_table.h b/include/struct_defs/comm_cmd_table.h
index 490c561d314..e3aecd611cd 100644
--- a/include/struct_defs/comm_cmd_table.h
+++ b/include/struct_defs/comm_cmd_table.h
@@ -6,9 +6,9 @@
 #include "functypes/funcptr_020F8E60.h"
 
 typedef struct CommCmdTable {
-    UnkFuncPtr_020F8E60 unk_00;
-    UnkFuncPtr_02032868 unk_04;
-    UnkFuncPtr_0203290C unk_08;
+    CommCmdRecvFunc recvFunc; // Receive communication function
+    CommCmdSizeFunc sizeFunc; // Size function
+    CommCmdBuffFunc buffFunc; // Buffer creation function, usually NULL
 } CommCmdTable;
 
 #endif // POKEPLATINUM_STRUCT_DEF_COMM_CMD_TABLE_H
diff --git a/include/unk_02032798.h b/include/unk_02032798.h
index fc0750726a9..d9dd8b53019 100644
--- a/include/unk_02032798.h
+++ b/include/unk_02032798.h
@@ -3,12 +3,12 @@
 
 #include "struct_defs/comm_cmd_table.h"
 
-void CommCmd_Init(const CommCmdTable *param0, int param1, void *param2);
-void sub_020327E0(void);
-void CommCmd_Callback(int param0, int param1, int param2, void *param3);
-int CommCmd_PacketSizeOf(int param0);
-BOOL sub_020328D0(int param0);
-void *sub_0203290C(int param0, int param1, int param2);
+void CommCmdManager_Init(const CommCmdTable *param0, int param1, void *param2);
+void CommCmdManager_Free(void);
+void CommCommCmdManager_Callback(int param0, int param1, int param2, void *param3);
+int CommCmdManager_PacketSizeOf(int param0);
+BOOL CommCmdManager_CheckCmdHasBuffer(int param0);
+void *CommCmdManager_TryCreateRecvBuffer(int param0, int param1, int param2);
 int CommPacketSizeOf_Variable(void);
 int CommPacketSizeOf_Nothing(void);
 int CommPacketSizeOf_NetId(void);
diff --git a/src/comm_manager.c b/src/comm_manager.c
index fdfd204b69d..9a210becf0d 100644
--- a/src/comm_manager.c
+++ b/src/comm_manager.c
@@ -175,7 +175,7 @@ static void CommManager_Initialize(SaveData *saveData, int commType)
     sCommMan->commType = commType;
 
     CommSys_Seed(&sCommMan->rand);
-    CommCmd_Init(NULL, 0, NULL);
+    CommCmdManager_Init(NULL, 0, NULL);
 
     if ((commType != COMM_TYPE_UNION) && (commType != COMM_TYPE_PARTY) && (commType != COMM_TYPE_MYSTERY_GIFT)) {
         NetworkIcon_Init();
@@ -191,7 +191,7 @@ static void CommMan_Free(void)
         return;
     }
 
-    sub_020327E0();
+    CommCmdManager_Free();
 
     if (sCommMan->unk_00) {
         Heap_Free(sCommMan->unk_00);
@@ -1744,7 +1744,7 @@ static void CommTask_ConnectingDraw(void)
  * @param confirmationMessage
  * @param unused_3
  */
-void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg, void *unused_3)
+void CommCmd_ValidateConfirmationMessage(int netID, int unused_1, void *msg, void *unused_3)
 {
     int i;
     u8 *confirmation = msg;
@@ -1783,7 +1783,7 @@ void CommManager_ValidateConfirmationMessage(int netID, int unused_1, void *msg,
  * @param confirmationMessage
  * @param unused_3
  */
-void CommManager_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *msg, void *unused_3)
+void CommCmd_ValidateConfirmationResponseMessage(int unused_0, int unused_1, void *msg, void *unused_3)
 {
     u8 netID;
     int i;
@@ -2363,7 +2363,7 @@ static void CommTask_EndMatchmakingWifi(void)
 /**
  * @brief Ends wifi matchmaking and sets the disconnected from wifi flag. Params unused
  */
-void CommManager_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3)
+void CommCmd_DisconnectWifi(int unused_0, int unused_1, void *unused_2, void *unused_3)
 {
     if (CommSys_CurNetId() == 0) {
         sCommMan->unk_4C = 0;
diff --git a/src/communication_information.c b/src/communication_information.c
index 2e6db313018..4a424c0eb23 100644
--- a/src/communication_information.c
+++ b/src/communication_information.c
@@ -153,7 +153,7 @@ int CommPlayerInfo_Size(void)
     return sizeof(CommPlayerInfo);
 }
 
-void CommunicatitonInformaion_FinishReading(int unused0, int unused1, void *unused2, void *unused3)
+void CommCmd_FinishRecvPlayerInfo(int unused0, int unused1, void *unused2, void *unused3)
 {
     if (sCommInfo) {
         sCommInfo->dataFinishedReading = TRUE;
@@ -167,7 +167,7 @@ BOOL CommInfo_IsDataFinishedReading(void)
     return sCommInfo->dataFinishedReading;
 }
 
-void CommInfo_RecvPlayerDataArray(int netId, int param1, void *src, void *unused)
+void CommCmd_RecvPlayerInfoArray(int netId, int param1, void *src, void *unused)
 {
     CommPlayerInfo *playerInfo = (CommPlayerInfo *)src;
 
@@ -195,7 +195,7 @@ void CommInfo_RecvPlayerDataArray(int netId, int param1, void *src, void *unused
     }
 }
 
-void CommInfo_RecvPlayerData(int netId, int param1, void *src, void *param3)
+void CommCmd_RecvPlayerInfo(int netId, int param1, void *src, void *param3)
 {
     if (!sCommInfo) {
         return;
diff --git a/src/communication_system.c b/src/communication_system.c
index 652d64aebf9..380a18f15ed 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -1404,7 +1404,7 @@ int CommSys_SendRingRemainingSize(void)
 
 static void CommSys_EndCallback(int netId, int command, int param2, void *param3, CommRecvPackage *param4)
 {
-    CommCmd_Callback(netId, command, param2, param3);
+    CommCommCmdManager_Callback(netId, command, param2, param3);
     param4->unk_0A = 0xee;
     param4->unk_08 = 0xffff;
     param4->unk_04 = NULL;
@@ -1437,7 +1437,7 @@ static void CommSys_RecvDataSingle(CommRing *ring, int netId, u8 *buffer, CommRe
         if (param3->unk_08 != 0xffff) {
             size = param3->unk_08;
         } else {
-            size = CommCmd_PacketSizeOf(cmd);
+            size = CommCmdManager_PacketSizeOf(cmd);
 
             if (sCommunicationSystem->unk_6B1) {
                 return;
@@ -1457,9 +1457,9 @@ static void CommSys_RecvDataSingle(CommRing *ring, int netId, u8 *buffer, CommRe
             param3->unk_08 = size;
         }
 
-        if (sub_020328D0(cmd)) {
+        if (CommCmdManager_CheckCmdHasBuffer(cmd)) {
             if (param3->unk_04 == NULL) {
-                param3->unk_04 = sub_0203290C(cmd, netId, param3->unk_08);
+                param3->unk_04 = CommCmdManager_TryCreateRecvBuffer(cmd, netId, param3->unk_08);
             }
 
             v3 = CommRing_Read(ring, buffer, size - param3->unk_00);
diff --git a/src/main_menu/ov97_0222D2F8.c b/src/main_menu/ov97_0222D2F8.c
index 16c6e96e8a2..623d9b86b8c 100644
--- a/src/main_menu/ov97_0222D2F8.c
+++ b/src/main_menu/ov97_0222D2F8.c
@@ -17,5 +17,5 @@ static const CommCmdTable Unk_ov97_0223D704[] = {
 void ov97_0222D2F8(void *param0)
 {
     int v0 = sizeof(Unk_ov97_0223D704) / sizeof(CommCmdTable);
-    CommCmd_Init(Unk_ov97_0223D704, v0, param0);
+    CommCmdManager_Init(Unk_ov97_0223D704, v0, param0);
 }
diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c
index fed0101fda0..0e58ca23f60 100644
--- a/src/overlay083/ov83_0223D4CC.c
+++ b/src/overlay083/ov83_0223D4CC.c
@@ -46,7 +46,7 @@ UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, v
     v0->unk_04 = NULL;
 
     if (param3 == 1) {
-        CommCmd_Init(param0, param1, param2);
+        CommCmdManager_Init(param0, param1, param2);
     } else {
         v0->unk_04 = ov83_0223D584(param0, param1, param2, heapID);
     }
@@ -117,7 +117,7 @@ static void ov83_0223D5CC(SysTask *param0, void *param1)
 
     for (v1 = 0; v1 < 8; v1++) {
         if (v0->unk_00[v1].unk_00 == 1) {
-            v0->unk_190[v0->unk_00[v1].unk_04].unk_00(
+            v0->unk_190[v0->unk_00[v1].unk_04].recvFunc(
                 0, v0->unk_00[v1].unk_30, v0->unk_00[v1].unk_08, v0->unk_198);
 
             memset(&v0->unk_00[v1], 0, sizeof(UnkStruct_ov83_0223D5CC));
@@ -147,7 +147,7 @@ static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 *param0, int param1, const voi
     GF_ASSERT(v2);
     param1 -= 22;
 
-    v1 = param0->unk_190[param1].unk_04();
+    v1 = param0->unk_190[param1].sizeFunc();
 
     GF_ASSERT(v1 == param3);
     GF_ASSERT(param3 < 38);
diff --git a/src/overlay114/ov114_02260044.c b/src/overlay114/ov114_02260044.c
index 8ba7bcc1de1..e0c7e2e39d2 100644
--- a/src/overlay114/ov114_02260044.c
+++ b/src/overlay114/ov114_02260044.c
@@ -12,12 +12,12 @@
 
 void ov114_02260044(UnkStruct_ov114_0225E854 *param0)
 {
-    CommCmd_Init(ov114_02260038(), ov114_02260040(), param0);
+    CommCmdManager_Init(ov114_02260038(), ov114_02260040(), param0);
 }
 
 void ov114_02260060(UnkStruct_ov114_0225D678 *param0)
 {
-    CommCmd_Init(ov114_02260038(), ov114_02260040(), param0);
+    CommCmdManager_Init(ov114_02260038(), ov114_02260040(), param0);
 }
 
 int ov114_0226007C(void)
diff --git a/src/overlay115/ov115_02265A24.c b/src/overlay115/ov115_02265A24.c
index 54665045ae3..9c408eb66dd 100644
--- a/src/overlay115/ov115_02265A24.c
+++ b/src/overlay115/ov115_02265A24.c
@@ -14,7 +14,7 @@
 
 void ov115_02265A24(UnkStruct_ov115_0226095C *param0)
 {
-    CommCmd_Init(ov115_02265A18(), ov115_02265A20(), param0);
+    CommCmdManager_Init(ov115_02265A18(), ov115_02265A20(), param0);
 }
 
 int ov115_02265A40(void)
diff --git a/src/overlay116/ov116_02260440.c b/src/overlay116/ov116_02260440.c
index b4689ede729..4beeb5c1acd 100644
--- a/src/overlay116/ov116_02260440.c
+++ b/src/overlay116/ov116_02260440.c
@@ -106,5 +106,5 @@ int ov116_022604A4(void)
 
 void ov116_022604A8(UnkStruct_ov116_0226139C *param0)
 {
-    CommCmd_Init(ov116_0226049C(), ov116_022604A4(), param0);
+    CommCmdManager_Init(ov116_0226049C(), ov116_022604A4(), param0);
 }
diff --git a/src/overlay117/ov117_022665FC.c b/src/overlay117/ov117_022665FC.c
index be186c89e83..70cc0ec5d88 100644
--- a/src/overlay117/ov117_022665FC.c
+++ b/src/overlay117/ov117_022665FC.c
@@ -29,7 +29,7 @@ void ov117_022665FC(void *param0)
 {
     int v0 = sizeof(Unk_ov117_02266FE4) / sizeof(CommCmdTable);
 
-    CommCmd_Init(Unk_ov117_02266FE4, v0, param0);
+    CommCmdManager_Init(Unk_ov117_02266FE4, v0, param0);
     GF_ASSERT(sizeof(UnkStruct_ov117_022621D4) < 256);
 }
 
diff --git a/src/unk_020322D8.c b/src/unk_020322D8.c
index 3218dd2682e..cace502970f 100644
--- a/src/unk_020322D8.c
+++ b/src/unk_020322D8.c
@@ -77,7 +77,7 @@ static BOOL sub_0203233C(UnkStruct_0203233C *param0, u8 param1)
 
 static BOOL sub_02032358(UnkStruct_020322D8 *param0, UnkStruct_0203233C *param1)
 {
-    int v0 = CommCmd_PacketSizeOf(param0->unk_0E);
+    int v0 = CommCmdManager_PacketSizeOf(param0->unk_0E);
 
     if (v0 == 0xffff) {
         if (param1->unk_04 < 3) {
@@ -108,7 +108,7 @@ static BOOL sub_020323D0(UnkStruct_020322D8 *param0, UnkStruct_0203233C *param1,
 {
     int v0;
     int v1;
-    int v2 = CommCmd_PacketSizeOf(param0->unk_0E);
+    int v2 = CommCmdManager_PacketSizeOf(param0->unk_0E);
 
     if (v2 == 0xffff) {
         v1 = 3;
@@ -168,7 +168,7 @@ BOOL CommQueue_Write(CommQueueMan *param0, int cmd, u8 *data, int size, BOOL par
     }
 
     GF_ASSERT(size < 65534);
-    v3 = CommCmd_PacketSizeOf(cmd);
+    v3 = CommCmdManager_PacketSizeOf(cmd);
 
     if (v3 == PACKET_SIZE_VARIABLE) {
         v3 = size;
diff --git a/src/unk_02032798.c b/src/unk_02032798.c
index d590f381993..cdae425eacd 100644
--- a/src/unk_02032798.c
+++ b/src/unk_02032798.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 
 #include "functypes/funcptr_02032868.h"
@@ -17,64 +19,77 @@
 
 typedef struct {
     const CommCmdTable *cmdTable;
-    int unk_04;
-    void *unk_08;
-    u8 unk_0C[8];
-    u8 unk_14;
+    int cmdTableSize;
+    void *data;
+    u8 swapCommandTableFlag[8];
+    u8 commandTableSwapped; // never accessed
 } CommCmdManager;
 
-static void sub_02032958(int param0, int param1, void *param2, void *param3);
-static void sub_0203299C(int param0, int param1, void *param2, void *param3);
-static void sub_020329C4(int param0, int param1, void *param2, void *param3);
-static int sub_02032954(void);
-
-static const CommCmdTable Unk_020E5D64[] = {
-    { NULL, CommPacketSizeOf_Nothing, NULL },
-    { NULL, CommPacketSizeOf_Nothing, NULL },
-    { sub_0203619C, CommPacketSizeOf_Nothing, NULL },
-    { CommInfo_RecvPlayerData, CommPlayerInfo_Size, NULL },
-    { CommInfo_RecvPlayerDataArray, CommPlayerInfo_Size, NULL },
-    { CommunicatitonInformaion_FinishReading, CommPacketSizeOf_Nothing, NULL },
-    { CommManager_ValidateConfirmationMessage, CommManager_ConfirmationMessage_sizeof, NULL },
-    { CommManager_ValidateConfirmationResponseMessage, CommManager_ConfirmationMessage_sizeof, NULL },
-    { NULL, NULL, NULL },
-    { NULL, NULL, NULL },
-    { sub_02036008, CommPacketSizeOf_NetId, NULL },
-    { sub_02036030, CommPacketSizeOf_NetId, NULL },
-    { sub_02036058, CommPacketSizeOf_NetId, NULL },
-    { sub_02032958, CommPacketSizeOf_Nothing, NULL },
-    { sub_0203299C, CommPacketSizeOf_Nothing, NULL },
-    { sub_020329C4, CommPacketSizeOf_Nothing, NULL },
-    { CommCmd_16, CommPacketSizeOf_NetId, NULL },
-    { CommCmd_17, CommPacketSizeOf_NetId, NULL },
-    { CommCmd_18, sub_02032954, NULL },
-    { sub_02036574, sub_02036590, NULL },
-    { sub_02036670, CommTool_TempDataSize, NULL },
-    { CommManager_DisconnectWifi, CommPacketSizeOf_Nothing, NULL }
+static void CommCmd_SwapCommandTable(int param0, int param1, void *param2, void *param3);
+static void CommCmd_DeinitCommCmdManager(int param0, int param1, void *param2, void *param3);
+static void CommCmd_FinishSwapCmdTable(int param0, int param1, void *param2, void *param3);
+static int CommPacketSizeOf_Two(void);
+
+/**
+ * CommCmdTable used by all communication methods
+ */
+static const CommCmdTable sCommCmdTable_Common[] = {
+    [COMM_CMD_NONE] = { NULL, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_1] = { NULL, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_2] = { sub_0203619C, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_RECV_PLAYER_INFO] = { CommCmd_RecvPlayerInfo, CommPlayerInfo_Size, NULL },
+    [COMM_CMD_RECV_PLAYER_INFO_ARRAY] = { CommCmd_RecvPlayerInfoArray, CommPlayerInfo_Size, NULL },
+    [COMM_CMD_RECV_PLAYER_INFO_FINISH] = { CommCmd_FinishRecvPlayerInfo, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_VALIDATE_CONFIRMATION] = { CommCmd_ValidateConfirmationMessage, CommManager_ConfirmationMessage_sizeof, NULL },
+    [COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE] = { CommCmd_ValidateConfirmationResponseMessage, CommManager_ConfirmationMessage_sizeof, NULL },
+    [COMM_CMD_8] = { NULL, NULL, NULL },
+    [COMM_CMD_9] = { NULL, NULL, NULL },
+    [COMM_CMD_10] = { sub_02036008, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_11] = { sub_02036030, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_12] = { sub_02036058, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_SWAP_CMD_TABLE] = { CommCmd_SwapCommandTable, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_DEINIT_MANAGER] = { CommCmd_DeinitCommCmdManager, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FINISH_SWAP_CMD_TABLE] = { CommCmd_FinishSwapCmdTable, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_16] = { CommCmd_16, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_17] = { CommCmd_17, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_18] = { CommCmd_18, CommPacketSizeOf_Two, NULL },
+    [COMM_CMD_19] = { sub_02036574, sub_02036590, NULL },
+    [COMM_CMD_20] = { sub_02036670, CommTool_TempDataSize, NULL },
+    [COMM_CMD_DISCONNECT_WIFI] = { CommCmd_DisconnectWifi, CommPacketSizeOf_Nothing, NULL }
 };
 
 static CommCmdManager *sCommCmdManager = NULL;
 
-void CommCmd_Init(const CommCmdTable *cmdTable, int param1, void *param2)
+/**
+ * @brief Initializes the Communication Command Manager
+ *
+ * @param extraCmdTable
+ * @param cmdTableSize
+ * @param data
+ */
+void CommCmdManager_Init(const CommCmdTable *cmdTable, int cmdTableSize, void *data)
 {
-    int v0;
+    int i;
 
     if (!sCommCmdManager) {
         sCommCmdManager = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommCmdManager));
     }
 
     sCommCmdManager->cmdTable = cmdTable;
-    sCommCmdManager->unk_04 = param1;
-    sCommCmdManager->unk_08 = param2;
+    sCommCmdManager->cmdTableSize = cmdTableSize;
+    sCommCmdManager->data = data;
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        sCommCmdManager->unk_0C[v0] = 0;
+    for (i = 0; i < (7 + 1); i++) {
+        sCommCmdManager->swapCommandTableFlag[i] = 0;
     }
 
-    sCommCmdManager->unk_14 = 0;
+    sCommCmdManager->commandTableSwapped = FALSE;
 }
 
-void sub_020327E0(void)
+/**
+ * @brief Frees the Communication Command Manager
+ */
+void CommCmdManager_Free(void)
 {
     if (sCommCmdManager) {
         Heap_Free(sCommCmdManager);
@@ -82,152 +97,220 @@ void sub_020327E0(void)
     }
 }
 
-void CommCmd_Callback(int param0, int cmd, int param2, void *param3)
+/**
+ * @brief Calls the communication command specified by cmd
+ *
+ * @param netID
+ * @param cmd
+ * @param size
+ * @param data
+ */
+void CommCommCmdManager_Callback(int netID, int cmd, int size, void *data)
 {
-    UnkFuncPtr_020F8E60 v0;
+    CommCmdRecvFunc recvFunc;
 
-    if (cmd < 22) {
-        v0 = Unk_020E5D64[cmd].unk_00;
+    if (cmd < COMM_CMD_MAX_COMMON) {
+        recvFunc = sCommCmdTable_Common[cmd].recvFunc;
     } else {
         GF_ASSERT(sCommCmdManager);
 
-        if (cmd > (sCommCmdManager->unk_04 + 22)) {
+        if (cmd > (sCommCmdManager->cmdTableSize + COMM_CMD_MAX_COMMON)) {
             sub_020363BC();
             return;
         }
 
-        v0 = sCommCmdManager->cmdTable[cmd - 22].unk_00;
+        recvFunc = sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].recvFunc;
     }
 
-    if (v0 != NULL) {
+    if (recvFunc != NULL) {
         if (sCommCmdManager) {
-            v0(param0, param2, param3, sCommCmdManager->unk_08);
+            recvFunc(netID, size, data, sCommCmdManager->data);
         } else {
-            v0(param0, param2, param3, NULL);
+            recvFunc(netID, size, data, NULL);
         }
     }
 }
 
-int CommCmd_PacketSizeOf(int cmd)
+/**
+ * @brief Gets the sizeof the packet sent by the comm command
+ *
+ * @param cmd
+ *
+ * @return Output of _sizeof() function associated with cmd return. Default 0
+ */
+int CommCmdManager_PacketSizeOf(int cmd)
 {
-    int v0 = 0;
-    UnkFuncPtr_02032868 v1;
+    int size = 0;
+    CommCmdSizeFunc sizeFunc;
 
-    if (cmd < 22) {
-        v1 = Unk_020E5D64[cmd].unk_04;
+    if (cmd < COMM_CMD_MAX_COMMON) {
+        sizeFunc = sCommCmdTable_Common[cmd].sizeFunc;
     } else {
         GF_ASSERT(sCommCmdManager);
 
         if (sCommCmdManager == NULL) {
             sub_020363BC();
-            return v0;
+            return size;
         }
 
-        if (cmd > (sCommCmdManager->unk_04 + 22)) {
+        if (cmd > (sCommCmdManager->cmdTableSize + COMM_CMD_MAX_COMMON)) {
             GF_ASSERT(FALSE);
             sub_020363BC();
-            return v0;
+            return size;
         }
 
-        v1 = sCommCmdManager->cmdTable[cmd - 22].unk_04;
+        sizeFunc = sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].sizeFunc;
     }
 
-    if (v1 != NULL) {
-        v0 = v1();
+    if (sizeFunc != NULL) {
+        size = sizeFunc();
     }
 
-    return v0;
+    return size;
 }
 
-BOOL sub_020328D0(int cmd)
+/**
+ * @brief Checks if the specified command has a receive buffer function
+ *
+ * @param cmd
+ *
+ * @return TRUE if the associated buffer function is not NULL
+ */
+BOOL CommCmdManager_CheckCmdHasBuffer(int cmd)
 {
-    if (cmd < 22) {
-        return Unk_020E5D64[cmd].unk_08 != NULL;
+    if (cmd < COMM_CMD_MAX_COMMON) {
+        return sCommCmdTable_Common[cmd].buffFunc != NULL;
     }
 
-    return sCommCmdManager->cmdTable[cmd - 22].unk_08 != NULL;
+    return sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].buffFunc != NULL;
 }
 
-void *sub_0203290C(int cmd, int netId, int param2)
+/**
+ * @brief Creates a buffer specified by the cmd's corresponding receive buffer function
+ *
+ * @param cmd
+ * @param netID
+ * @param size
+ *
+ * @return Pointer to the buffer if created, NULL otherwise
+ */
+void *CommCmdManager_TryCreateRecvBuffer(int cmd, int netId, int size)
 {
-    UnkFuncPtr_0203290C v0;
+    CommCmdBuffFunc buffFunc;
 
-    if (cmd < 22) {
-        v0 = Unk_020E5D64[cmd].unk_08;
-        return v0(netId, NULL, param2);
+    if (cmd < COMM_CMD_MAX_COMMON) {
+        buffFunc = sCommCmdTable_Common[cmd].buffFunc;
+        return buffFunc(netId, NULL, size);
     } else {
-        v0 = sCommCmdManager->cmdTable[cmd - 22].unk_08;
-        return v0(netId, sCommCmdManager->unk_08, param2);
+        buffFunc = sCommCmdManager->cmdTable[cmd - COMM_CMD_MAX_COMMON].buffFunc;
+        return buffFunc(netId, sCommCmdManager->data, size);
     }
 
     return NULL;
 }
 
+/**
+ * @brief Gets the constant that indicates the message has a variable size instead of a fixed one.
+ *
+ * @return PACKET_SIZE_VARIABLE
+ */
 int CommPacketSizeOf_Variable(void)
 {
     return PACKET_SIZE_VARIABLE;
 }
 
+/**
+ * @brief Used for when the function doesn't receive any data
+ *
+ * @return 0
+ */
 int CommPacketSizeOf_Nothing(void)
 {
     return 0;
 }
 
+/**
+ * @brief Used for when the function only sends a NetID
+ *
+ * @return 1
+ */
 int CommPacketSizeOf_NetId(void)
 {
     return 1;
 }
 
-static int sub_02032954(void)
+/**
+ * @brief Returns 2
+ *
+ * @return 2
+ */
+static int CommPacketSizeOf_Two(void)
 {
     return 2;
 }
 
-static void sub_02032958(int param0, int param1, void *param2, void *param3)
+/**
+ * @brief Waits for a response from all connected players before swapping the secondary command table.
+ *
+ * @param netID
+ * @param size
+ * @param unused2
+ * @param unused3
+ */
+static void CommCmd_SwapCommandTable(int netID, int size, void *unused2, void *unused3)
 {
-    u8 *v0 = param2;
-    int v1;
+    int i;
 
     if (CommSys_CurNetId() != 0) {
         return;
     }
 
-    sCommCmdManager->unk_0C[param0] = 1;
+    sCommCmdManager->swapCommandTableFlag[netID] = 1;
 
-    for (v1 = 0; v1 < (7 + 1); v1++) {
-        if (!CommSys_IsPlayerConnected(v1)) {
+    for (i = 0; i < (7 + 1); i++) {
+        if (!CommSys_IsPlayerConnected(i)) {
             continue;
         }
 
-        if (!sCommCmdManager->unk_0C[v1]) {
+        if (!sCommCmdManager->swapCommandTableFlag[i]) {
             return;
         }
     }
 
-    CommSys_SendDataServer(14, NULL, 0);
+    CommSys_SendDataServer(COMM_CMD_DEINIT_MANAGER, NULL, 0);
 }
 
-static void sub_0203299C(int param0, int param1, void *param2, void *param3)
+/**
+ * @brief Deinitializes the Communication Command Manager without freeing it. Usually used to swap the secondary command table.
+ *
+ * @param netID
+ * @param size
+ * @param unused2
+ * @param unused3
+ */
+static void CommCmd_DeinitCommCmdManager(int netID, int size, void *param2, void *param3)
 {
-    u8 *v0 = param2;
-    int v1;
-
     sCommCmdManager->cmdTable = NULL;
-    sCommCmdManager->unk_04 = 0;
-    sCommCmdManager->unk_08 = NULL;
-    sCommCmdManager->unk_14 = 1;
+    sCommCmdManager->cmdTableSize = 0;
+    sCommCmdManager->data = NULL;
+    sCommCmdManager->commandTableSwapped = TRUE;
 
-    CommSys_SendDataFixedSize(15, param2);
+    CommSys_SendDataFixedSize(COMM_CMD_FINISH_SWAP_CMD_TABLE, param2);
 }
 
-static void sub_020329C4(int param0, int param1, void *param2, void *param3)
+/**
+ * @brief Waits for a response after finishing swapping the command table, reseting the swap flags.
+ *
+ * @param netID
+ * @param size
+ * @param unused2
+ * @param unused3
+ */
+static void CommCmd_FinishSwapCmdTable(int netID, int size, void *param2, void *param3)
 {
-    u8 *v0 = param2;
-    int v1;
-
     if (CommSys_CurNetId() != 0) {
         return;
     }
 
-    sCommCmdManager->unk_0C[param0] = 0;
+    sCommCmdManager->swapCommandTableFlag[netID] = 0;
 }
diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c
index 8b67fc5bd94..2adcc9c8f9c 100644
--- a/src/unk_0207A6DC.c
+++ b/src/unk_0207A6DC.c
@@ -107,7 +107,7 @@ void sub_0207A6DC(void *param0)
     v2 = (UnkStruct_0207ACB4 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_0207ACB4));
     v3 = (UnkStruct_0207AD40 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_0207AD40));
 
-    CommCmd_Init(Unk_020F099C, v0, param0);
+    CommCmdManager_Init(Unk_020F099C, v0, param0);
 
     v2->battleSys = battleSys;
     v2->unk_04 = 0;
@@ -124,7 +124,7 @@ void sub_0207A6DC(void *param0)
 void sub_0207A744(void *param0)
 {
     int v0 = sizeof(Unk_020F099C) / sizeof(CommCmdTable);
-    CommCmd_Init(Unk_020F099C, v0, param0);
+    CommCmdManager_Init(Unk_020F099C, v0, param0);
 }
 
 static int sub_0207A758(void)
diff --git a/src/unk_02095AF0.c b/src/unk_02095AF0.c
index aa55109e508..46af3aa3774 100644
--- a/src/unk_02095AF0.c
+++ b/src/unk_02095AF0.c
@@ -49,7 +49,7 @@ static const CommCmdTable Unk_020F58FC[] = {
 void sub_02095AF0(void *param0)
 {
     int v0 = sizeof(Unk_020F58FC) / sizeof(CommCmdTable);
-    CommCmd_Init(Unk_020F58FC, v0, param0);
+    CommCmdManager_Init(Unk_020F58FC, v0, param0);
 }
 
 static u8 *sub_02095B04(int param0, void *param1, int param2)
diff --git a/src/unk_02095CD4.c b/src/unk_02095CD4.c
index 3fb0231b271..c53486ea5a1 100644
--- a/src/unk_02095CD4.c
+++ b/src/unk_02095CD4.c
@@ -44,7 +44,7 @@ static const CommCmdTable Unk_020F59BC[] = {
 void sub_02095CD4(void *param0)
 {
     int v0 = sizeof(Unk_020F59BC) / sizeof(CommCmdTable);
-    CommCmd_Init(Unk_020F59BC, v0, param0);
+    CommCmdManager_Init(Unk_020F59BC, v0, param0);
 }
 
 static int sub_02095CE8(u8 param0)
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 8805495a4ff..2d69f0de935 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -142,7 +142,7 @@ static const CommCmdTable Unk_020F5A40[] = {
 void sub_02095E98(void *param0)
 {
     int v0 = sizeof(Unk_020F5A40) / sizeof(CommCmdTable);
-    CommCmd_Init(Unk_020F5A40, v0, param0);
+    CommCmdManager_Init(Unk_020F5A40, v0, param0);
 }
 
 void sub_02095EAC(int param0, int param1, void *param2, void *param3)
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index da54d56dc4a..8ea4b46fd7d 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -147,7 +147,7 @@ void sub_020961E8(void *param0)
     int v1;
     int v2 = sizeof(Unk_020F5F68) / sizeof(CommCmdTable);
 
-    CommCmd_Init(Unk_020F5F68, v2, param0);
+    CommCmdManager_Init(Unk_020F5F68, v2, param0);
 
     for (v1 = 0; v1 < 5; v1++) {
         (void)0;
diff --git a/src/unk_02099500.c b/src/unk_02099500.c
index b1ef1f4c8f4..bac2b8621a6 100644
--- a/src/unk_02099500.c
+++ b/src/unk_02099500.c
@@ -169,7 +169,7 @@ void sub_02099510(int param0, int param1, void *param2, void *param3)
 void CommFieldCmd_Init(void *param0)
 {
     int v0 = sizeof(Unk_020F68A4) / sizeof(CommCmdTable);
-    CommCmd_Init(Unk_020F68A4, v0, param0);
+    CommCmdManager_Init(Unk_020F68A4, v0, param0);
 }
 
 static int CommPacketSizeOf_TrainerCase(void)
diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c
index ba3a4f710e5..d14a3705db6 100644
--- a/src/unk_0209BA80.c
+++ b/src/unk_0209BA80.c
@@ -97,7 +97,7 @@ static const CommCmdTable Unk_020F8BF0[] = {
 void sub_0209BA80(void *param0)
 {
     int v0 = sizeof(Unk_020F8BF0) / sizeof(CommCmdTable);
-    CommCmd_Init(Unk_020F8BF0, v0, param0);
+    CommCmdManager_Init(Unk_020F8BF0, v0, param0);
 }
 
 static void sub_0209BA94(int param0, int param1, void *param2, void *param3)
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 9df3790e01b..411a05a2681 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -33,7 +33,7 @@ typedef struct {
 static BOOL sub_0209BE84(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u32 param3);
 
 static const CommCmdTable Unk_020F8EA8[135];
-static const UnkFuncPtr_020F8E60 Unk_020F8E60[18];
+static const CommCmdRecvFunc Unk_020F8E60[18];
 
 UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, enum HeapID heapID)
 {
@@ -57,7 +57,7 @@ void sub_0209BE38(UnkStruct_0209BDF8 *param0)
 
 void sub_0209BE50(UnkStruct_0209BDF8 *param0)
 {
-    CommCmd_Init(Unk_020F8EA8, 135, param0);
+    CommCmdManager_Init(Unk_020F8EA8, 135, param0);
 }
 
 void sub_0209BE64(UnkStruct_0209BDF8 *param0)
@@ -470,7 +470,7 @@ static const CommCmdTable Unk_020F8EA8[135] = {
     { sub_0209BEF0, sub_0209C158, sub_0209C160 }
 };
 
-static const UnkFuncPtr_020F8E60 Unk_020F8E60[18] = {
+static const CommCmdRecvFunc Unk_020F8E60[18] = {
     sub_0209C040,
     sub_0209BF54,
     sub_0209BF64,
diff --git a/src/unk_0209C390.c b/src/unk_0209C390.c
index 2013957495c..45de11aabaf 100644
--- a/src/unk_0209C390.c
+++ b/src/unk_0209C390.c
@@ -13,12 +13,12 @@
 
 void sub_0209C390(UnkStruct_ov65_02236744 *param0)
 {
-    CommCmd_Init(sub_02039A58(), sub_02039A60(), param0);
+    CommCmdManager_Init(sub_02039A58(), sub_02039A60(), param0);
 }
 
 void sub_0209C3AC(void)
 {
-    CommCmd_Init(sub_02039A58(), sub_02039A60(), NULL);
+    CommCmdManager_Init(sub_02039A58(), sub_02039A60(), NULL);
 }
 
 int sub_0209C3C4(void)

From 6d559a598972d57de791290ac53bd1d68c7749d8 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 05:41:16 -0400
Subject: [PATCH 18/39] Document Frontier CommCmd constants, rename
 comm_command and comm_command_frontier

---
 .../frontier/battle_arcade/main.h             |   6 +-
 .../frontier/battle_castle/opponent_app.h     |   8 +-
 .../frontier/battle_castle/self_app.h         |   8 +-
 .../frontier/battle_factory/main.h            |   8 +-
 .../applications/frontier/battle_hall/main.h  |   6 +-
 ...unk_0209BA80.h => comm_command_frontier.h} |   6 +-
 include/communication_system.h                |   8 +-
 .../constants/communication/comm_command.h    |  60 ++-
 include/overlay104/ov104_0222ECE8.h           |  52 +--
 include/unk_020363E8.h                        |   4 +-
 .../frontier/battle_arcade/main.c             |   8 +-
 .../frontier/battle_castle/opponent_app.c     |  10 +-
 .../frontier/battle_castle/self_app.c         |  16 +-
 .../frontier/battle_factory/main.c            |  10 +-
 src/applications/frontier/battle_hall/main.c  |   8 +-
 src/{unk_02032798.c => comm_command.c}        |  14 +-
 src/comm_command_frontier.c                   | 390 ++++++++++++++++++
 src/comm_manager.c                            |  15 +-
 src/communication_information.c               |   3 +-
 src/communication_system.c                    |  17 +-
 src/main_menu/ov97_0222D2F8.c                 |   2 +-
 src/meson.build                               |   4 +-
 src/overlay083/ov83_0223D4CC.c                |   2 +-
 src/overlay104/frscrcmd_battle_arcade.c       |   2 +-
 src/overlay104/frscrcmd_battle_castle.c       |   2 +-
 src/overlay104/frscrcmd_battle_factory.c      |   2 +-
 src/overlay104/frscrcmd_battle_hall.c         |   2 +-
 src/overlay104/ov104_0222ECE8.c               | 104 ++---
 src/overlay104/ov104_022395F0.c               |   2 +-
 src/overlay104/ov104_02239C58.c               |   2 +-
 src/overlay114/ov114_02260044.c               |   2 +-
 src/overlay115/ov115_02265A24.c               |   2 +-
 src/overlay116/ov116_02260440.c               |   2 +-
 src/overlay117/ov117_022665FC.c               |   2 +-
 src/unk_020322D8.c                            |   2 +-
 src/unk_020363E8.c                            |   4 +-
 src/unk_020494DC.c                            |   2 +-
 src/unk_0207A6DC.c                            |   2 +-
 src/unk_02095AF0.c                            |   2 +-
 src/unk_02095CD4.c                            |   2 +-
 src/unk_02095E98.c                            |   2 +-
 src/unk_020961E8.c                            |   2 +-
 src/unk_02099500.c                            |   2 +-
 src/unk_0209BA80.c                            | 387 -----------------
 src/unk_0209BDF8.c                            |   2 +-
 src/unk_0209C390.c                            |   2 +-
 46 files changed, 631 insertions(+), 569 deletions(-)
 rename include/{unk_0209BA80.h => comm_command_frontier.h} (76%)
 rename src/{unk_02032798.c => comm_command.c} (95%)
 create mode 100644 src/comm_command_frontier.c
 delete mode 100644 src/unk_0209BA80.c

diff --git a/include/applications/frontier/battle_arcade/main.h b/include/applications/frontier/battle_arcade/main.h
index 28a1b26db80..52d201de339 100644
--- a/include/applications/frontier/battle_arcade/main.h
+++ b/include/applications/frontier/battle_arcade/main.h
@@ -32,8 +32,8 @@ typedef struct BattleArcadeAppArgs {
 BOOL BattleArcadeApp_Init(ApplicationManager *appMan, int *state);
 BOOL BattleArcadeApp_Main(ApplicationManager *appMan, int *state);
 BOOL BattleArcadeApp_Exit(ApplicationManager *appMan, int *state);
-void BattleArcadeApp_HandleInitialLayoutCmd(int netID, int unused, void *data, void *context);
-void BattleArcadeApp_HandleResultCmd(int netID, int unused, void *data, void *context);
-void BattleArcadeApp_HandleUnusedCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleArcadeHandleInitialLayout(int netID, int unused, void *data, void *context);
+void CommCmd_BattleArcadeHandleResult(int netID, int unused, void *data, void *context);
+void CommCmd_BattleArcadeUnused(int netID, int unused, void *data, void *context);
 
 #endif // POKEPLATINUM_APPLICATIONS_BATTLE_ARCADE_MAIN_H
diff --git a/include/applications/frontier/battle_castle/opponent_app.h b/include/applications/frontier/battle_castle/opponent_app.h
index 7843fad70fd..12455c008b7 100644
--- a/include/applications/frontier/battle_castle/opponent_app.h
+++ b/include/applications/frontier/battle_castle/opponent_app.h
@@ -6,9 +6,9 @@
 BOOL BattleCastleOpponentApp_Init(ApplicationManager *appMan, int *state);
 BOOL BattleCastleOpponentApp_Main(ApplicationManager *appMan, int *state);
 BOOL BattleCastleOpponentApp_Exit(ApplicationManager *appMan, int *state);
-void BattleCastleOpponentApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context);
-void BattleCastleOpponentApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context);
-void BattleCastleOpponentApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context);
-void BattleCastleOpponentApp_HandleExitAppCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleOpponentHandlePlayerInfo(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleOpponentHandlePurchaseInfo(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleOpponentUpdateCursorCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleOpponentHandleExitApp(int netID, int unused, void *data, void *context);
 
 #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_OPPONENT_MAIN_H
diff --git a/include/applications/frontier/battle_castle/self_app.h b/include/applications/frontier/battle_castle/self_app.h
index 0399521eeba..02dbca98061 100644
--- a/include/applications/frontier/battle_castle/self_app.h
+++ b/include/applications/frontier/battle_castle/self_app.h
@@ -6,9 +6,9 @@
 BOOL BattleCastleSelfApp_Init(ApplicationManager *appMan, int *state);
 BOOL BattleCastleSelfApp_Main(ApplicationManager *appMan, int *state);
 BOOL BattleCastleSelfApp_Exit(ApplicationManager *appMan, int *state);
-void BattleCastleSelfApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context);
-void BattleCastleSelfApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context);
-void BattleCastleSelfApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context);
-void BattleCastleSelfApp_HandleExitAppCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleHandlePlayerInfo(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastlePurchaseInfo(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleHandleUpdateCursor(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleHandleExitApp(int netID, int unused, void *data, void *context);
 
 #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SELF_MAIN_H
diff --git a/include/applications/frontier/battle_factory/main.h b/include/applications/frontier/battle_factory/main.h
index 21aa677b8da..aca419e82ad 100644
--- a/include/applications/frontier/battle_factory/main.h
+++ b/include/applications/frontier/battle_factory/main.h
@@ -21,9 +21,9 @@ typedef struct BattleFactoryAppArgs {
 int BattleFactoryApp_Init(ApplicationManager *appMan, int *state);
 int BattleFactoryApp_Main(ApplicationManager *appMan, int *state);
 int BattleFactoryApp_Exit(ApplicationManager *appMan, int *state);
-void BattleFactoryApp_DummyCommCommand(int netID, int unused, void *data, void *context);
-void BattleFactoryApp_HandleSelectionUpdateCmd(int netID, int unused, void *data, void *context);
-void BattleFactoryApp_DummyCommCommand2(int netID, int unused, void *data, void *context);
-void BattleFactoryApp_HandleTradeResultCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleFactoryDummy(int netID, int unused, void *data, void *context);
+void CommCmd_BattleFactoryHandleSelectionUpdate(int netID, int unused, void *data, void *context);
+void CommCmd_BattleFactoryDummy2(int netID, int unused, void *data, void *context);
+void CommCmd_BattleFactoryHandleTradeResult(int netID, int unused, void *data, void *context);
 
 #endif // POKEPLATINUM_APPLICATIONS_BATTLE_FACTORY_MAIN_H
diff --git a/include/applications/frontier/battle_hall/main.h b/include/applications/frontier/battle_hall/main.h
index 892189830e4..14d83fa5c51 100644
--- a/include/applications/frontier/battle_hall/main.h
+++ b/include/applications/frontier/battle_hall/main.h
@@ -23,8 +23,8 @@ typedef struct BattleHallAppArgs {
 BOOL BattleHallApp_Init(ApplicationManager *appMan, int *state);
 BOOL BattleHallApp_Main(ApplicationManager *appMan, int *state);
 BOOL BattleHallApp_Exit(ApplicationManager *appMan, int *state);
-void BattleHall_DummyCommCommand(int netID, int unused, void *unused2, void *unused3);
-void BattleHall_HandleTypeSelectionMsg(int netID, int unused, void *data, void *context);
-void BattleHall_HandlePartnerDecisionCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleHallDummy(int netID, int unused, void *unused2, void *unused3);
+void CommCmd_BattleHallHandleTypeSelectionMsg(int netID, int unused, void *data, void *context);
+void CommCmd_BattleHallHandlePartnerDecision(int netID, int unused, void *data, void *context);
 
 #endif // POKEPLATINUM_APPLICATIONS_BATTLE_HALL_MAIN_H
diff --git a/include/unk_0209BA80.h b/include/comm_command_frontier.h
similarity index 76%
rename from include/unk_0209BA80.h
rename to include/comm_command_frontier.h
index 5bdb75ac30e..8f96f8811e0 100644
--- a/include/unk_0209BA80.h
+++ b/include/comm_command_frontier.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_0209BA80_H
-#define POKEPLATINUM_UNK_0209BA80_H
+#ifndef POKEPLATINUM_COMM_COMMAND_FRONTIER_H
+#define POKEPLATINUM_COMM_COMMAND_FRONTIER_H
 
 #include "struct_defs/battle_tower.h"
 #include "struct_defs/struct_0209BBA4.h"
@@ -12,4 +12,4 @@ BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2);
 BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1);
 BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1);
 
-#endif // POKEPLATINUM_UNK_0209BA80_H
+#endif // POKEPLATINUM_COMM_COMMAND_FRONTIER_H
diff --git a/include/communication_system.h b/include/communication_system.h
index 13243f13670..3c5e010792f 100644
--- a/include/communication_system.h
+++ b/include/communication_system.h
@@ -47,9 +47,9 @@ void CommSys_DisableSendMovementData(void);
 BOOL CommSys_IsSendingMovementData(void);
 BOOL CommSys_WriteToQueueServer(int cmd, const void *data, int param2);
 BOOL CommSys_WriteToQueue(int cmd, const void *data, int size);
-void sub_02036008(int unused0, int unused1, void *param2, void *unused3);
-void sub_02036030(int unused0, int unused1, void *param2, void *unused3);
-void sub_02036058(int unused0, int unused1, void *param2, void *unused3);
+void CommCmd_10(int unused0, int unused1, void *param2, void *unused3);
+void CommCmd_11(int unused0, int unused1, void *param2, void *unused3);
+void CommCmd_12(int unused0, int unused1, void *param2, void *unused3);
 u16 CommSys_CurNetId(void);
 BOOL CommSys_SendDataFixedSize(int cmd, const void *data);
 BOOL CommSys_SendMessage(int cmd);
@@ -60,7 +60,7 @@ int CommType_MaxPlayers(int param0);
 int CommType_MinPlayers(int param0);
 void CommSys_SetAlone(BOOL param0);
 BOOL CommSys_IsAlone(void);
-void sub_0203619C(int param0, int param1, void *param2, void *param3);
+void CommCmd_2(int param0, int param1, void *param2, void *param3);
 void CommSys_Seed(MATHRandContext32 *rand);
 BOOL CommSys_IsCmdQueuedServer(int cmd);
 BOOL CommSys_IsCmdQueued(int cmd);
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 4076d557ad1..e6085229acf 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -11,12 +11,12 @@ enum CommCommand_Common {
     COMM_CMD_2,
     COMM_CMD_RECV_PLAYER_INFO,
     COMM_CMD_RECV_PLAYER_INFO_ARRAY,
-    COMM_CMD_RECV_PLAYER_INFO_FINISH,
+    COMM_CMD_RECV_PLAYER_INFO_FINISH, // 5
     COMM_CMD_VALIDATE_CONFIRMATION,
     COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE,
     COMM_CMD_8,
     COMM_CMD_9,
-    COMM_CMD_10,
+    COMM_CMD_10, // 10
     COMM_CMD_11,
     COMM_CMD_12,
     COMM_CMD_SWAP_CMD_TABLE,
@@ -31,4 +31,60 @@ enum CommCommand_Common {
     COMM_CMD_MAX_COMMON,
 };
 
+enum CommCommand_Frontier {
+    COMM_CMD_F_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_F_23,
+    COMM_CMD_F_24,
+    COMM_CMD_F_25,
+    COMM_CMD_F_26,
+    COMM_CMD_F_27,
+    COMM_CMD_F_28,
+    COMM_CMD_FACTORY_DUMMY,
+    COMM_CMD_FACTORY_SELECTION_UPDATE, // 30
+    COMM_CMD_FACTORY_DUMMY2,
+    COMM_CMD_FACTORY_TRADE_RESULT,
+    COMM_CMD_F_33,
+    COMM_CMD_F_34,
+    COMM_CMD_F_35,
+    COMM_CMD_F_36,
+    COMM_CMD_F_37,
+    COMM_CMD_F_38,
+    COMM_CMD_HALL_DUMMY,
+    COMM_CMD_HALL_TYPE_SELECTION_MSG, // 40
+    COMM_CMD_HALL_PARTNER_DECISION,
+    COMM_CMD_F_42,
+    COMM_CMD_F_43,
+    COMM_CMD_F_44,
+    COMM_CMD_F_45,
+    COMM_CMD_F_46,
+    COMM_CMD_F_47,
+    COMM_CMD_F_48,
+    COMM_CMD_CASTLE_PLAYER_INFO,
+    COMM_CMD_CASTLE_PURCHASE_INFO, // 50
+    COMM_CMD_CASTLE_UPDATE_CURSOR,
+    COMM_CMD_CASTLE_EXIT,
+    COMM_CMD_CASTLE_OPP_PLAYER_INFO,
+    COMM_CMD_CASTLE_OPP_PURCHASE_INFO,
+    COMM_CMD_CASTLE_OPP_UPDATE_CURSOR, // 55
+    COMM_CMD_CASTLE_OPP_EXIT,
+    COMM_CMD_F_57,
+    COMM_CMD_F_58,
+    COMM_CMD_F_59,
+    COMM_CMD_F_60,
+    COMM_CMD_F_61,
+    COMM_CMD_F_62,
+    COMM_CMD_F_63,
+    COMM_CMD_F_64,
+    COMM_CMD_F_65,
+    COMM_CMD_F_66,
+    COMM_CMD_F_67,
+    COMM_CMD_F_68,
+    COMM_CMD_F_69,
+    COMM_CMD_F_70,
+    COMM_CMD_ARCADE_INIT_LAYOUT,
+    COMM_CMD_ARCADE_RESULT,
+    COMM_CMD_ARCADE_UNUSED,
+    COMM_CMD_MAX_FRONTIER,
+};
+
 #endif
diff --git a/include/overlay104/ov104_0222ECE8.h b/include/overlay104/ov104_0222ECE8.h
index 4b452b6cb91..93ebb1dc69f 100644
--- a/include/overlay104/ov104_0222ECE8.h
+++ b/include/overlay104/ov104_0222ECE8.h
@@ -6,59 +6,59 @@
 #include "overlay104/struct_battle_factory.h"
 #include "overlay104/struct_battle_hall.h"
 
-void ov104_0222ECE8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_33(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222ED00(BattleHall *param0);
-void ov104_0222ED2C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_34(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222ED44(BattleHall *param0);
-void ov104_0222ED74(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_35(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EDA8(BattleHall *param0);
-void ov104_0222EDDC(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_36(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EE14(BattleHall *param0, u8 param1);
-void ov104_0222EE38(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_37(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EE60(BattleHall *param0);
-void ov104_0222EEA8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_38(int param0, int param1, void *param2, void *param3);
 u8 *ov104_0222EED8(int param0, void *param1, int param2);
 BOOL ov104_0222EEF8(BattleFactory *param0);
-void ov104_0222EF30(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_22(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EF64(BattleFactory *param0);
-void ov104_0222EF94(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_23(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EFCC(BattleFactory *param0);
-void ov104_0222F03C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_24(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F0B4(BattleFactory *param0);
-void ov104_0222F124(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_25(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1);
-void ov104_0222F1C4(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_26(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1);
-void ov104_0222F210(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_27(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F238(BattleFactory *param0);
-void ov104_0222F31C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_28(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F3B8(BattleCastle *param0);
-void ov104_0222F418(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_42(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F44C(BattleCastle *param0);
-void ov104_0222F480(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_43(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F4B8(BattleCastle *param0);
-void ov104_0222F530(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_44(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F5D4(BattleCastle *param0);
-void ov104_0222F650(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_45(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1);
-void ov104_0222F6E8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_46(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F710(BattleCastle *param0, u16 param1);
-void ov104_0222F730(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_47(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F758(BattleCastle *param0);
-void ov104_0222F7BC(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_48(int param0, int param1, void *param2, void *param3);
 u8 *ov104_0222F84C(int param0, void *param1, int param2);
 BOOL ov104_0222F86C(BattleArcade *param0);
-void ov104_0222F8A0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_65(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F8D0(BattleArcade *param0);
-void ov104_0222F908(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_66(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F944(BattleArcade *param0);
-void ov104_0222F9C0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_67(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222FA38(BattleArcade *param0, u16 param1);
-void ov104_0222FA5C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_68(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222FA84(BattleArcade *param0, u16 param1);
-void ov104_0222FAA8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_69(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222FAD0(BattleArcade *param0);
-void ov104_0222FB34(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_70(int param0, int param1, void *param2, void *param3);
 u8 *ov104_0222FBC4(int param0, void *param1, int param2);
 
 #endif // POKEPLATINUM_OV104_0222ECE8_H
diff --git a/include/unk_020363E8.h b/include/unk_020363E8.h
index 0abd80d6f66..a88d70df933 100644
--- a/include/unk_020363E8.h
+++ b/include/unk_020363E8.h
@@ -13,7 +13,7 @@ void CommTiming_StartSync(u8 syncNo);
 void sub_0203650C(void);
 BOOL CommTiming_IsSyncState(u8 syncState);
 int CommTool_GetSyncNo(int netId);
-void sub_02036574(int param0, int param1, void *param2, void *param3);
+void CommCmd_19(int param0, int param1, void *param2, void *param3);
 int sub_02036590(void);
 void sub_02036594(u8 param0, u8 param1);
 int CommList_Get(int param0, u8 param1);
@@ -21,7 +21,7 @@ void CommList_Refresh(void);
 void CommTool_ClearReceivedTempDataAllPlayers(void);
 BOOL sub_02036614(int param0, const void *param1);
 const void *sub_0203664C(int param0);
-void sub_02036670(int param0, int param1, void *param2, void *param3);
+void CommCmd_20(int param0, int param1, void *param2, void *param3);
 int CommTool_TempDataSize(void);
 
 #endif // POKEPLATINUM_UNK_020363E8_H
diff --git a/src/applications/frontier/battle_arcade/main.c b/src/applications/frontier/battle_arcade/main.c
index 635f9fe19a3..7ab38dc5bb2 100644
--- a/src/applications/frontier/battle_arcade/main.c
+++ b/src/applications/frontier/battle_arcade/main.c
@@ -48,7 +48,7 @@
 #include "trainer_info.h"
 #include "unk_02030494.h"
 #include "unk_020363E8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 FS_EXTERN_OVERLAY(overlay104);
@@ -1115,7 +1115,7 @@ static void CreateInitialLayoutPayload(BattleArcadeApp *app, u16 cmd)
     i += 1;
 }
 
-void BattleArcadeApp_HandleInitialLayoutCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleArcadeHandleInitialLayout(int netID, int unused, void *data, void *context)
 {
     BattleArcadeApp *app = context;
     const u16 *payload = data;
@@ -1159,7 +1159,7 @@ static u16 GetRandomNumber(BattleArcadeApp *app)
     return LCRNG_Next();
 }
 
-void BattleArcadeApp_HandleResultCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleArcadeHandleResult(int netID, int unused, void *data, void *context)
 {
     BattleArcadeApp *app = context;
     const u16 *payload = data;
@@ -1190,7 +1190,7 @@ static void UnusedCommCommandPayload(BattleArcadeApp *app, u16 cmd)
     app->commPayload[1] = app->cursorPos;
 }
 
-void BattleArcadeApp_HandleUnusedCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleArcadeUnused(int netID, int unused, void *data, void *context)
 {
     BattleArcadeApp *app = context;
     const u16 *payload = data;
diff --git a/src/applications/frontier/battle_castle/opponent_app.c b/src/applications/frontier/battle_castle/opponent_app.c
index 4f4fccbfdc7..c60fe6c7562 100644
--- a/src/applications/frontier/battle_castle/opponent_app.c
+++ b/src/applications/frontier/battle_castle/opponent_app.c
@@ -56,7 +56,7 @@
 #include "unk_020302D0.h"
 #include "unk_020363E8.h"
 #include "unk_0205DFC4.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "res/text/bank/battle_castle_opponent_app.h"
@@ -2343,7 +2343,7 @@ static void CreatePlayerInfoPayload(BattleCastleOpponentApp *app, u16 cmd)
     i += 3;
 }
 
-void BattleCastleOpponentApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastleOpponentHandlePlayerInfo(int netID, int unused, void *data, void *context)
 {
     BattleCastleOpponentApp *app = context;
     const u16 *payload = data;
@@ -2380,7 +2380,7 @@ static void CreatePurchaseInfoPayload(BattleCastleOpponentApp *app, u16 cmd, u16
     app->commPayload[5] = app->selectedMenuEntry;
 }
 
-void BattleCastleOpponentApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastleOpponentHandlePurchaseInfo(int netID, int unused, void *data, void *context)
 {
     BattleCastleOpponentApp *app = context;
     const u16 *payload = data;
@@ -2414,7 +2414,7 @@ static void CreateUpdateCursorPayload(BattleCastleOpponentApp *app, u16 cmd)
     app->commPayload[1] = app->selectedMonSlot;
 }
 
-void BattleCastleOpponentApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastleOpponentUpdateCursorCmd(int netID, int unused, void *data, void *context)
 {
     BattleCastleOpponentApp *app = context;
     const u16 *payload = data;
@@ -2432,7 +2432,7 @@ static void CreateExitAppPayload(BattleCastleOpponentApp *app)
     app->commPayload[0] = TRUE;
 }
 
-void BattleCastleOpponentApp_HandleExitAppCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastleOpponentHandleExitApp(int netID, int unused, void *data, void *context)
 {
     BattleCastleOpponentApp *app = context;
     const u16 *payload = data;
diff --git a/src/applications/frontier/battle_castle/self_app.c b/src/applications/frontier/battle_castle/self_app.c
index 6751a441955..d01091e8432 100644
--- a/src/applications/frontier/battle_castle/self_app.c
+++ b/src/applications/frontier/battle_castle/self_app.c
@@ -57,7 +57,7 @@
 #include "unk_020363E8.h"
 #include "unk_0205DFC4.h"
 #include "unk_0208C098.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "res/text/bank/battle_castle_self_app.h"
@@ -416,12 +416,12 @@ static BOOL IsMonMissingPP(Pokemon *mon);
 static void CloseMessageBox(Window *window);
 BOOL SendCommMessage(BattleCastleSelfApp *app, u16 cmd, u16 slot);
 void CreatePlayerInfoPayload(BattleCastleSelfApp *app, u16 cmd);
-void BattleCastleSelfApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleHandlePlayerInfo(int netID, int unused, void *data, void *context);
 void CreatePurchaseInfoPayload(BattleCastleSelfApp *app, u16 cmd, u16 slot);
 void CreateUpdateCursorPayload(BattleCastleSelfApp *app, u16 cmd);
-void BattleCastleSelfApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleHandleUpdateCursor(int netID, int unused, void *data, void *context);
 void CreateExitAppPayload(BattleCastleSelfApp *app);
-void BattleCastleSelfApp_HandleExitAppCmd(int netID, int unused, void *data, void *context);
+void CommCmd_BattleCastleHandleExitApp(int netID, int unused, void *data, void *context);
 static void ApplyItemEffect(Pokemon *mon, u16 itemID);
 static void PrintPlayersAndPartnersNames(BattleCastleSelfApp *app, Window *window);
 static void HealPokemon(BattleCastleSelfApp *app, u8 slot, u8 menuOption);
@@ -3056,7 +3056,7 @@ void CreatePlayerInfoPayload(BattleCastleSelfApp *app, u16 cmd)
     i += 3;
 }
 
-void BattleCastleSelfApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastleHandlePlayerInfo(int netID, int unused, void *data, void *context)
 {
     BattleCastleSelfApp *app = context;
     const u16 *payload = data;
@@ -3093,7 +3093,7 @@ void CreatePurchaseInfoPayload(BattleCastleSelfApp *app, u16 cmd, u16 slot)
     app->commPayload[5] = app->selectedMenuEntry;
 }
 
-void BattleCastleSelfApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastlePurchaseInfo(int netID, int unused, void *data, void *context)
 {
     BattleCastleSelfApp *app = context;
     const u16 *payload = data;
@@ -3127,7 +3127,7 @@ void CreateUpdateCursorPayload(BattleCastleSelfApp *app, u16 cmd)
     app->commPayload[1] = app->selectedMonSlot;
 }
 
-void BattleCastleSelfApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastleHandleUpdateCursor(int netID, int unused, void *data, void *context)
 {
     BattleCastleSelfApp *app = context;
     const u16 *payload = data;
@@ -3145,7 +3145,7 @@ void CreateExitAppPayload(BattleCastleSelfApp *app)
     app->commPayload[0] = TRUE;
 }
 
-void BattleCastleSelfApp_HandleExitAppCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleCastleHandleExitApp(int netID, int unused, void *data, void *context)
 {
     BattleCastleSelfApp *app = context;
     const u16 *payload = data;
diff --git a/src/applications/frontier/battle_factory/main.c b/src/applications/frontier/battle_factory/main.c
index 2f63c933217..95c66455a72 100644
--- a/src/applications/frontier/battle_factory/main.c
+++ b/src/applications/frontier/battle_factory/main.c
@@ -53,7 +53,7 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "constdata/const_020F410C.h"
@@ -2848,7 +2848,7 @@ void DummyCreatePayload(BattleFactoryApp *app, u16 cmd)
     app->commPayload[0] = cmd;
 }
 
-void BattleFactoryApp_DummyCommCommand(int netID, int unused, void *data, void *context)
+void CommCmd_BattleFactoryDummy(int netID, int unused, void *data, void *context)
 {
     if (CommSys_CurNetId() == netID) {
         return;
@@ -2880,7 +2880,7 @@ void CreateUpdateSelectionPayload(BattleFactoryApp *app, u16 cmd, u16 unused)
     }
 }
 
-void BattleFactoryApp_HandleSelectionUpdateCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleFactoryHandleSelectionUpdate(int netID, int unused, void *data, void *context)
 {
     int i;
     BattleFactoryApp *app = context;
@@ -2908,7 +2908,7 @@ void BattleFactoryApp_HandleSelectionUpdateCmd(int netID, int unused, void *data
     app->partnerListingUpdateNeeded = TRUE;
 }
 
-void BattleFactoryApp_DummyCommCommand2(int netID, int unused, void *data, void *context)
+void CommCmd_BattleFactoryDummy2(int netID, int unused, void *data, void *context)
 {
     GF_ASSERT(FALSE);
 }
@@ -2949,7 +2949,7 @@ void CreateTradeResultPayload(BattleFactoryApp *app, u16 cmd, u16 tradedMon)
     app->commPayload[3] = app->selectedIndices[1];
 }
 
-void BattleFactoryApp_HandleTradeResultCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleFactoryHandleTradeResult(int netID, int unused, void *data, void *context)
 {
     BattleFactoryApp *app = context;
     const u16 *payload = data;
diff --git a/src/applications/frontier/battle_hall/main.c b/src/applications/frontier/battle_hall/main.c
index b35d1df4e17..6d48b128e6e 100644
--- a/src/applications/frontier/battle_hall/main.c
+++ b/src/applications/frontier/battle_hall/main.c
@@ -46,7 +46,7 @@
 #include "trainer_info.h"
 #include "unk_02030108.h"
 #include "unk_020363E8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "constdata/const_020F410C.h"
@@ -1424,7 +1424,7 @@ static void DummyCreatePayload(BattleHallApp *app, u16 dummy)
     app->commPayload[0] = dummy;
 }
 
-void BattleHall_DummyCommCommand(int netID, int unused, void *unused2, void *unused3)
+void CommCmd_BattleHallDummy(int netID, int unused, void *unused2, void *unused3)
 {
     if (CommSys_CurNetId() == netID) {
         return;
@@ -1447,7 +1447,7 @@ static void CreateTypeSelectionPayload(BattleHallApp *app, u16 cmd, u16 cursorPo
     app->commPayload[3] = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL);
 }
 
-void BattleHall_HandleTypeSelectionMsg(int netID, int unused, void *data, void *context)
+void CommCmd_BattleHallHandleTypeSelectionMsg(int netID, int unused, void *data, void *context)
 {
     BattleHallApp *app = context;
     const u16 *payload = data;
@@ -1479,7 +1479,7 @@ static void CreateDecisionPayload(BattleHallApp *app, u16 cmd, u16 decision)
     app->commPayload[1] = decision;
 }
 
-void BattleHall_HandlePartnerDecisionCmd(int netID, int unused, void *data, void *context)
+void CommCmd_BattleHallHandlePartnerDecision(int netID, int unused, void *data, void *context)
 {
     BattleHallApp *app = context;
     const u16 *payload = data;
diff --git a/src/unk_02032798.c b/src/comm_command.c
similarity index 95%
rename from src/unk_02032798.c
rename to src/comm_command.c
index cdae425eacd..312a23ca878 100644
--- a/src/unk_02032798.c
+++ b/src/comm_command.c
@@ -1,4 +1,4 @@
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 #include <nitro.h>
 #include <string.h>
@@ -36,7 +36,7 @@ static int CommPacketSizeOf_Two(void);
 static const CommCmdTable sCommCmdTable_Common[] = {
     [COMM_CMD_NONE] = { NULL, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_1] = { NULL, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_2] = { sub_0203619C, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_2] = { CommCmd_2, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_RECV_PLAYER_INFO] = { CommCmd_RecvPlayerInfo, CommPlayerInfo_Size, NULL },
     [COMM_CMD_RECV_PLAYER_INFO_ARRAY] = { CommCmd_RecvPlayerInfoArray, CommPlayerInfo_Size, NULL },
     [COMM_CMD_RECV_PLAYER_INFO_FINISH] = { CommCmd_FinishRecvPlayerInfo, CommPacketSizeOf_Nothing, NULL },
@@ -44,17 +44,17 @@ static const CommCmdTable sCommCmdTable_Common[] = {
     [COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE] = { CommCmd_ValidateConfirmationResponseMessage, CommManager_ConfirmationMessage_sizeof, NULL },
     [COMM_CMD_8] = { NULL, NULL, NULL },
     [COMM_CMD_9] = { NULL, NULL, NULL },
-    [COMM_CMD_10] = { sub_02036008, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_11] = { sub_02036030, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_12] = { sub_02036058, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_10] = { CommCmd_10, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_11] = { CommCmd_11, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_12] = { CommCmd_12, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_SWAP_CMD_TABLE] = { CommCmd_SwapCommandTable, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_DEINIT_MANAGER] = { CommCmd_DeinitCommCmdManager, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_FINISH_SWAP_CMD_TABLE] = { CommCmd_FinishSwapCmdTable, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_16] = { CommCmd_16, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_17] = { CommCmd_17, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_18] = { CommCmd_18, CommPacketSizeOf_Two, NULL },
-    [COMM_CMD_19] = { sub_02036574, sub_02036590, NULL },
-    [COMM_CMD_20] = { sub_02036670, CommTool_TempDataSize, NULL },
+    [COMM_CMD_19] = { CommCmd_19, sub_02036590, NULL },
+    [COMM_CMD_20] = { CommCmd_20, CommTool_TempDataSize, NULL },
     [COMM_CMD_DISCONNECT_WIFI] = { CommCmd_DisconnectWifi, CommPacketSizeOf_Nothing, NULL }
 };
 
diff --git a/src/comm_command_frontier.c b/src/comm_command_frontier.c
new file mode 100644
index 00000000000..7fd37336b2e
--- /dev/null
+++ b/src/comm_command_frontier.c
@@ -0,0 +1,390 @@
+#include "comm_command_frontier.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "constants/battle_tower.h"
+#include "constants/communication/comm_command.h"
+
+#include "struct_defs/battle_tower.h"
+#include "struct_defs/comm_cmd_table.h"
+#include "struct_defs/struct_0209BBA4.h"
+
+#include "applications/frontier/battle_arcade/main.h"
+#include "applications/frontier/battle_castle/opponent_app.h"
+#include "applications/frontier/battle_castle/self_app.h"
+#include "applications/frontier/battle_factory/main.h"
+#include "applications/frontier/battle_hall/main.h"
+#include "overlay104/ov104_0222ECE8.h"
+#include "overlay104/ov104_0223C164.h"
+
+#include "battle_frontier_stats.h"
+#include "communication_system.h"
+#include "party.h"
+#include "pokemon.h"
+#include "unk_02032798.h"
+#include "unk_0205DFC4.h"
+
+static void CommCmd_Frontier_62(int param0, int param1, void *param2, void *param3);
+BOOL sub_0209BB08(BattleTower *battleTower);
+static void CommCmd_Frontier_63(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Frontier_64(int param0, int param1, void *param2, void *param3);
+BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0);
+void CommCmd_Frontier_57(int param0, int param1, void *param2, void *param3);
+BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1);
+void CommCmd_Frontier_58(int param0, int param1, void *param2, void *param3);
+BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2);
+void CommCmd_Frontier_59(int param0, int param1, void *param2, void *param3);
+BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1);
+void CommCmd_Frontier_60(int param0, int param1, void *param2, void *param3);
+BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1);
+void CommCmd_Frontier_61(int param0, int param1, void *param2, void *param3);
+
+// clang-format off
+static const CommCmdTable Unk_020F8BF0[] = {
+    [COMM_CMD_F_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_22, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_23, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_24, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_25, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_26, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_27, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_28, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_FACTORY_DUMMY - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryDummy, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_FACTORY_SELECTION_UPDATE - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryHandleSelectionUpdate, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_FACTORY_DUMMY2 - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryDummy2, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_FACTORY_TRADE_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleFactoryHandleTradeResult, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_33 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_33, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_34 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_34, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_35 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_35, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_36 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_36, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_37 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_37, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_38 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_38, CommPacketSizeOf_Variable, ov104_0222EED8 },
+    [COMM_CMD_HALL_DUMMY - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallDummy, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_HALL_TYPE_SELECTION_MSG - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallHandleTypeSelectionMsg, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_HALL_PARTNER_DECISION - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallHandlePartnerDecision, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_42 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_42, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_43 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_43, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_44 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_44, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_45 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_45, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_46 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_46, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_47 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_47, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_48 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_48, CommPacketSizeOf_Variable, ov104_0222F84C },
+    [COMM_CMD_CASTLE_PLAYER_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleHandlePlayerInfo, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CASTLE_PURCHASE_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastlePurchaseInfo, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CASTLE_UPDATE_CURSOR - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleHandleUpdateCursor, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CASTLE_EXIT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleHandleExitApp, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CASTLE_OPP_PLAYER_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentHandlePlayerInfo, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CASTLE_OPP_PURCHASE_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentHandlePurchaseInfo, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CASTLE_OPP_UPDATE_CURSOR - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentUpdateCursorCmd, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CASTLE_OPP_EXIT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleCastleOpponentHandleExitApp, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_57 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_57, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_58 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_58, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_59 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_59, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_60 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_60, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_61 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_61, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_62 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_62, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_63 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_63, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_64 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_64, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_65 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_65, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_66 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_66, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_67 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_67, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_68 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_68, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_69 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_69, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_F_70 - COMM_CMD_MAX_COMMON] = { CommCmd_Frontier_70, CommPacketSizeOf_Variable, ov104_0222FBC4 },
+    [COMM_CMD_ARCADE_INIT_LAYOUT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleArcadeHandleInitialLayout, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_ARCADE_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_BattleArcadeHandleResult, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_ARCADE_UNUSED - COMM_CMD_MAX_COMMON] = { CommCmd_BattleArcadeUnused, CommPacketSizeOf_Variable, NULL }
+};
+// clang-format on
+
+void sub_0209BA80(void *param0)
+{
+    int v0 = sizeof(Unk_020F8BF0) / sizeof(CommCmdTable);
+    CommCmdManager_Init(Unk_020F8BF0, v0, param0);
+}
+
+static void CommCmd_Frontier_62(int param0, int param1, void *param2, void *param3)
+{
+    u16 v0;
+    int v1;
+    BattleTower *battleTower = param3;
+    const u16 *v3 = param2;
+
+    v0 = 0;
+    v1 = 0;
+    battleTower->unk_8D4++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    battleTower->partnerGender = (u8)v3[0];
+    battleTower->unk_16[0] = v3[1];
+    battleTower->unk_16[1] = v3[2];
+    battleTower->unk_14 = v3[3];
+    battleTower->partnerID = BT_PARTNERS_COUNT + battleTower->partnerGender;
+
+    if ((battleTower->unk_2E[0] == battleTower->unk_16[0]) || (battleTower->unk_2E[0] == battleTower->unk_16[1])) {
+        v0 += 1;
+    }
+
+    if ((battleTower->unk_2E[1] == battleTower->unk_16[0]) || (battleTower->unk_2E[1] == battleTower->unk_16[1])) {
+        v0 += 2;
+    }
+
+    battleTower->unk_8D8 = v0;
+    return;
+}
+
+BOOL sub_0209BB08(BattleTower *battleTower)
+{
+    int v0, v1;
+
+    v1 = (14 * 2);
+
+    MI_CpuCopy8(battleTower->trainerIDs, battleTower->unk_83E, v1);
+
+    if (CommSys_SendData(63, battleTower->unk_83E, v1) == 1) {
+        v0 = 1;
+    } else {
+        v0 = 0;
+    }
+
+    return v0;
+}
+
+static void CommCmd_Frontier_63(int param0, int param1, void *param2, void *param3)
+{
+    int v0;
+    BattleTower *battleTower = param3;
+    const u16 *v2 = param2;
+
+    v0 = 0;
+    battleTower->unk_8D4++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    if (CommSys_CurNetId() == 0) {
+        return;
+    }
+
+    MI_CpuCopy8(v2, battleTower->trainerIDs, BT_OPPONENTS_COUNT * 2 * sizeof(u16));
+    return;
+}
+
+static void CommCmd_Frontier_64(int param0, int param1, void *param2, void *param3)
+{
+    int v0;
+    BattleTower *battleTower = param3;
+    const u16 *v2 = param2;
+
+    v0 = 0;
+
+    battleTower->unk_8D8 = 0;
+    battleTower->unk_8D4++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    if (battleTower->unk_10_3 || v2[0]) {
+        battleTower->unk_8D8 = 1;
+    }
+
+    return;
+}
+
+BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0)
+{
+    int v0, v1, v2;
+
+    v1 = 40;
+    param0->unk_08[0] = param0->unk_A0;
+
+    v2 = ov104_0223C264(param0->unk_A0);
+    param0->unk_08[1] = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->saveData), v2, BattleFrontierStats_GetHostFriendIdx(v2));
+
+    if (CommSys_SendData(57, param0->unk_08, v1) == 1) {
+        v0 = 1;
+    } else {
+        v0 = 0;
+    }
+
+    return v0;
+}
+
+void CommCmd_Frontier_57(int param0, int param1, void *param2, void *param3)
+{
+    u16 v0;
+    UnkStruct_0209BBA4 *v1 = param3;
+    const u16 *v2 = param2;
+
+    v1->unk_6F++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    v1->unk_6E = (u8)v2[0];
+    v1->unk_72 = v2[1];
+
+    return;
+}
+
+BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1)
+{
+    int v0, v1 = 40;
+    param0->unk_08[0] = param1;
+
+    if (CommSys_SendData(58, param0->unk_08, v1) == 1) {
+        v0 = 1;
+    } else {
+        v0 = 0;
+    }
+
+    return v0;
+}
+
+void CommCmd_Frontier_58(int param0, int param1, void *param2, void *param3)
+{
+    int v0;
+    UnkStruct_0209BBA4 *v1 = param3;
+    const u16 *v2 = param2;
+
+    v0 = 0;
+    v1->unk_6F++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    v1->unk_59 = (u8)v2[0];
+    return;
+}
+
+BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2)
+{
+    int v0, v1;
+    Pokemon *v2;
+    Party *v3;
+
+    v1 = 40;
+    v3 = SaveData_GetParty(param0->saveData);
+
+    param0->unk_6A[0] = param1;
+    param0->unk_6A[1] = param2;
+
+    if (param1 == 0xff) {
+        param0->unk_76[0] = 0;
+        param0->unk_7E[0] = 0;
+        param0->unk_76[1] = 0;
+        param0->unk_7E[1] = 0;
+    } else {
+        v2 = Party_GetPokemonBySlotIndex(v3, param1);
+
+        param0->unk_76[0] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL);
+        param0->unk_7E[0] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL);
+
+        v2 = Party_GetPokemonBySlotIndex(v3, param2);
+
+        param0->unk_76[1] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL);
+        param0->unk_7E[1] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL);
+    }
+
+    param0->unk_08[0] = param0->unk_76[0];
+    param0->unk_08[1] = param0->unk_7E[0];
+    param0->unk_08[2] = param0->unk_76[1];
+    param0->unk_08[3] = param0->unk_7E[1];
+
+    if (CommSys_SendData(59, param0->unk_08, v1) == 1) {
+        v0 = 1;
+    } else {
+        v0 = 0;
+    }
+
+    return v0;
+}
+
+void CommCmd_Frontier_59(int param0, int param1, void *param2, void *param3)
+{
+    UnkStruct_0209BBA4 *v0 = param3;
+    const u16 *v1 = param2;
+
+    v0->unk_6F++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    v0->unk_86[0] = v1[0];
+    v0->unk_8E[0] = v1[1];
+    v0->unk_86[1] = v1[2];
+    v0->unk_8E[1] = v1[3];
+
+    return;
+}
+
+BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1)
+{
+    int v0, v1 = 40;
+
+    param0->unk_08[0] = param1;
+
+    if (CommSys_SendData(60, param0->unk_08, v1) == 1) {
+        v0 = 1;
+    } else {
+        v0 = 0;
+    }
+
+    return v0;
+}
+
+void CommCmd_Frontier_60(int param0, int param1, void *param2, void *param3)
+{
+    int v0;
+    UnkStruct_0209BBA4 *v1 = param3;
+    const u16 *v2 = param2;
+
+    v0 = 0;
+    v1->unk_6F++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    v1->unk_74 = v2[0];
+    return;
+}
+
+BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1)
+{
+    int v0, v1 = 40;
+    param0->unk_08[0] = param1;
+
+    if (CommSys_SendData(61, param0->unk_08, v1) == 1) {
+        v0 = 1;
+    } else {
+        v0 = 0;
+    }
+
+    return v0;
+}
+
+void CommCmd_Frontier_61(int param0, int param1, void *param2, void *param3)
+{
+    int v0;
+    UnkStruct_0209BBA4 *v1 = param3;
+    const u16 *v2 = param2;
+
+    v0 = 0;
+    v1->unk_6F++;
+
+    if (CommSys_CurNetId() == param0) {
+        return;
+    }
+
+    v1->unk_71 = (u8)v2[0];
+    return;
+}
diff --git a/src/comm_manager.c b/src/comm_manager.c
index 9a210becf0d..8ad6d9daeda 100644
--- a/src/comm_manager.c
+++ b/src/comm_manager.c
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include "constants/communication/comm_avaliable_connections.h"
+#include "constants/communication/comm_command.h"
 #include "constants/communication/comm_error.h"
 #include "constants/communication/comm_type.h"
 
@@ -24,7 +25,7 @@
 #include "system.h"
 #include "trainer_info.h"
 #include "unk_0203266C.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_02033200.h"
 #include "unk_02039814.h"
 #include "wireless_manager.h"
@@ -1480,7 +1481,7 @@ static void CommTask_ConnectUnionClient(void)
     }
 
     if (sCommMan->timer > (120 - 10)) {
-        CommSys_SendDataFixedSize(6, sFreakConfirmationMessage);
+        CommSys_SendDataFixedSize(COMM_CMD_VALIDATE_CONFIRMATION, sFreakConfirmationMessage);
     }
 
     if (sCommMan->timer != 0) {
@@ -1578,10 +1579,10 @@ void CommManager_StartDrawServer(void)
 
     if (CommSys_CurNetId() == 0) {
         u8 data = 0;
-        CommSys_SendDataFixedSize(10, &data);
+        CommSys_SendDataFixedSize(COMM_CMD_10, &data);
     } else {
         u8 data = 0;
-        CommSys_SendDataFixedSize(10, &data);
+        CommSys_SendDataFixedSize(COMM_CMD_10, &data);
     }
 }
 
@@ -1766,13 +1767,13 @@ void CommCmd_ValidateConfirmationMessage(int netID, int unused_1, void *msg, voi
     if (success && (!sCommMan->pauseUnion)) {
         sGameConfirmationMessage[0] = netID;
         // "[netID]GAME" indicates a success
-        CommSys_SendDataFixedSizeServer(7, sGameConfirmationMessage);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE, sGameConfirmationMessage);
         return;
     }
 
     // "[netID]FULL" indicates a failure
     sFullConfirmationMessage[0] = netID;
-    CommSys_SendDataFixedSizeServer(7, sFullConfirmationMessage);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE, sFullConfirmationMessage);
 }
 
 /**
@@ -2516,7 +2517,7 @@ void CommManager_EndBattleWifiMatch(void)
 {
     u8 netID = CommSys_CurNetId();
 
-    CommSys_SendDataFixedSize(21, &netID);
+    CommSys_SendDataFixedSize(COMM_CMD_DISCONNECT_WIFI, &netID);
 }
 
 /**
diff --git a/src/communication_information.c b/src/communication_information.c
index 4a424c0eb23..74c7023ec92 100644
--- a/src/communication_information.c
+++ b/src/communication_information.c
@@ -4,6 +4,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/heap.h"
 
 #include "struct_decls/wi_fi_list.h"
@@ -145,7 +146,7 @@ void CommInfo_SendPlayerInfo(void)
         BattleRegulation_Copy(sCommInfo->regulation, (BattleRegulation *)sCommInfo->playerInfo[netId].regulationBuffer);
     }
 
-    CommSys_SendData(3, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo));
+    CommSys_SendData(COMM_CMD_RECV_PLAYER_INFO, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo));
 }
 
 int CommPlayerInfo_Size(void)
diff --git a/src/communication_system.c b/src/communication_system.c
index 380a18f15ed..37f46c4800b 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -4,6 +4,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/heap.h"
 
 #include "struct_defs/comm_queue_man.h"
@@ -22,7 +23,7 @@
 #include "system.h"
 #include "unk_020322D8.h"
 #include "unk_0203266C.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "wireless_manager.h"
@@ -1672,9 +1673,9 @@ static void CommSys_Transmission(void)
     switch (sCommunicationSystem->transmissionState) {
     case 1:
         if (CommSys_TransmissionType() == 1) {
-            v0 = CommSys_SendDataFixedSize(11, &sCommunicationSystem->unk_6A4);
+            v0 = CommSys_SendDataFixedSize(COMM_CMD_11, &sCommunicationSystem->unk_6A4);
         } else {
-            v0 = CommSys_SendDataServer(11, &sCommunicationSystem->unk_6A4, 1);
+            v0 = CommSys_SendDataServer(COMM_CMD_11, &sCommunicationSystem->unk_6A4, 1);
         }
 
         if (v0) {
@@ -1682,7 +1683,7 @@ static void CommSys_Transmission(void)
         }
         break;
     case 3:
-        if (CommSys_SendDataFixedSize(12, &sCommunicationSystem->unk_6A4)) {
+        if (CommSys_SendDataFixedSize(COMM_CMD_12, &sCommunicationSystem->unk_6A4)) {
             CommSys_SwitchTransitionType(sCommunicationSystem->unk_6A4);
             sCommunicationSystem->transmissionState = 0;
         }
@@ -1690,7 +1691,7 @@ static void CommSys_Transmission(void)
     }
 }
 
-void sub_02036008(int unused0, int unused1, void *param2, void *unused3)
+void CommCmd_10(int unused0, int unused1, void *param2, void *unused3)
 {
     u8 *v0 = param2;
 
@@ -1702,7 +1703,7 @@ void sub_02036008(int unused0, int unused1, void *param2, void *unused3)
     sCommunicationSystem->unk_6A4 = v0[0];
 }
 
-void sub_02036030(int unused0, int unused1, void *param2, void *unused3)
+void CommCmd_11(int unused0, int unused1, void *param2, void *unused3)
 {
     u8 *v0 = param2;
 
@@ -1714,7 +1715,7 @@ void sub_02036030(int unused0, int unused1, void *param2, void *unused3)
     sCommunicationSystem->transmissionState = 3;
 }
 
-void sub_02036058(int unused0, int unused1, void *param2, void *unused3)
+void CommCmd_12(int unused0, int unused1, void *param2, void *unused3)
 {
     u8 *v0 = param2;
 
@@ -1815,7 +1816,7 @@ BOOL CommSys_IsAlone(void)
     return FALSE;
 }
 
-void sub_0203619C(int param0, int param1, void *param2, void *param3)
+void CommCmd_2(int param0, int param1, void *param2, void *param3)
 {
     u8 v0;
 
diff --git a/src/main_menu/ov97_0222D2F8.c b/src/main_menu/ov97_0222D2F8.c
index 623d9b86b8c..0353060e7e9 100644
--- a/src/main_menu/ov97_0222D2F8.c
+++ b/src/main_menu/ov97_0222D2F8.c
@@ -7,7 +7,7 @@
 
 #include "main_menu/ov97_0222D04C.h"
 
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 static const CommCmdTable Unk_ov97_0223D704[] = {
     { ov97_0222D284, ov97_0222D2B0, ov97_0222D2B8 },
diff --git a/src/meson.build b/src/meson.build
index 8f40868a637..05436b58b5f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -144,7 +144,7 @@ pokeplatinum_c = files(
     'comm_ring.c',
     'unk_020322D8.c',
     'unk_0203266C.c',
-    'unk_02032798.c',
+    'comm_command.c',
     'communication_information.c',
     'unk_02033200.c',
     'communication_system.c',
@@ -344,7 +344,7 @@ pokeplatinum_c = files(
     'unk_0209B344.c',
     'unk_0209B6F8.c',
     'unk_0209BA18.c',
-    'unk_0209BA80.c',
+    'comm_command_frontier.c',
     'unk_0209BDF8.c',
     'unk_0209C194.c',
     'unk_0209C370.c',
diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c
index 0e58ca23f60..16d0bda1867 100644
--- a/src/overlay083/ov83_0223D4CC.c
+++ b/src/overlay083/ov83_0223D4CC.c
@@ -12,7 +12,7 @@
 #include "heap.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 typedef struct {
     BOOL unk_00;
diff --git a/src/overlay104/frscrcmd_battle_arcade.c b/src/overlay104/frscrcmd_battle_arcade.c
index f5d3cbad689..8c58ed47f17 100644
--- a/src/overlay104/frscrcmd_battle_arcade.c
+++ b/src/overlay104/frscrcmd_battle_arcade.c
@@ -36,7 +36,7 @@
 #include "trainer_info.h"
 #include "unk_02030494.h"
 #include "unk_0209B6F8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/frscrcmd_battle_castle.c b/src/overlay104/frscrcmd_battle_castle.c
index 67cf49d889a..6de23b290c9 100644
--- a/src/overlay104/frscrcmd_battle_castle.c
+++ b/src/overlay104/frscrcmd_battle_castle.c
@@ -26,7 +26,7 @@
 #include "unk_020302D0.h"
 #include "unk_0205DFC4.h"
 #include "unk_0209B6F8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/frscrcmd_battle_factory.c b/src/overlay104/frscrcmd_battle_factory.c
index 6ed95be6eb0..16d363461b1 100644
--- a/src/overlay104/frscrcmd_battle_factory.c
+++ b/src/overlay104/frscrcmd_battle_factory.c
@@ -26,7 +26,7 @@
 #include "sys_task_manager.h"
 #include "unk_0202FF4C.h"
 #include "unk_0209B6F8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/frscrcmd_battle_hall.c b/src/overlay104/frscrcmd_battle_hall.c
index d0142e5406d..1618d43352c 100644
--- a/src/overlay104/frscrcmd_battle_hall.c
+++ b/src/overlay104/frscrcmd_battle_hall.c
@@ -28,7 +28,7 @@
 #include "tv_segment.h"
 #include "unk_02030108.h"
 #include "unk_0209B6F8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c
index 8c0ffdc1d57..32a99f3385b 100644
--- a/src/overlay104/ov104_0222ECE8.c
+++ b/src/overlay104/ov104_0222ECE8.c
@@ -26,61 +26,61 @@
 #include "unk_0205DFC4.h"
 
 BOOL ov104_0222EEF8(BattleFactory *param0);
-void ov104_0222EF30(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_22(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EF64(BattleFactory *param0);
-void ov104_0222EF94(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_23(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EFCC(BattleFactory *param0);
-void ov104_0222F03C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_24(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F0B4(BattleFactory *param0);
-void ov104_0222F124(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_25(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1);
-void ov104_0222F1C4(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_26(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1);
-void ov104_0222F210(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_27(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F238(BattleFactory *param0);
-void ov104_0222F31C(int param0, int param1, void *param2, void *param3);
-void ov104_0222ECE8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_28(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_33(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222ED00(BattleHall *param0);
-void ov104_0222ED2C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_34(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222ED44(BattleHall *param0);
-void ov104_0222ED74(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_35(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EDA8(BattleHall *param0);
-void ov104_0222EDDC(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_36(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EE14(BattleHall *param0, u8 param1);
-void ov104_0222EE38(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_37(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222EE60(BattleHall *param0);
-void ov104_0222EEA8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_38(int param0, int param1, void *param2, void *param3);
 u8 *ov104_0222EED8(int param0, void *param1, int param2);
 BOOL ov104_0222F3B8(BattleCastle *param0);
-void ov104_0222F418(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_42(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F44C(BattleCastle *param0);
-void ov104_0222F480(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_43(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F4B8(BattleCastle *param0);
-void ov104_0222F530(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_44(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F5D4(BattleCastle *param0);
-void ov104_0222F650(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_45(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1);
-void ov104_0222F6E8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_46(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F710(BattleCastle *param0, u16 param1);
-void ov104_0222F730(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_47(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F758(BattleCastle *param0);
-void ov104_0222F7BC(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_48(int param0, int param1, void *param2, void *param3);
 u8 *ov104_0222F84C(int param0, void *param1, int param2);
 BOOL ov104_0222F86C(BattleArcade *param0);
-void ov104_0222F8A0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_65(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F8D0(BattleArcade *param0);
-void ov104_0222F908(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_66(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222F944(BattleArcade *param0);
-void ov104_0222F9C0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_67(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222FA38(BattleArcade *param0, u16 param1);
-void ov104_0222FA5C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_68(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222FA84(BattleArcade *param0, u16 param1);
-void ov104_0222FAA8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_69(int param0, int param1, void *param2, void *param3);
 BOOL ov104_0222FAD0(BattleArcade *param0);
-void ov104_0222FB34(int param0, int param1, void *param2, void *param3);
+void CommCmd_Frontier_70(int param0, int param1, void *param2, void *param3);
 u8 *ov104_0222FBC4(int param0, void *param1, int param2);
 
-void ov104_0222ECE8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_33(int param0, int param1, void *param2, void *param3)
 {
     BattleHall *v0 = param3;
     const u16 *v1 = param2;
@@ -116,7 +116,7 @@ BOOL ov104_0222ED00(BattleHall *param0)
     return v4;
 }
 
-void ov104_0222ED2C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_34(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleHall *v2 = param3;
@@ -160,7 +160,7 @@ BOOL ov104_0222ED44(BattleHall *param0)
     return v5;
 }
 
-void ov104_0222ED74(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_35(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleHall *v2 = param3;
@@ -209,7 +209,7 @@ BOOL ov104_0222EDA8(BattleHall *param0)
     return v3;
 }
 
-void ov104_0222EDDC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_36(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleHall *v2 = param3;
@@ -252,7 +252,7 @@ BOOL ov104_0222EE14(BattleHall *param0, u8 param1)
     return v1;
 }
 
-void ov104_0222EE38(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_37(int param0, int param1, void *param2, void *param3)
 {
     BattleHall *v0 = param3;
     const u16 *v1 = param2;
@@ -291,7 +291,7 @@ BOOL ov104_0222EE60(BattleHall *param0)
     return v2;
 }
 
-void ov104_0222EEA8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_38(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1, v2;
     BattleHall *v3 = param3;
@@ -344,7 +344,7 @@ BOOL ov104_0222EEF8(BattleFactory *param0)
     return v4;
 }
 
-void ov104_0222EF30(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_22(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleFactory *v2 = param3;
@@ -390,7 +390,7 @@ BOOL ov104_0222EF64(BattleFactory *param0)
     return v3;
 }
 
-void ov104_0222EF94(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_23(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleFactory *v2 = param3;
@@ -452,7 +452,7 @@ BOOL ov104_0222EFCC(BattleFactory *param0)
     return v3;
 }
 
-void ov104_0222F03C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_24(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     Pokemon *v2;
@@ -528,7 +528,7 @@ BOOL ov104_0222F0B4(BattleFactory *param0)
     return v3;
 }
 
-void ov104_0222F124(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_25(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleFactory *v2 = param3;
@@ -584,7 +584,7 @@ BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1)
     return v1;
 }
 
-void ov104_0222F1C4(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_26(int param0, int param1, void *param2, void *param3)
 {
     BattleFactory *v0 = param3;
     const u16 *v1 = param2;
@@ -617,7 +617,7 @@ BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1)
     return v1;
 }
 
-void ov104_0222F210(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_27(int param0, int param1, void *param2, void *param3)
 {
     BattleFactory *v0 = param3;
     const u16 *v1 = param2;
@@ -681,7 +681,7 @@ BOOL ov104_0222F238(BattleFactory *param0)
     return v4;
 }
 
-void ov104_0222F31C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_28(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     u8 v2;
@@ -747,7 +747,7 @@ BOOL ov104_0222F3B8(BattleCastle *param0)
     return v2;
 }
 
-void ov104_0222F418(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_42(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleCastle *v2 = param3;
@@ -794,7 +794,7 @@ BOOL ov104_0222F44C(BattleCastle *param0)
     return v2;
 }
 
-void ov104_0222F480(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_43(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleCastle *v2 = param3;
@@ -859,7 +859,7 @@ BOOL ov104_0222F4B8(BattleCastle *param0)
     return v2;
 }
 
-void ov104_0222F530(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_44(int param0, int param1, void *param2, void *param3)
 {
     Pokemon *v0;
     int v1, v2;
@@ -944,7 +944,7 @@ BOOL ov104_0222F5D4(BattleCastle *param0)
     return v2;
 }
 
-void ov104_0222F650(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_45(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleCastle *v2 = param3;
@@ -997,7 +997,7 @@ BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1)
     return v0;
 }
 
-void ov104_0222F6E8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_46(int param0, int param1, void *param2, void *param3)
 {
     int v0;
     BattleCastle *v1 = param3;
@@ -1028,7 +1028,7 @@ BOOL ov104_0222F710(BattleCastle *param0, u16 param1)
     return v0;
 }
 
-void ov104_0222F730(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_47(int param0, int param1, void *param2, void *param3)
 {
     int v0;
     BattleCastle *v1 = param3;
@@ -1070,7 +1070,7 @@ BOOL ov104_0222F758(BattleCastle *param0)
     return v2;
 }
 
-void ov104_0222F7BC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_48(int param0, int param1, void *param2, void *param3)
 {
     u8 v0;
     int v1, v2, v3;
@@ -1133,7 +1133,7 @@ BOOL ov104_0222F86C(BattleArcade *param0)
     return v2;
 }
 
-void ov104_0222F8A0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_65(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleArcade *v2 = param3;
@@ -1176,7 +1176,7 @@ BOOL ov104_0222F8D0(BattleArcade *param0)
     return v2;
 }
 
-void ov104_0222F908(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_66(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleArcade *v2 = param3;
@@ -1237,7 +1237,7 @@ BOOL ov104_0222F944(BattleArcade *param0)
     return v2;
 }
 
-void ov104_0222F9C0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_67(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     BattleArcade *v2 = param3;
@@ -1290,7 +1290,7 @@ BOOL ov104_0222FA38(BattleArcade *param0, u16 param1)
     return v0;
 }
 
-void ov104_0222FA5C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_68(int param0, int param1, void *param2, void *param3)
 {
     int v0;
     BattleArcade *v1 = param3;
@@ -1321,7 +1321,7 @@ BOOL ov104_0222FA84(BattleArcade *param0, u16 param1)
     return v0;
 }
 
-void ov104_0222FAA8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_69(int param0, int param1, void *param2, void *param3)
 {
     int v0;
     BattleArcade *v1 = param3;
@@ -1363,7 +1363,7 @@ BOOL ov104_0222FAD0(BattleArcade *param0)
     return v2;
 }
 
-void ov104_0222FB34(int param0, int param1, void *param2, void *param3)
+void CommCmd_Frontier_70(int param0, int param1, void *param2, void *param3)
 {
     u8 v0;
     int v1, v2, v3;
diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c
index 48903555747..4b8f7849352 100644
--- a/src/overlay104/ov104_022395F0.c
+++ b/src/overlay104/ov104_022395F0.c
@@ -28,7 +28,7 @@
 #include "unk_0204FA34.h"
 #include "unk_0205DFC4.h"
 #include "unk_0209B6F8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 
 static BOOL ov104_02239680(FrontierScriptContext *param0);
 static BOOL ov104_02239C20(FrontierScriptContext *param0);
diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c
index 415b05983b2..3e3bbc5cb13 100644
--- a/src/overlay104/ov104_02239C58.c
+++ b/src/overlay104/ov104_02239C58.c
@@ -20,7 +20,7 @@
 #include "savedata.h"
 #include "unk_0202D778.h"
 #include "unk_0209B6F8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 
 #include "constdata/const_020F410C.h"
 
diff --git a/src/overlay114/ov114_02260044.c b/src/overlay114/ov114_02260044.c
index e0c7e2e39d2..f80e93772f3 100644
--- a/src/overlay114/ov114_02260044.c
+++ b/src/overlay114/ov114_02260044.c
@@ -8,7 +8,7 @@
 #include "overlay114/struct_ov114_0225D678_decl.h"
 #include "overlay114/struct_ov114_0225E854_decl.h"
 
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 void ov114_02260044(UnkStruct_ov114_0225E854 *param0)
 {
diff --git a/src/overlay115/ov115_02265A24.c b/src/overlay115/ov115_02265A24.c
index 9c408eb66dd..80ff0cd8966 100644
--- a/src/overlay115/ov115_02265A24.c
+++ b/src/overlay115/ov115_02265A24.c
@@ -10,7 +10,7 @@
 #include "overlay115/struct_ov115_02265AD4.h"
 
 #include "communication_system.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 void ov115_02265A24(UnkStruct_ov115_0226095C *param0)
 {
diff --git a/src/overlay116/ov116_02260440.c b/src/overlay116/ov116_02260440.c
index 4beeb5c1acd..f246932d897 100644
--- a/src/overlay116/ov116_02260440.c
+++ b/src/overlay116/ov116_02260440.c
@@ -13,7 +13,7 @@
 #include "overlay116/struct_ov116_0226139C.h"
 
 #include "math_util.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 static void ov116_02260440(int param0, int param1, void *param2, void *param3);
 static void ov116_02260458(int param0, int param1, void *param2, void *param3);
diff --git a/src/overlay117/ov117_022665FC.c b/src/overlay117/ov117_022665FC.c
index 70cc0ec5d88..f0a6c5b7e67 100644
--- a/src/overlay117/ov117_022665FC.c
+++ b/src/overlay117/ov117_022665FC.c
@@ -10,7 +10,7 @@
 #include "overlay117/struct_ov117_022621D4.h"
 
 #include "communication_system.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 static void ov117_02266618(int param0, int param1, void *param2, void *param3);
 static void ov117_0226663C(int param0, int param1, void *param2, void *param3);
diff --git a/src/unk_020322D8.c b/src/unk_020322D8.c
index cace502970f..f2ea97ae815 100644
--- a/src/unk_020322D8.c
+++ b/src/unk_020322D8.c
@@ -11,7 +11,7 @@
 #include "comm_ring.h"
 #include "communication_system.h"
 #include "heap.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 static UnkStruct_020322D8 *sub_020322D8(CommQueueMan *param0)
 {
diff --git a/src/unk_020363E8.c b/src/unk_020363E8.c
index 213466c1789..08252bd3ab5 100644
--- a/src/unk_020363E8.c
+++ b/src/unk_020363E8.c
@@ -133,7 +133,7 @@ int CommTool_GetSyncNo(int netId)
     return sCommTool->syncNo[netId];
 }
 
-void sub_02036574(int netId, int param1, void *param2, void *param3)
+void CommCmd_19(int netId, int param1, void *param2, void *param3)
 {
     UnkStruct_02036574 *v0 = param2;
 
@@ -205,7 +205,7 @@ const void *sub_0203664C(int netId)
     return NULL;
 }
 
-void sub_02036670(int netId, int param1, void *param2, void *param3)
+void CommCmd_20(int netId, int param1, void *param2, void *param3)
 {
     sCommTool->hasRecievedTempData[netId] = TRUE;
     MI_CpuCopy8(param2, sCommTool->unk_18[netId], COMM_TOOL_TEMP_DATA_SIZE);
diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c
index a04a8f4e9c8..c18db12bb56 100644
--- a/src/unk_020494DC.c
+++ b/src/unk_020494DC.c
@@ -31,7 +31,7 @@
 #include "unk_0204AEE8.h"
 #include "unk_0205DFC4.h"
 #include "unk_0206B9D8.h"
-#include "unk_0209BA80.h"
+#include "comm_command_frontier.h"
 
 static u16 BattleTower_GetPartnerParam(BattleTower *battleTower, u8 param1);
 
diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c
index 2adcc9c8f9c..7cdfe66bfb3 100644
--- a/src/unk_0207A6DC.c
+++ b/src/unk_0207A6DC.c
@@ -27,7 +27,7 @@
 #include "sys_task_manager.h"
 #include "trainer_info.h"
 #include "unk_0202F1D4.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_020363E8.h"
 
 void sub_0207A81C(BattleSystem *battleSys, int param1, int param2, void *param3, u8 param4);
diff --git a/src/unk_02095AF0.c b/src/unk_02095AF0.c
index 46af3aa3774..241aea8194f 100644
--- a/src/unk_02095AF0.c
+++ b/src/unk_02095AF0.c
@@ -16,7 +16,7 @@
 #include "contest.h"
 #include "heap.h"
 #include "unk_020298BC.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 static void sub_02095B2C(int param0, int param1, void *param2, void *param3);
 static u8 *sub_02095B04(int param0, void *param1, int param2);
diff --git a/src/unk_02095CD4.c b/src/unk_02095CD4.c
index c53486ea5a1..5309ed6ec10 100644
--- a/src/unk_02095CD4.c
+++ b/src/unk_02095CD4.c
@@ -14,7 +14,7 @@
 #include "pal_pad.h"
 #include "party.h"
 #include "unk_0202D778.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 
 void sub_02095DFC(int param0, int param1, void *param2, void *param3);
 void sub_02095E28(int param0, int param1, void *param2, void *param3);
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 2d69f0de935..cc8f9026d84 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -14,7 +14,7 @@
 #include "bg_window.h"
 #include "comm_manager.h"
 #include "communication_system.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index 8ea4b46fd7d..bf18c60cc27 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -14,7 +14,7 @@
 #include "communication_system.h"
 #include "math_util.h"
 #include "sound_playback.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_02099500.c b/src/unk_02099500.c
index bac2b8621a6..f5d5e341ba0 100644
--- a/src/unk_02099500.c
+++ b/src/unk_02099500.c
@@ -19,7 +19,7 @@
 #include "field_comm_manager.h"
 #include "trainer_case.h"
 #include "trainer_info.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_0204FA34.h"
 #include "unk_0205001C.h"
 #include "unk_02050548.h"
diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c
deleted file mode 100644
index d14a3705db6..00000000000
--- a/src/unk_0209BA80.c
+++ /dev/null
@@ -1,387 +0,0 @@
-#include "unk_0209BA80.h"
-
-#include <nitro.h>
-#include <string.h>
-
-#include "constants/battle_tower.h"
-
-#include "struct_defs/battle_tower.h"
-#include "struct_defs/comm_cmd_table.h"
-#include "struct_defs/struct_0209BBA4.h"
-
-#include "applications/frontier/battle_arcade/main.h"
-#include "applications/frontier/battle_castle/opponent_app.h"
-#include "applications/frontier/battle_castle/self_app.h"
-#include "applications/frontier/battle_factory/main.h"
-#include "applications/frontier/battle_hall/main.h"
-#include "overlay104/ov104_0222ECE8.h"
-#include "overlay104/ov104_0223C164.h"
-
-#include "battle_frontier_stats.h"
-#include "communication_system.h"
-#include "party.h"
-#include "pokemon.h"
-#include "unk_02032798.h"
-#include "unk_0205DFC4.h"
-
-static void sub_0209BA94(int param0, int param1, void *param2, void *param3);
-BOOL sub_0209BB08(BattleTower *battleTower);
-static void sub_0209BB34(int param0, int param1, void *param2, void *param3);
-static void sub_0209BB68(int param0, int param1, void *param2, void *param3);
-BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0);
-void sub_0209BBEC(int param0, int param1, void *param2, void *param3);
-BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1);
-void sub_0209BC3C(int param0, int param1, void *param2, void *param3);
-BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2);
-void sub_0209BD28(int param0, int param1, void *param2, void *param3);
-BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1);
-void sub_0209BD88(int param0, int param1, void *param2, void *param3);
-BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1);
-void sub_0209BDD0(int param0, int param1, void *param2, void *param3);
-
-static const CommCmdTable Unk_020F8BF0[] = {
-    { ov104_0222EF30, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222EF94, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F03C, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F124, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F1C4, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F210, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F31C, CommPacketSizeOf_Variable, NULL },
-    { BattleFactoryApp_DummyCommCommand, CommPacketSizeOf_Variable, NULL },
-    { BattleFactoryApp_HandleSelectionUpdateCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleFactoryApp_DummyCommCommand2, CommPacketSizeOf_Variable, NULL },
-    { BattleFactoryApp_HandleTradeResultCmd, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222ECE8, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222ED2C, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222ED74, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222EDDC, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222EE38, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222EEA8, CommPacketSizeOf_Variable, ov104_0222EED8 },
-    { BattleHall_DummyCommCommand, CommPacketSizeOf_Variable, NULL },
-    { BattleHall_HandleTypeSelectionMsg, CommPacketSizeOf_Variable, NULL },
-    { BattleHall_HandlePartnerDecisionCmd, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F418, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F480, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F530, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F650, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F6E8, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F730, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F7BC, CommPacketSizeOf_Variable, ov104_0222F84C },
-    { BattleCastleSelfApp_HandlePlayerInfoCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleCastleSelfApp_HandlePurchaseInfoCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleCastleSelfApp_HandleUpdateCursorCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleCastleSelfApp_HandleExitAppCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleCastleOpponentApp_HandlePlayerInfoCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleCastleOpponentApp_HandlePurchaseInfoCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleCastleOpponentApp_HandleUpdateCursorCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleCastleOpponentApp_HandleExitAppCmd, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BBEC, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BC3C, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BD28, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BD88, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BDD0, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BA94, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BB34, CommPacketSizeOf_Variable, NULL },
-    { sub_0209BB68, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F8A0, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F908, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222F9C0, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222FA5C, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222FAA8, CommPacketSizeOf_Variable, NULL },
-    { ov104_0222FB34, CommPacketSizeOf_Variable, ov104_0222FBC4 },
-    { BattleArcadeApp_HandleInitialLayoutCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleArcadeApp_HandleResultCmd, CommPacketSizeOf_Variable, NULL },
-    { BattleArcadeApp_HandleUnusedCmd, CommPacketSizeOf_Variable, NULL }
-};
-
-void sub_0209BA80(void *param0)
-{
-    int v0 = sizeof(Unk_020F8BF0) / sizeof(CommCmdTable);
-    CommCmdManager_Init(Unk_020F8BF0, v0, param0);
-}
-
-static void sub_0209BA94(int param0, int param1, void *param2, void *param3)
-{
-    u16 v0;
-    int v1;
-    BattleTower *battleTower = param3;
-    const u16 *v3 = param2;
-
-    v0 = 0;
-    v1 = 0;
-    battleTower->unk_8D4++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    battleTower->partnerGender = (u8)v3[0];
-    battleTower->unk_16[0] = v3[1];
-    battleTower->unk_16[1] = v3[2];
-    battleTower->unk_14 = v3[3];
-    battleTower->partnerID = BT_PARTNERS_COUNT + battleTower->partnerGender;
-
-    if ((battleTower->unk_2E[0] == battleTower->unk_16[0]) || (battleTower->unk_2E[0] == battleTower->unk_16[1])) {
-        v0 += 1;
-    }
-
-    if ((battleTower->unk_2E[1] == battleTower->unk_16[0]) || (battleTower->unk_2E[1] == battleTower->unk_16[1])) {
-        v0 += 2;
-    }
-
-    battleTower->unk_8D8 = v0;
-    return;
-}
-
-BOOL sub_0209BB08(BattleTower *battleTower)
-{
-    int v0, v1;
-
-    v1 = (14 * 2);
-
-    MI_CpuCopy8(battleTower->trainerIDs, battleTower->unk_83E, v1);
-
-    if (CommSys_SendData(63, battleTower->unk_83E, v1) == 1) {
-        v0 = 1;
-    } else {
-        v0 = 0;
-    }
-
-    return v0;
-}
-
-static void sub_0209BB34(int param0, int param1, void *param2, void *param3)
-{
-    int v0;
-    BattleTower *battleTower = param3;
-    const u16 *v2 = param2;
-
-    v0 = 0;
-    battleTower->unk_8D4++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    if (CommSys_CurNetId() == 0) {
-        return;
-    }
-
-    MI_CpuCopy8(v2, battleTower->trainerIDs, BT_OPPONENTS_COUNT * 2 * sizeof(u16));
-    return;
-}
-
-static void sub_0209BB68(int param0, int param1, void *param2, void *param3)
-{
-    int v0;
-    BattleTower *battleTower = param3;
-    const u16 *v2 = param2;
-
-    v0 = 0;
-
-    battleTower->unk_8D8 = 0;
-    battleTower->unk_8D4++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    if (battleTower->unk_10_3 || v2[0]) {
-        battleTower->unk_8D8 = 1;
-    }
-
-    return;
-}
-
-BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0)
-{
-    int v0, v1, v2;
-
-    v1 = 40;
-    param0->unk_08[0] = param0->unk_A0;
-
-    v2 = ov104_0223C264(param0->unk_A0);
-    param0->unk_08[1] = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->saveData), v2, BattleFrontierStats_GetHostFriendIdx(v2));
-
-    if (CommSys_SendData(57, param0->unk_08, v1) == 1) {
-        v0 = 1;
-    } else {
-        v0 = 0;
-    }
-
-    return v0;
-}
-
-void sub_0209BBEC(int param0, int param1, void *param2, void *param3)
-{
-    u16 v0;
-    UnkStruct_0209BBA4 *v1 = param3;
-    const u16 *v2 = param2;
-
-    v1->unk_6F++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    v1->unk_6E = (u8)v2[0];
-    v1->unk_72 = v2[1];
-
-    return;
-}
-
-BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1)
-{
-    int v0, v1 = 40;
-    param0->unk_08[0] = param1;
-
-    if (CommSys_SendData(58, param0->unk_08, v1) == 1) {
-        v0 = 1;
-    } else {
-        v0 = 0;
-    }
-
-    return v0;
-}
-
-void sub_0209BC3C(int param0, int param1, void *param2, void *param3)
-{
-    int v0;
-    UnkStruct_0209BBA4 *v1 = param3;
-    const u16 *v2 = param2;
-
-    v0 = 0;
-    v1->unk_6F++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    v1->unk_59 = (u8)v2[0];
-    return;
-}
-
-BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2)
-{
-    int v0, v1;
-    Pokemon *v2;
-    Party *v3;
-
-    v1 = 40;
-    v3 = SaveData_GetParty(param0->saveData);
-
-    param0->unk_6A[0] = param1;
-    param0->unk_6A[1] = param2;
-
-    if (param1 == 0xff) {
-        param0->unk_76[0] = 0;
-        param0->unk_7E[0] = 0;
-        param0->unk_76[1] = 0;
-        param0->unk_7E[1] = 0;
-    } else {
-        v2 = Party_GetPokemonBySlotIndex(v3, param1);
-
-        param0->unk_76[0] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL);
-        param0->unk_7E[0] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL);
-
-        v2 = Party_GetPokemonBySlotIndex(v3, param2);
-
-        param0->unk_76[1] = Pokemon_GetValue(v2, MON_DATA_SPECIES, NULL);
-        param0->unk_7E[1] = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL);
-    }
-
-    param0->unk_08[0] = param0->unk_76[0];
-    param0->unk_08[1] = param0->unk_7E[0];
-    param0->unk_08[2] = param0->unk_76[1];
-    param0->unk_08[3] = param0->unk_7E[1];
-
-    if (CommSys_SendData(59, param0->unk_08, v1) == 1) {
-        v0 = 1;
-    } else {
-        v0 = 0;
-    }
-
-    return v0;
-}
-
-void sub_0209BD28(int param0, int param1, void *param2, void *param3)
-{
-    UnkStruct_0209BBA4 *v0 = param3;
-    const u16 *v1 = param2;
-
-    v0->unk_6F++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    v0->unk_86[0] = v1[0];
-    v0->unk_8E[0] = v1[1];
-    v0->unk_86[1] = v1[2];
-    v0->unk_8E[1] = v1[3];
-
-    return;
-}
-
-BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1)
-{
-    int v0, v1 = 40;
-
-    param0->unk_08[0] = param1;
-
-    if (CommSys_SendData(60, param0->unk_08, v1) == 1) {
-        v0 = 1;
-    } else {
-        v0 = 0;
-    }
-
-    return v0;
-}
-
-void sub_0209BD88(int param0, int param1, void *param2, void *param3)
-{
-    int v0;
-    UnkStruct_0209BBA4 *v1 = param3;
-    const u16 *v2 = param2;
-
-    v0 = 0;
-    v1->unk_6F++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    v1->unk_74 = v2[0];
-    return;
-}
-
-BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1)
-{
-    int v0, v1 = 40;
-    param0->unk_08[0] = param1;
-
-    if (CommSys_SendData(61, param0->unk_08, v1) == 1) {
-        v0 = 1;
-    } else {
-        v0 = 0;
-    }
-
-    return v0;
-}
-
-void sub_0209BDD0(int param0, int param1, void *param2, void *param3)
-{
-    int v0;
-    UnkStruct_0209BBA4 *v1 = param3;
-    const u16 *v2 = param2;
-
-    v0 = 0;
-    v1->unk_6F++;
-
-    if (CommSys_CurNetId() == param0) {
-        return;
-    }
-
-    v1->unk_71 = (u8)v2[0];
-    return;
-}
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 411a05a2681..3654f17287e 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -19,7 +19,7 @@
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
 #include "unk_02099500.h"
diff --git a/src/unk_0209C390.c b/src/unk_0209C390.c
index 45de11aabaf..f9284147eb1 100644
--- a/src/unk_0209C390.c
+++ b/src/unk_0209C390.c
@@ -8,7 +8,7 @@
 #include "overlay065/struct_ov65_02236744_decl.h"
 #include "overlay065/struct_ov65_02236760.h"
 
-#include "unk_02032798.h"
+#include "comm_command.h"
 #include "unk_02039A58.h"
 
 void sub_0209C390(UnkStruct_ov65_02236744 *param0)

From 3a8e2a9bf2799aaa20a166e9660ef96d0a3a9370 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 05:42:47 -0400
Subject: [PATCH 19/39] make format

---
 src/applications/frontier/battle_arcade/main.c         | 2 +-
 src/applications/frontier/battle_castle/opponent_app.c | 2 +-
 src/applications/frontier/battle_castle/self_app.c     | 2 +-
 src/applications/frontier/battle_factory/main.c        | 2 +-
 src/applications/frontier/battle_hall/main.c           | 2 +-
 src/comm_manager.c                                     | 2 +-
 src/communication_system.c                             | 2 +-
 src/overlay083/ov83_0223D4CC.c                         | 2 +-
 src/overlay104/frscrcmd_battle_arcade.c                | 2 +-
 src/overlay104/frscrcmd_battle_castle.c                | 2 +-
 src/overlay104/frscrcmd_battle_factory.c               | 2 +-
 src/overlay104/frscrcmd_battle_hall.c                  | 2 +-
 src/overlay104/ov104_022395F0.c                        | 2 +-
 src/overlay104/ov104_02239C58.c                        | 2 +-
 src/overlay115/ov115_02265A24.c                        | 2 +-
 src/overlay116/ov116_02260440.c                        | 2 +-
 src/overlay117/ov117_022665FC.c                        | 2 +-
 src/unk_020322D8.c                                     | 2 +-
 src/unk_020494DC.c                                     | 2 +-
 src/unk_0207A6DC.c                                     | 2 +-
 src/unk_02095AF0.c                                     | 2 +-
 src/unk_02095CD4.c                                     | 2 +-
 src/unk_02095E98.c                                     | 2 +-
 src/unk_020961E8.c                                     | 2 +-
 src/unk_02099500.c                                     | 2 +-
 src/unk_0209BDF8.c                                     | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/applications/frontier/battle_arcade/main.c b/src/applications/frontier/battle_arcade/main.c
index 7ab38dc5bb2..8dbe2a7e193 100644
--- a/src/applications/frontier/battle_arcade/main.c
+++ b/src/applications/frontier/battle_arcade/main.c
@@ -18,6 +18,7 @@
 
 #include "battle_frontier_stats.h"
 #include "bg_window.h"
+#include "comm_command_frontier.h"
 #include "communication_system.h"
 #include "font.h"
 #include "game_options.h"
@@ -48,7 +49,6 @@
 #include "trainer_info.h"
 #include "unk_02030494.h"
 #include "unk_020363E8.h"
-#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 FS_EXTERN_OVERLAY(overlay104);
diff --git a/src/applications/frontier/battle_castle/opponent_app.c b/src/applications/frontier/battle_castle/opponent_app.c
index c60fe6c7562..b82586b0136 100644
--- a/src/applications/frontier/battle_castle/opponent_app.c
+++ b/src/applications/frontier/battle_castle/opponent_app.c
@@ -19,6 +19,7 @@
 
 #include "battle_frontier_stats.h"
 #include "bg_window.h"
+#include "comm_command_frontier.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -56,7 +57,6 @@
 #include "unk_020302D0.h"
 #include "unk_020363E8.h"
 #include "unk_0205DFC4.h"
-#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "res/text/bank/battle_castle_opponent_app.h"
diff --git a/src/applications/frontier/battle_castle/self_app.c b/src/applications/frontier/battle_castle/self_app.c
index d01091e8432..15d4067c4c8 100644
--- a/src/applications/frontier/battle_castle/self_app.c
+++ b/src/applications/frontier/battle_castle/self_app.c
@@ -17,6 +17,7 @@
 
 #include "battle_frontier_stats.h"
 #include "bg_window.h"
+#include "comm_command_frontier.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -57,7 +58,6 @@
 #include "unk_020363E8.h"
 #include "unk_0205DFC4.h"
 #include "unk_0208C098.h"
-#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "res/text/bank/battle_castle_self_app.h"
diff --git a/src/applications/frontier/battle_factory/main.c b/src/applications/frontier/battle_factory/main.c
index 95c66455a72..f62233b511b 100644
--- a/src/applications/frontier/battle_factory/main.c
+++ b/src/applications/frontier/battle_factory/main.c
@@ -17,6 +17,7 @@
 #include "overlay104/ov104_0223A7F4.h"
 
 #include "bg_window.h"
+#include "comm_command_frontier.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "coordinates.h"
@@ -53,7 +54,6 @@
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020363E8.h"
-#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "constdata/const_020F410C.h"
diff --git a/src/applications/frontier/battle_hall/main.c b/src/applications/frontier/battle_hall/main.c
index 6d48b128e6e..fd725ece4dc 100644
--- a/src/applications/frontier/battle_hall/main.c
+++ b/src/applications/frontier/battle_hall/main.c
@@ -12,6 +12,7 @@
 #include "overlay104/ov104_0223AF58.h"
 
 #include "bg_window.h"
+#include "comm_command_frontier.h"
 #include "communication_system.h"
 #include "dexmode_checker.h"
 #include "font.h"
@@ -46,7 +47,6 @@
 #include "trainer_info.h"
 #include "unk_02030108.h"
 #include "unk_020363E8.h"
-#include "comm_command_frontier.h"
 #include "vram_transfer.h"
 
 #include "constdata/const_020F410C.h"
diff --git a/src/comm_manager.c b/src/comm_manager.c
index 8ad6d9daeda..06b3305c099 100644
--- a/src/comm_manager.c
+++ b/src/comm_manager.c
@@ -15,6 +15,7 @@
 
 #include "battle_regulation.h"
 #include "bg_window.h"
+#include "comm_command.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
@@ -25,7 +26,6 @@
 #include "system.h"
 #include "trainer_info.h"
 #include "unk_0203266C.h"
-#include "comm_command.h"
 #include "unk_02033200.h"
 #include "unk_02039814.h"
 #include "wireless_manager.h"
diff --git a/src/communication_system.c b/src/communication_system.c
index 37f46c4800b..57cdcec35fa 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -13,6 +13,7 @@
 
 #include "nintendo_wfc/main.h"
 
+#include "comm_command.h"
 #include "comm_manager.h"
 #include "comm_ring.h"
 #include "communication_information.h"
@@ -23,7 +24,6 @@
 #include "system.h"
 #include "unk_020322D8.h"
 #include "unk_0203266C.h"
-#include "comm_command.h"
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "wireless_manager.h"
diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c
index 16d0bda1867..758bed58449 100644
--- a/src/overlay083/ov83_0223D4CC.c
+++ b/src/overlay083/ov83_0223D4CC.c
@@ -7,12 +7,12 @@
 
 #include "nintendo_wfc/main.h"
 
+#include "comm_command.h"
 #include "comm_manager.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
-#include "comm_command.h"
 
 typedef struct {
     BOOL unk_00;
diff --git a/src/overlay104/frscrcmd_battle_arcade.c b/src/overlay104/frscrcmd_battle_arcade.c
index 8c58ed47f17..2722b4f2ed9 100644
--- a/src/overlay104/frscrcmd_battle_arcade.c
+++ b/src/overlay104/frscrcmd_battle_arcade.c
@@ -22,6 +22,7 @@
 #include "overlay104/struct_ov104_02230BE4.h"
 #include "overlay104/struct_ov104_0223C634.h"
 
+#include "comm_command_frontier.h"
 #include "communication_information.h"
 #include "field_battle_data_transfer.h"
 #include "gx_layers.h"
@@ -36,7 +37,6 @@
 #include "trainer_info.h"
 #include "unk_02030494.h"
 #include "unk_0209B6F8.h"
-#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/frscrcmd_battle_castle.c b/src/overlay104/frscrcmd_battle_castle.c
index 6de23b290c9..20084286320 100644
--- a/src/overlay104/frscrcmd_battle_castle.c
+++ b/src/overlay104/frscrcmd_battle_castle.c
@@ -18,6 +18,7 @@
 #include "overlay104/struct_ov104_02230BE4.h"
 
 #include "battle_frontier_stats.h"
+#include "comm_command_frontier.h"
 #include "communication_system.h"
 #include "field_battle_data_transfer.h"
 #include "heap.h"
@@ -26,7 +27,6 @@
 #include "unk_020302D0.h"
 #include "unk_0205DFC4.h"
 #include "unk_0209B6F8.h"
-#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/frscrcmd_battle_factory.c b/src/overlay104/frscrcmd_battle_factory.c
index 16d363461b1..d218fbe249c 100644
--- a/src/overlay104/frscrcmd_battle_factory.c
+++ b/src/overlay104/frscrcmd_battle_factory.c
@@ -17,6 +17,7 @@
 #include "overlay104/struct_ov104_02230BE4.h"
 
 #include "bg_window.h"
+#include "comm_command_frontier.h"
 #include "field_battle_data_transfer.h"
 #include "heap.h"
 #include "party.h"
@@ -26,7 +27,6 @@
 #include "sys_task_manager.h"
 #include "unk_0202FF4C.h"
 #include "unk_0209B6F8.h"
-#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/frscrcmd_battle_hall.c b/src/overlay104/frscrcmd_battle_hall.c
index 1618d43352c..3d19e71d82c 100644
--- a/src/overlay104/frscrcmd_battle_hall.c
+++ b/src/overlay104/frscrcmd_battle_hall.c
@@ -19,6 +19,7 @@
 #include "overlay104/struct_ov104_02230BE4.h"
 #include "savedata/save_table.h"
 
+#include "comm_command_frontier.h"
 #include "field_battle_data_transfer.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -28,7 +29,6 @@
 #include "tv_segment.h"
 #include "unk_02030108.h"
 #include "unk_0209B6F8.h"
-#include "comm_command_frontier.h"
 
 #include "constdata/const_020EA358.h"
 
diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c
index 4b8f7849352..4c1c1070055 100644
--- a/src/overlay104/ov104_022395F0.c
+++ b/src/overlay104/ov104_022395F0.c
@@ -18,6 +18,7 @@
 #include "overlay104/struct_ov104_02230BE4.h"
 
 #include "battle_frontier_stats.h"
+#include "comm_command_frontier.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "item_use_pokemon.h"
@@ -28,7 +29,6 @@
 #include "unk_0204FA34.h"
 #include "unk_0205DFC4.h"
 #include "unk_0209B6F8.h"
-#include "comm_command_frontier.h"
 
 static BOOL ov104_02239680(FrontierScriptContext *param0);
 static BOOL ov104_02239C20(FrontierScriptContext *param0);
diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c
index 3e3bbc5cb13..bea9aea56df 100644
--- a/src/overlay104/ov104_02239C58.c
+++ b/src/overlay104/ov104_02239C58.c
@@ -12,6 +12,7 @@
 #include "field/field_system.h"
 
 #include "bag.h"
+#include "comm_command_frontier.h"
 #include "dexmode_checker.h"
 #include "heap.h"
 #include "mail.h"
@@ -20,7 +21,6 @@
 #include "savedata.h"
 #include "unk_0202D778.h"
 #include "unk_0209B6F8.h"
-#include "comm_command_frontier.h"
 
 #include "constdata/const_020F410C.h"
 
diff --git a/src/overlay115/ov115_02265A24.c b/src/overlay115/ov115_02265A24.c
index 80ff0cd8966..af01e4e4a2e 100644
--- a/src/overlay115/ov115_02265A24.c
+++ b/src/overlay115/ov115_02265A24.c
@@ -9,8 +9,8 @@
 #include "overlay115/struct_ov115_02265AD0.h"
 #include "overlay115/struct_ov115_02265AD4.h"
 
-#include "communication_system.h"
 #include "comm_command.h"
+#include "communication_system.h"
 
 void ov115_02265A24(UnkStruct_ov115_0226095C *param0)
 {
diff --git a/src/overlay116/ov116_02260440.c b/src/overlay116/ov116_02260440.c
index f246932d897..9c776efb174 100644
--- a/src/overlay116/ov116_02260440.c
+++ b/src/overlay116/ov116_02260440.c
@@ -12,8 +12,8 @@
 #include "overlay116/struct_ov116_02260498.h"
 #include "overlay116/struct_ov116_0226139C.h"
 
-#include "math_util.h"
 #include "comm_command.h"
+#include "math_util.h"
 
 static void ov116_02260440(int param0, int param1, void *param2, void *param3);
 static void ov116_02260458(int param0, int param1, void *param2, void *param3);
diff --git a/src/overlay117/ov117_022665FC.c b/src/overlay117/ov117_022665FC.c
index f0a6c5b7e67..b6febbbbd36 100644
--- a/src/overlay117/ov117_022665FC.c
+++ b/src/overlay117/ov117_022665FC.c
@@ -9,8 +9,8 @@
 #include "overlay117/struct_ov117_02261280.h"
 #include "overlay117/struct_ov117_022621D4.h"
 
-#include "communication_system.h"
 #include "comm_command.h"
+#include "communication_system.h"
 
 static void ov117_02266618(int param0, int param1, void *param2, void *param3);
 static void ov117_0226663C(int param0, int param1, void *param2, void *param3);
diff --git a/src/unk_020322D8.c b/src/unk_020322D8.c
index f2ea97ae815..bbe9fdde1b6 100644
--- a/src/unk_020322D8.c
+++ b/src/unk_020322D8.c
@@ -8,10 +8,10 @@
 #include "struct_defs/struct_02032318.h"
 #include "struct_defs/struct_0203233C.h"
 
+#include "comm_command.h"
 #include "comm_ring.h"
 #include "communication_system.h"
 #include "heap.h"
-#include "comm_command.h"
 
 static UnkStruct_020322D8 *sub_020322D8(CommQueueMan *param0)
 {
diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c
index c18db12bb56..7e88385828e 100644
--- a/src/unk_020494DC.c
+++ b/src/unk_020494DC.c
@@ -17,6 +17,7 @@
 #include "overlay005/field_menu.h"
 
 #include "bg_window.h"
+#include "comm_command_frontier.h"
 #include "communication_system.h"
 #include "field_script_context.h"
 #include "field_system.h"
@@ -31,7 +32,6 @@
 #include "unk_0204AEE8.h"
 #include "unk_0205DFC4.h"
 #include "unk_0206B9D8.h"
-#include "comm_command_frontier.h"
 
 static u16 BattleTower_GetPartnerParam(BattleTower *battleTower, u8 param1);
 
diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c
index 7cdfe66bfb3..04e16333e05 100644
--- a/src/unk_0207A6DC.c
+++ b/src/unk_0207A6DC.c
@@ -19,6 +19,7 @@
 
 #include "charcode_util.h"
 #include "chatot_cry.h"
+#include "comm_command.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "pal_pad.h"
@@ -27,7 +28,6 @@
 #include "sys_task_manager.h"
 #include "trainer_info.h"
 #include "unk_0202F1D4.h"
-#include "comm_command.h"
 #include "unk_020363E8.h"
 
 void sub_0207A81C(BattleSystem *battleSys, int param1, int param2, void *param3, u8 param4);
diff --git a/src/unk_02095AF0.c b/src/unk_02095AF0.c
index 241aea8194f..f59db8a2632 100644
--- a/src/unk_02095AF0.c
+++ b/src/unk_02095AF0.c
@@ -12,11 +12,11 @@
 #include "overlay017/ov17_02252CEC.h"
 #include "overlay017/struct_ov17_0224EDE0.h"
 
+#include "comm_command.h"
 #include "communication_system.h"
 #include "contest.h"
 #include "heap.h"
 #include "unk_020298BC.h"
-#include "comm_command.h"
 
 static void sub_02095B2C(int param0, int param1, void *param2, void *param3);
 static u8 *sub_02095B04(int param0, void *param1, int param2);
diff --git a/src/unk_02095CD4.c b/src/unk_02095CD4.c
index 5309ed6ec10..17cfa0188ce 100644
--- a/src/unk_02095CD4.c
+++ b/src/unk_02095CD4.c
@@ -10,11 +10,11 @@
 #include "field/field_system.h"
 #include "overlay088/ov88_0223B140.h"
 
+#include "comm_command.h"
 #include "communication_system.h"
 #include "pal_pad.h"
 #include "party.h"
 #include "unk_0202D778.h"
-#include "comm_command.h"
 
 void sub_02095DFC(int param0, int param1, void *param2, void *param3);
 void sub_02095E28(int param0, int param1, void *param2, void *param3);
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index cc8f9026d84..ba7c2a3242a 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -12,9 +12,9 @@
 #include "overlay058/struct_ov58_021D2820.h"
 
 #include "bg_window.h"
+#include "comm_command.h"
 #include "comm_manager.h"
 #include "communication_system.h"
-#include "comm_command.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index bf18c60cc27..6490a53a981 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -10,11 +10,11 @@
 #include "overlay059/ov59_021D0D80.h"
 #include "overlay059/struct_ov59_021D30E0.h"
 
+#include "comm_command.h"
 #include "comm_manager.h"
 #include "communication_system.h"
 #include "math_util.h"
 #include "sound_playback.h"
-#include "comm_command.h"
 #include "unk_02099500.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_02099500.c b/src/unk_02099500.c
index f5d5e341ba0..4d73be89c30 100644
--- a/src/unk_02099500.c
+++ b/src/unk_02099500.c
@@ -15,11 +15,11 @@
 #include "underground/spheres.h"
 #include "underground/traps.h"
 
+#include "comm_command.h"
 #include "comm_player_manager.h"
 #include "field_comm_manager.h"
 #include "trainer_case.h"
 #include "trainer_info.h"
-#include "comm_command.h"
 #include "unk_0204FA34.h"
 #include "unk_0205001C.h"
 #include "unk_02050548.h"
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 3654f17287e..36990991894 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -15,11 +15,11 @@
 #include "overlay109/struct_ov109_021D1048.h"
 #include "overlay109/struct_ov109_021D17EC.h"
 
+#include "comm_command.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
-#include "comm_command.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
 #include "unk_02099500.h"

From cb578e05e87dc95cf2364bb6db6658f245865519 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 06:34:35 -0400
Subject: [PATCH 20/39] Add Ov117 CommCmd constants

---
 include/{unk_02032798.h => comm_command.h}    |  6 +--
 .../constants/communication/comm_command.h    | 16 ++++--
 platinum.us/main.lsf                          |  4 +-
 src/comm_command_frontier.c                   | 14 ++---
 src/overlay104/ov104_0222ECE8.c               | 52 ++++++++++---------
 src/overlay117/ov117_022665FC.c               | 30 ++++++-----
 src/unk_020363E8.c                            | 11 ++--
 src/unk_020494DC.c                            |  7 +--
 8 files changed, 78 insertions(+), 62 deletions(-)
 rename include/{unk_02032798.h => comm_command.h} (82%)

diff --git a/include/unk_02032798.h b/include/comm_command.h
similarity index 82%
rename from include/unk_02032798.h
rename to include/comm_command.h
index d9dd8b53019..37140e04c82 100644
--- a/include/unk_02032798.h
+++ b/include/comm_command.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_02032798_H
-#define POKEPLATINUM_UNK_02032798_H
+#ifndef POKEPLATINUM_COMM_COMMAND_H
+#define POKEPLATINUM_COMM_COMMAND_H
 
 #include "struct_defs/comm_cmd_table.h"
 
@@ -13,4 +13,4 @@ int CommPacketSizeOf_Variable(void);
 int CommPacketSizeOf_Nothing(void);
 int CommPacketSizeOf_NetId(void);
 
-#endif // POKEPLATINUM_UNK_02032798_H
+#endif // POKEPLATINUM_COMM_COMMAND_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index e6085229acf..d7107992f16 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -1,10 +1,7 @@
 #ifndef POKEPLATINUM_CONSTANTS_COMM_COMMAND_H
 #define POKEPLATINUM_CONSTANTS_COMM_COMMAND_H
 
-/*
- * Base Communication Commands used globally.
- */
-
+// Base Communication Commands used globally.
 enum CommCommand_Common {
     COMM_CMD_NONE = 0,
     COMM_CMD_1,
@@ -31,6 +28,7 @@ enum CommCommand_Common {
     COMM_CMD_MAX_COMMON,
 };
 
+// Communication Commands used for the Frontier
 enum CommCommand_Frontier {
     COMM_CMD_F_22 = COMM_CMD_MAX_COMMON,
     COMM_CMD_F_23,
@@ -87,4 +85,14 @@ enum CommCommand_Frontier {
     COMM_CMD_MAX_FRONTIER,
 };
 
+// Communication Commands used for Overlay 117
+
+enum CommCommand_Ov117 {
+    COMM_CMD_OV117_NONE = COMM_CMD_MAX_COMMON,
+    COMM_CMD_OV117_23,
+    COMM_CMD_OV117_24,
+    COMM_CMD_OV117_25,
+    COMM_CMD_MAX_OV117,
+};
+
 #endif
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 6bc1b164189..4cab29cfd43 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -155,7 +155,7 @@ Static main
 	Object main.nef.p/src_comm_ring.c.o
 	Object main.nef.p/src_unk_020322D8.c.o
 	Object main.nef.p/src_unk_0203266C.c.o
-	Object main.nef.p/src_unk_02032798.c.o
+	Object main.nef.p/src_comm_command.c.o
 	Object main.nef.p/src_communication_information.c.o
 	Object main.nef.p/src_unk_02033200.c.o
 	Object main.nef.p/src_communication_system.c.o
@@ -363,7 +363,7 @@ Static main
 	Object main.nef.p/src_error_message_reset.c.o
 	Object main.nef.p/src_unk_0209B6F8.c.o
 	Object main.nef.p/src_unk_0209BA18.c.o
-	Object main.nef.p/src_unk_0209BA80.c.o
+	Object main.nef.p/src_comm_command_frontier.c.o
 	Object main.nef.p/src_unk_0209BDF8.c.o
 	Object main.nef.p/src_unk_0209C194.c.o
 	Object main.nef.p/src_unk_0209C370.c.o
diff --git a/src/comm_command_frontier.c b/src/comm_command_frontier.c
index 7fd37336b2e..64e4273c5fe 100644
--- a/src/comm_command_frontier.c
+++ b/src/comm_command_frontier.c
@@ -19,10 +19,10 @@
 #include "overlay104/ov104_0223C164.h"
 
 #include "battle_frontier_stats.h"
+#include "comm_command.h"
 #include "communication_system.h"
 #include "party.h"
 #include "pokemon.h"
-#include "unk_02032798.h"
 #include "unk_0205DFC4.h"
 
 static void CommCmd_Frontier_62(int param0, int param1, void *param2, void *param3);
@@ -144,7 +144,7 @@ BOOL sub_0209BB08(BattleTower *battleTower)
 
     MI_CpuCopy8(battleTower->trainerIDs, battleTower->unk_83E, v1);
 
-    if (CommSys_SendData(63, battleTower->unk_83E, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_63, battleTower->unk_83E, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -206,7 +206,7 @@ BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0)
     v2 = ov104_0223C264(param0->unk_A0);
     param0->unk_08[1] = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->saveData), v2, BattleFrontierStats_GetHostFriendIdx(v2));
 
-    if (CommSys_SendData(57, param0->unk_08, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_57, param0->unk_08, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -238,7 +238,7 @@ BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1)
     int v0, v1 = 40;
     param0->unk_08[0] = param1;
 
-    if (CommSys_SendData(58, param0->unk_08, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_58, param0->unk_08, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -298,7 +298,7 @@ BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2)
     param0->unk_08[2] = param0->unk_76[1];
     param0->unk_08[3] = param0->unk_7E[1];
 
-    if (CommSys_SendData(59, param0->unk_08, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_59, param0->unk_08, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -332,7 +332,7 @@ BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1)
 
     param0->unk_08[0] = param1;
 
-    if (CommSys_SendData(60, param0->unk_08, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_60, param0->unk_08, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -363,7 +363,7 @@ BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1)
     int v0, v1 = 40;
     param0->unk_08[0] = param1;
 
-    if (CommSys_SendData(61, param0->unk_08, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_61, param0->unk_08, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c
index 32a99f3385b..edffd673cb5 100644
--- a/src/overlay104/ov104_0222ECE8.c
+++ b/src/overlay104/ov104_0222ECE8.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
 
@@ -107,7 +109,7 @@ BOOL ov104_0222ED00(BattleHall *param0)
     v1 += 1;
     v1 += (7 + 1);
 
-    if (CommSys_SendData(34, v3, v5) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_34, v3, v5) == 1) {
         v4 = 1;
     } else {
         v4 = 0;
@@ -151,7 +153,7 @@ BOOL ov104_0222ED44(BattleHall *param0)
 
     v3 += (10 * 2);
 
-    if (CommSys_SendData(35, v4, v6) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_35, v4, v6) == 1) {
         v5 = 1;
     } else {
         v5 = 0;
@@ -200,7 +202,7 @@ BOOL ov104_0222EDA8(BattleHall *param0)
 
     v1 += (10 * 2);
 
-    if (CommSys_SendData(36, v2, v4) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_36, v2, v4) == 1) {
         v3 = 1;
     } else {
         v3 = 0;
@@ -243,7 +245,7 @@ BOOL ov104_0222EE14(BattleHall *param0, u8 param1)
 
     v0[0] = param1;
 
-    if (CommSys_SendData(37, v0, v2) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_37, v0, v2) == 1) {
         v1 = 1;
     } else {
         v1 = 0;
@@ -282,7 +284,7 @@ BOOL ov104_0222EE60(BattleHall *param0)
 
     MI_CpuCopy8(v5, &param0->unk_784[0], v4);
 
-    if (CommSys_SendDataHuge(38, param0->unk_784, v3) == 1) {
+    if (CommSys_SendDataHuge(COMM_CMD_F_38, param0->unk_784, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -335,7 +337,7 @@ BOOL ov104_0222EEF8(BattleFactory *param0)
     v1 += 4;
     v1 += (7 + 1);
 
-    if (CommSys_SendData(22, v3, v5) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_22, v3, v5) == 1) {
         v4 = 1;
     } else {
         v4 = 0;
@@ -381,7 +383,7 @@ BOOL ov104_0222EF64(BattleFactory *param0)
 
     v1 += (7 * 2);
 
-    if (CommSys_SendData(23, v2, v4) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_23, v2, v4) == 1) {
         v3 = 1;
     } else {
         v3 = 0;
@@ -443,7 +445,7 @@ BOOL ov104_0222EFCC(BattleFactory *param0)
 
     v1 += (6 * 2);
 
-    if (CommSys_SendData(24, v2, v4) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_24, v2, v4) == 1) {
         v3 = 1;
     } else {
         v3 = 0;
@@ -519,7 +521,7 @@ BOOL ov104_0222F0B4(BattleFactory *param0)
 
     v1 += (4 * 2);
 
-    if (CommSys_SendData(25, v2, v4) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_25, v2, v4) == 1) {
         v3 = 1;
     } else {
         v3 = 0;
@@ -575,7 +577,7 @@ BOOL ov104_0222F1A0(BattleFactory *param0, u8 param1)
 
     v0[0] = param1;
 
-    if (CommSys_SendData(26, v0, v2) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_26, v0, v2) == 1) {
         v1 = 1;
     } else {
         v1 = 0;
@@ -608,7 +610,7 @@ BOOL ov104_0222F1EC(BattleFactory *param0, u8 param1)
 
     v0[0] = param1;
 
-    if (CommSys_SendData(27, v0, v2) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_27, v0, v2) == 1) {
         v1 = 1;
     } else {
         v1 = 0;
@@ -672,7 +674,7 @@ BOOL ov104_0222F238(BattleFactory *param0)
 
     v2 += (v0 * 2);
 
-    if (CommSys_SendData(28, v3, v5) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_28, v3, v5) == 1) {
         v4 = 1;
     } else {
         v4 = 0;
@@ -738,7 +740,7 @@ BOOL ov104_0222F3B8(BattleCastle *param0)
     param0->unk_3C0[v1] = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType)));
     v1 += 1;
 
-    if (CommSys_SendData(42, param0->unk_3C0, v3) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_42, param0->unk_3C0, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -785,7 +787,7 @@ BOOL ov104_0222F44C(BattleCastle *param0)
 
     v1 += (7 * 2);
 
-    if (CommSys_SendData(43, param0->unk_3C0, v3) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_43, param0->unk_3C0, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -850,7 +852,7 @@ BOOL ov104_0222F4B8(BattleCastle *param0)
 
     param0->unk_3C0[1] = param0->unk_A1B;
 
-    if (CommSys_SendData(44, param0->unk_3C0, v3) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_44, param0->unk_3C0, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -935,7 +937,7 @@ BOOL ov104_0222F5D4(BattleCastle *param0)
 
     v1 += (4 * 2);
 
-    if (CommSys_SendData(45, param0->unk_3C0, v3) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_45, param0->unk_3C0, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -988,7 +990,7 @@ BOOL ov104_0222F6C8(BattleCastle *param0, u16 param1)
     int v0, v1 = 40;
     param0->unk_3C0[0] = param1;
 
-    if (CommSys_SendData(46, param0->unk_3C0, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_46, param0->unk_3C0, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -1019,7 +1021,7 @@ BOOL ov104_0222F710(BattleCastle *param0, u16 param1)
     int v0, v1 = 40;
     param0->unk_3C0[0] = param1;
 
-    if (CommSys_SendData(47, param0->unk_3C0, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_47, param0->unk_3C0, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -1061,7 +1063,7 @@ BOOL ov104_0222F758(BattleCastle *param0)
         MI_CpuCopy8(v6, &param0->unk_410[v0 * v4], v4);
     }
 
-    if (CommSys_SendDataHuge(48, param0->unk_410, v3) == 1) {
+    if (CommSys_SendDataHuge(COMM_CMD_F_48, param0->unk_410, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -1124,7 +1126,7 @@ BOOL ov104_0222F86C(BattleArcade *param0)
 
     v1 += 3;
 
-    if (CommSys_SendData(65, param0->unk_424, v3) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_65, param0->unk_424, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -1167,7 +1169,7 @@ BOOL ov104_0222F8D0(BattleArcade *param0)
 
     v1 += (7 * 2);
 
-    if (CommSys_SendData(66, param0->unk_424, v3) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_66, param0->unk_424, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -1228,7 +1230,7 @@ BOOL ov104_0222F944(BattleArcade *param0)
 
     v1 += (4 * 2);
 
-    if (CommSys_SendData(67, param0->unk_424, v3) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_67, param0->unk_424, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -1281,7 +1283,7 @@ BOOL ov104_0222FA38(BattleArcade *param0, u16 param1)
     int v0, v1 = 40;
     param0->unk_424[0] = param1;
 
-    if (CommSys_SendData(68, param0->unk_424, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_68, param0->unk_424, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -1312,7 +1314,7 @@ BOOL ov104_0222FA84(BattleArcade *param0, u16 param1)
     int v0, v1 = 40;
     param0->unk_424[0] = param1;
 
-    if (CommSys_SendData(69, param0->unk_424, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_F_69, param0->unk_424, v1) == 1) {
         v0 = 1;
     } else {
         v0 = 0;
@@ -1354,7 +1356,7 @@ BOOL ov104_0222FAD0(BattleArcade *param0)
         MI_CpuCopy8(v6, &param0->unk_474[v0 * v4], v4);
     }
 
-    if (CommSys_SendDataHuge(70, param0->unk_474, v3) == 1) {
+    if (CommSys_SendDataHuge(COMM_CMD_F_70, param0->unk_474, v3) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
diff --git a/src/overlay117/ov117_022665FC.c b/src/overlay117/ov117_022665FC.c
index b6febbbbd36..5befa147da7 100644
--- a/src/overlay117/ov117_022665FC.c
+++ b/src/overlay117/ov117_022665FC.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 
 #include "overlay117/ov117_02260668.h"
@@ -12,18 +14,20 @@
 #include "comm_command.h"
 #include "communication_system.h"
 
-static void ov117_02266618(int param0, int param1, void *param2, void *param3);
-static void ov117_0226663C(int param0, int param1, void *param2, void *param3);
-static void ov117_02266660(int param0, int param1, void *param2, void *param3);
+static void CommCmd_ov117_24(int param0, int param1, void *param2, void *param3);
+static void CommCmd_ov117_25(int param0, int param1, void *param2, void *param3);
+static void CommCmd_ov117_23(int param0, int param1, void *param2, void *param3);
 static int ov117_02266610(void);
 static int ov117_02266614(void);
 
+// clang-format off
 static const CommCmdTable Unk_ov117_02266FE4[] = {
-    { NULL, CommPacketSizeOf_Nothing, NULL },
-    { ov117_02266660, ov117_02266614, NULL },
-    { ov117_02266618, ov117_02266610, NULL },
-    { ov117_0226663C, CommPacketSizeOf_Nothing, NULL }
+    [COMM_CMD_OV117_NONE - COMM_CMD_MAX_COMMON] = { NULL, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_OV117_23 - COMM_CMD_MAX_COMMON] = { CommCmd_ov117_23, ov117_02266614, NULL },
+    [COMM_CMD_OV117_24 - COMM_CMD_MAX_COMMON] = { CommCmd_ov117_24, ov117_02266610, NULL },
+    [COMM_CMD_OV117_25 - COMM_CMD_MAX_COMMON] = { CommCmd_ov117_25, CommPacketSizeOf_Nothing, NULL }
 };
+// clang-format on
 
 void ov117_022665FC(void *param0)
 {
@@ -43,7 +47,7 @@ static int ov117_02266614(void)
     return sizeof(u32);
 }
 
-static void ov117_02266618(int param0, int param1, void *param2, void *param3)
+static void CommCmd_ov117_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov117_02261280 *v0 = param3;
     ov117_02262044(v0, param0, param2);
@@ -51,14 +55,14 @@ static void ov117_02266618(int param0, int param1, void *param2, void *param3)
 
 BOOL ov117_02266624(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *param1)
 {
-    if (CommSys_SendData(24, param1, sizeof(UnkStruct_ov117_022621D4)) == 1) {
+    if (CommSys_SendData(COMM_CMD_OV117_24, param1, sizeof(UnkStruct_ov117_022621D4)) == 1) {
         return 1;
     }
 
     return 0;
 }
 
-static void ov117_0226663C(int param0, int param1, void *param2, void *param3)
+static void CommCmd_ov117_25(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov117_02261280 *v0 = param3;
     v0->unk_2FC0 = 1;
@@ -66,14 +70,14 @@ static void ov117_0226663C(int param0, int param1, void *param2, void *param3)
 
 BOOL ov117_02266648(UnkStruct_ov117_02261280 *param0)
 {
-    if (CommSys_SendData(25, NULL, 0) == 1) {
+    if (CommSys_SendData(COMM_CMD_OV117_25, NULL, 0) == 1) {
         return 1;
     }
 
     return 0;
 }
 
-static void ov117_02266660(int param0, int param1, void *param2, void *param3)
+static void CommCmd_ov117_23(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov117_02261280 *v0 = param3;
     u32 *v1 = param2;
@@ -97,7 +101,7 @@ BOOL ov117_022666A4(UnkStruct_ov117_02261280 *param0)
 {
     u32 v0 = 100;
 
-    if (CommSys_SendData(23, &v0, sizeof(u32)) == 1) {
+    if (CommSys_SendData(COMM_CMD_OV117_23, &v0, sizeof(u32)) == 1) {
         return 1;
     }
 
diff --git a/src/unk_020363E8.c b/src/unk_020363E8.c
index 08252bd3ab5..7c678534601 100644
--- a/src/unk_020363E8.c
+++ b/src/unk_020363E8.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/heap.h"
 
 #include "communication_system.h"
@@ -68,7 +69,7 @@ void CommCmd_16(int netId, int param1, void *_buff, void *param3)
     if (CommSys_CurNetId() == 0) {
         v2[0] = netId;
         v2[1] = syncNo;
-        CommSys_SendDataFixedSizeServer(18, &v2);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_18, &v2);
 
         sCommTool->syncNo[netId] = syncNo;
 
@@ -80,7 +81,7 @@ void CommCmd_16(int netId, int param1, void *_buff, void *param3)
             }
         }
 
-        CommSys_SendDataFixedSizeServer(17, &syncNo);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_17, &syncNo);
     }
 }
 
@@ -108,7 +109,7 @@ void sub_0203650C(void)
 {
     if (sCommTool) {
         if (sCommTool->sendTiming) {
-            if (CommSys_SendDataFixedSize(16, &sCommTool->syncNoPersonal)) {
+            if (CommSys_SendDataFixedSize(COMM_CMD_16, &sCommTool->syncNoPersonal)) {
                 sCommTool->sendTiming = 0;
             }
         }
@@ -153,7 +154,7 @@ void sub_02036594(u8 param0, u8 param1)
     v0.unk_00 = param0;
     v0.unk_01 = param1;
 
-    CommSys_SendDataFixedSize(19, &v0);
+    CommSys_SendDataFixedSize(COMM_CMD_19, &v0);
 }
 
 int CommList_Get(int param0, u8 param1)
@@ -189,7 +190,7 @@ BOOL sub_02036614(int param0, const void *param1)
 {
     if (sCommTool) {
         MI_CpuCopy8(param1, sCommTool->unk_18[param0], COMM_TOOL_TEMP_DATA_SIZE);
-        CommSys_SendDataFixedSize(20, sCommTool->unk_18[param0]);
+        CommSys_SendDataFixedSize(COMM_CMD_20, sCommTool->unk_18[param0]);
         return 1;
     }
 
diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c
index 7e88385828e..8bdd297416c 100644
--- a/src/unk_020494DC.c
+++ b/src/unk_020494DC.c
@@ -5,6 +5,7 @@
 
 #include "constants/battle_tower.h"
 #include "constants/battle_tower_functions.h"
+#include "constants/communication/comm_command.h"
 #include "generated/battle_tower_modes.h"
 #include "generated/game_records.h"
 #include "generated/items.h"
@@ -253,15 +254,15 @@ BOOL ScrCmd_1E1(ScriptContext *ctx)
 
     switch (v3) {
     case 0:
-        cmd = 62;
+        cmd = COMM_CMD_F_62;
         sub_0204B060(ctx->fieldSystem->battleTower, ctx->fieldSystem->saveData);
         break;
     case 1:
-        cmd = 63;
+        cmd = COMM_CMD_F_63;
         sub_0204B0BC(ctx->fieldSystem->battleTower);
         break;
     case 2:
-        cmd = 64;
+        cmd = COMM_CMD_F_64;
         sub_0204B0D4(ctx->fieldSystem->battleTower, v4);
         break;
     }

From 807a4ff10f35d405be4c869e69b2b36ee6405060 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 11:18:16 -0400
Subject: [PATCH 21/39] Name comm_command_battle

---
 .../{unk_0207A6DC.h => comm_command_battle.h} |   6 +-
 .../constants/communication/comm_command.h    |  18 +++-
 include/constants/communication/comm_sync.h   |   7 ++
 platinum.us/main.lsf                          |   2 +-
 src/battle/battle_controller.c                |   2 +-
 src/battle/battle_main.c                      |   2 +-
 src/{unk_0207A6DC.c => comm_command_battle.c} | 102 +++++++++---------
 src/meson.build                               |   2 +-
 8 files changed, 83 insertions(+), 58 deletions(-)
 rename include/{unk_0207A6DC.h => comm_command_battle.h} (88%)
 rename src/{unk_0207A6DC.c => comm_command_battle.c} (77%)

diff --git a/include/unk_0207A6DC.h b/include/comm_command_battle.h
similarity index 88%
rename from include/unk_0207A6DC.h
rename to include/comm_command_battle.h
index a7326fa9100..ca4487c4437 100644
--- a/include/unk_0207A6DC.h
+++ b/include/comm_command_battle.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_0207A6DC_H
-#define POKEPLATINUM_UNK_0207A6DC_H
+#ifndef POKEPLATINUM_COMM_COMMAND_BATTLE_H
+#define POKEPLATINUM_COMM_COMMAND_BATTLE_H
 
 #include "struct_decls/battle_system.h"
 #include "struct_defs/struct_0207A778.h"
@@ -23,4 +23,4 @@ BOOL sub_0207ABD0(UnkStruct_0207A778 *param0, int param1, int param2);
 BOOL sub_0207AC28(UnkStruct_0207A778 *param0, int param1);
 BOOL sub_0207AC54(UnkStruct_0207A778 *param0, int param1, int param2);
 
-#endif // POKEPLATINUM_UNK_0207A6DC_H
+#endif // POKEPLATINUM_COMM_COMMAND_BATTLE_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index d7107992f16..b486bf46305 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -85,8 +85,24 @@ enum CommCommand_Frontier {
     COMM_CMD_MAX_FRONTIER,
 };
 
-// Communication Commands used for Overlay 117
+// Communication Commands used for Battle
+enum CommCommand_Battle {
+    COMM_CMD_BATTLE_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_BATTLE_23,
+    COMM_CMD_BATTLE_24,
+    COMM_CMD_BATTLE_25,
+    COMM_CMD_BATTLE_26,
+    COMM_CMD_BATTLE_27,
+    COMM_CMD_BATTLE_28,
+    COMM_CMD_BATTLE_29,
+    COMM_CMD_BATTLE_30,
+    COMM_CMD_BATTLE_31,
+    COMM_CMD_BATTLE_32,
+    COMM_CMD_BATTLE_33,
+    COMM_CMD_MAX_BATTLE,
+};
 
+// Communication Commands used for Overlay 117
 enum CommCommand_Ov117 {
     COMM_CMD_OV117_NONE = COMM_CMD_MAX_COMMON,
     COMM_CMD_OV117_23,
diff --git a/include/constants/communication/comm_sync.h b/include/constants/communication/comm_sync.h
index cea2b73baaa..eae2a0f7aa0 100644
--- a/include/constants/communication/comm_sync.h
+++ b/include/constants/communication/comm_sync.h
@@ -8,6 +8,13 @@ enum CommSync {
 
     SYNC_BATTLE_ROOM_RETURN = 30,
 
+    SYNC_51 = 51,
+    SYNC_52,
+    SYNC_53,
+    SYNC_54,
+    SYNC_55,
+    SYNC_56,
+
     SYNC_BATTLE_END_CONNECTION = 91,
     SYNC_PAUSE_BATTLE,
 
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 4cab29cfd43..48281a41b49 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -294,7 +294,7 @@ Static main
 	Object main.nef.p/src_dexmode_checker.c.o
 	Object main.nef.p/src_height_weight_data.c.o
 	Object main.nef.p/src_battle_regulation_validation.c.o
-	Object main.nef.p/src_unk_0207A6DC.c.o
+	Object main.nef.p/src_comm_command_battle.c.o
 	Object main.nef.p/src_evolution.c.o
 	Object main.nef.p/src_unk_0207C63C.c.o
 	Object main.nef.p/src_type_icon.c.o
diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c
index 5a9ce1834cb..80dc568b115 100644
--- a/src/battle/battle_controller.c
+++ b/src/battle/battle_controller.c
@@ -27,7 +27,7 @@
 #include "party.h"
 #include "pokemon.h"
 #include "unk_0202F1D4.h"
-#include "unk_0207A6DC.h"
+#include "comm_command_battle.h"
 
 static void BattleController_SendLocalMessage(BattleSystem *battleSys, int recipient, int battler, void *message, u8 size);
 static void SendMessage(BattleSystem *battleSys, int recipient, int battler, void *message, u8 size);
diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c
index ddbaf3f2efa..d70d77b772f 100644
--- a/src/battle/battle_main.c
+++ b/src/battle/battle_main.c
@@ -84,7 +84,7 @@
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_02038F8C.h"
-#include "unk_0207A6DC.h"
+#include "comm_command_battle.h"
 #include "unk_0208C098.h"
 #include "vram_transfer.h"
 
diff --git a/src/unk_0207A6DC.c b/src/comm_command_battle.c
similarity index 77%
rename from src/unk_0207A6DC.c
rename to src/comm_command_battle.c
index 04e16333e05..84208850155 100644
--- a/src/unk_0207A6DC.c
+++ b/src/comm_command_battle.c
@@ -1,9 +1,11 @@
-#include "unk_0207A6DC.h"
+#include "comm_command_battle.h"
 
 #include <nitro.h>
 #include <string.h>
 
 #include "constants/battle.h"
+#include "constants/communication/comm_command.h"
+#include "constants/communication/comm_sync.h"
 
 #include "struct_decls/battle_system.h"
 #include "struct_defs/chatot_cry.h"
@@ -62,33 +64,33 @@ static u8 *sub_0207A7FC(int param0, void *param1, int param2);
 static u8 *sub_0207A804(int param0, void *param1, int param2);
 static u8 *sub_0207A80C(int param0, void *param1, int param2);
 static u8 *sub_0207A814(int param0, void *param1, int param2);
-static void sub_0207A8A8(int param0, int param1, void *param2, void *param3);
-static void sub_0207A934(int param0, int param1, void *param2, void *param3);
-static void sub_0207A9BC(int param0, int param1, void *param2, void *param3);
-static void sub_0207AA28(int param0, int param1, void *param2, void *param3);
-static void sub_0207AA90(int param0, int param1, void *param2, void *param3);
-static void sub_0207AB8C(int param0, int param1, void *param2, void *param3);
-static void sub_0207AC18(int param0, int param1, void *param2, void *param3);
-static void sub_0207ACA4(int param0, int param1, void *param2, void *param3);
-static void sub_0207ADB4(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_23(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_24(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_25(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_26(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_27(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_28(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_29_30(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_31_32(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_22(int param0, int param1, void *param2, void *param3);
 static void sub_0207ACB4(SysTask *param0, void *param1);
 static void sub_0207AD40(SysTask *param0, void *param1);
-static void sub_0207AE34(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Battle_33(int param0, int param1, void *param2, void *param3);
 static void PalPad_CreateNetworkObject(TrainerInfo *param0, PalPad *param1, PalPad *param2);
 
 static const CommCmdTable Unk_020F099C[] = {
-    { sub_0207ADB4, CommPacketSizeOf_Variable, NULL },
-    { sub_0207A8A8, CommPacketSizeOf_Variable, NULL },
-    { sub_0207A934, sub_0207A758, NULL },
-    { sub_0207A9BC, sub_0207A75C, sub_0207A778 },
-    { sub_0207AA28, sub_0207A774, sub_0207A798 },
-    { sub_0207AA90, sub_0207A764, sub_0207A7B8 },
-    { sub_0207AB8C, sub_0207A76C, sub_0207A7D4 },
-    { sub_0207AC18, sub_0207A774, sub_0207A7F4 },
-    { sub_0207AC18, sub_0207A774, sub_0207A7FC },
-    { sub_0207ACA4, sub_0207A764, sub_0207A804 },
-    { sub_0207ACA4, sub_0207A764, sub_0207A80C },
-    { sub_0207AE34, sub_0207AE64, sub_0207A814 }
+    [COMM_CMD_BATTLE_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_22, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_BATTLE_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_23, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_BATTLE_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_24, sub_0207A758, NULL },
+    [COMM_CMD_BATTLE_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_25, sub_0207A75C, sub_0207A778 },
+    [COMM_CMD_BATTLE_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_26, sub_0207A774, sub_0207A798 },
+    [COMM_CMD_BATTLE_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_27, sub_0207A764, sub_0207A7B8 },
+    [COMM_CMD_BATTLE_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_28, sub_0207A76C, sub_0207A7D4 },
+    [COMM_CMD_BATTLE_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_29_30, sub_0207A774, sub_0207A7F4 },
+    [COMM_CMD_BATTLE_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_29_30, sub_0207A774, sub_0207A7FC },
+    [COMM_CMD_BATTLE_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_31_32, sub_0207A764, sub_0207A804 },
+    [COMM_CMD_BATTLE_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_31_32, sub_0207A764, sub_0207A80C },
+    [COMM_CMD_BATTLE_33 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_33, sub_0207AE64, sub_0207A814 }
 };
 
 void sub_0207A6DC(void *param0)
@@ -266,7 +268,7 @@ void sub_0207A81C(BattleSystem *battleSys, int param1, int param2, void *param3,
     Heap_Free(info);
 }
 
-static void sub_0207A8A8(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_23(int param0, int param1, void *param2, void *param3)
 {
     BattleSystem *battleSys = (BattleSystem *)param3;
     int v1;
@@ -294,14 +296,14 @@ BOOL sub_0207A8F4(UnkStruct_0207A778 *param0, u32 param1)
         return 0;
     }
 
-    if (CommTiming_IsSyncState(51) == 0) {
+    if (CommTiming_IsSyncState(SYNC_51) == 0) {
         return 0;
     }
 
-    return CommSys_SendData(24, (void *)&param1, 4);
+    return CommSys_SendData(COMM_CMD_BATTLE_24, (void *)&param1, 4);
 }
 
-static void sub_0207A934(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
 
@@ -330,14 +332,14 @@ BOOL sub_0207A988(UnkStruct_0207A778 *param0)
         return 0;
     }
 
-    if (CommTiming_IsSyncState(52) == 0) {
+    if (CommTiming_IsSyncState(SYNC_52) == 0) {
         return 0;
     }
 
-    return CommSys_SendDataHuge(25, (void *)&param0->unk_20[0], TrainerInfo_Size());
+    return CommSys_SendDataHuge(COMM_CMD_BATTLE_25, (void *)&param0->unk_20[0], TrainerInfo_Size());
 }
 
-static void sub_0207A9BC(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_25(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
     v0->unk_1020++;
@@ -363,14 +365,14 @@ BOOL sub_0207A9F8(UnkStruct_0207A778 *param0)
         return 0;
     }
 
-    if (CommTiming_IsSyncState(53) == 0) {
+    if (CommTiming_IsSyncState(SYNC_53) == 0) {
         return 0;
     }
 
-    return CommSys_SendDataHuge(26, (void *)&param0->unk_20[0], sizeof(Trainer));
+    return CommSys_SendDataHuge(COMM_CMD_BATTLE_26, (void *)&param0->unk_20[0], sizeof(Trainer));
 }
 
-static void sub_0207AA28(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_26(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
     v0->unk_1020++;
@@ -396,14 +398,14 @@ BOOL sub_0207AA5C(UnkStruct_0207A778 *param0)
         return 0;
     }
 
-    if (CommTiming_IsSyncState(54) == 0) {
+    if (CommTiming_IsSyncState(SYNC_54) == 0) {
         return 0;
     }
 
-    return CommSys_SendDataHuge(27, (void *)&param0->unk_20[0], Party_SaveSize());
+    return CommSys_SendDataHuge(COMM_CMD_BATTLE_27, (void *)&param0->unk_20[0], Party_SaveSize());
 }
 
-static void sub_0207AA90(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_27(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
 
@@ -430,11 +432,11 @@ BOOL sub_0207AAC8(UnkStruct_0207A778 *param0)
         return 0;
     }
 
-    if (CommTiming_IsSyncState(55) == 0) {
+    if (CommTiming_IsSyncState(SYNC_55) == 0) {
         return 0;
     }
 
-    return CommSys_SendDataHuge(28, (void *)&param0->unk_20[0], 1000);
+    return CommSys_SendDataHuge(COMM_CMD_BATTLE_28, (void *)&param0->unk_20[0], 1000);
 }
 
 BOOL sub_0207AAFC(UnkStruct_0207A778 *param0)
@@ -473,14 +475,14 @@ BOOL sub_0207AB58(UnkStruct_0207A778 *param0) // SEND pal pad data?!
         return 0;
     }
 
-    if (CommTiming_IsSyncState(56) == 0) {
+    if (CommTiming_IsSyncState(SYNC_56) == 0) {
         return 0;
     }
 
-    return CommSys_SendDataHuge(33, (void *)param0->unk_20, 1000);
+    return CommSys_SendDataHuge(COMM_CMD_BATTLE_33, (void *)param0->unk_20, 1000);
 }
 
-static void sub_0207AB8C(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_28(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
     v0->unk_1020++;
@@ -511,13 +513,13 @@ BOOL sub_0207ABD0(UnkStruct_0207A778 *param0, int param1, int param2)
     }
 
     if (param1 == 1) {
-        return CommSys_SendDataHuge(29, (void *)&param0->unk_20[0], sizeof(Trainer));
+        return CommSys_SendDataHuge(COMM_CMD_BATTLE_29, (void *)&param0->unk_20[0], sizeof(Trainer));
     } else {
-        return CommSys_SendDataHuge(30, (void *)&param0->unk_20[0], sizeof(Trainer));
+        return CommSys_SendDataHuge(COMM_CMD_BATTLE_30, (void *)&param0->unk_20[0], sizeof(Trainer));
     }
 }
 
-static void sub_0207AC18(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_29_30(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
     v0->unk_1020++;
@@ -548,13 +550,13 @@ BOOL sub_0207AC54(UnkStruct_0207A778 *param0, int param1, int param2)
     }
 
     if (param1 == 1) {
-        return CommSys_SendDataHuge(31, (void *)&param0->unk_20[0], Party_SaveSize());
+        return CommSys_SendDataHuge(COMM_CMD_BATTLE_31, (void *)&param0->unk_20[0], Party_SaveSize());
     } else {
-        return CommSys_SendDataHuge(32, (void *)&param0->unk_20[0], Party_SaveSize());
+        return CommSys_SendDataHuge(COMM_CMD_BATTLE_32, (void *)&param0->unk_20[0], Party_SaveSize());
     }
 }
 
-static void sub_0207ACA4(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_31_32(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
     v0->unk_1020++;
@@ -591,7 +593,7 @@ void sub_0207ACB4(SysTask *param0, void *param1)
 
         v5 = sizeof(BattleMessageInfo) + (v1[v2[0] + 2] | (v1[v2[0] + 3] << 8));
 
-        if (CommSys_SendData(23, (void *)&v1[v2[0]], v5) == 1) {
+        if (CommSys_SendData(COMM_CMD_BATTLE_23, (void *)&v1[v2[0]], v5) == 1) {
             v2[0] += v5;
         }
         break;
@@ -641,7 +643,7 @@ void sub_0207AD40(SysTask *param0, void *param1)
     }
 }
 
-static void sub_0207ADB4(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Battle_22(int param0, int param1, void *param2, void *param3)
 {
     BattleSystem *battleSys = (BattleSystem *)param3;
 
@@ -667,7 +669,7 @@ static void PalPad_CreateNetworkObject(TrainerInfo *trainerInfo, PalPad *source,
     }
 }
 
-void sub_0207AE34(int param0, int param1, void *param2, void *param3)
+void CommCmd_Battle_33(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3;
 
diff --git a/src/meson.build b/src/meson.build
index 05436b58b5f..7566a0444c0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -278,7 +278,7 @@ pokeplatinum_c = files(
     'dexmode_checker.c',
     'height_weight_data.c',
     'battle_regulation_validation.c',
-    'unk_0207A6DC.c',
+    'comm_command_battle.c',
     'evolution.c',
     'unk_0207C63C.c',
     'type_icon.c',

From 5dd25cd288ba0e13c999375d1920d8da058e3807 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 11:31:12 -0400
Subject: [PATCH 22/39] Name comm_command_wobbuffet_pop

---
 .../constants/communication/comm_command.h    | 14 +++++-----
 ...22665FC.h => comm_command_wobbuffet_pop.h} |  6 ++--
 platinum.us/main.lsf                          |  2 +-
 src/comm_command_battle.c                     |  2 ++
 src/meson.build                               |  2 +-
 ...22665FC.c => comm_command_wobbuffet_pop.c} | 28 +++++++++----------
 src/overlay117/ov117_02260668.c               |  2 +-
 7 files changed, 29 insertions(+), 27 deletions(-)
 rename include/overlay117/{ov117_022665FC.h => comm_command_wobbuffet_pop.h} (68%)
 rename src/overlay117/{ov117_022665FC.c => comm_command_wobbuffet_pop.c} (59%)

diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index b486bf46305..f27ebfc03e3 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -102,13 +102,13 @@ enum CommCommand_Battle {
     COMM_CMD_MAX_BATTLE,
 };
 
-// Communication Commands used for Overlay 117
-enum CommCommand_Ov117 {
-    COMM_CMD_OV117_NONE = COMM_CMD_MAX_COMMON,
-    COMM_CMD_OV117_23,
-    COMM_CMD_OV117_24,
-    COMM_CMD_OV117_25,
-    COMM_CMD_MAX_OV117,
+// Communication Commands used for Wobbuffet Pop minigame
+enum CommCommand_WobbuffetPop {
+    COMM_CMD_WOB_POP_NONE = COMM_CMD_MAX_COMMON,
+    COMM_CMD_WOB_POP_23,
+    COMM_CMD_WOB_POP_24,
+    COMM_CMD_WOB_POP_25,
+    COMM_CMD_MAX_WOB_POP,
 };
 
 #endif
diff --git a/include/overlay117/ov117_022665FC.h b/include/overlay117/comm_command_wobbuffet_pop.h
similarity index 68%
rename from include/overlay117/ov117_022665FC.h
rename to include/overlay117/comm_command_wobbuffet_pop.h
index 4e3c63ec123..3ba87235138 100644
--- a/include/overlay117/ov117_022665FC.h
+++ b/include/overlay117/comm_command_wobbuffet_pop.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_OV117_022665FC_H
-#define POKEPLATINUM_OV117_022665FC_H
+#ifndef POKEPLATINUM_COMM_COMMAND_WOBBUFFET_POP_H
+#define POKEPLATINUM_COMM_COMMAND_WOBBUFFET_POP_H
 
 #include "overlay117/struct_ov117_02261280_decl.h"
 #include "overlay117/struct_ov117_022621D4.h"
@@ -9,4 +9,4 @@ BOOL ov117_02266624(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *
 BOOL ov117_02266648(UnkStruct_ov117_02261280 *param0);
 BOOL ov117_022666A4(UnkStruct_ov117_02261280 *param0);
 
-#endif // POKEPLATINUM_OV117_022665FC_H
+#endif // POKEPLATINUM_COMM_COMMAND_WOBBUFFET_POP_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 48281a41b49..297707b9f1c 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -1686,7 +1686,7 @@ Overlay overlay117
 	Object main.nef.p/src_overlay117_ov117_022626B0.c.o
 	Object main.nef.p/src_overlay117_ov117_02263AF0.c.o
 	Object main.nef.p/src_overlay117_ov117_02266498.c.o
-	Object main.nef.p/src_overlay117_ov117_022665FC.c.o
+	Object main.nef.p/src_overlay117_comm_command_wobbuffet_pop.c.o
 	Object main.nef.p/src_overlay117_ov117_022666C0.c.o
 }
 
diff --git a/src/comm_command_battle.c b/src/comm_command_battle.c
index 84208850155..3653b6e3106 100644
--- a/src/comm_command_battle.c
+++ b/src/comm_command_battle.c
@@ -78,6 +78,7 @@ static void sub_0207AD40(SysTask *param0, void *param1);
 static void CommCmd_Battle_33(int param0, int param1, void *param2, void *param3);
 static void PalPad_CreateNetworkObject(TrainerInfo *param0, PalPad *param1, PalPad *param2);
 
+// clang-format off
 static const CommCmdTable Unk_020F099C[] = {
     [COMM_CMD_BATTLE_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_22, CommPacketSizeOf_Variable, NULL },
     [COMM_CMD_BATTLE_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_23, CommPacketSizeOf_Variable, NULL },
@@ -92,6 +93,7 @@ static const CommCmdTable Unk_020F099C[] = {
     [COMM_CMD_BATTLE_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_31_32, sub_0207A764, sub_0207A80C },
     [COMM_CMD_BATTLE_33 - COMM_CMD_MAX_COMMON] = { CommCmd_Battle_33, sub_0207AE64, sub_0207A814 }
 };
+// clang-format on
 
 void sub_0207A6DC(void *param0)
 {
diff --git a/src/meson.build b/src/meson.build
index 7566a0444c0..51b7db61739 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1005,7 +1005,7 @@ pokeplatinum_c = files(
     'overlay117/ov117_022626B0.c',
     'overlay117/ov117_02263AF0.c',
     'overlay117/ov117_02266498.c',
-    'overlay117/ov117_022665FC.c',
+    'overlay117/comm_command_wobbuffet_pop.c',
     'overlay117/ov117_022666C0.c',
     'applications/party_menu/form_change.c',
     'cutscenes/egg_hatch/graphics.c',
diff --git a/src/overlay117/ov117_022665FC.c b/src/overlay117/comm_command_wobbuffet_pop.c
similarity index 59%
rename from src/overlay117/ov117_022665FC.c
rename to src/overlay117/comm_command_wobbuffet_pop.c
index 5befa147da7..2c9883e8a61 100644
--- a/src/overlay117/ov117_022665FC.c
+++ b/src/overlay117/comm_command_wobbuffet_pop.c
@@ -1,4 +1,4 @@
-#include "overlay117/ov117_022665FC.h"
+#include "overlay117/comm_command_wobbuffet_pop.h"
 
 #include <nitro.h>
 #include <string.h>
@@ -14,18 +14,18 @@
 #include "comm_command.h"
 #include "communication_system.h"
 
-static void CommCmd_ov117_24(int param0, int param1, void *param2, void *param3);
-static void CommCmd_ov117_25(int param0, int param1, void *param2, void *param3);
-static void CommCmd_ov117_23(int param0, int param1, void *param2, void *param3);
+static void CommCmd_WobPop_24(int param0, int param1, void *param2, void *param3);
+static void CommCmd_WobPop_25(int param0, int param1, void *param2, void *param3);
+static void CommCmd_WobPop_23(int param0, int param1, void *param2, void *param3);
 static int ov117_02266610(void);
 static int ov117_02266614(void);
 
 // clang-format off
 static const CommCmdTable Unk_ov117_02266FE4[] = {
-    [COMM_CMD_OV117_NONE - COMM_CMD_MAX_COMMON] = { NULL, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_OV117_23 - COMM_CMD_MAX_COMMON] = { CommCmd_ov117_23, ov117_02266614, NULL },
-    [COMM_CMD_OV117_24 - COMM_CMD_MAX_COMMON] = { CommCmd_ov117_24, ov117_02266610, NULL },
-    [COMM_CMD_OV117_25 - COMM_CMD_MAX_COMMON] = { CommCmd_ov117_25, CommPacketSizeOf_Nothing, NULL }
+    [COMM_CMD_WOB_POP_NONE - COMM_CMD_MAX_COMMON] = { NULL, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_WOB_POP_23 - COMM_CMD_MAX_COMMON] = { CommCmd_WobPop_23, ov117_02266614, NULL },
+    [COMM_CMD_WOB_POP_24 - COMM_CMD_MAX_COMMON] = { CommCmd_WobPop_24, ov117_02266610, NULL },
+    [COMM_CMD_WOB_POP_25 - COMM_CMD_MAX_COMMON] = { CommCmd_WobPop_25, CommPacketSizeOf_Nothing, NULL }
 };
 // clang-format on
 
@@ -47,7 +47,7 @@ static int ov117_02266614(void)
     return sizeof(u32);
 }
 
-static void CommCmd_ov117_24(int param0, int param1, void *param2, void *param3)
+static void CommCmd_WobPop_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov117_02261280 *v0 = param3;
     ov117_02262044(v0, param0, param2);
@@ -55,14 +55,14 @@ static void CommCmd_ov117_24(int param0, int param1, void *param2, void *param3)
 
 BOOL ov117_02266624(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *param1)
 {
-    if (CommSys_SendData(COMM_CMD_OV117_24, param1, sizeof(UnkStruct_ov117_022621D4)) == 1) {
+    if (CommSys_SendData(COMM_CMD_WOB_POP_24, param1, sizeof(UnkStruct_ov117_022621D4)) == 1) {
         return 1;
     }
 
     return 0;
 }
 
-static void CommCmd_ov117_25(int param0, int param1, void *param2, void *param3)
+static void CommCmd_WobPop_25(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov117_02261280 *v0 = param3;
     v0->unk_2FC0 = 1;
@@ -70,14 +70,14 @@ static void CommCmd_ov117_25(int param0, int param1, void *param2, void *param3)
 
 BOOL ov117_02266648(UnkStruct_ov117_02261280 *param0)
 {
-    if (CommSys_SendData(COMM_CMD_OV117_25, NULL, 0) == 1) {
+    if (CommSys_SendData(COMM_CMD_WOB_POP_25, NULL, 0) == 1) {
         return 1;
     }
 
     return 0;
 }
 
-static void CommCmd_ov117_23(int param0, int param1, void *param2, void *param3)
+static void CommCmd_WobPop_23(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov117_02261280 *v0 = param3;
     u32 *v1 = param2;
@@ -101,7 +101,7 @@ BOOL ov117_022666A4(UnkStruct_ov117_02261280 *param0)
 {
     u32 v0 = 100;
 
-    if (CommSys_SendData(COMM_CMD_OV117_23, &v0, sizeof(u32)) == 1) {
+    if (CommSys_SendData(COMM_CMD_WOB_POP_23, &v0, sizeof(u32)) == 1) {
         return 1;
     }
 
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index c95da80f720..56caec2ed29 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -10,7 +10,7 @@
 #include "overlay114/ov114_0225C700.h"
 #include "overlay117/ov117_022626B0.h"
 #include "overlay117/ov117_02263AF0.h"
-#include "overlay117/ov117_022665FC.h"
+#include "overlay117/comm_command_wobbuffet_pop.h"
 #include "overlay117/ov117_022666C0.h"
 #include "overlay117/struct_ov117_02261280.h"
 #include "overlay117/struct_ov117_02261C2C.h"

From 3571a5ad925b3325d3f895b703bb55dce4be4b76 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 11:41:18 -0400
Subject: [PATCH 23/39] Name comm_command_mime_jr_top

---
 .../constants/communication/comm_command.h    | 10 ++++++
 ..._02260440.h => comm_command_mime_jr_top.h} |  6 ++--
 platinum.us/main.lsf                          |  2 +-
 src/meson.build                               |  2 +-
 ..._02260440.c => comm_command_mime_jr_top.c} | 36 ++++++++++---------
 src/overlay116/ov116_022604C4.c               |  2 +-
 6 files changed, 36 insertions(+), 22 deletions(-)
 rename include/overlay116/{ov116_02260440.h => comm_command_mime_jr_top.h} (59%)
 rename src/overlay116/{ov116_02260440.c => comm_command_mime_jr_top.c} (56%)

diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index f27ebfc03e3..5f5815dea28 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -102,6 +102,16 @@ enum CommCommand_Battle {
     COMM_CMD_MAX_BATTLE,
 };
 
+// Communication Commands used for Mime Jr. Top minigame
+enum CommCommand_MimeJrTop {
+    COMM_CMD_MIME_TOP_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_MIME_TOP_23,
+    COMM_CMD_MIME_TOP_24,
+    COMM_CMD_MIME_TOP_25,
+    COMM_CMD_MIME_TOP_26,
+    COMM_CMD_MAX_MIME_TOP,
+};
+
 // Communication Commands used for Wobbuffet Pop minigame
 enum CommCommand_WobbuffetPop {
     COMM_CMD_WOB_POP_NONE = COMM_CMD_MAX_COMMON,
diff --git a/include/overlay116/ov116_02260440.h b/include/overlay116/comm_command_mime_jr_top.h
similarity index 59%
rename from include/overlay116/ov116_02260440.h
rename to include/overlay116/comm_command_mime_jr_top.h
index 42000406a85..3b98df92adf 100644
--- a/include/overlay116/ov116_02260440.h
+++ b/include/overlay116/comm_command_mime_jr_top.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_OV116_02260440_H
-#define POKEPLATINUM_OV116_02260440_H
+#ifndef POKEPLATINUM_COMM_COMMAND_MINE_JR_TOP_H
+#define POKEPLATINUM_COMM_COMMAND_MINE_JR_TOP_H
 
 #include "struct_defs/comm_cmd_table.h"
 
@@ -9,4 +9,4 @@ const CommCmdTable *ov116_0226049C(void);
 int ov116_022604A4(void);
 void ov116_022604A8(UnkStruct_ov116_0226139C *param0);
 
-#endif // POKEPLATINUM_OV116_02260440_H
+#endif // POKEPLATINUM_COMM_COMMAND_MINE_JR_TOP_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 297707b9f1c..b8484301c7f 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -1669,7 +1669,7 @@ Overlay overlay115
 Overlay overlay116
 {
 	After overlay114
-	Object main.nef.p/src_overlay116_ov116_02260440.c.o
+	Object main.nef.p/src_overlay116_comm_command_mime_jr_top.c.o
 	Object main.nef.p/src_overlay116_ov116_022604C4.c.o
 	Object main.nef.p/src_overlay116_ov116_02261870.c.o
 	Object main.nef.p/src_overlay116_ov116_02262A44.c.o
diff --git a/src/meson.build b/src/meson.build
index 51b7db61739..9736001ca8d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -993,7 +993,7 @@ pokeplatinum_c = files(
     'overlay115/ov115_02260CEC.c',
     'overlay115/ov115_02265A18.c',
     'overlay115/ov115_02265A24.c',
-    'overlay116/ov116_02260440.c',
+    'overlay116/comm_command_mime_jr_top.c',
     'overlay116/ov116_022604C4.c',
     'overlay116/ov116_02261870.c',
     'overlay116/ov116_02262A44.c',
diff --git a/src/overlay116/ov116_02260440.c b/src/overlay116/comm_command_mime_jr_top.c
similarity index 56%
rename from src/overlay116/ov116_02260440.c
rename to src/overlay116/comm_command_mime_jr_top.c
index 9c776efb174..84f27a88b4c 100644
--- a/src/overlay116/ov116_02260440.c
+++ b/src/overlay116/comm_command_mime_jr_top.c
@@ -1,8 +1,10 @@
-#include "overlay116/ov116_02260440.h"
+#include "overlay116/comm_command_mime_jr_top.h"
 
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 
 #include "overlay116/ov116_022604C4.h"
@@ -15,26 +17,28 @@
 #include "comm_command.h"
 #include "math_util.h"
 
-static void ov116_02260440(int param0, int param1, void *param2, void *param3);
-static void ov116_02260458(int param0, int param1, void *param2, void *param3);
-static void ov116_02260464(int param0, int param1, void *param2, void *param3);
-static void ov116_02260478(int param0, int param1, void *param2, void *param3);
-static void ov116_02260484(int param0, int param1, void *param2, void *param3);
+static void CommCmd_MimeJrTop_22(int param0, int param1, void *param2, void *param3);
+static void CommCmd_MimeJrTop_23(int param0, int param1, void *param2, void *param3);
+static void CommCmd_MimeJrTop_24(int param0, int param1, void *param2, void *param3);
+static void CommCmd_MimeJrTop_25(int param0, int param1, void *param2, void *param3);
+static void CommCmd_MimeJrTop_26(int param0, int param1, void *param2, void *param3);
 static int ov116_02260488(void);
 static int ov116_0226048C(void);
 static int ov116_02260490(void);
 static int ov116_02260494(void);
 static int ov116_02260498(void);
 
+// clang-format off
 static const CommCmdTable Unk_ov116_02267740[] = {
-    { ov116_02260440, ov116_0226048C, NULL },
-    { ov116_02260458, ov116_02260488, NULL },
-    { ov116_02260464, ov116_02260490, NULL },
-    { ov116_02260478, ov116_02260494, NULL },
-    { ov116_02260484, ov116_02260498, NULL }
+    [COMM_CMD_MIME_TOP_22 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_22, ov116_0226048C, NULL },
+    [COMM_CMD_MIME_TOP_23 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_23, ov116_02260488, NULL },
+    [COMM_CMD_MIME_TOP_24 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_24, ov116_02260490, NULL },
+    [COMM_CMD_MIME_TOP_25 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_25, ov116_02260494, NULL },
+    [COMM_CMD_MIME_TOP_26 - COMM_CMD_MAX_COMMON] = { CommCmd_MimeJrTop_26, ov116_02260498, NULL }
 };
+// clang-format on
 
-static void ov116_02260440(int param0, int param1, void *param2, void *param3)
+static void CommCmd_MimeJrTop_22(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov116_0226139C *v0 = param3;
 
@@ -44,27 +48,27 @@ static void ov116_02260440(int param0, int param1, void *param2, void *param3)
     ov116_022617D4(v0);
 }
 
-static void ov116_02260458(int param0, int param1, void *param2, void *param3)
+static void CommCmd_MimeJrTop_23(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov116_0226139C *v0 = param3;
     ov116_022617DC(v0);
 }
 
-static void ov116_02260464(int param0, int param1, void *param2, void *param3)
+static void CommCmd_MimeJrTop_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov116_0226139C *v0 = param3;
     UnkStruct_ov116_02260490 *v1 = ((UnkStruct_ov116_02260490 *)param2);
     v0->unk_04->unk_2858[param0].unk_00 = v1->unk_00;
 }
 
-static void ov116_02260478(int param0, int param1, void *param2, void *param3)
+static void CommCmd_MimeJrTop_25(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov116_0226139C *v0 = param3;
     UnkStruct_ov116_02260494 *v1 = ((UnkStruct_ov116_02260494 *)param2);
     v0->unk_24.unk_00[param0].unk_00 = v1->unk_00;
 }
 
-static void ov116_02260484(int param0, int param1, void *param2, void *param3)
+static void CommCmd_MimeJrTop_26(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov116_0226139C *v0 = param3;
 }
diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c
index 159b9ad9fb3..bcbbaaada22 100644
--- a/src/overlay116/ov116_022604C4.c
+++ b/src/overlay116/ov116_022604C4.c
@@ -7,7 +7,7 @@
 
 #include "nintendo_wfc/main.h"
 #include "overlay114/ov114_0225C700.h"
-#include "overlay116/ov116_02260440.h"
+#include "overlay116/comm_command_mime_jr_top.h"
 #include "overlay116/ov116_02261870.h"
 #include "overlay116/ov116_02262A44.h"
 #include "overlay116/ov116_02262A8C.h"

From 73f810690ba527503bdd47ae8b805f55efc3598c Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 22 May 2026 11:54:17 -0400
Subject: [PATCH 24/39] Name comm_command_poffin_cooking

---
 .../constants/communication/comm_command.h    | 15 ++++++++
 .../overlay083/comm_command_poffin_cooking.h  |  9 +++++
 include/overlay083/ov83_0223D144.h            |  9 -----
 include/overlay083/ov83_0223D150.h            |  2 +-
 platinum.us/main.lsf                          |  2 +-
 src/meson.build                               |  2 +-
 src/overlay083/comm_command_poffin_cooking.c  | 38 +++++++++++++++++++
 src/overlay083/ov83_0223D144.c                | 34 -----------------
 src/overlay083/ov83_0223D150.c                |  4 +-
 9 files changed, 67 insertions(+), 48 deletions(-)
 create mode 100644 include/overlay083/comm_command_poffin_cooking.h
 delete mode 100644 include/overlay083/ov83_0223D144.h
 create mode 100644 src/overlay083/comm_command_poffin_cooking.c
 delete mode 100644 src/overlay083/ov83_0223D144.c

diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 5f5815dea28..8ed83b8b03f 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -102,6 +102,21 @@ enum CommCommand_Battle {
     COMM_CMD_MAX_BATTLE,
 };
 
+// Communication Commands used for Poffin Cooking minigame
+enum CommCommand_PoffinCooking {
+    COMM_CMD_POFFIN_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_POFFIN_23,
+    COMM_CMD_POFFIN_24,
+    COMM_CMD_POFFIN_25,
+    COMM_CMD_POFFIN_26,
+    COMM_CMD_POFFIN_27,
+    COMM_CMD_POFFIN_28,
+    COMM_CMD_POFFIN_29,
+    COMM_CMD_POFFIN_30,
+    COMM_CMD_POFFIN_31,
+    COMM_CMD_POFFIN_32,
+};
+
 // Communication Commands used for Mime Jr. Top minigame
 enum CommCommand_MimeJrTop {
     COMM_CMD_MIME_TOP_22 = COMM_CMD_MAX_COMMON,
diff --git a/include/overlay083/comm_command_poffin_cooking.h b/include/overlay083/comm_command_poffin_cooking.h
new file mode 100644
index 00000000000..e4593e6b882
--- /dev/null
+++ b/include/overlay083/comm_command_poffin_cooking.h
@@ -0,0 +1,9 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_POFFIN_COOKING_H
+#define POKEPLATINUM_COMM_COMMAND_POFFIN_COOKING_H
+
+#include "struct_defs/comm_cmd_table.h"
+
+const CommCmdTable *ov83_0223D144(void);
+int ov83_0223D14C(void);
+
+#endif // POKEPLATINUM_COMM_COMMAND_POFFIN_COOKING_H
diff --git a/include/overlay083/ov83_0223D144.h b/include/overlay083/ov83_0223D144.h
deleted file mode 100644
index abe81a0514a..00000000000
--- a/include/overlay083/ov83_0223D144.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef POKEPLATINUM_OV83_0223D144_H
-#define POKEPLATINUM_OV83_0223D144_H
-
-#include "struct_defs/comm_cmd_table.h"
-
-const CommCmdTable *ov83_0223D144(void);
-int ov83_0223D14C(void);
-
-#endif // POKEPLATINUM_OV83_0223D144_H
diff --git a/include/overlay083/ov83_0223D150.h b/include/overlay083/ov83_0223D150.h
index 3ea9039b76f..b58630c6589 100644
--- a/include/overlay083/ov83_0223D150.h
+++ b/include/overlay083/ov83_0223D150.h
@@ -7,7 +7,7 @@
 
 void ov83_0223D150(UnkStruct_ov83_0223B784 *param0, TrainerInfo *param1);
 void ov83_0223D1EC(UnkStruct_ov83_0223B784 *param0);
-void ov83_0223D204(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_22(int param0, int param1, void *param2, void *param3);
 void ov83_0223D210(int param0, int param1, void *param2, void *param3);
 void ov83_0223D21C(int param0, int param1, void *param2, void *param3);
 void ov83_0223D258(int param0, int param1, void *param2, void *param3);
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index b8484301c7f..37ef02fd565 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -1336,7 +1336,7 @@ Overlay overlay83
 	After overlay82
 	Object main.nef.p/src_overlay083_ov83_0223B5A0.c.o
 	Object main.nef.p/src_overlay083_ov83_0223C958.c.o
-	Object main.nef.p/src_overlay083_ov83_0223D144.c.o
+	Object main.nef.p/src_overlay083_comm_command_poffin_cooking.c.o
 	Object main.nef.p/src_overlay083_ov83_0223D150.c.o
 	Object main.nef.p/src_overlay083_ov83_0223D4CC.c.o
 	Object main.nef.p/src_overlay083_ov83_0223D6A8.c.o
diff --git a/src/meson.build b/src/meson.build
index 9736001ca8d..2284defb61b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -826,7 +826,7 @@ pokeplatinum_c = files(
     'overlay082/ov82_0223B2E0.c',
     'overlay083/ov83_0223B5A0.c',
     'overlay083/ov83_0223C958.c',
-    'overlay083/ov83_0223D144.c',
+    'overlay083/comm_command_poffin_cooking.c',
     'overlay083/ov83_0223D150.c',
     'overlay083/ov83_0223D4CC.c',
     'overlay083/ov83_0223D6A8.c',
diff --git a/src/overlay083/comm_command_poffin_cooking.c b/src/overlay083/comm_command_poffin_cooking.c
new file mode 100644
index 00000000000..5ec98dd06df
--- /dev/null
+++ b/src/overlay083/comm_command_poffin_cooking.c
@@ -0,0 +1,38 @@
+#include "overlay083/comm_command_poffin_cooking.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "constants/communication/comm_command.h"
+
+#include "struct_defs/comm_cmd_table.h"
+
+#include "overlay083/ov83_0223D150.h"
+
+#include "poffin.h"
+
+// clang-format off
+static const CommCmdTable Unk_ov83_02240390[] = {
+    [COMM_CMD_POFFIN_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_22, ov83_0223D4AC, NULL },
+    [COMM_CMD_POFFIN_23 - COMM_CMD_MAX_COMMON] = { ov83_0223D210, ov83_0223D4AC, NULL },
+    [COMM_CMD_POFFIN_24 - COMM_CMD_MAX_COMMON] = { ov83_0223D21C, ov83_0223D4B4, NULL },
+    [COMM_CMD_POFFIN_25 - COMM_CMD_MAX_COMMON] = { ov83_0223D258, ov83_0223D4B8, NULL },
+    [COMM_CMD_POFFIN_26 - COMM_CMD_MAX_COMMON] = { ov83_0223D2E8, ov83_0223D4BC, NULL },
+    [COMM_CMD_POFFIN_27 - COMM_CMD_MAX_COMMON] = { ov83_0223D3D8, ov83_0223D4C0, NULL },
+    [COMM_CMD_POFFIN_28 - COMM_CMD_MAX_COMMON] = { ov83_0223D3F8, Poffin_SizeOf, NULL },
+    [COMM_CMD_POFFIN_29 - COMM_CMD_MAX_COMMON] = { ov83_0223D410, ov83_0223D4B0, NULL },
+    [COMM_CMD_POFFIN_30 - COMM_CMD_MAX_COMMON] = { ov83_0223D430, ov83_0223D4B0, NULL },
+    [COMM_CMD_POFFIN_31 - COMM_CMD_MAX_COMMON] = { ov83_0223D354, ov83_0223D4C4, NULL },
+    [COMM_CMD_POFFIN_32 - COMM_CMD_MAX_COMMON] = { ov83_0223D3A8, ov83_0223D4C8, NULL }
+};
+// clang-format on
+
+const CommCmdTable *ov83_0223D144(void)
+{
+    return Unk_ov83_02240390;
+}
+
+int ov83_0223D14C(void)
+{
+    return sizeof(Unk_ov83_02240390) / sizeof(CommCmdTable);
+}
diff --git a/src/overlay083/ov83_0223D144.c b/src/overlay083/ov83_0223D144.c
deleted file mode 100644
index 5552692d23b..00000000000
--- a/src/overlay083/ov83_0223D144.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "overlay083/ov83_0223D144.h"
-
-#include <nitro.h>
-#include <string.h>
-
-#include "struct_defs/comm_cmd_table.h"
-
-#include "overlay083/ov83_0223D150.h"
-
-#include "poffin.h"
-
-static const CommCmdTable Unk_ov83_02240390[] = {
-    { ov83_0223D204, ov83_0223D4AC, NULL },
-    { ov83_0223D210, ov83_0223D4AC, NULL },
-    { ov83_0223D21C, ov83_0223D4B4, NULL },
-    { ov83_0223D258, ov83_0223D4B8, NULL },
-    { ov83_0223D2E8, ov83_0223D4BC, NULL },
-    { ov83_0223D3D8, ov83_0223D4C0, NULL },
-    { ov83_0223D3F8, Poffin_SizeOf, NULL },
-    { ov83_0223D410, ov83_0223D4B0, NULL },
-    { ov83_0223D430, ov83_0223D4B0, NULL },
-    { ov83_0223D354, ov83_0223D4C4, NULL },
-    { ov83_0223D3A8, ov83_0223D4C8, NULL }
-};
-
-const CommCmdTable *ov83_0223D144(void)
-{
-    return Unk_ov83_02240390;
-}
-
-int ov83_0223D14C(void)
-{
-    return sizeof(Unk_ov83_02240390) / sizeof(CommCmdTable);
-}
diff --git a/src/overlay083/ov83_0223D150.c b/src/overlay083/ov83_0223D150.c
index aaaf93518de..2f44ed271e3 100644
--- a/src/overlay083/ov83_0223D150.c
+++ b/src/overlay083/ov83_0223D150.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "overlay083/ov83_0223B5A0.h"
-#include "overlay083/ov83_0223D144.h"
+#include "overlay083/comm_command_poffin_cooking.h"
 #include "overlay083/ov83_0223D4CC.h"
 #include "overlay083/ov83_0223F7F4.h"
 #include "overlay083/struct_ov83_0223B784.h"
@@ -56,7 +56,7 @@ void ov83_0223D1EC(UnkStruct_ov83_0223B784 *param0)
     param0->unk_148C = NULL;
 }
 
-void ov83_0223D204(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_22(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
     ov83_0223B774(v0, 3);

From d7c7cf7f8c7385ba1dc7b05816a3845c2d127126 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 25 May 2026 19:34:43 -0400
Subject: [PATCH 25/39] comm_command_field

---
 include/comm_command_field.h                  |  11 +
 include/comm_player_manager.h                 |  10 +-
 .../constants/communication/comm_command.h    | 118 ++++++++++
 include/field_comm_manager.h                  |   4 +-
 include/overlay083/ov83_0223D150.h            |  20 +-
 include/underground/manager.h                 |  14 +-
 include/underground/mining.h                  |  16 +-
 include/underground/pc.h                      |   6 +-
 include/underground/player.h                  |  20 +-
 include/underground/player_talk.h             |  16 +-
 include/underground/records.h                 |   4 +-
 include/underground/secret_bases.h            |  26 +--
 include/underground/spheres.h                 |   2 +-
 include/underground/traps.h                   |  34 +--
 include/unk_0204FA34.h                        |   2 +-
 include/unk_0205001C.h                        |   2 +-
 include/unk_02050548.h                        |   2 +-
 include/unk_0205A0D8.h                        |   4 +-
 include/unk_0205B33C.h                        |  16 +-
 include/unk_02099500.h                        |  11 -
 platinum.us/main.lsf                          |   2 +-
 src/comm_command_field.c                      | 212 +++++++++++++++++
 src/comm_player_manager.c                     |  16 +-
 src/field_comm_manager.c                      |   6 +-
 src/meson.build                               |   2 +-
 src/overlay083/comm_command_poffin_cooking.c  |  20 +-
 src/overlay083/ov83_0223D150.c                |  20 +-
 src/scrcmd.c                                  |   2 +-
 src/scrcmd_battle_hall.c                      |   2 +-
 src/underground/comm_manager.c                |   2 +-
 src/underground/manager.c                     |  14 +-
 src/underground/mining.c                      |  16 +-
 src/underground/pc.c                          |   8 +-
 src/underground/player.c                      |  20 +-
 src/underground/player_talk.c                 |  16 +-
 src/underground/records.c                     |   4 +-
 src/underground/secret_bases.c                |  26 +--
 src/underground/spheres.c                     |   2 +-
 src/underground/traps.c                       |  34 +--
 src/unk_0204FA34.c                            |   2 +-
 src/unk_0204FAB4.c                            |   2 +-
 src/unk_0205001C.c                            |   4 +-
 src/unk_0205003C.c                            |   2 +-
 src/unk_02050548.c                            |   4 +-
 src/unk_0205A0D8.c                            |   4 +-
 src/unk_0205B33C.c                            |  18 +-
 src/unk_02095E98.c                            | 198 ++++++++--------
 src/unk_020961E8.c                            | 202 ++++++++--------
 src/unk_02099500.c                            | 208 -----------------
 src/unk_0209BDF8.c                            | 218 +++++++++---------
 50 files changed, 873 insertions(+), 751 deletions(-)
 create mode 100644 include/comm_command_field.h
 delete mode 100644 include/unk_02099500.h
 create mode 100644 src/comm_command_field.c
 delete mode 100644 src/unk_02099500.c

diff --git a/include/comm_command_field.h b/include/comm_command_field.h
new file mode 100644
index 00000000000..082bd1f0cb4
--- /dev/null
+++ b/include/comm_command_field.h
@@ -0,0 +1,11 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_FIELD_H
+#define POKEPLATINUM_COMM_COMMAND_FIELD_H
+
+void CommCmd_Field_Dummy(int param0, int param1, void *param2, void *param3);
+void CommFieldCmd_Init(void *param0);
+int sub_02099530(void);
+int sub_02099538(void);
+int sub_02099540(void);
+int sub_02099544(void);
+
+#endif // POKEPLATINUM_COMM_COMMAND_FIELD_H
diff --git a/include/comm_player_manager.h b/include/comm_player_manager.h
index 7e275ab9907..20b7a994169 100644
--- a/include/comm_player_manager.h
+++ b/include/comm_player_manager.h
@@ -103,13 +103,13 @@ u32 CommPlayer_Size(void);
 void CommPlayer_Destroy(u8 netId, BOOL param1, BOOL param2);
 BOOL CommPlayerMan_IsFieldSystemActive(void);
 void sub_02057FC4(BOOL param0);
-void sub_02058018(int netId, int param1, void *param2, void *unused);
+void CommCmd_Field_62(int netId, int param1, void *param2, void *unused);
 void sub_0205805C(FieldSystem *fieldSystem, BOOL param1);
 BOOL CommPlayer_CheckNPCCollision(int x, int z);
-void CommPlayer_RecvLocation(int netId, int unused0, void *src, void *unused1);
-void CommPlayer_RecvDelete(int unused0, int unused1, void *src, void *unused2);
+void CommCmd_RecvPlayerLocation(int netId, int unused0, void *src, void *unused1);
+void CommCmd_DeletePlayer(int unused0, int unused1, void *src, void *unused2);
 int CommPacketSizeOf_RecvLocation(void);
-void CommPlayer_RecvLocationAndInit(int netId, int size, void *src, void *unused);
+void CommCmd_RecvPlayerLocationAndInit(int netId, int size, void *src, void *unused);
 void CommPlayer_StartSlide(int netId, int dir, BOOL isHurlTrap);
 void CommPlayer_StopSlide(int netId);
 void CommPlayer_EndCurrentSlide(int netId);
@@ -138,7 +138,7 @@ int CommPlayerMan_GetLinkNetIDAtLocation(int xPos, int zPos);
 void CommPlayerMan_SetMovementEnabled(int netId, BOOL movementEnabled);
 BOOL CommPlayerMan_IsMovementEnabled(int netId);
 BOOL sub_020590C4(void);
-void sub_02059180(int netId, int unused0, void *src, void *unused3);
+void CommCmd_Field_93(int netId, int unused0, void *src, void *unused3);
 void CommPlayer_SetBattleDir(void);
 BOOL sub_0205928C(void);
 int CommPlayer_GetOppositeDir(int dir);
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 8ed83b8b03f..9a31fcc9b17 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -85,6 +85,123 @@ enum CommCommand_Frontier {
     COMM_CMD_MAX_FRONTIER,
 };
 
+// Communication Commands used for Field movement
+enum CommCommand_Field {
+    COMM_CMD_RECV_PLAYER_LOCATION = COMM_CMD_MAX_COMMON,
+    COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT,
+    COMM_CMD_VENDOR_TALK_REQUEST,
+    COMM_CMD_VENDOR_TALK,
+    COMM_CMD_VENDOR_TALK_SERVER,
+    COMM_CMD_OPEN_MENU_REQUEST,
+    COMM_CMD_INTERACT_EVENT,
+    COMM_CMD_OPEN_MENU_EVENT,
+    COMM_CMD_TALK_EVENT,
+    COMM_CMD_PROCESS_ALL_DATA_SENT_MSG,
+    COMM_CMD_TRY_PLACE_TRAP,
+    COMM_CMD_REMOVE_BURIED_TRAP_INDEX,
+    COMM_CMD_PLACE_TRAP_RESULT,
+    COMM_CMD_LOAD_LINK_TRAPS,
+    COMM_CMD_RECV_LOAD_TRAPS,
+    COMM_CMD_TRIGGER_TRAP,
+    COMM_CMD_CALL_SECOND_TRAP_EFFECT,
+    COMM_CMD_START_SLIDE_ANIM,
+    COMM_CMD_ESCAPE_HOLE,
+    COMM_CMD_ESCAPE_TRAP,
+    COMM_CMD_ESCAPED_TRAP,
+    COMM_CMD_END_TRAP_EFFECT,
+    COMM_CMD_TRAP_HELP,
+    COMM_CMD_TRIGGERD_TRAP_BITS,
+    COMM_CMD_SEND_TRAP_RADAR_RESULTS,
+    COMM_CMD_RECV_TRAP_RADAR_RESULTS,
+    COMM_CMD_UNDERGROUND_TOUCH_INPUT,
+    COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS,
+    COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS,
+    COMM_CMD_DISENGAGE_TRAP,
+    COMM_CMD_DELETE_PLAYER,
+    COMM_CMD_BASE_INFO,
+    COMM_CMD_ENTER_BASE,
+    COMM_CMD_BASE_ENTRANCE_BUFFER,
+    COMM_CMD_CLEAR_TRANSITION_STATUS,
+    COMM_CMD_EXIT_BASE,
+    COMM_CMD_BASE_TRANSMITION_PROMPT,
+    COMM_CMD_BASE_TRANSITION_EVENT,
+    COMM_CMD_SECRET_BASE_GOOD_INTERACTION,
+    COMM_CMD_ENTER_BASE_FAILED,
+    COMM_CMD_FIELD_62,
+    COMM_CMD_RETRIEVE_BURIED_SPHERES,
+    COMM_CMD_INTERACT_MINING_SPOT,
+    COMM_CMD_CONFIRM_START_MINING_RESULT,
+    COMM_CMD_CONFIRM_START_MINING,
+    COMM_CMD_END_MINING,
+    COMM_CMD_MINING_LINK_INPUT,
+    COMM_CMD_MINING_LINK_INPUT_SERVER,
+    COMM_CMD_PLAYER_STATE_UNDERGROUND,
+    COMM_CMD_START_TREASURE_RADAR,
+    COMM_CMD_MINING_SPOT_RADAR,
+    COMM_CMD_REQUEST_TALK_UPDATE_SERVER,
+    COMM_CMD_RESPONSE_TALK_UPDATE_SERVER,
+    COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER,
+    COMM_CMD_TALK_UPDATE_SERVER,
+    COMM_CMD_SEND_GIFT_SERVER,
+    COMM_CMD_RECV_GIFT_OFFER,
+    COMM_CMD_SEND_TALK_MSG_SERVER,
+    COMM_CMD_RECV_TALK_MSG_SERVER,
+    COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER,
+    COMM_CMD_UNDERGROUND_RECORD,
+    COMM_CMD_UNDERGROUND_PC_INTERACT,
+    COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE,
+    COMM_CMD_UNDERGROUND_FLAG_EVENT,
+    COMM_CMD_CREATE_SECRET_BASE_REQUEST,
+    COMM_CMD_CREATE_SECRET_BASE_EVENT,
+    COMM_CMD_TRAINER_CASE_COPIED,
+    COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG,
+    COMM_CMD_UNDERGROUND_TAKEN_FLAG,
+    COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO,
+    COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER,
+    COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK,
+    COMM_CMD_FIELD_93,
+    COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM,
+    COMM_CMD_UNDERGROUND_FLAG_RANK_UP,
+    COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT,
+    COMM_CMD_FIELD_98,
+    COMM_CMD_FIELD_99,
+    COMM_CMD_FIELD_100,
+    COMM_CMD_FIELD_101,
+    COMM_CMD_FIELD_102,
+    COMM_CMD_FIELD_103,
+    COMM_CMD_FIELD_104,
+    COMM_CMD_FIELD_105,
+    COMM_CMD_FIELD_106,
+    COMM_CMD_FIELD_107,
+    COMM_CMD_FIELD_108,
+    COMM_CMD_FIELD_109,
+    COMM_CMD_FIELD_110,
+    COMM_CMD_FIELD_111,
+    COMM_CMD_FIELD_112,
+    COMM_CMD_FIELD_113,
+    COMM_CMD_FIELD_114,
+    COMM_CMD_FIELD_115,
+    COMM_CMD_FIELD_116,
+    COMM_CMD_FIELD_117,
+    COMM_CMD_FIELD_118,
+    COMM_CMD_FIELD_119,
+    COMM_CMD_FIELD_120,
+    COMM_CMD_FIELD_121,
+    COMM_CMD_FIELD_122,
+    COMM_CMD_FIELD_123,
+    COMM_CMD_FIELD_124,
+    COMM_CMD_FIELD_125,
+    COMM_CMD_FIELD_126,
+    COMM_CMD_FIELD_127,
+    COMM_CMD_FIELD_128,
+    COMM_CMD_FIELD_129,
+    COMM_CMD_FIELD_130,
+    COMM_CMD_FIELD_131,
+    COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE,
+    COMM_CMD_FIELD_133,
+    COMM_CMD_FIELD_134,
+};
+
 // Communication Commands used for Battle
 enum CommCommand_Battle {
     COMM_CMD_BATTLE_22 = COMM_CMD_MAX_COMMON,
@@ -115,6 +232,7 @@ enum CommCommand_PoffinCooking {
     COMM_CMD_POFFIN_30,
     COMM_CMD_POFFIN_31,
     COMM_CMD_POFFIN_32,
+    COMM_CMD_MAX_POFFIN,
 };
 
 // Communication Commands used for Mime Jr. Top minigame
diff --git a/include/field_comm_manager.h b/include/field_comm_manager.h
index 32da513ce3d..c76b8b956a8 100644
--- a/include/field_comm_manager.h
+++ b/include/field_comm_manager.h
@@ -40,9 +40,9 @@ void FieldCommManager_ReconnectBattleClient(void);
 void FieldCommManager_EnterBattleRoom(FieldSystem *fieldSystem);
 void FieldCommManager_EndBattleNoSync(void);
 void FieldCommManager_EndBattleSync(void);
-void FieldCommManager_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3);
+void CommCmd_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3);
 BOOL FieldCommManager_IsInMovementState(void);
-void FieldCommManager_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3);
+void CommCmd_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3);
 u8 *FieldCommManager_GetTrainerCase(int netId, void *unused1, int unused2);
 SecretBase *FieldCommManager_GetCurrentOccupiedSecretBase(SaveData *saveData);
 void FieldCommManager_PauseUndergroundResources(void);
diff --git a/include/overlay083/ov83_0223D150.h b/include/overlay083/ov83_0223D150.h
index b58630c6589..b85152c5854 100644
--- a/include/overlay083/ov83_0223D150.h
+++ b/include/overlay083/ov83_0223D150.h
@@ -8,16 +8,16 @@
 void ov83_0223D150(UnkStruct_ov83_0223B784 *param0, TrainerInfo *param1);
 void ov83_0223D1EC(UnkStruct_ov83_0223B784 *param0);
 void CommCmd_Poffin_22(int param0, int param1, void *param2, void *param3);
-void ov83_0223D210(int param0, int param1, void *param2, void *param3);
-void ov83_0223D21C(int param0, int param1, void *param2, void *param3);
-void ov83_0223D258(int param0, int param1, void *param2, void *param3);
-void ov83_0223D2E8(int param0, int param1, void *param2, void *param3);
-void ov83_0223D354(int param0, int param1, void *param2, void *param3);
-void ov83_0223D3A8(int param0, int param1, void *param2, void *param3);
-void ov83_0223D3D8(int param0, int param1, void *param2, void *param3);
-void ov83_0223D3F8(int param0, int param1, void *param2, void *param3);
-void ov83_0223D410(int param0, int param1, void *param2, void *param3);
-void ov83_0223D430(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_23(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_24(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_25(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_26(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_31(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_32(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_27(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_28(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_29(int param0, int param1, void *param2, void *param3);
+void CommCmd_Poffin_30(int param0, int param1, void *param2, void *param3);
 int ov83_0223D4AC(void);
 int ov83_0223D4B0(void);
 int ov83_0223D4B4(void);
diff --git a/include/underground/manager.h b/include/underground/manager.h
index ef9406d5f4d..08858cdcdfb 100644
--- a/include/underground/manager.h
+++ b/include/underground/manager.h
@@ -81,9 +81,9 @@ BOOL UndergroundMan_FormatCommonStringWith2TrainerNames(TrainerInfo *trainerInfo
 BOOL UndergroundMan_FormatCommonStringWithTrainerName(TrainerInfo *trainerInfo, int index, int bankEntry, String *dest);
 BOOL UndergroundMan_AreCoordinatesOccupied(int x, int z);
 BOOL UndergroundMan_CheckForTouchInput(void);
-void UndergroundMan_ProcessTouchInput(int netID, int unused1, void *data, void *unused3);
-void UndergroundMan_ProcessTouchRadarTrapResults(int unused0, int size, void *data, void *unused3);
-void UndergroundMan_ProcessTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3);
+void CommCmd_UndergroundTouchInput(int netID, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundTouchRadarTrapResults(int unused0, int size, void *data, void *unused3);
+void CommCmd_UndergroundTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3);
 int UndergroundMan_CalcCoordsIndexGet(CoordinatesU16 *coordinates);
 int UndergroundMan_CalcCoordsIndexInsert(CoordinatesU16 *coordinates);
 void UndergroundMan_InitCoordsOrderingState(int orderedArrayLength, GetCoordinatesFunc getCoordsFunc);
@@ -91,7 +91,7 @@ void UndergroundMan_OpenMenu(void);
 void UndergroundMan_ProgressInteractCooldown(void);
 void UndergroundMan_ProcessInteract(u8 flags);
 int CommPacketSizeOf_InteractEvent(void);
-void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *unused3);
 void UndergroundMan_Process(void);
 void UndergroundMan_InitAllResources(FieldSystem *fieldSystem);
 void UndergroundMan_PauseResources(void);
@@ -119,14 +119,14 @@ void UndergroundMan_SetStoredPosKey(u16 menuKey);
 void UndergroundMan_StoreCursorAndListPos(u16 menuKey, u16 cursorPos, u16 listPos);
 u16 UndergroundMan_GetStoredListPos(u16 menuKey);
 u16 UndergroundMan_GetStoredCursorPos(u16 menuKey);
-void UndergroundMan_ProcessVendorTalkRequest(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_VendorTalkRequest(int unused0, int unused1, void *data, void *unused3);
 void UndergroundMan_SetCurrentSysTask(void *ctx, SysTask *sysTask, EndSysTaskFunc endFunc);
 void UndergroundMan_ClearCurrentSysTaskInfo(void);
 BOOL UndergroundMan_ForceEndCurrentSysTask(void);
 BOOL UndergroundMan_ShouldFieldSystemBeResumed(int netID);
 void UndergroundMan_SendPlayerState(void);
-void UndergroundMan_ProcessPlayerState(int netID, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundPlayerState(int netID, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_UndergroundPlayerState(void);
-void UndergroundMan_ProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_UndergroundProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3);
 
 #endif // POKEPLATINUM_UNDERGROUND_MANAGER_H
diff --git a/include/underground/mining.h b/include/underground/mining.h
index c85e794f5bb..9ffa8804f35 100644
--- a/include/underground/mining.h
+++ b/include/underground/mining.h
@@ -17,13 +17,13 @@ void MiningEnv_Free(void);
 BOOL Mining_CheckForMiningSpotInteract(int netID, CoordinatesU16 *coordinates);
 void Mining_SpawnMiningSpotNearBuriedSphere(int buriedSphereX, int buriedSphereZ, MATHRandContext16 *rand);
 void Mining_SendRadarResults(void);
-void Mining_ProcessMiningSpotInteract(int unused0, int unused1, void *data, void *unused3);
-void Mining_ProcessConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3);
-void Mining_ProcessStartMiningConfirm(int unused0, int unused1, void *data, void *unused3);
-void Mining_ProcessMiningGameEnd(int netID, int unused1, void *unused2, void *unused3);
-void Mining_ProcessLinkInput(int netID, int unused1, void *data, void *unused3);
+void CommCmd_InteractMiningSpot(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_ConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3);
+void CommCmd_ConfirmStartMining(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_EndMiningGame(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_MiningLinkInput(int netID, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_MiningLinkInput(void);
-void Mining_ProcessLinkInputServer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_MiningLinkInputServer(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_MiningLinkInputWithNetID(void);
 BOOL Mining_IsMiningSpotAtCoordinates(int x, int z);
 int NormalRadar_GetXCoordOfMiningSpot(int radarIndex);
@@ -32,8 +32,8 @@ int TreasureRadar_GetXCoordOfMiningSpot(int radarIndex);
 int TreasureRadar_GetZCoordOfMiningSpot(int radarIndex);
 void TreasureRadar_Start(void);
 void TreasureRadar_Exit(void);
-void Mining_ProcessTreasureRadarStart(int netID, int unused1, void *unused2, void *unused3);
-void Mining_ProcessMiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_StartTreasureRadar(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_MiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_MiningSpotRadarResult(void);
 BOOL Mining_GetQueuedMessage(String *dest);
 void Mining_ClearMessageQueue(void);
diff --git a/include/underground/pc.h b/include/underground/pc.h
index 35b0e883005..08445777e0a 100644
--- a/include/underground/pc.h
+++ b/include/underground/pc.h
@@ -8,9 +8,9 @@
 
 int UndergroundPC_GetPCOwnerNetIDAtCoordinates(CoordinatesU16 *coordinates, int dir);
 BOOL UndergroundPC_TryUsePC(int netID, CoordinatesU16 *coordinates);
-void UndergroundPC_ProcessPCInteraction(int unused0, int unused1, void *data, void *data2);
+void CommCmd_IntreactUndergroundPC(int unused0, int unused1, void *data, void *data2);
 int CommPacketSizeOf_PCInteraction(void);
-void UndergroundPC_ProcessTakeFlagAttempt(int unused0, int unused1, void *data, void *unused3);
-void UndergroundPC_ProcessTakenFlag(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_AttemptUndergroundTakeFlag(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundTakenFlag(int unused0, int unused1, void *data, void *unused3);
 
 #endif // POKEPLATINUM_UNDERGROUND_PC_H
diff --git a/include/underground/player.h b/include/underground/player.h
index 281f97def27..57bb1bcb53d 100644
--- a/include/underground/player.h
+++ b/include/underground/player.h
@@ -22,27 +22,27 @@ enum FlagEventType {
 };
 
 void UndergroundPlayer_DeleteAllPlayers(void);
-void UndergroundPlayer_ProcessOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3);
-void UndergroundPlayer_ProcessOpenMenuEvent(int unused0, int unused1, void *data, void *unused3);
-void UndergroundPlayer_ProcessTalkEvent(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_UndergroundOpenMenuEvent(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundTalkEvent(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_FlagEvent(void);
-void UndergroundPlayer_ProcessFlagEventType(int netID, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundFlagEventType(int netID, int unused1, void *data, void *unused3);
 BOOL UndergroundPlayer_TalkHeldFlagCheck(int netID, int targetNetID, BOOL blockInteraction);
 BOOL UndergroundPlayer_BuriedObjectHeldFlagCheck(int netID);
-void UndergroundPlayer_ProcessFlagEvent(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundFlagEvent(int unused0, int unused1, void *data, void *unused3);
 void UndergroundPlayer_ClearHeldFlagInfo(void);
 u8 *UndergroundPlayer_GetHeldFlagInfoBuffer(int unused0, void *unused1, int unused2);
 void UndergroundPlayer_SendHeldFlagOwnerInfo(void);
 int CommPacketSizeOf_TrainerInfo(void);
-void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3);
-void UndergroundPlayer_ProcessHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_HeldFlagInfo(void);
-void UndergroundPlayer_ProcessHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3);
 BOOL UndergroundPlayer_HaveLinksReceivedHeldFlagData(void);
 void UndergroundPlayer_ResetHeldFlagInfo(void);
 BOOL UndergroundPlayer_IsAffectedByTrap(int netID);
-void UndergroundPlayer_ProcessVendorTalk(int netID, int unused1, void *unused2, void *unused3);
-void UndergroundPlayer_ProcessVendorTalkServer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundVendorTalk(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_UndergroundVendorTalkServer(int unused0, int unused1, void *data, void *unused3);
 int UndergroundPlayer_GetXPos(int netID);
 int UndergroundPlayer_GetZPos(int netID);
 void UndergroundPlayer_UpdateStatus(int netID, int status);
diff --git a/include/underground/player_talk.h b/include/underground/player_talk.h
index d25198c1a26..516f5c7fa0b 100644
--- a/include/underground/player_talk.h
+++ b/include/underground/player_talk.h
@@ -7,16 +7,16 @@ typedef void (*ExitCallback)(int);
 
 void UndergroundTalk_Start(int linkNetID, ExitCallback exitCallback, FieldSystem *fieldSystem);
 void UndergroundTalkResponse_Start(int unused, int linkNetID, FieldSystem *fieldSystem);
-void UndergroundTalk_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3);
-void UndergroundTalkResponse_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3);
-void UndergroundTalkResponse_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3);
-void UndergroundTalk_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3);
+void CommCmd_RequestUndergroundTalkStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_RequestUndergroundTalkResponseStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundTalkResponseStateUpdateServer(int unused0, int size, void *data, void *unused3);
+void CommCmd_UndergroundTalkStateUpdateServer(int unused0, int size, void *data, void *unused3);
 int CommPacketSizeOf_TalkStateChangeRequest(void);
-void UndergroundTalk_SendGiftServer(int unused0, int unused1, void *data, void *unused3);
-void UndergroundTalkResponse_ReceiveGiftOffer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundSendGiftServer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundRecvGiftOffer(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_Gift(void);
-void UndergroundTalk_SendTalkMessageServer(int unused0, int unused1, void *data, void *unused3);
-void UndergroundTalk_ReceiveTalkMessage(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_SendUndergroundTalkMessageServer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_RecvUndergroundTalkMessage(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_TalkMessage(void);
 void UndergroundTalk_ExitConversation(void);
 
diff --git a/include/underground/records.h b/include/underground/records.h
index a717746308b..53687add9d3 100644
--- a/include/underground/records.h
+++ b/include/underground/records.h
@@ -23,8 +23,8 @@ int RecordsEnv_Size(void);
 void UndergroundRecords_ShowTrainerCase(BgConfig *bgConfig, TrainerInfo *trainerInfo, ExitRecordScreenCallback exitCallback, void *exitCallbackArg, BOOL isCurrentTrainer);
 void UndergroundRecords_SendRecord(int targetNetID);
 void UndergroundRecords_RetrieveTrainerScore(void);
-void UndergroundRecords_SendRecordServer(int unused0, int size, void *data, void *unused3);
-void UndergroundRecords_ProcessLinkRecord(int unused0, int size, void *data, void *unused3);
+void CommCmd_SendUndergroundRecordServer(int unused0, int size, void *data, void *unused3);
+void CommCmd_UndergroundRecord(int unused0, int size, void *data, void *unused3);
 BOOL UndergroundRecords_IsLinkRecordReceived(void);
 void UndergroundRecords_ClearLinkRecordReceived(void);
 void UndergroundRecords_PrintEntryForDecoration(UndergroundRecord *undergroundRecord, int bankEntry);
diff --git a/include/underground/secret_bases.h b/include/underground/secret_bases.h
index ce90c1a051e..8e6da5ddd6c 100644
--- a/include/underground/secret_bases.h
+++ b/include/underground/secret_bases.h
@@ -32,30 +32,30 @@ void SecretBases_ClearAllBaseInfo(void);
 int SecretBasesEnv_Size(void);
 void SecretBases_ClearBaseEntranceData(int netID);
 void SecretBases_RemoveEntrance(int netID);
-void SecretBases_ProcessBaseTransitionPromptEvent(int unused0, int unused1, void *data, void *unused3);
-void SecretBases_ProcessFailedBaseEnter(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_SecretBaseTransitionPrompt(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_FailedSecretBaseEnter(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_BaseTransitionPromptEvent(void);
-void SecretBases_ProcessBaseTransitionEvent(int netID, int unused1, void *data, void *unused3);
+void CommCmd_SecretBaseTransitionEvent(int netID, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_BaseTransitionEvent(void);
 BOOL SecretBases_CheckForEnterExit(int netID, int x, int z);
 int CommPacketSizeOf_BaseExitEvent(void);
-void SecretBases_ProcessBaseExitEvent(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_SecretBaseExit(int unused0, int unused1, void *data, void *unused3);
 void SecretBases_RequestClearTransitioningStatus(void);
-void SecretBases_ClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_SecretBaseClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3);
 BOOL SecretBases_IsPlayerMidBaseTransition(int netID);
 void SecretBases_SendBaseInfo(void);
 void SecretBases_SendEnteredBase(int baseOwnerNetID);
-void SecretBases_ProcessBaseEnter(int unused0, int unused1, void *data, void *unused3);
-void SecretBases_ProcessBaseInfo(int netID, int unused1, void *data, void *unused3);
+void CommCmd_EnterSecretBase(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_SecretBaseInfo(int netID, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_SecretBaseInfo(void);
 BOOL SecretBases_HaveLinksReceivedBaseData(void);
 void SecretBases_ClearLinksReceivedBaseData(void);
-void SecretBases_ProcessBaseEntrancesBuffer(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_SecretBaseEntranceBuffer(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_BaseEntrancesBuffer(void);
 void SecretBases_UseDiggerDrill(void);
 int CommPacketSizeOf_SecretBaseCreateEvent(void);
-void SecretBases_ProcessBaseCreateRequest(int netID, int unused1, void *data, void *unused3);
-void SecretBases_ProcessBaseCreateEvent(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_CreateSecretBaseRequest(int netID, int unused1, void *data, void *unused3);
+void CommCmd_CreateSecretBaseEvent(int unused0, int unused1, void *data, void *unused3);
 BOOL SecretBases_GetQueuedMessage(String *dest);
 SecretBase *SecretBases_GetCurrentOccupiedBase(SaveData *saveData);
 int SecretBases_GetBaseXCoordinate(void);
@@ -66,13 +66,13 @@ void SecretBases_EraseBaseDecorationMessageBox(void);
 void SecretBases_SetGoodNameForPrinter(enum Good goodID);
 void SecretBases_SetTwoDigitNumberWithIndexForPrinter(int num, int index);
 BOOL SecretBases_CheckForInteractableGood(int netID, CoordinatesU16 *coordinates);
-void SecretBases_ProcessGoodInteractionEvent(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_SecretBaseGoodInteraction(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_GoodInteractionEvent(void);
 void SecretBases_QueueObtainedFlagMessage(int netID, int flagOwnerNetID);
 void SecretBases_QueueTookFlagMessage(int netID, int victimNetID);
 void SecretBases_QueueTookBackFlagMessage(int netID);
-void SecretBases_ProcessFlagRankUp(int netID, int unused1, void *data, void *unused3);
-void SecretBases_ProcessFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundFlagRankUp(int netID, int unused1, void *data, void *unused3);
+void CommCmd_UndergroundFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_FlagRankUpEvent(void);
 BOOL SecretBases_CheckPlayerTriggeredTool(int netID);
 BOOL SecretBases_ClearToolEffectFlag(int netID);
diff --git a/include/underground/spheres.h b/include/underground/spheres.h
index c3361276784..3e346c0ad65 100644
--- a/include/underground/spheres.h
+++ b/include/underground/spheres.h
@@ -21,7 +21,7 @@ void Spheres_DisableBuriedSphereSparkles(void);
 void Spheres_EnableBuriedSphereSparkles(void);
 void SpheresEnv_Free(void);
 void Spheres_AdvanceBuriedSphereSparkleTimer(void);
-void Spheres_ProcessRetrieveBuriedSphereRequest(int unused, int unused2, void *src, void *unused3);
+void CommCmd_RetrieveBuriedSpheresRequest(int unused, int unused2, void *src, void *unused3);
 void TouchRadarSearch_Init(TouchRadarSearchContext *ctx, int radius);
 BOOL TouchRadarSearch_GetNextCoords(TouchRadarSearchContext *ctx, CoordinatesS16 *out);
 void Spheres_TryBurySphere(enum SphereType sphereType, int sphereSize, int x, int z);
diff --git a/include/underground/traps.h b/include/underground/traps.h
index 8c4b98f68b2..7ecf0eab40f 100644
--- a/include/underground/traps.h
+++ b/include/underground/traps.h
@@ -23,49 +23,49 @@ int CommPacketSizeOf_AllTrapsPlacedPlayer(void);
 void Underground_SendPlacedTrap(u8 trapID);
 void Traps_SendTrapRadarResults(void);
 void Traps_SendPlacedTraps(void);
-void Traps_TryPlaceTrap(int netID, int unused1, void *data, void *unused3);
+void CommCmd_TryPlaceTrap(int netID, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_PlaceTrapResult(void);
 enum Trap Traps_SpawnRandomTrap(int x, int z, MATHRandContext16 *rand, int index);
 void Traps_LoadSpawnedTraps(void);
-void Traps_ProcessPlaceTrapResult(int unused0, int unused1, void *data, void *unused3);
-void Traps_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_PlaceTrapResult(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_RemoveBuriedTrapAtIndex(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_2Bytes_Unused(void);
-void Traps_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3);
-void Traps_ReceiveLoadTrapsResult(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_LoadPlacedTraps(int netID, int size, void *data, void *unused3);
+void CommCmd_RecvLoadTraps(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_LoadTrapsResult(void);
 BOOL Traps_HaveLinksReceivedPlacedTraps(void);
 void Traps_ClearLinksReceivedPlacedTraps(void);
 int CommPacketSizeOf_CoordinatesU16(void);
 BOOL Traps_TryDisengageTrap(int netID, CoordinatesU16 *unused, u8 flags);
 int CommPacketSizeOf_TriggeredTrap(void);
-void Traps_ProcessDisengagedTrap(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_DisengagedTrap(int unused0, int unused1, void *data, void *unused3);
 BOOL Traps_IsTrapAtCoordinates(int x, int z);
 int CommPacketSizeOf_TriggeredTrap2(void);
 void Traps_HandleTriggeredTool(int victimNetID, int setterNetID, enum Trap trapID, int x, int z, int victimDir);
 BOOL Traps_CheckPlayerSteppedOnTrap(int netID);
 BOOL Traps_HasPlayerTriggeredTool(int netID);
-void Traps_HandleTriggeredTrap(int unused0, int unused1, void *data, void *unused3);
-void Traps_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3);
-void Traps_StartLinkSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_TriggeredTraps(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3);
+void CommCmd_StartSlideAnimation(int unused0, int unused1, void *data, void *unused3);
 void Traps_SendTriggeredTrapBits(void);
-void Traps_ProcessTriggeredTrapBits(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_TriggeredTrapBits(int unused0, int unused1, void *data, void *unused3);
 BOOL Traps_GetQueuedMessage(String *dest);
 BOOL Traps_GetQueuedMessage2(String *dest);
 void Traps_ForceEndCurrentTrapEffectClient(int netID, BOOL allowToolStepBack);
 int CommPacketSizeOf_EscapedTrap(void);
-void Traps_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3);
-void Traps_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3);
-void Traps_ProcessEscapedTrap(int unused0, int unused1, void *data, void *unused3);
-void Traps_EscapeHole(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_EscapedTrap(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_EscapeHole(int unused0, int unused1, void *data, void *unused3);
 void Traps_HelpLink(int netID, int linkNetID);
-void Traps_ProcessTrapHelp(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_TrapHelp(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_TrapHelpData(void);
 int TrapRadar_GetXCoordOfBuriedTrap(int radarIndex);
 int TrapRadar_GetZCoordOfBuriedTrap(int radarIndex);
 void TrapRadar_Start(void);
 void TrapRadar_Exit(void);
-void Traps_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3);
-void Traps_ReceiveTrapRadarResults(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_SendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_RecvTrapRadarResults(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_TrapRadarResult(void);
 void Traps_Dummy2(BgConfig *bgConfig);
 void TouchRadar_StartTask(FieldSystem *fieldSystem, int touchedTileX, int touchedTileZ, int touchX, int touchY, u8 *trapResults, int trapResultCount, u8 *miningSpotResults, int miningSpotResultCount, u8 *buriedSphereResults, int buriedSphereResultCount);
diff --git a/include/unk_0204FA34.h b/include/unk_0204FA34.h
index c988aae71ae..67fbae29cae 100644
--- a/include/unk_0204FA34.h
+++ b/include/unk_0204FA34.h
@@ -14,7 +14,7 @@ typedef struct BattleHallSameSpeciesCheck {
     u16 *speciesAreDifferent;
 } BattleHallSameSpeciesCheck;
 
-void BattleHall_ProcessSelectedSpeciesMsg(int netID, int unused, void *data, void *context);
+void CommCmd_BattleHallSelectedSpeciesMsg(int netID, int unused, void *data, void *context);
 void sub_0204FA50(SaveData *saveData, UnkStruct_0203026C *param1, u8 param2);
 
 #endif // POKEPLATINUM_UNK_0204FA34_H
diff --git a/include/unk_0205001C.h b/include/unk_0205001C.h
index 4ef72facf01..3f0dcec6b25 100644
--- a/include/unk_0205001C.h
+++ b/include/unk_0205001C.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_UNK_0205001C_H
 #define POKEPLATINUM_UNK_0205001C_H
 
-void sub_0205001C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_133(int param0, int param1, void *param2, void *param3);
 
 #endif // POKEPLATINUM_UNK_0205001C_H
diff --git a/include/unk_02050548.h b/include/unk_02050548.h
index dc18e264fe0..d398f8b9b4f 100644
--- a/include/unk_02050548.h
+++ b/include/unk_02050548.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_UNK_02050548_H
 #define POKEPLATINUM_UNK_02050548_H
 
-void sub_02050548(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_134(int param0, int param1, void *param2, void *param3);
 
 #endif // POKEPLATINUM_UNK_02050548_H
diff --git a/include/unk_0205A0D8.h b/include/unk_0205A0D8.h
index 2ce81515f84..8c426f1214e 100644
--- a/include/unk_0205A0D8.h
+++ b/include/unk_0205A0D8.h
@@ -5,10 +5,10 @@
 #include "functypes/funcptr_0205AB10.h"
 
 void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1);
-void sub_0205B0C0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_106(int param0, int param1, void *param2, void *param3);
 int sub_0205B0E4(void);
 u8 *sub_0205B0F4(int param0, void *param1, int param2);
-void sub_0205B110(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_107(int param0, int param1, void *param2, void *param3);
 void sub_0205B2D4(FieldSystem *fieldSystem);
 
 #endif // POKEPLATINUM_UNK_0205A0D8_H
diff --git a/include/unk_0205B33C.h b/include/unk_0205B33C.h
index 1d8702ac6f0..e4d3835b364 100644
--- a/include/unk_0205B33C.h
+++ b/include/unk_0205B33C.h
@@ -24,17 +24,17 @@ u32 sub_0205B8D8(UnkStruct_0205B43C *param0);
 u32 sub_0205B8DC(UnkStruct_0205B43C *param0);
 u32 sub_0205B91C(UnkStruct_0205B43C *param0);
 void sub_0205B930(UnkStruct_0205B43C *param0, int param1, u32 param2);
-void sub_0205B988(int param0, int param1, void *param2, void *param3);
-void sub_0205B98C(int param0, int param1, void *param2, void *param3);
-void sub_0205B990(int param0, int param1, void *param2, void *param3);
-void sub_0205B9AC(int param0, int param1, void *param2, void *param3);
-void sub_0205B9C4(int param0, int param1, void *param2, void *param3);
-void sub_0205B9E0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_98(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_100(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_102(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_99(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_103(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_104(int param0, int param1, void *param2, void *param3);
 int sub_0205B9E8(UnkStruct_0205B43C *param0);
 int sub_0205B9EC(UnkStruct_0205B43C *param0, int param1);
-void sub_0205BA08(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_105(int param0, int param1, void *param2, void *param3);
 u8 *sub_0205BA5C(int param0, void *param1, int param2);
-void sub_0205BA6C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_101(int param0, int param1, void *param2, void *param3);
 u16 sub_0205BA7C(UnkStruct_0205B43C *param0);
 void sub_0205BAAC(int param0);
 int UnionRoom_GetTrainerCasePlayerMessage(StringTemplate *strTemplate);
diff --git a/include/unk_02099500.h b/include/unk_02099500.h
deleted file mode 100644
index c9ce90b9fd0..00000000000
--- a/include/unk_02099500.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef POKEPLATINUM_UNK_02099500_H
-#define POKEPLATINUM_UNK_02099500_H
-
-void sub_02099510(int param0, int param1, void *param2, void *param3);
-void CommFieldCmd_Init(void *param0);
-int sub_02099530(void);
-int sub_02099538(void);
-int sub_02099540(void);
-int sub_02099544(void);
-
-#endif // POKEPLATINUM_UNK_02099500_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 37ef02fd565..a82cb6e7167 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -345,7 +345,7 @@ Static main
 	Object main.nef.p/src_rowan_intro_app_template.c.o
 	Object main.nef.p/src_applications_poffin_case_main.c.o
 	Object main.nef.p/src_poffin_sprite.c.o
-	Object main.nef.p/src_unk_02099500.c.o
+	Object main.nef.p/src_comm_command_field.c.o
 	Object main.nef.p/src_wifi_overlays.c.o
 	Object main.nef.p/src_unk_02099604.c.o
 	Object main.nef.p/src_unk_020996D0.c.o
diff --git a/src/comm_command_field.c b/src/comm_command_field.c
new file mode 100644
index 00000000000..e3e1f9f6adb
--- /dev/null
+++ b/src/comm_command_field.c
@@ -0,0 +1,212 @@
+#include "comm_command_field.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "constants/communication/comm_command.h"
+
+#include "struct_defs/comm_cmd_table.h"
+
+#include "underground/manager.h"
+#include "underground/mining.h"
+#include "underground/pc.h"
+#include "underground/player.h"
+#include "underground/player_talk.h"
+#include "underground/records.h"
+#include "underground/secret_bases.h"
+#include "underground/spheres.h"
+#include "underground/traps.h"
+
+#include "comm_command.h"
+#include "comm_player_manager.h"
+#include "field_comm_manager.h"
+#include "trainer_case.h"
+#include "trainer_info.h"
+#include "unk_0204FA34.h"
+#include "unk_0205001C.h"
+#include "unk_02050548.h"
+#include "unk_0205A0D8.h"
+#include "unk_0205B33C.h"
+
+static int CommPacketSizeOf_TrainerCase(void);
+static int sub_02099548(void);
+static int sub_0209954C(void);
+
+static int CommPacketSizeOf_3Bytes_Unused(void)
+{
+    return 3;
+}
+
+static int sub_02099504(void)
+{
+    return 24;
+}
+
+static int sub_02099508(void)
+{
+    return 236 * 6 + 4 * 2;
+}
+
+// clang-format off
+static const CommCmdTable Unk_020F68A4[] = {
+    [COMM_CMD_RECV_PLAYER_LOCATION - COMM_CMD_MAX_COMMON] = { CommCmd_RecvPlayerLocation, CommPacketSizeOf_RecvLocation, NULL },
+    [COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT - COMM_CMD_MAX_COMMON] = { CommCmd_RecvPlayerLocationAndInit, CommPacketSizeOf_RecvLocationAndInit, NULL },
+    [COMM_CMD_VENDOR_TALK_REQUEST - COMM_CMD_MAX_COMMON] = { CommCmd_VendorTalkRequest, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_VENDOR_TALK - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundVendorTalk, CommPacketSizeOf_Nothing, NULL }, // 25
+    [COMM_CMD_VENDOR_TALK_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundVendorTalkServer, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_OPEN_MENU_REQUEST - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundOpenMenuRequest, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_INTERACT_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundInteractEvent, CommPacketSizeOf_InteractEvent, NULL },
+    [COMM_CMD_OPEN_MENU_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundOpenMenuEvent, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_TALK_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTalkEvent, CommPacketSizeOf_Variable, NULL }, // 30
+    [COMM_CMD_PROCESS_ALL_DATA_SENT_MSG - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundProcessAllDataSentMessage, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_TRY_PLACE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_TryPlaceTrap, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_REMOVE_BURIED_TRAP_INDEX - COMM_CMD_MAX_COMMON] = { CommCmd_RemoveBuriedTrapAtIndex, CommPacketSizeOf_2Bytes_Unused, NULL }, // corresponding cmd never sent
+    [COMM_CMD_PLACE_TRAP_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_PlaceTrapResult, CommPacketSizeOf_PlaceTrapResult, NULL },
+    [COMM_CMD_LOAD_LINK_TRAPS - COMM_CMD_MAX_COMMON] = { CommCmd_LoadPlacedTraps, CommPacketSizeOf_AllTrapsPlacedPlayer, NULL }, // 35
+    [COMM_CMD_RECV_LOAD_TRAPS - COMM_CMD_MAX_COMMON] = { CommCmd_RecvLoadTraps, CommPacketSizeOf_LoadTrapsResult, NULL },
+    [COMM_CMD_TRIGGER_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_TriggeredTraps, CommPacketSizeOf_TriggeredTrap2, NULL },
+    [COMM_CMD_CALL_SECOND_TRAP_EFFECT - COMM_CMD_MAX_COMMON] = { CommCmd_CallSecondTrapEffectServerFunc, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_START_SLIDE_ANIM - COMM_CMD_MAX_COMMON] = { CommCmd_StartSlideAnimation, CommPacketSizeOf_3Bytes_Unused, NULL }, // corresponding cmd never sent
+    [COMM_CMD_ESCAPE_HOLE - COMM_CMD_MAX_COMMON] = { CommCmd_EscapeHole, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_ESCAPE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_EscapeTrapServer, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_ESCAPED_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_EscapedTrap, CommPacketSizeOf_EscapedTrap, NULL },
+    [COMM_CMD_END_TRAP_EFFECT - COMM_CMD_MAX_COMMON] = { CommCmd_EndCurrentTrapEffectServer, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_TRAP_HELP - COMM_CMD_MAX_COMMON] = { CommCmd_TrapHelp, CommPacketSizeOf_TrapHelpData, NULL },
+    [COMM_CMD_TRIGGERD_TRAP_BITS - COMM_CMD_MAX_COMMON] = { CommCmd_TriggeredTrapBits, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_SEND_TRAP_RADAR_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_SendTrapRadarResults, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_RECV_TRAP_RADAR_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_RecvTrapRadarResults, CommPacketSizeOf_TrapRadarResult, NULL },
+    [COMM_CMD_UNDERGROUND_TOUCH_INPUT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchInput, CommPacketSizeOf_CoordinatesU16, NULL },
+    [COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchRadarTrapResults, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchRadarMiningSpotResults, CommPacketSizeOf_Variable, NULL }, // 50
+    [COMM_CMD_DISENGAGE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_DisengagedTrap, CommPacketSizeOf_TriggeredTrap, NULL },
+    [COMM_CMD_DELETE_PLAYER - COMM_CMD_MAX_COMMON] = { CommCmd_DeletePlayer, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_BASE_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseInfo, CommPacketSizeOf_SecretBaseInfo, NULL },
+    [COMM_CMD_ENTER_BASE - COMM_CMD_MAX_COMMON] = { CommCmd_EnterSecretBase, CommPacketSizeOf_SecretBaseInfo, NULL },
+    [COMM_CMD_BASE_ENTRANCE_BUFFER - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseEntranceBuffer, CommPacketSizeOf_BaseEntrancesBuffer, NULL }, // 55
+    [COMM_CMD_CLEAR_TRANSITION_STATUS - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseClearTransitioningStatus, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_EXIT_BASE - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseExit, CommPacketSizeOf_BaseExitEvent, NULL },
+    [COMM_CMD_BASE_TRANSMITION_PROMPT - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseTransitionPrompt, CommPacketSizeOf_BaseTransitionPromptEvent, NULL },
+    [COMM_CMD_BASE_TRANSITION_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseTransitionEvent, CommPacketSizeOf_BaseTransitionEvent, NULL },
+    [COMM_CMD_SECRET_BASE_GOOD_INTERACTION - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseGoodInteraction, CommPacketSizeOf_GoodInteractionEvent, NULL }, // 60
+    [COMM_CMD_ENTER_BASE_FAILED - COMM_CMD_MAX_COMMON] = { CommCmd_FailedSecretBaseEnter, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_62 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_62, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_RETRIEVE_BURIED_SPHERES - COMM_CMD_MAX_COMMON] = { CommCmd_RetrieveBuriedSpheresRequest, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_INTERACT_MINING_SPOT - COMM_CMD_MAX_COMMON] = { CommCmd_InteractMiningSpot, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_CONFIRM_START_MINING_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_ConfirmStartMiningResult, CommPacketSizeOf_NetId, NULL }, // 65
+    [COMM_CMD_CONFIRM_START_MINING - COMM_CMD_MAX_COMMON] = { CommCmd_ConfirmStartMining, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_END_MINING - COMM_CMD_MAX_COMMON] = { CommCmd_EndMiningGame, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_MINING_LINK_INPUT - COMM_CMD_MAX_COMMON] = { CommCmd_MiningLinkInput, CommPacketSizeOf_MiningLinkInput, NULL },
+    [COMM_CMD_MINING_LINK_INPUT_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_MiningLinkInputServer, CommPacketSizeOf_MiningLinkInputWithNetID, NULL },
+    [COMM_CMD_PLAYER_STATE_UNDERGROUND - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundPlayerState, CommPacketSizeOf_UndergroundPlayerState, NULL },
+    [COMM_CMD_START_TREASURE_RADAR - COMM_CMD_MAX_COMMON] = { CommCmd_StartTreasureRadar, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_MINING_SPOT_RADAR - COMM_CMD_MAX_COMMON] = { CommCmd_MiningSpotRadarResult, CommPacketSizeOf_MiningSpotRadarResult, NULL },
+    [COMM_CMD_REQUEST_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_RequestUndergroundTalkStateAndUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL },
+    [COMM_CMD_RESPONSE_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_RequestUndergroundTalkResponseStateAndUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL },
+    [COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTalkResponseStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, // 75
+    [COMM_CMD_TALK_UPDATE_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL },
+    [COMM_CMD_SEND_GIFT_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundSendGiftServer, CommPacketSizeOf_Gift, NULL },
+    [COMM_CMD_RECV_GIFT_OFFER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundRecvGiftOffer, CommPacketSizeOf_Gift, NULL },
+    [COMM_CMD_SEND_TALK_MSG_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_SendUndergroundTalkMessageServer, CommPacketSizeOf_TalkMessage, NULL },
+    [COMM_CMD_RECV_TALK_MSG_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_RecvUndergroundTalkMessage, CommPacketSizeOf_TalkMessage, NULL },
+    [COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_SendUndergroundRecordServer, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_UNDERGROUND_RECORD - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundRecord, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_UNDERGROUND_PC_INTERACT - COMM_CMD_MAX_COMMON] = { CommCmd_IntreactUndergroundPC, CommPacketSizeOf_PCInteraction, NULL }, // 83
+    [COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagEventType, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_UNDERGROUND_FLAG_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagEvent, CommPacketSizeOf_FlagEvent, NULL },
+    [COMM_CMD_CREATE_SECRET_BASE_REQUEST - COMM_CMD_MAX_COMMON] = { CommCmd_CreateSecretBaseRequest, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_CREATE_SECRET_BASE_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_CreateSecretBaseEvent, CommPacketSizeOf_SecretBaseCreateEvent, NULL },
+    [COMM_CMD_TRAINER_CASE_COPIED - COMM_CMD_MAX_COMMON] = { CommCmd_SetTrainerCaseCopiedFlag, CommPacketSizeOf_TrainerCase, FieldCommManager_GetTrainerCase },
+    [COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG - COMM_CMD_MAX_COMMON] = { CommCmd_AttemptUndergroundTakeFlag, CommPacketSizeOf_PCInteraction, NULL },
+    [COMM_CMD_UNDERGROUND_TAKEN_FLAG - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTakenFlag, CommPacketSizeOf_PCInteraction, NULL }, // 90
+    [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfo, CommPacketSizeOf_TrainerInfo, NULL },
+    [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfoServer, CommPacketSizeOf_HeldFlagInfo, UndergroundPlayer_GetHeldFlagInfoBuffer },
+    [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfoAck, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_93 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_93, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM - COMM_CMD_MAX_COMMON] = { CommCmd_UpdateBattleRoomMovement, CommPacketSizeOf_NetId, NULL }, // 95
+    [COMM_CMD_UNDERGROUND_FLAG_RANK_UP - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagRankUp, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagRankUpEvent, CommPacketSizeOf_FlagRankUpEvent, NULL },
+    [COMM_CMD_FIELD_98 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_98, TrainerInfo_Size, NULL },
+    [COMM_CMD_FIELD_99 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_99, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_100 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_100, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_101 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_101, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_102 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_102, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_103 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_103, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_104 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_104, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_105 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_105, CommPacketSizeOf_TrainerCase, sub_0205BA5C },
+    [COMM_CMD_FIELD_106 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_106, sub_0205B0E4, sub_0205B0F4 },
+    [COMM_CMD_FIELD_107 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_107, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_108 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_109 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_110 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_111 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_112 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099548, NULL },
+    [COMM_CMD_FIELD_113 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_114 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_115 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_116 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099530, NULL },
+    [COMM_CMD_FIELD_117 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_118 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099538, NULL },
+    [COMM_CMD_FIELD_119 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099540, NULL },
+    [COMM_CMD_FIELD_120 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099544, NULL },
+    [COMM_CMD_FIELD_121 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_122 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_123 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_124 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_125 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_126 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_0209954C, NULL },
+    [COMM_CMD_FIELD_127 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099504, NULL },
+    [COMM_CMD_FIELD_131 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099508, NULL },
+    [COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallSelectedSpeciesMsg, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_FIELD_133 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_133, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_FIELD_134 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_134, CommPacketSizeOf_Variable, NULL }
+};
+// clang-format on
+
+void CommCmd_Field_Dummy(int param0, int param1, void *param2, void *param3)
+{
+    return;
+}
+
+void CommFieldCmd_Init(void *param0)
+{
+    int v0 = sizeof(Unk_020F68A4) / sizeof(CommCmdTable);
+    CommCmdManager_Init(Unk_020F68A4, v0, param0);
+}
+
+static int CommPacketSizeOf_TrainerCase(void)
+{
+    return sizeof(TrainerCase);
+}
+
+int sub_02099530(void)
+{
+    return 3000 + 8;
+}
+
+int sub_02099538(void)
+{
+    return 1008;
+}
+
+int sub_02099540(void)
+{
+    return 10;
+}
+
+int sub_02099544(void)
+{
+    return 10 * 5;
+}
+
+static int sub_02099548(void)
+{
+    return 4;
+}
+
+static int sub_0209954C(void)
+{
+    return 4;
+}
diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index c6ff8fbe925..c505f05d036 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -527,7 +527,7 @@ static void sub_02057EF8(void *unused)
             }
 
             u8 netId_u8 = netId;
-            CommPlayer_RecvDelete(0, 1, &netId_u8, sCommPlayerManager->fieldSystem);
+            CommCmd_DeletePlayer(0, 1, &netId_u8, sCommPlayerManager->fieldSystem);
         }
     }
 }
@@ -562,7 +562,7 @@ static void sub_02057FF0(BOOL param0)
     }
 }
 
-void sub_02058018(int netId, int param1, void *param2, void *unused)
+void CommCmd_Field_62(int netId, int param1, void *param2, void *unused)
 {
     u8 *buffer = (u8 *)param2;
 
@@ -796,7 +796,7 @@ static void CommPlayer_Move(SysTask *unused0, void *unused1)
 
                         if (sCommPlayerManager->alteredMovementStepsLeft[netId] == 0) {
                             u8 v10 = 1;
-                            Traps_EscapeTrapServer(netId, 1, &v10, NULL);
+                            CommCmd_EscapeTrapServer(netId, 1, &v10, NULL);
                         }
                     }
                 }
@@ -805,7 +805,7 @@ static void CommPlayer_Move(SysTask *unused0, void *unused1)
     }
 }
 
-void CommPlayer_RecvLocation(int netId, int unused0, void *src, void *unused1)
+void CommCmd_RecvPlayerLocation(int netId, int unused0, void *src, void *unused1)
 {
     u8 *buffer = (u8 *)src;
     CommPlayerLocation *playerLocation;
@@ -845,7 +845,7 @@ void CommPlayer_RecvLocation(int netId, int unused0, void *src, void *unused1)
     }
 }
 
-void CommPlayer_RecvDelete(int unused0, int unused1, void *src, void *unused2)
+void CommCmd_DeletePlayer(int unused0, int unused1, void *src, void *unused2)
 {
     u8 *buffer = (u8 *)src;
     u8 netId = buffer[0];
@@ -875,7 +875,7 @@ int CommPacketSizeOf_RecvLocation(void)
     return COMM_PACKET_SIZE_LOCATION;
 }
 
-void CommPlayer_RecvLocationAndInit(int netId, int size, void *src, void *unused)
+void CommCmd_RecvPlayerLocationAndInit(int netId, int size, void *src, void *unused)
 {
     u8 *buffer = (u8 *)src;
     CommPlayerLocation *playerLocation;
@@ -1135,7 +1135,7 @@ static BOOL CommPlayer_MoveSlide(int netId, int speed)
     } else if (sCommPlayerManager->slideTilesLeft[netId] == 0) {
         u8 data = 1;
 
-        Traps_EscapeTrapServer(netId, 1, &data, NULL);
+        CommCmd_EscapeTrapServer(netId, 1, &data, NULL);
         return TRUE;
     }
 
@@ -1495,7 +1495,7 @@ BOOL sub_020590C4(void)
     return v8;
 }
 
-void sub_02059180(int netId, int unused0, void *src, void *unused3)
+void CommCmd_Field_93(int netId, int unused0, void *src, void *unused3)
 {
     u8 *buffer = src;
 
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 9d6b11ae03b..e46435ee91e 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -33,7 +33,7 @@
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_0205A0D8.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 
 static void FieldCommManager_RunTask(SysTask *task, void *unused);
 static void FieldCommManager_SetTask(FieldCommTask task, int time);
@@ -609,7 +609,7 @@ static void FieldCommTask_BattleRoomMovement(void)
  * @param message
  * @param unused3
  */
-void FieldCommManager_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3)
+void CommCmd_UpdateBattleRoomMovement(int unused0, int unused1, void *message, void *unused3)
 {
     u8 *data = message;
 
@@ -760,7 +760,7 @@ static void FieldCommTask_ReinitBattleClient(void)
  * @param unused2
  * @param unused3
  */
-void FieldCommManager_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3)
+void CommCmd_SetTrainerCaseCopiedFlag(int netId, int unused1, void *unused2, void *unused3)
 {
     sFieldCommMan->trainerCaseCopied[netId] = 1;
 }
diff --git a/src/meson.build b/src/meson.build
index 2284defb61b..70fe0ea4d1b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -327,7 +327,7 @@ pokeplatinum_c = files(
     'pokedex_data_index.c',
     'applications/poffin_case/main.c',
     'poffin_sprite.c',
-    'unk_02099500.c',
+    'comm_command_field.c',
     'wifi_overlays.c',
     'unk_02099604.c',
     'unk_020996D0.c',
diff --git a/src/overlay083/comm_command_poffin_cooking.c b/src/overlay083/comm_command_poffin_cooking.c
index 5ec98dd06df..469d79ffbc8 100644
--- a/src/overlay083/comm_command_poffin_cooking.c
+++ b/src/overlay083/comm_command_poffin_cooking.c
@@ -14,16 +14,16 @@
 // clang-format off
 static const CommCmdTable Unk_ov83_02240390[] = {
     [COMM_CMD_POFFIN_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_22, ov83_0223D4AC, NULL },
-    [COMM_CMD_POFFIN_23 - COMM_CMD_MAX_COMMON] = { ov83_0223D210, ov83_0223D4AC, NULL },
-    [COMM_CMD_POFFIN_24 - COMM_CMD_MAX_COMMON] = { ov83_0223D21C, ov83_0223D4B4, NULL },
-    [COMM_CMD_POFFIN_25 - COMM_CMD_MAX_COMMON] = { ov83_0223D258, ov83_0223D4B8, NULL },
-    [COMM_CMD_POFFIN_26 - COMM_CMD_MAX_COMMON] = { ov83_0223D2E8, ov83_0223D4BC, NULL },
-    [COMM_CMD_POFFIN_27 - COMM_CMD_MAX_COMMON] = { ov83_0223D3D8, ov83_0223D4C0, NULL },
-    [COMM_CMD_POFFIN_28 - COMM_CMD_MAX_COMMON] = { ov83_0223D3F8, Poffin_SizeOf, NULL },
-    [COMM_CMD_POFFIN_29 - COMM_CMD_MAX_COMMON] = { ov83_0223D410, ov83_0223D4B0, NULL },
-    [COMM_CMD_POFFIN_30 - COMM_CMD_MAX_COMMON] = { ov83_0223D430, ov83_0223D4B0, NULL },
-    [COMM_CMD_POFFIN_31 - COMM_CMD_MAX_COMMON] = { ov83_0223D354, ov83_0223D4C4, NULL },
-    [COMM_CMD_POFFIN_32 - COMM_CMD_MAX_COMMON] = { ov83_0223D3A8, ov83_0223D4C8, NULL }
+    [COMM_CMD_POFFIN_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_23, ov83_0223D4AC, NULL },
+    [COMM_CMD_POFFIN_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_24, ov83_0223D4B4, NULL },
+    [COMM_CMD_POFFIN_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_25, ov83_0223D4B8, NULL },
+    [COMM_CMD_POFFIN_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_26, ov83_0223D4BC, NULL },
+    [COMM_CMD_POFFIN_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_27, ov83_0223D4C0, NULL },
+    [COMM_CMD_POFFIN_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_28, Poffin_SizeOf, NULL },
+    [COMM_CMD_POFFIN_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_29, ov83_0223D4B0, NULL },
+    [COMM_CMD_POFFIN_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_30, ov83_0223D4B0, NULL },
+    [COMM_CMD_POFFIN_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_31, ov83_0223D4C4, NULL },
+    [COMM_CMD_POFFIN_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Poffin_32, ov83_0223D4C8, NULL }
 };
 // clang-format on
 
diff --git a/src/overlay083/ov83_0223D150.c b/src/overlay083/ov83_0223D150.c
index 2f44ed271e3..373466b03f9 100644
--- a/src/overlay083/ov83_0223D150.c
+++ b/src/overlay083/ov83_0223D150.c
@@ -62,13 +62,13 @@ void CommCmd_Poffin_22(int param0, int param1, void *param2, void *param3)
     ov83_0223B774(v0, 3);
 }
 
-void ov83_0223D210(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_23(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
     ov83_0223B77C(v0, 8);
 }
 
-void ov83_0223D21C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
 
@@ -77,7 +77,7 @@ void ov83_0223D21C(int param0, int param1, void *param2, void *param3)
     ov83_0223B774(v0, 5);
 }
 
-void ov83_0223D258(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_25(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
     int v1;
@@ -102,7 +102,7 @@ void ov83_0223D258(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void ov83_0223D2E8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_26(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
     UnkStruct_ov83_0223D2E8 *v1;
@@ -130,7 +130,7 @@ void ov83_0223D2E8(int param0, int param1, void *param2, void *param3)
     v0->unk_1666++;
 }
 
-void ov83_0223D354(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_31(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
     UnkStruct_ov83_0223FCE8 *v1;
@@ -154,7 +154,7 @@ void ov83_0223D354(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void ov83_0223D3A8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_32(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
 
@@ -162,7 +162,7 @@ void ov83_0223D3A8(int param0, int param1, void *param2, void *param3)
     v0->unk_165C[param0]++;
 }
 
-void ov83_0223D3D8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_27(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
 
@@ -170,13 +170,13 @@ void ov83_0223D3D8(int param0, int param1, void *param2, void *param3)
     ov83_0223B774(v0, 10);
 }
 
-void ov83_0223D3F8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_28(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
     memcpy(v0->unk_1494.unk_100, param2, param1);
 }
 
-void ov83_0223D410(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_29(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
 
@@ -184,7 +184,7 @@ void ov83_0223D410(int param0, int param1, void *param2, void *param3)
     ov83_0223B774(v0, 12);
 }
 
-void ov83_0223D430(int param0, int param1, void *param2, void *param3)
+void CommCmd_Poffin_30(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov83_0223B784 *v0 = param3;
     int v1;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 0777c2db57c..4de3bafa3cf 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -213,7 +213,7 @@
 #include "unk_0207DA28.h"
 #include "unk_02097B18.h"
 #include "unk_020985E4.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 #include "unk_02099604.h"
 #include "unk_0209ACF4.h"
 #include "unk_0209B344.h"
diff --git a/src/scrcmd_battle_hall.c b/src/scrcmd_battle_hall.c
index 42d3b8fe1ba..9ec6fe3c125 100644
--- a/src/scrcmd_battle_hall.c
+++ b/src/scrcmd_battle_hall.c
@@ -37,7 +37,7 @@
 #include "unk_02030108.h"
 #include "unk_0204FA34.h"
 #include "unk_0205DFC4.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 
 #include "constdata/const_020F410C.h"
 
diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c
index 8223b9a4a03..2dea4ff7eae 100644
--- a/src/underground/comm_manager.c
+++ b/src/underground/comm_manager.c
@@ -326,7 +326,7 @@ static void CommManUnderground_ConnectTaskClient(void)
         UndergroundMan_ForceEndCurrentSysTask();
         CommPlayer_CopyPersonal(0);
 
-        Traps_EndCurrentTrapEffectServer(0, 0, NULL, NULL);
+        CommCmd_EndCurrentTrapEffectServer(0, 0, NULL, NULL);
         Traps_ForceEndCurrentTrapEffectClient(0, TRUE);
 
         CommInfo_InitPlayer(0);
diff --git a/src/underground/manager.c b/src/underground/manager.c
index b666614e665..3158d935908 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -423,7 +423,7 @@ static void UndergroundMan_StartTouchRadar(int netID, CoordinatesU16 *touchedTil
     CommSys_SendDataServer(50, buffer, size);
 }
 
-void UndergroundMan_ProcessTouchInput(int netID, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundTouchInput(int netID, int unused1, void *data, void *unused3)
 {
     CoordinatesU16 *touchedTileCoords = data;
 
@@ -439,7 +439,7 @@ void UndergroundMan_ProcessTouchInput(int netID, int unused1, void *data, void *
     UndergroundMan_StartTouchRadar(netID, touchedTileCoords);
 }
 
-void UndergroundMan_ProcessTouchRadarTrapResults(int unused0, int size, void *data, void *unused3)
+void CommCmd_UndergroundTouchRadarTrapResults(int unused0, int size, void *data, void *unused3)
 {
     u8 *buffer = data;
 
@@ -451,7 +451,7 @@ void UndergroundMan_ProcessTouchRadarTrapResults(int unused0, int size, void *da
     sUndergroundMan->touchRadarTrapResultCount = size - 1;
 }
 
-void UndergroundMan_ProcessTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3)
+void CommCmd_UndergroundTouchRadarMiningSpotResults(int unused0, int size, void *data, void *unused3)
 {
     u8 *buffer = data;
     u8 sphereResults[MAX_TOUCH_RADAR_RESULTS_OF_TYPE + 1];
@@ -592,7 +592,7 @@ int CommPacketSizeOf_InteractEvent(void)
     return sizeof(InteractEvent);
 }
 
-void UndergroundMan_ProcessInteractEvent(int netID, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *unused3)
 {
     TalkEvent talkEvent;
     InteractEvent *event = data;
@@ -1101,7 +1101,7 @@ u16 UndergroundMan_GetStoredCursorPos(u16 menuKey)
     return 0;
 }
 
-void UndergroundMan_ProcessVendorTalkRequest(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_VendorTalkRequest(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *buffer = data;
     int netID = *buffer;
@@ -1201,7 +1201,7 @@ void UndergroundMan_SendPlayerState(void)
     CommSys_SendDataFixedSize(70, &playerState);
 }
 
-void UndergroundMan_ProcessPlayerState(int netID, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundPlayerState(int netID, int unused1, void *data, void *unused3)
 {
     UndergroundPlayerState *playerState = data;
 
@@ -1216,7 +1216,7 @@ int CommPacketSizeOf_UndergroundPlayerState(void)
     return sizeof(UndergroundPlayerState);
 }
 
-void UndergroundMan_ProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_UndergroundProcessAllDataSentMessage(int netID, int unused1, void *unused2, void *unused3)
 {
     sUndergroundMan->initialized[netID] = TRUE;
 }
diff --git a/src/underground/mining.c b/src/underground/mining.c
index 8f9cc7ff9ad..0d0ba29d88a 100644
--- a/src/underground/mining.c
+++ b/src/underground/mining.c
@@ -1104,7 +1104,7 @@ static void Mining_ForceEndConfirmStartMiningTask(SysTask *sysTask, void *data)
     SysTask_Done(sysTask);
 }
 
-void Mining_ProcessMiningSpotInteract(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_InteractMiningSpot(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *netID = data;
 
@@ -1148,7 +1148,7 @@ static void Mining_ConfirmStartMiningTask(SysTask *sysTask, void *unused)
     }
 }
 
-void Mining_ProcessConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3)
+void CommCmd_ConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3)
 {
     Underground *underground = SaveData_GetUnderground(sMiningEnv->fieldSystem->saveData);
     MiningSpot *miningSpot = sMiningEnv->currentUsedMiningSpots[netID];
@@ -1174,7 +1174,7 @@ void Mining_ProcessConfirmStartMiningResult(int netID, int unused1, void *data,
     }
 }
 
-void Mining_ProcessStartMiningConfirm(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_ConfirmStartMining(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *netID = data;
 
@@ -1186,13 +1186,13 @@ void Mining_ProcessStartMiningConfirm(int unused0, int unused1, void *data, void
     sMiningEnv->miningMessagesQueued[*netID] = TRUE;
 }
 
-void Mining_ProcessMiningGameEnd(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_EndMiningGame(int netID, int unused1, void *unused2, void *unused3)
 {
     sMiningEnv->isPlayerMining[netID] = FALSE;
     sMiningEnv->normalRadarTimer[netID] = 0;
 }
 
-void Mining_ProcessLinkInput(int netID, int unused1, void *data, void *unused3)
+void CommCmd_MiningLinkInput(int netID, int unused1, void *data, void *unused3)
 {
     MiningLinkInput *linkInput = data;
     MiningLinkInputWithNetID linkInputWithNetID;
@@ -1209,7 +1209,7 @@ int CommPacketSizeOf_MiningLinkInput(void)
     return sizeof(MiningLinkInput);
 }
 
-void Mining_ProcessLinkInputServer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_MiningLinkInputServer(int unused0, int unused1, void *data, void *unused3)
 {
     MiningLinkInputWithNetID *linkInput = data;
 
@@ -2998,7 +2998,7 @@ void TreasureRadar_Exit(void)
     }
 }
 
-void Mining_ProcessTreasureRadarStart(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_StartTreasureRadar(int netID, int unused1, void *unused2, void *unused3)
 {
     sMiningEnv->treasureRadarIndex[netID] = 1;
 }
@@ -3035,7 +3035,7 @@ static void Mining_SendTreasureRadarResults(void)
     }
 }
 
-void Mining_ProcessMiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_MiningSpotRadarResult(int unused0, int unused1, void *data, void *unused3)
 {
     MiningSpotRadarResult *radarResult = data;
 
diff --git a/src/underground/pc.c b/src/underground/pc.c
index 325ea106b90..7f532f8bdc8 100644
--- a/src/underground/pc.c
+++ b/src/underground/pc.c
@@ -200,7 +200,7 @@ BOOL UndergroundPC_TryUsePC(int netID, CoordinatesU16 *coordinates)
         } else {
             if (UndergroundPlayer_IsHoldingFlag(netID)) {
                 u8 flagEventType = FLAG_EVENT_REGISTER;
-                UndergroundPlayer_ProcessFlagEventType(netID, 1, &flagEventType, NULL);
+                CommCmd_UndergroundFlagEventType(netID, 1, &flagEventType, NULL);
                 return TRUE;
             }
         }
@@ -217,7 +217,7 @@ static void UndergroundPC_ResumeFieldSystem(int unused)
     CommPlayerMan_ResumeFieldSystemWithContextBit(PAUSE_BIT_LINK_PC);
 }
 
-void UndergroundPC_ProcessPCInteraction(int unused0, int unused1, void *data, void *data2)
+void CommCmd_IntreactUndergroundPC(int unused0, int unused1, void *data, void *data2)
 {
     PCInteraction *pcInteraction = data;
     FieldSystem *fieldSystem = data2;
@@ -925,7 +925,7 @@ static void UndergroundPC_StartTakeFlagPromptTask(FieldSystem *fieldSystem, PCIn
     UndergroundMan_SetCurrentSysTask(ctx, ctx->sysTask, UndergroundPC_EndFlagPromptTask);
 }
 
-void UndergroundPC_ProcessTakeFlagAttempt(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_AttemptUndergroundTakeFlag(int unused0, int unused1, void *data, void *unused3)
 {
     PCInteraction *pcInteraction = data;
 
@@ -934,7 +934,7 @@ void UndergroundPC_ProcessTakeFlagAttempt(int unused0, int unused1, void *data,
     }
 }
 
-void UndergroundPC_ProcessTakenFlag(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundTakenFlag(int unused0, int unused1, void *data, void *unused3)
 {
     PCInteraction *pcInteraction = data;
 
diff --git a/src/underground/player.c b/src/underground/player.c
index d578ba7250c..057ddc21cde 100644
--- a/src/underground/player.c
+++ b/src/underground/player.c
@@ -161,7 +161,7 @@ static void UndergroundPlayer_CloseMenuCallback(int unused)
     }
 }
 
-void UndergroundPlayer_ProcessOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_UndergroundOpenMenuRequest(int netID, int unused1, void *unused2, void *unused3)
 {
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
 
@@ -184,7 +184,7 @@ void UndergroundPlayer_ProcessOpenMenuRequest(int netID, int unused1, void *unus
     }
 }
 
-void UndergroundPlayer_ProcessOpenMenuEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundOpenMenuEvent(int unused0, int unused1, void *data, void *unused3)
 {
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
     OpenMenuEvent *event = data;
@@ -207,7 +207,7 @@ void UndergroundPlayer_ProcessOpenMenuEvent(int unused0, int unused1, void *data
     }
 }
 
-void UndergroundPlayer_ProcessTalkEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundTalkEvent(int unused0, int unused1, void *data, void *unused3)
 {
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
     TalkEvent *event = data;
@@ -260,7 +260,7 @@ int CommPacketSizeOf_FlagEvent(void)
     return sizeof(FlagEvent);
 }
 
-void UndergroundPlayer_ProcessFlagEventType(int netID, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundFlagEventType(int netID, int unused1, void *data, void *unused3)
 {
     u8 *flagEventType = data;
     FlagEvent event;
@@ -395,7 +395,7 @@ static void UndergroundPlayer_HandleCurrentPlayerLosingFlag(FlagEvent *event, BO
     Sound_PlayEffect(SEQ_SE_DP_CARD10);
 }
 
-void UndergroundPlayer_ProcessFlagEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundFlagEvent(int unused0, int unused1, void *data, void *unused3)
 {
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
     FlagEvent *event = data;
@@ -552,7 +552,7 @@ int CommPacketSizeOf_TrainerInfo(void)
     return sizeof(TrainerInfo);
 }
 
-void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void *data, void *unused3)
 {
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
     const TrainerInfo *flagOwnerInfo = data;
@@ -583,7 +583,7 @@ void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1,
     }
 }
 
-void UndergroundPlayer_ProcessHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundHeldFlagOwnerInfoServer(int unused0, int unused1, void *data, void *unused3)
 {
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
     HeldFlagInfo *heldFlagInfo = data;
@@ -606,7 +606,7 @@ int CommPacketSizeOf_HeldFlagInfo(void)
     return sizeof(HeldFlagInfo);
 }
 
-void UndergroundPlayer_ProcessHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundHeldFlagOwnerInfoAck(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *netID = data;
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
@@ -663,13 +663,13 @@ BOOL UndergroundPlayer_IsAffectedByTrap(int netID)
     return FALSE;
 }
 
-void UndergroundPlayer_ProcessVendorTalk(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_UndergroundVendorTalk(int netID, int unused1, void *unused2, void *unused3)
 {
     u8 data = netID;
     CommSys_SendDataFixedSizeServer(26, &data);
 }
 
-void UndergroundPlayer_ProcessVendorTalkServer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundVendorTalkServer(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *netID = data;
     UndergroundMan_QueueTalkedToVendorMessage(*netID);
diff --git a/src/underground/player_talk.c b/src/underground/player_talk.c
index 59b098a0f85..eadba947bd6 100644
--- a/src/underground/player_talk.c
+++ b/src/underground/player_talk.c
@@ -1339,17 +1339,17 @@ void UndergroundTalkResponse_Start(int unused, int linkNetID, FieldSystem *field
     menu->sysTask = SysTask_Start(UndergroundTalkResponse_Main, menu, 10000);
 }
 
-void UndergroundTalk_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RequestUndergroundTalkStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3)
 {
     CommSys_SendDataFixedSizeServer(75, data);
 }
 
-void UndergroundTalkResponse_RequestLinkTalkStateUpdateServer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RequestUndergroundTalkResponseStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3)
 {
     CommSys_SendDataFixedSizeServer(76, data);
 }
 
-void UndergroundTalkResponse_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3)
+void CommCmd_UndergroundTalkResponseStateUpdateServer(int unused0, int size, void *data, void *unused3)
 {
     TalkStateChangeRequest *req = data;
 
@@ -1359,7 +1359,7 @@ void UndergroundTalkResponse_HandleLinkTalkStateUpdateServer(int unused0, int si
     }
 }
 
-void UndergroundTalk_HandleLinkTalkStateUpdateServer(int unused0, int size, void *data, void *unused3)
+void CommCmd_UndergroundTalkStateUpdateServer(int unused0, int size, void *data, void *unused3)
 {
     TalkStateChangeRequest *req = data;
 
@@ -1376,12 +1376,12 @@ int CommPacketSizeOf_TalkStateChangeRequest(void)
     return sizeof(TalkStateChangeRequest);
 }
 
-void UndergroundTalk_SendGiftServer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundSendGiftServer(int unused0, int unused1, void *data, void *unused3)
 {
     CommSys_SendDataFixedSizeServer(78, data);
 }
 
-void UndergroundTalkResponse_ReceiveGiftOffer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundRecvGiftOffer(int unused0, int unused1, void *data, void *unused3)
 {
     ResponseMenu *menu = sCurrentResponseMenu;
     Gift *gift = data;
@@ -1412,12 +1412,12 @@ int CommPacketSizeOf_Gift(void)
     return sizeof(Gift);
 }
 
-void UndergroundTalk_SendTalkMessageServer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_SendUndergroundTalkMessageServer(int unused0, int unused1, void *data, void *unused3)
 {
     CommSys_SendDataFixedSizeServer(80, data);
 }
 
-void UndergroundTalk_ReceiveTalkMessage(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RecvUndergroundTalkMessage(int unused0, int unused1, void *data, void *unused3)
 {
     ResponseMenu *responseMenu = sCurrentResponseMenu;
     TalkMenu *talkMenu = sCurrentTalkMenu;
diff --git a/src/underground/records.c b/src/underground/records.c
index 3e3880e80f0..8408699ae57 100644
--- a/src/underground/records.c
+++ b/src/underground/records.c
@@ -264,12 +264,12 @@ void UndergroundRecords_RetrieveTrainerScore(void)
     UndergroundRecord_SetTrainerScore(recordsEnv->record, trainerScore);
 }
 
-void UndergroundRecords_SendRecordServer(int unused0, int size, void *data, void *unused3)
+void CommCmd_SendUndergroundRecordServer(int unused0, int size, void *data, void *unused3)
 {
     CommSys_SendDataServer(82, data, size);
 }
 
-void UndergroundRecords_ProcessLinkRecord(int unused0, int size, void *data, void *unused3)
+void CommCmd_UndergroundRecord(int unused0, int size, void *data, void *unused3)
 {
     RecordBuffer *buffer = data;
 
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index be6ebd1a976..f3ff1db1a8b 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -653,7 +653,7 @@ static int SecretBases_GetEntranceOwnerNetIDFromCoords(int x, int z)
     return NETID_NONE;
 }
 
-void SecretBases_ProcessBaseTransitionPromptEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_SecretBaseTransitionPrompt(int unused0, int unused1, void *data, void *unused3)
 {
     BaseTransitionPromptEvent *event = data;
 
@@ -672,7 +672,7 @@ void SecretBases_ProcessBaseTransitionPromptEvent(int unused0, int unused1, void
     }
 }
 
-void SecretBases_ProcessFailedBaseEnter(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_FailedSecretBaseEnter(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *netID = data;
 
@@ -689,7 +689,7 @@ int CommPacketSizeOf_BaseTransitionPromptEvent(void)
     return sizeof(BaseTransitionPromptEvent);
 }
 
-void SecretBases_ProcessBaseTransitionEvent(int netID, int unused1, void *data, void *unused3)
+void CommCmd_SecretBaseTransitionEvent(int netID, int unused1, void *data, void *unused3)
 {
     BaseTransitionEvent *event = data;
     u8 buffer = netID;
@@ -1265,7 +1265,7 @@ int CommPacketSizeOf_BaseExitEvent(void)
     return sizeof(BaseExitEvent);
 }
 
-void SecretBases_ProcessBaseExitEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_SecretBaseExit(int unused0, int unused1, void *data, void *unused3)
 {
     BaseExitEvent *event = data;
 
@@ -1294,7 +1294,7 @@ void SecretBases_RequestClearTransitioningStatus(void)
     CommSys_SendMessage(56);
 }
 
-void SecretBases_ClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_SecretBaseClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3)
 {
     secretBasesEnv->baseTransitioningOwnerNetIDs[netID] = NETID_NONE;
     secretBasesEnv->baseEnteringOwnerNetIDs[netID] = NETID_NONE;
@@ -1336,7 +1336,7 @@ void SecretBases_SendEnteredBase(int baseOwnerNetID)
     CommSys_WriteToQueueServer(54, &secretBasesEnv->baseInfo[baseOwnerNetID], sizeof(SecretBaseInfo));
 }
 
-void SecretBases_ProcessBaseEnter(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_EnterSecretBase(int unused0, int unused1, void *data, void *unused3)
 {
     SecretBaseInfo *baseInfo = data;
 
@@ -1389,7 +1389,7 @@ void SecretBases_ProcessBaseEnter(int unused0, int unused1, void *data, void *un
     }
 }
 
-void SecretBases_ProcessBaseInfo(int netID, int unused1, void *data, void *unused3)
+void CommCmd_SecretBaseInfo(int netID, int unused1, void *data, void *unused3)
 {
     u8 *info = data;
     if (!secretBasesEnv) {
@@ -1448,7 +1448,7 @@ static void SecretBases_SendBaseEntrancesBuffer(void)
     CommSys_WriteToQueueServer(55, &secretBasesEnv->baseEntrancesBuffer, sizeof(secretBasesEnv->baseEntrancesBuffer));
 }
 
-void SecretBases_ProcessBaseEntrancesBuffer(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_SecretBaseEntranceBuffer(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *baseEntrancesBuffer = (u8 *)data;
     BaseEntrance temp;
@@ -1924,7 +1924,7 @@ int CommPacketSizeOf_SecretBaseCreateEvent(void)
     return sizeof(SecretBaseCreateEvent);
 }
 
-void SecretBases_ProcessBaseCreateRequest(int netID, int unused1, void *data, void *unused3)
+void CommCmd_CreateSecretBaseRequest(int netID, int unused1, void *data, void *unused3)
 {
     u8 *type = data;
     int x = CommPlayer_GetXInFrontOfPlayerServer(netID);
@@ -2019,7 +2019,7 @@ static void SecretBases_StartDiggerDrillTask(void)
     UndergroundMan_SetCurrentSysTask(ctx, ctx->sysTask, SecretBases_EndDiggerDrillTask);
 }
 
-void SecretBases_ProcessBaseCreateEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_CreateSecretBaseEvent(int unused0, int unused1, void *data, void *unused3)
 {
     SecretBaseCreateEvent *event = data;
     UndergroundRecord *undergroundRecord = SaveData_GetUndergroundRecord(FieldSystem_GetSaveData(secretBasesEnv->fieldSystem));
@@ -2330,7 +2330,7 @@ BOOL SecretBases_CheckForInteractableGood(int netID, CoordinatesU16 *coordinates
     return FALSE;
 }
 
-void SecretBases_ProcessGoodInteractionEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_SecretBaseGoodInteraction(int unused0, int unused1, void *data, void *unused3)
 {
     GoodInteractionEvent *event = data;
     SecretBase *secretBase = (SecretBase *)secretBasesEnv->currentOccupiedBaseInfo->secretBase;
@@ -2424,7 +2424,7 @@ static void SecretBases_FlagRankUpTask(SysTask *sysTask, void *data)
     }
 }
 
-void SecretBases_ProcessFlagRankUp(int netID, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundFlagRankUp(int netID, int unused1, void *data, void *unused3)
 {
     u8 *prevFlagRank = data;
 
@@ -2436,7 +2436,7 @@ void SecretBases_ProcessFlagRankUp(int netID, int unused1, void *data, void *unu
     CommSys_SendDataFixedSizeServer(97, &event);
 }
 
-void SecretBases_ProcessFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_UndergroundFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3)
 {
     FlagRankUpEvent *event = data;
 
diff --git a/src/underground/spheres.c b/src/underground/spheres.c
index 3834e5188af..d489de57f38 100644
--- a/src/underground/spheres.c
+++ b/src/underground/spheres.c
@@ -238,7 +238,7 @@ static BuriedSphere *Spheres_GetBuriedSphereAtCoordinates(int x, int z)
     return spheresEnv->buriedSpheresByCoordinates[index];
 }
 
-void Spheres_ProcessRetrieveBuriedSphereRequest(int unused, int unused2, void *data, void *unused3)
+void CommCmd_RetrieveBuriedSpheresRequest(int unused, int unused2, void *data, void *unused3)
 {
     u8 *netID = data;
     int curNetID = CommSys_CurNetId();
diff --git a/src/underground/traps.c b/src/underground/traps.c
index 01aebdfada0..0e4f4868ca6 100644
--- a/src/underground/traps.c
+++ b/src/underground/traps.c
@@ -1172,7 +1172,7 @@ void Traps_SendPlacedTraps(void)
     CommSys_WriteToQueue(35, &trapsEnv->playerPlacedTraps[0], sizeof(BuriedTrap) * MAX_PLACED_TRAPS);
 }
 
-void Traps_TryPlaceTrap(int netID, int unused1, void *data, void *unused3)
+void CommCmd_TryPlaceTrap(int netID, int unused1, void *data, void *unused3)
 {
     u8 *trapID = (u8 *)data;
 
@@ -1377,7 +1377,7 @@ static void Traps_RemovePlacedTrapCurrentPlayer(BuriedTrap *trap)
     trapsEnv->trapTextureManager[MAX_PLACED_TRAPS - 1] = NULL;
 }
 
-void Traps_ProcessPlaceTrapResult(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_PlaceTrapResult(int unused0, int unused1, void *data, void *unused3)
 {
     PlaceTrapResult *placeResult = (PlaceTrapResult *)data;
 
@@ -1404,7 +1404,7 @@ void Traps_ProcessPlaceTrapResult(int unused0, int unused1, void *data, void *un
     }
 }
 
-void Traps_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RemoveBuriedTrapAtIndex(int unused0, int unused1, void *data, void *unused3)
 {
     u16 *buffer = data;
     int index = buffer[0];
@@ -1417,7 +1417,7 @@ int CommPacketSizeOf_2Bytes_Unused(void)
     return 2;
 }
 
-void Traps_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3)
+void CommCmd_LoadPlacedTraps(int netID, int size, void *data, void *unused3)
 {
     BuriedTrap *trapPtr = &trapsEnv->buriedTraps[netID * MAX_PLACED_TRAPS];
 
@@ -1450,7 +1450,7 @@ void Traps_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3)
     Traps_SendTriggeredTrapBits();
 }
 
-void Traps_ReceiveLoadTrapsResult(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RecvLoadTraps(int unused0, int unused1, void *data, void *unused3)
 {
     LoadTrapsResult *result = data;
 
@@ -1525,7 +1525,7 @@ int CommPacketSizeOf_TriggeredTrap(void)
     return sizeof(TriggeredTrap);
 }
 
-void Traps_ProcessDisengagedTrap(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_DisengagedTrap(int unused0, int unused1, void *data, void *unused3)
 {
     TriggeredTrap *retrievedTrap = (TriggeredTrap *)data;
 
@@ -1695,7 +1695,7 @@ BOOL Traps_HasPlayerTriggeredTool(int netID)
     return trapsEnv->triggeredTraps[netID].isTool;
 }
 
-void Traps_HandleTriggeredTrap(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_TriggeredTraps(int unused0, int unused1, void *data, void *unused3)
 {
     TriggeredTrap *trap = (TriggeredTrap *)data;
 
@@ -1751,7 +1751,7 @@ void Traps_HandleTriggeredTrap(int unused0, int unused1, void *data, void *unuse
     }
 }
 
-void Traps_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3)
+void CommCmd_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3)
 {
     u8 *trapID = data;
     TrapServerFunc trapEffectFunc = sTrapEffectServerSecondFuncs[*trapID];
@@ -1766,7 +1766,7 @@ void Traps_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, vo
     }
 }
 
-void Traps_StartLinkSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_StartSlideAnimation(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *buffer = data;
 
@@ -1790,7 +1790,7 @@ void Traps_SendTriggeredTrapBits(void)
     }
 }
 
-void Traps_ProcessTriggeredTrapBits(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_TriggeredTrapBits(int unused0, int unused1, void *data, void *unused3)
 {
     u8 bits = *(u8 *)data;
 
@@ -2564,7 +2564,7 @@ int CommPacketSizeOf_EscapedTrap(void)
     return sizeof(EscapedTrap);
 }
 
-void Traps_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3)
 {
     if (UndergroundPlayer_IsAffectedByTrap(netID)) {
         UndergroundPlayer_RevertStatusToNormal(netID);
@@ -2582,7 +2582,7 @@ void Traps_EscapeTrapServer(int netID, int unused1, void *unused2, void *unused3
     trapsEnv->triggeredTrapIDs[netID] = TRAP_NONE;
 }
 
-void Traps_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, void *unused3)
 {
     UndergroundPlayer_RevertStatusToNormal(netID);
 
@@ -2596,7 +2596,7 @@ void Traps_EndCurrentTrapEffectServer(int netID, int unused1, void *unused2, voi
     SecretBases_ClearToolEffectFlag(netID);
 }
 
-void Traps_ProcessEscapedTrap(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_EscapedTrap(int unused0, int unused1, void *data, void *unused3)
 {
     EscapedTrap *escapedTrap = data;
     enum Trap trapID = escapedTrap->trapID;
@@ -2636,7 +2636,7 @@ void Traps_ProcessEscapedTrap(int unused0, int unused1, void *data, void *unused
     }
 }
 
-void Traps_EscapeHole(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_EscapeHole(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *netID = data;
     enum Trap trapID = trapsEnv->triggeredTrapIDClient;
@@ -2661,7 +2661,7 @@ void Traps_HelpLink(int netID, int linkNetID)
     CommPlayerMan_SetMovementEnabled(netID, FALSE);
 }
 
-void Traps_ProcessTrapHelp(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_TrapHelp(int unused0, int unused1, void *data, void *unused3)
 {
     TrapHelpData *helpdata = data;
     UndergroundRecord *undergroundRecord = SaveData_GetUndergroundRecord(FieldSystem_GetSaveData(trapsEnv->fieldSystem));
@@ -2773,7 +2773,7 @@ void TrapRadar_Exit(void)
     }
 }
 
-void Traps_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_SendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3)
 {
     trapsEnv->trapRadarIndex[netID] = 1;
 }
@@ -2817,7 +2817,7 @@ static void SendTrapRadarResults(void)
     }
 }
 
-void Traps_ReceiveTrapRadarResults(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RecvTrapRadarResults(int unused0, int unused1, void *data, void *unused3)
 {
     TrapRadarResult *radarResult = data;
 
diff --git a/src/unk_0204FA34.c b/src/unk_0204FA34.c
index 595b1871e98..7745904a5f6 100644
--- a/src/unk_0204FA34.c
+++ b/src/unk_0204FA34.c
@@ -12,7 +12,7 @@
 #include "unk_02030108.h"
 #include "unk_0205DFC4.h"
 
-void BattleHall_ProcessSelectedSpeciesMsg(int netID, int unused, void *data, void *context)
+void CommCmd_BattleHallSelectedSpeciesMsg(int netID, int unused, void *data, void *context)
 {
     BattleHallSameSpeciesCheck *myData = context;
     const BattleHallSameSpeciesCheck *partnersData = data;
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index f3d635b466e..0d6620ad6d6 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -32,7 +32,7 @@
 #include "unk_020302D0.h"
 #include "unk_02049D08.h"
 #include "unk_0205DFC4.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 
 #include "constdata/const_020F410C.h"
 
diff --git a/src/unk_0205001C.c b/src/unk_0205001C.c
index bb7fae404ca..1f07db728e9 100644
--- a/src/unk_0205001C.c
+++ b/src/unk_0205001C.c
@@ -7,9 +7,9 @@
 
 #include "communication_system.h"
 
-void sub_0205001C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_133(int param0, int param1, void *param2, void *param3);
 
-void sub_0205001C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_133(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     UnkStruct_0204FCF8 *v2 = param3;
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index a7c9976824c..c70608d175e 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -32,7 +32,7 @@
 #include "unk_02030494.h"
 #include "unk_02049D08.h"
 #include "unk_0205DFC4.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 
 #include "constdata/const_020F410C.h"
 
diff --git a/src/unk_02050548.c b/src/unk_02050548.c
index abf6c436e72..000dfafacd7 100644
--- a/src/unk_02050548.c
+++ b/src/unk_02050548.c
@@ -7,9 +7,9 @@
 
 #include "communication_system.h"
 
-void sub_02050548(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_134(int param0, int param1, void *param2, void *param3);
 
-void sub_02050548(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_134(int param0, int param1, void *param2, void *param3)
 {
     int v0, v1;
     UnkStruct_02050224 *v2 = param3;
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index f8c6da7bdb5..84b9df21f32 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -963,7 +963,7 @@ static void sub_0205B0B4(UnkStruct_0205A0D8 *param0)
     Window_EraseStandardFrame(param0->unk_7C, 1);
 }
 
-void sub_0205B0C0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_106(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0205A0D8 *v0 = sub_0205AC74(param3);
 
@@ -988,7 +988,7 @@ u8 *sub_0205B0F4(int param0, void *param1, int param2)
     }
 }
 
-void sub_0205B110(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_107(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0205A0D8 *v0 = sub_0205AC74(param3);
 
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index 33ac9b0aefc..de3292a7095 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -36,7 +36,7 @@
 #include "unk_02014D38.h"
 #include "unk_02033200.h"
 #include "unk_02095E98.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 
 #include "constdata/const_020ED570.h"
 #include "res/text/bank/country_names.h"
@@ -623,17 +623,17 @@ void sub_0205B930(UnkStruct_0205B43C *param0, int param1, u32 param2)
     }
 }
 
-void sub_0205B988(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_98(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_0205B98C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_100(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_0205B990(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_102(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
 
@@ -643,7 +643,7 @@ void sub_0205B990(int param0, int param1, void *param2, void *param3)
 
 static int Unk_021C0858;
 
-void sub_0205B9AC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_99(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
     u8 *v1 = (u8 *)param2;
@@ -654,7 +654,7 @@ void sub_0205B9AC(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_0205B9C4(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_103(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
     u8 *v1 = (u8 *)param2;
@@ -667,7 +667,7 @@ void sub_0205B9C4(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_0205B9E0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_104(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
 
@@ -689,7 +689,7 @@ int sub_0205B9EC(UnkStruct_0205B43C *param0, int param1)
     return 0;
 }
 
-void sub_0205BA08(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_105(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
     TrainerCase *trainerCase = (TrainerCase *)param2;
@@ -719,7 +719,7 @@ u8 *sub_0205BA5C(int param0, void *param1, int param2)
     return (u8 *)v1->unk_188[param0];
 }
 
-void sub_0205BA6C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_101(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
     UnkStruct_0205B43C *v1 = fieldSystem->unk_7C;
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index ba7c2a3242a..b359d10a2a6 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -15,7 +15,7 @@
 #include "comm_command.h"
 #include "comm_manager.h"
 #include "communication_system.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 #include "wireless_manager.h"
 
 typedef struct UnkStruct_02095EAC_t UnkStruct_02095EAC;
@@ -27,102 +27,102 @@ static void sub_0209617C(UnkStruct_02095EAC *param0, int param1);
 static void sub_02096170(int param0, int param1, void *param2, void *param3);
 
 static const CommCmdTable Unk_020F5A40[] = {
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, sub_020961E0, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, sub_020961E0, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     { sub_02095EAC, sub_02099538, sub_020961D0 },
     { sub_02095F40, sub_02099540 },
     { sub_02095F68, sub_02099544 },
@@ -135,8 +135,8 @@ static const CommCmdTable Unk_020F5A40[] = {
     { sub_02096114, CommPacketSizeOf_Nothing },
     { sub_0209612C, CommPacketSizeOf_Nothing },
     { sub_02096170, CommPacketSizeOf_Nothing },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL }
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }
 };
 
 void sub_02095E98(void *param0)
diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c
index 6490a53a981..38585fe1d4c 100644
--- a/src/unk_020961E8.c
+++ b/src/unk_020961E8.c
@@ -15,7 +15,7 @@
 #include "communication_system.h"
 #include "math_util.h"
 #include "sound_playback.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 #include "wireless_manager.h"
 
 typedef struct UnkStruct_020961E8_t UnkStruct_020961E8;
@@ -29,92 +29,92 @@ void sub_020961FC(int param0, int param1, void *param2, void *param3);
 void sub_0209620C(int param0, int param1, void *param2, void *param3);
 
 static const CommCmdTable Unk_020F5F68[] = {
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
     { sub_02096380, sub_02096404 },
     { sub_02096384, sub_02096404 },
     { sub_02096360, sub_02096404 },
@@ -125,20 +125,20 @@ static const CommCmdTable Unk_020F5F68[] = {
     { sub_0209621C, sub_02096400 },
     { sub_020961FC, sub_02099530, sub_0209640C },
     { sub_0209620C, sub_02096404 },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL },
-    { sub_02099510, sub_02096400, NULL }
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL },
+    { CommCmd_Field_Dummy, sub_02096400, NULL }
 };
 
 void sub_020961E8(void *param0)
diff --git a/src/unk_02099500.c b/src/unk_02099500.c
deleted file mode 100644
index 4d73be89c30..00000000000
--- a/src/unk_02099500.c
+++ /dev/null
@@ -1,208 +0,0 @@
-#include "unk_02099500.h"
-
-#include <nitro.h>
-#include <string.h>
-
-#include "struct_defs/comm_cmd_table.h"
-
-#include "underground/manager.h"
-#include "underground/mining.h"
-#include "underground/pc.h"
-#include "underground/player.h"
-#include "underground/player_talk.h"
-#include "underground/records.h"
-#include "underground/secret_bases.h"
-#include "underground/spheres.h"
-#include "underground/traps.h"
-
-#include "comm_command.h"
-#include "comm_player_manager.h"
-#include "field_comm_manager.h"
-#include "trainer_case.h"
-#include "trainer_info.h"
-#include "unk_0204FA34.h"
-#include "unk_0205001C.h"
-#include "unk_02050548.h"
-#include "unk_0205A0D8.h"
-#include "unk_0205B33C.h"
-
-static int CommPacketSizeOf_TrainerCase(void);
-static int sub_02099548(void);
-static int sub_0209954C(void);
-
-static int CommPacketSizeOf_3Bytes_Unused(void)
-{
-    return 3;
-}
-
-static int sub_02099504(void)
-{
-    return 24;
-}
-
-static int sub_02099508(void)
-{
-    return 236 * 6 + 4 * 2;
-}
-
-static const CommCmdTable Unk_020F68A4[] = {
-    { CommPlayer_RecvLocation, CommPacketSizeOf_RecvLocation, NULL },
-    { CommPlayer_RecvLocationAndInit, CommPacketSizeOf_RecvLocationAndInit, NULL },
-    { UndergroundMan_ProcessVendorTalkRequest, CommPacketSizeOf_NetId, NULL },
-    { UndergroundPlayer_ProcessVendorTalk, CommPacketSizeOf_Nothing, NULL }, // 25
-    { UndergroundPlayer_ProcessVendorTalkServer, CommPacketSizeOf_NetId, NULL },
-    { UndergroundPlayer_ProcessOpenMenuRequest, CommPacketSizeOf_Nothing, NULL },
-    { UndergroundMan_ProcessInteractEvent, CommPacketSizeOf_InteractEvent, NULL },
-    { UndergroundPlayer_ProcessOpenMenuEvent, CommPacketSizeOf_Variable, NULL },
-    { UndergroundPlayer_ProcessTalkEvent, CommPacketSizeOf_Variable, NULL }, // 30
-    { UndergroundMan_ProcessAllDataSentMessage, CommPacketSizeOf_Nothing, NULL },
-    { Traps_TryPlaceTrap, CommPacketSizeOf_NetId, NULL },
-    { Traps_RemoveBuriedTrapAtIndex_Unused, CommPacketSizeOf_2Bytes_Unused, NULL }, // corresponding cmd never sent
-    { Traps_ProcessPlaceTrapResult, CommPacketSizeOf_PlaceTrapResult, NULL },
-    { Traps_LoadLinkPlacedTraps, CommPacketSizeOf_AllTrapsPlacedPlayer, NULL }, // 35
-    { Traps_ReceiveLoadTrapsResult, CommPacketSizeOf_LoadTrapsResult, NULL },
-    { Traps_HandleTriggeredTrap, CommPacketSizeOf_TriggeredTrap2, NULL },
-    { Traps_CallSecondTrapEffectServerFunc, CommPacketSizeOf_NetId, NULL },
-    { Traps_StartLinkSlideAnimation_Unused, CommPacketSizeOf_3Bytes_Unused, NULL }, // corresponding cmd never sent
-    { Traps_EscapeHole, CommPacketSizeOf_NetId, NULL },
-    { Traps_EscapeTrapServer, CommPacketSizeOf_Nothing, NULL },
-    { Traps_ProcessEscapedTrap, CommPacketSizeOf_EscapedTrap, NULL },
-    { Traps_EndCurrentTrapEffectServer, CommPacketSizeOf_Nothing, NULL },
-    { Traps_ProcessTrapHelp, CommPacketSizeOf_TrapHelpData, NULL },
-    { Traps_ProcessTriggeredTrapBits, CommPacketSizeOf_NetId, NULL },
-    { Traps_QueueSendTrapRadarResults, CommPacketSizeOf_Nothing, NULL },
-    { Traps_ReceiveTrapRadarResults, CommPacketSizeOf_TrapRadarResult, NULL },
-    { UndergroundMan_ProcessTouchInput, CommPacketSizeOf_CoordinatesU16, NULL },
-    { UndergroundMan_ProcessTouchRadarTrapResults, CommPacketSizeOf_Variable, NULL },
-    { UndergroundMan_ProcessTouchRadarMiningSpotResults, CommPacketSizeOf_Variable, NULL }, // 50
-    { Traps_ProcessDisengagedTrap, CommPacketSizeOf_TriggeredTrap, NULL },
-    { CommPlayer_RecvDelete, CommPacketSizeOf_NetId, NULL },
-    { SecretBases_ProcessBaseInfo, CommPacketSizeOf_SecretBaseInfo, NULL },
-    { SecretBases_ProcessBaseEnter, CommPacketSizeOf_SecretBaseInfo, NULL },
-    { SecretBases_ProcessBaseEntrancesBuffer, CommPacketSizeOf_BaseEntrancesBuffer, NULL }, // 55
-    { SecretBases_ClearTransitioningStatus, CommPacketSizeOf_Nothing, NULL },
-    { SecretBases_ProcessBaseExitEvent, CommPacketSizeOf_BaseExitEvent, NULL },
-    { SecretBases_ProcessBaseTransitionPromptEvent, CommPacketSizeOf_BaseTransitionPromptEvent, NULL },
-    { SecretBases_ProcessBaseTransitionEvent, CommPacketSizeOf_BaseTransitionEvent, NULL },
-    { SecretBases_ProcessGoodInteractionEvent, CommPacketSizeOf_GoodInteractionEvent, NULL }, // 60
-    { SecretBases_ProcessFailedBaseEnter, CommPacketSizeOf_NetId, NULL },
-    { sub_02058018, CommPacketSizeOf_NetId, NULL },
-    { Spheres_ProcessRetrieveBuriedSphereRequest, CommPacketSizeOf_NetId, NULL },
-    { Mining_ProcessMiningSpotInteract, CommPacketSizeOf_NetId, NULL },
-    { Mining_ProcessConfirmStartMiningResult, CommPacketSizeOf_NetId, NULL }, // 65
-    { Mining_ProcessStartMiningConfirm, CommPacketSizeOf_NetId, NULL },
-    { Mining_ProcessMiningGameEnd, CommPacketSizeOf_NetId, NULL },
-    { Mining_ProcessLinkInput, CommPacketSizeOf_MiningLinkInput, NULL },
-    { Mining_ProcessLinkInputServer, CommPacketSizeOf_MiningLinkInputWithNetID, NULL },
-    { UndergroundMan_ProcessPlayerState, CommPacketSizeOf_UndergroundPlayerState, NULL },
-    { Mining_ProcessTreasureRadarStart, CommPacketSizeOf_Nothing, NULL },
-    { Mining_ProcessMiningSpotRadarResult, CommPacketSizeOf_MiningSpotRadarResult, NULL },
-    { UndergroundTalk_RequestLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL },
-    { UndergroundTalkResponse_RequestLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL },
-    { UndergroundTalkResponse_HandleLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL }, // 75
-    { UndergroundTalk_HandleLinkTalkStateUpdateServer, CommPacketSizeOf_TalkStateChangeRequest, NULL },
-    { UndergroundTalk_SendGiftServer, CommPacketSizeOf_Gift, NULL },
-    { UndergroundTalkResponse_ReceiveGiftOffer, CommPacketSizeOf_Gift, NULL },
-    { UndergroundTalk_SendTalkMessageServer, CommPacketSizeOf_TalkMessage, NULL },
-    { UndergroundTalk_ReceiveTalkMessage, CommPacketSizeOf_TalkMessage, NULL },
-    { UndergroundRecords_SendRecordServer, CommPacketSizeOf_Variable, NULL },
-    { UndergroundRecords_ProcessLinkRecord, CommPacketSizeOf_Variable, NULL },
-    { UndergroundPC_ProcessPCInteraction, CommPacketSizeOf_PCInteraction, NULL }, // 83
-    { UndergroundPlayer_ProcessFlagEventType, CommPacketSizeOf_NetId, NULL },
-    { UndergroundPlayer_ProcessFlagEvent, CommPacketSizeOf_FlagEvent, NULL },
-    { SecretBases_ProcessBaseCreateRequest, CommPacketSizeOf_NetId, NULL },
-    { SecretBases_ProcessBaseCreateEvent, CommPacketSizeOf_SecretBaseCreateEvent, NULL },
-    { FieldCommManager_SetTrainerCaseCopiedFlag, CommPacketSizeOf_TrainerCase, FieldCommManager_GetTrainerCase },
-    { UndergroundPC_ProcessTakeFlagAttempt, CommPacketSizeOf_PCInteraction, NULL },
-    { UndergroundPC_ProcessTakenFlag, CommPacketSizeOf_PCInteraction, NULL }, // 90
-    { UndergroundPlayer_ProcessHeldFlagOwnerInfo, CommPacketSizeOf_TrainerInfo, NULL },
-    { UndergroundPlayer_ProcessHeldFlagOwnerInfoServer, CommPacketSizeOf_HeldFlagInfo, UndergroundPlayer_GetHeldFlagInfoBuffer },
-    { UndergroundPlayer_ProcessHeldFlagOwnerInfoAck, CommPacketSizeOf_NetId, NULL },
-    { sub_02059180, CommPacketSizeOf_NetId, NULL },
-    { FieldCommManager_UpdateBattleRoomMovement, CommPacketSizeOf_NetId, NULL }, // 95
-    { SecretBases_ProcessFlagRankUp, CommPacketSizeOf_NetId, NULL },
-    { SecretBases_ProcessFlagRankUpEvent, CommPacketSizeOf_FlagRankUpEvent, NULL },
-    { sub_0205B988, TrainerInfo_Size, NULL },
-    { sub_0205B9AC, CommPacketSizeOf_NetId, NULL },
-    { sub_0205B98C, CommPacketSizeOf_NetId, NULL },
-    { sub_0205BA6C, CommPacketSizeOf_NetId, NULL },
-    { sub_0205B990, CommPacketSizeOf_Nothing, NULL },
-    { sub_0205B9C4, CommPacketSizeOf_NetId, NULL },
-    { sub_0205B9E0, CommPacketSizeOf_Nothing, NULL },
-    { sub_0205BA08, CommPacketSizeOf_TrainerCase, sub_0205BA5C },
-    { sub_0205B0C0, sub_0205B0E4, sub_0205B0F4 },
-    { sub_0205B110, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, sub_02099548, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, sub_02099530, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, sub_02099538, NULL },
-    { sub_02099510, sub_02099540, NULL },
-    { sub_02099510, sub_02099544, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_NetId, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, sub_0209954C, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, sub_02099504, NULL },
-    { sub_02099510, sub_02099508, NULL },
-    { BattleHall_ProcessSelectedSpeciesMsg, CommPacketSizeOf_Variable, NULL },
-    { sub_0205001C, CommPacketSizeOf_Variable, NULL },
-    { sub_02050548, CommPacketSizeOf_Variable, NULL }
-};
-
-void sub_02099510(int param0, int param1, void *param2, void *param3)
-{
-    return;
-}
-
-void CommFieldCmd_Init(void *param0)
-{
-    int v0 = sizeof(Unk_020F68A4) / sizeof(CommCmdTable);
-    CommCmdManager_Init(Unk_020F68A4, v0, param0);
-}
-
-static int CommPacketSizeOf_TrainerCase(void)
-{
-    return sizeof(TrainerCase);
-}
-
-int sub_02099530(void)
-{
-    return 3000 + 8;
-}
-
-int sub_02099538(void)
-{
-    return 1008;
-}
-
-int sub_02099540(void)
-{
-    return 10;
-}
-
-int sub_02099544(void)
-{
-    return 10 * 5;
-}
-
-static int sub_02099548(void)
-{
-    return 4;
-}
-
-static int sub_0209954C(void)
-{
-    return 4;
-}
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 36990991894..46e5498f43b 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -22,7 +22,7 @@
 #include "heap.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
-#include "unk_02099500.h"
+#include "comm_command_field.h"
 #include "wireless_manager.h"
 
 typedef struct {
@@ -358,114 +358,114 @@ void *sub_0209C188(UnkStruct_0209BDF8 *param0, int param1)
 }
 
 static const CommCmdTable Unk_020F8EA8[135] = {
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
-    { sub_02099510, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     { sub_0209BED0, sub_0209C154, NULL },
     { sub_0209BEF0, sub_0209C158, sub_0209C160 }
 };

From 30ca6a1b07da460498df383a1fc41500dc720d00 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 25 May 2026 20:06:52 -0400
Subject: [PATCH 26/39] comm_command_record_corner

---
 include/comm_command_record_corner.h          | 14 ++++++
 .../constants/communication/comm_command.h    | 23 +++++++--
 include/unk_020961E8.h                        | 14 ------
 platinum.us/main.lsf                          |  2 +-
 src/comm_command_field.c                      |  4 +-
 ...20961E8.c => comm_command_record_corner.c} | 48 ++++++++++---------
 src/meson.build                               |  2 +-
 src/overlay059/ov59_021D0D80.c                |  2 +-
 8 files changed, 64 insertions(+), 45 deletions(-)
 create mode 100644 include/comm_command_record_corner.h
 delete mode 100644 include/unk_020961E8.h
 rename src/{unk_020961E8.c => comm_command_record_corner.c} (80%)

diff --git a/include/comm_command_record_corner.h b/include/comm_command_record_corner.h
new file mode 100644
index 00000000000..41e2fa29a4e
--- /dev/null
+++ b/include/comm_command_record_corner.h
@@ -0,0 +1,14 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_RECORD_CORNER_H
+#define POKEPLATINUM_COMM_COMMAND_RECORD_CORNER_H
+
+void sub_020961E8(void *param0);
+void CommCmd_Field_RecordCorner_115(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_111(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_112(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_110(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_108(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_109(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_113(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_114(int param0, int param1, void *param2, void *param3);
+
+#endif // POKEPLATINUM_COMM_COMMAND_RECORD_CORNER_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 9a31fcc9b17..73645bf15d6 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -173,7 +173,9 @@ enum CommCommand_Field {
     COMM_CMD_FIELD_105,
     COMM_CMD_FIELD_106,
     COMM_CMD_FIELD_107,
-    COMM_CMD_FIELD_108,
+    
+    // The field Communication Command table has a dummy section that gets used by different subprocesses. 
+    COMM_CMD_FIELD_DUMMY_START, 
     COMM_CMD_FIELD_109,
     COMM_CMD_FIELD_110,
     COMM_CMD_FIELD_111,
@@ -196,10 +198,25 @@ enum CommCommand_Field {
     COMM_CMD_FIELD_128,
     COMM_CMD_FIELD_129,
     COMM_CMD_FIELD_130,
-    COMM_CMD_FIELD_131,
-    COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE,
+    COMM_CMD_FIELD_DUMMY_END, //Dummy end
+    
+    // Field Record Corner Commands
+    COMM_CMD_FIELD_RECORD_108 = COMM_CMD_FIELD_DUMMY_START,
+    COMM_CMD_FIELD_RECORD_109,
+    COMM_CMD_FIELD_RECORD_110,
+    COMM_CMD_FIELD_RECORD_111,
+    COMM_CMD_FIELD_RECORD_112,
+    COMM_CMD_FIELD_RECORD_113,
+    COMM_CMD_FIELD_RECORD_114,
+    COMM_CMD_FIELD_RECORD_115,
+    COMM_CMD_FIELD_RECORD_116,
+    COMM_CMD_FIELD_RECORD_117,
+    
+    // Remaining Field Commands
+    COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE = COMM_CMD_FIELD_DUMMY_END + 1,
     COMM_CMD_FIELD_133,
     COMM_CMD_FIELD_134,
+    COMM_CMD_MAX_FIELD
 };
 
 // Communication Commands used for Battle
diff --git a/include/unk_020961E8.h b/include/unk_020961E8.h
deleted file mode 100644
index 8e1d856d025..00000000000
--- a/include/unk_020961E8.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef POKEPLATINUM_UNK_020961E8_H
-#define POKEPLATINUM_UNK_020961E8_H
-
-void sub_020961E8(void *param0);
-void sub_0209621C(int param0, int param1, void *param2, void *param3);
-void sub_02096264(int param0, int param1, void *param2, void *param3);
-void sub_02096274(int param0, int param1, void *param2, void *param3);
-void sub_02096360(int param0, int param1, void *param2, void *param3);
-void sub_02096380(int param0, int param1, void *param2, void *param3);
-void sub_02096384(int param0, int param1, void *param2, void *param3);
-void sub_02096388(int param0, int param1, void *param2, void *param3);
-void sub_020963A0(int param0, int param1, void *param2, void *param3);
-
-#endif // POKEPLATINUM_UNK_020961E8_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index a82cb6e7167..77705f570b9 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -330,7 +330,7 @@ Static main
 	Object main.nef.p/src_unk_02095AF0.c.o
 	Object main.nef.p/src_unk_02095CD4.c.o
 	Object main.nef.p/src_unk_02095E98.c.o
-	Object main.nef.p/src_unk_020961E8.c.o
+	Object main.nef.p/src_comm_command_record_corner.c.o
 	Object main.nef.p/src_item_use_pokemon.c.o
 	Object main.nef.p/src_unk_020972FC.c.o
 	Object main.nef.p/src_berry_data.c.o
diff --git a/src/comm_command_field.c b/src/comm_command_field.c
index e3e1f9f6adb..408a84b6682 100644
--- a/src/comm_command_field.c
+++ b/src/comm_command_field.c
@@ -135,7 +135,7 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_FIELD_105 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_105, CommPacketSizeOf_TrainerCase, sub_0205BA5C },
     [COMM_CMD_FIELD_106 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_106, sub_0205B0E4, sub_0205B0F4 },
     [COMM_CMD_FIELD_107 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_107, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_108 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_DUMMY_START - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_FIELD_109 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_FIELD_110 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_FIELD_111 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
@@ -158,7 +158,7 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_FIELD_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_FIELD_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_FIELD_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099504, NULL },
-    [COMM_CMD_FIELD_131 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099508, NULL },
+    [COMM_CMD_FIELD_DUMMY_END - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099508, NULL },
     [COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallSelectedSpeciesMsg, CommPacketSizeOf_Variable, NULL },
     [COMM_CMD_FIELD_133 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_133, CommPacketSizeOf_Variable, NULL },
     [COMM_CMD_FIELD_134 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_134, CommPacketSizeOf_Variable, NULL }
diff --git a/src/unk_020961E8.c b/src/comm_command_record_corner.c
similarity index 80%
rename from src/unk_020961E8.c
rename to src/comm_command_record_corner.c
index 38585fe1d4c..42939aabb1f 100644
--- a/src/unk_020961E8.c
+++ b/src/comm_command_record_corner.c
@@ -1,8 +1,10 @@
-#include "unk_020961E8.h"
+#include "comm_command_record_corner.h"
 
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 #include "struct_defs/struct_020961E8_t.h"
 #include "struct_defs/struct_02096274.h"
@@ -25,8 +27,8 @@ static int sub_02096404(void);
 static u8 *sub_0209640C(int param0, void *param1, int param2);
 static int sub_02096408(void);
 static void sub_020963C0(UnkStruct_020961E8 *param0, int param1);
-void sub_020961FC(int param0, int param1, void *param2, void *param3);
-void sub_0209620C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_116(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_RecordCorner_117(int param0, int param1, void *param2, void *param3);
 
 static const CommCmdTable Unk_020F5F68[] = {
     { CommCmd_Field_Dummy, sub_02096400, NULL },
@@ -115,16 +117,16 @@ static const CommCmdTable Unk_020F5F68[] = {
     { CommCmd_Field_Dummy, sub_02096400, NULL },
     { CommCmd_Field_Dummy, sub_02096400, NULL },
     { CommCmd_Field_Dummy, sub_02096400, NULL },
-    { sub_02096380, sub_02096404 },
-    { sub_02096384, sub_02096404 },
-    { sub_02096360, sub_02096404 },
-    { sub_02096264, sub_02096400 },
-    { sub_02096274, sub_02096408 },
-    { sub_02096388, sub_02096400 },
-    { sub_020963A0, sub_02096400 },
-    { sub_0209621C, sub_02096400 },
-    { sub_020961FC, sub_02099530, sub_0209640C },
-    { sub_0209620C, sub_02096404 },
+    [COMM_CMD_FIELD_RECORD_108 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_108, sub_02096404 },
+    [COMM_CMD_FIELD_RECORD_109 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_109, sub_02096404 },
+    [COMM_CMD_FIELD_RECORD_110 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_110, sub_02096404 },
+    [COMM_CMD_FIELD_RECORD_111 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_111, sub_02096400 },
+    [COMM_CMD_FIELD_RECORD_112 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_112, sub_02096408 },
+    [COMM_CMD_FIELD_RECORD_113 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_113, sub_02096400 },
+    [COMM_CMD_FIELD_RECORD_114 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_114, sub_02096400 },
+    [COMM_CMD_FIELD_RECORD_115 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_115, sub_02096400 },
+    [COMM_CMD_FIELD_RECORD_116 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_116, sub_02099530, sub_0209640C },
+    [COMM_CMD_FIELD_RECORD_117 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_RecordCorner_117, sub_02096404 },
     { CommCmd_Field_Dummy, sub_02096400, NULL },
     { CommCmd_Field_Dummy, sub_02096400, NULL },
     { CommCmd_Field_Dummy, sub_02096400, NULL },
@@ -154,13 +156,13 @@ void sub_020961E8(void *param0)
     }
 }
 
-void sub_020961FC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_116(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3;
     v0->unk_4A98++;
 }
 
-void sub_0209620C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_117(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3;
     u8 *v1 = (u8 *)param2;
@@ -174,7 +176,7 @@ void sub_0209620C(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_0209621C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_115(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3;
 
@@ -190,13 +192,13 @@ void sub_0209621C(int param0, int param1, void *param2, void *param3)
     Sound_PlayEffect(SEQ_SE_DP_F209);
 }
 
-void sub_02096264(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_111(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3;
     ov59_021D2204(v0, 2, 0);
 }
 
-void sub_02096274(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_112(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3;
     UnkStruct_02096274 v1;
@@ -244,7 +246,7 @@ void sub_02096274(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02096360(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_110(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3;
     u8 v1 = *(u8 *)param2;
@@ -256,17 +258,17 @@ void sub_02096360(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02096380(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_108(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_02096384(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_109(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_02096388(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_113(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3;
 
@@ -275,7 +277,7 @@ void sub_02096388(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_020963A0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_RecordCorner_114(int param0, int param1, void *param2, void *param3)
 {
     u8 v0;
 
diff --git a/src/meson.build b/src/meson.build
index 70fe0ea4d1b..ddad15aeab0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -313,7 +313,7 @@ pokeplatinum_c = files(
     'unk_02095AF0.c',
     'unk_02095CD4.c',
     'unk_02095E98.c',
-    'unk_020961E8.c',
+    'comm_command_record_corner.c',
     'item_use_pokemon.c',
     'unk_020972FC.c',
     'berry_data.c',
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 500f481c326..1dd0e323ac0 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -54,7 +54,7 @@
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
-#include "unk_020961E8.h"
+#include "comm_command_record_corner.h"
 #include "vram_transfer.h"
 #include "wireless_manager.h"
 

From 6a441af37068b47db79d793b4019eb0a24824aa0 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 25 May 2026 22:13:00 -0400
Subject: [PATCH 27/39] comm_command_draw

---
 include/comm_command_draw.h                   | 17 ++++++
 .../constants/communication/comm_command.h    | 46 ++++++----------
 include/unk_02095E98.h                        | 17 ------
 platinum.us/main.lsf                          |  2 +-
 src/{unk_02095E98.c => comm_command_draw.c}   | 54 ++++++++++---------
 src/comm_command_field.c                      | 44 +++++++--------
 src/meson.build                               |  2 +-
 src/overlay058/ov58_021D0D80.c                |  2 +-
 src/unk_0205B33C.c                            |  2 +-
 9 files changed, 86 insertions(+), 100 deletions(-)
 create mode 100644 include/comm_command_draw.h
 delete mode 100644 include/unk_02095E98.h
 rename src/{unk_02095E98.c => comm_command_draw.c} (82%)

diff --git a/include/comm_command_draw.h b/include/comm_command_draw.h
new file mode 100644
index 00000000000..1bc27612fdc
--- /dev/null
+++ b/include/comm_command_draw.h
@@ -0,0 +1,17 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_DRAW_H
+#define POKEPLATINUM_COMM_COMMAND_DRAW_H
+
+void sub_02095E98(void *param0);
+void CommCmd_Field_Draw_118(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_119(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_120(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_124(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_126(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_125(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_123(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_121(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_122(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_127(int param0, int param1, void *param2, void *param3);
+void CommCmd_Field_Draw_128(int param0, int param1, void *param2, void *param3);
+
+#endif // POKEPLATINUM_COMM_COMMAND_DRAW_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 73645bf15d6..3400df195d7 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -173,35 +173,7 @@ enum CommCommand_Field {
     COMM_CMD_FIELD_105,
     COMM_CMD_FIELD_106,
     COMM_CMD_FIELD_107,
-    
-    // The field Communication Command table has a dummy section that gets used by different subprocesses. 
-    COMM_CMD_FIELD_DUMMY_START, 
-    COMM_CMD_FIELD_109,
-    COMM_CMD_FIELD_110,
-    COMM_CMD_FIELD_111,
-    COMM_CMD_FIELD_112,
-    COMM_CMD_FIELD_113,
-    COMM_CMD_FIELD_114,
-    COMM_CMD_FIELD_115,
-    COMM_CMD_FIELD_116,
-    COMM_CMD_FIELD_117,
-    COMM_CMD_FIELD_118,
-    COMM_CMD_FIELD_119,
-    COMM_CMD_FIELD_120,
-    COMM_CMD_FIELD_121,
-    COMM_CMD_FIELD_122,
-    COMM_CMD_FIELD_123,
-    COMM_CMD_FIELD_124,
-    COMM_CMD_FIELD_125,
-    COMM_CMD_FIELD_126,
-    COMM_CMD_FIELD_127,
-    COMM_CMD_FIELD_128,
-    COMM_CMD_FIELD_129,
-    COMM_CMD_FIELD_130,
-    COMM_CMD_FIELD_DUMMY_END, //Dummy end
-    
-    // Field Record Corner Commands
-    COMM_CMD_FIELD_RECORD_108 = COMM_CMD_FIELD_DUMMY_START,
+    COMM_CMD_FIELD_RECORD_108,
     COMM_CMD_FIELD_RECORD_109,
     COMM_CMD_FIELD_RECORD_110,
     COMM_CMD_FIELD_RECORD_111,
@@ -211,8 +183,20 @@ enum CommCommand_Field {
     COMM_CMD_FIELD_RECORD_115,
     COMM_CMD_FIELD_RECORD_116,
     COMM_CMD_FIELD_RECORD_117,
-    
-    // Remaining Field Commands
+    COMM_CMD_FIELD_DRAWING_118,
+    COMM_CMD_FIELD_DRAWING_119,
+    COMM_CMD_FIELD_DRAWING_120,
+    COMM_CMD_FIELD_DRAWING_121,
+    COMM_CMD_FIELD_DRAWING_122,
+    COMM_CMD_FIELD_DRAWING_123,
+    COMM_CMD_FIELD_DRAWING_124,
+    COMM_CMD_FIELD_DRAWING_125,
+    COMM_CMD_FIELD_DRAWING_126,
+    COMM_CMD_FIELD_DRAWING_127,
+    COMM_CMD_FIELD_DRAWING_128,
+    COMM_CMD_FIELD_DRAWING_129,
+    COMM_CMD_FIELD_130,
+    COMM_CMD_FIELD_DUMMY_END, //Dummy end
     COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE = COMM_CMD_FIELD_DUMMY_END + 1,
     COMM_CMD_FIELD_133,
     COMM_CMD_FIELD_134,
diff --git a/include/unk_02095E98.h b/include/unk_02095E98.h
deleted file mode 100644
index 37c34667199..00000000000
--- a/include/unk_02095E98.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef POKEPLATINUM_UNK_02095E98_H
-#define POKEPLATINUM_UNK_02095E98_H
-
-void sub_02095E98(void *param0);
-void sub_02095EAC(int param0, int param1, void *param2, void *param3);
-void sub_02095F40(int param0, int param1, void *param2, void *param3);
-void sub_02095F68(int param0, int param1, void *param2, void *param3);
-void sub_02095F9C(int param0, int param1, void *param2, void *param3);
-void sub_02095FE4(int param0, int param1, void *param2, void *param3);
-void sub_020960D4(int param0, int param1, void *param2, void *param3);
-void sub_020960D8(int param0, int param1, void *param2, void *param3);
-void sub_0209610C(int param0, int param1, void *param2, void *param3);
-void sub_02096110(int param0, int param1, void *param2, void *param3);
-void sub_02096114(int param0, int param1, void *param2, void *param3);
-void sub_0209612C(int param0, int param1, void *param2, void *param3);
-
-#endif // POKEPLATINUM_UNK_02095E98_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 77705f570b9..97831bb8dd9 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -329,7 +329,7 @@ Static main
 	Object main.nef.p/src_unk_02094EDC.c.o
 	Object main.nef.p/src_unk_02095AF0.c.o
 	Object main.nef.p/src_unk_02095CD4.c.o
-	Object main.nef.p/src_unk_02095E98.c.o
+	Object main.nef.p/src_comm_command_draw.c.o
 	Object main.nef.p/src_comm_command_record_corner.c.o
 	Object main.nef.p/src_item_use_pokemon.c.o
 	Object main.nef.p/src_unk_020972FC.c.o
diff --git a/src/unk_02095E98.c b/src/comm_command_draw.c
similarity index 82%
rename from src/unk_02095E98.c
rename to src/comm_command_draw.c
index b359d10a2a6..1406b272d31 100644
--- a/src/unk_02095E98.c
+++ b/src/comm_command_draw.c
@@ -1,8 +1,10 @@
-#include "unk_02095E98.h"
+#include "comm_command_draw.h"
 
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 #include "struct_defs/struct_02095EAC_sub1.h"
 #include "struct_defs/struct_02095EAC_t.h"
@@ -24,7 +26,7 @@ static u8 *sub_020961D0(int param0, void *param1, int param2);
 static int sub_020961E0(void);
 static int sub_020961E4(void);
 static void sub_0209617C(UnkStruct_02095EAC *param0, int param1);
-static void sub_02096170(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Field_Draw_129(int param0, int param1, void *param2, void *param3);
 
 static const CommCmdTable Unk_020F5A40[] = {
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
@@ -123,18 +125,18 @@ static const CommCmdTable Unk_020F5A40[] = {
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    { sub_02095EAC, sub_02099538, sub_020961D0 },
-    { sub_02095F40, sub_02099540 },
-    { sub_02095F68, sub_02099544 },
-    { sub_0209610C, CommPacketSizeOf_NetId },
-    { sub_02096110, CommPacketSizeOf_NetId },
-    { sub_020960D8, CommPacketSizeOf_NetId },
-    { sub_02095F9C, CommPacketSizeOf_Nothing },
-    { sub_020960D4, CommPacketSizeOf_Nothing },
-    { sub_02095FE4, sub_020961E4 },
-    { sub_02096114, CommPacketSizeOf_Nothing },
-    { sub_0209612C, CommPacketSizeOf_Nothing },
-    { sub_02096170, CommPacketSizeOf_Nothing },
+    [COMM_CMD_FIELD_DRAWING_118 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_118, sub_02099538, sub_020961D0 },
+    [COMM_CMD_FIELD_DRAWING_119 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_119, sub_02099540 },
+    [COMM_CMD_FIELD_DRAWING_120 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_120, sub_02099544 },
+    [COMM_CMD_FIELD_DRAWING_121 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_121, CommPacketSizeOf_NetId },
+    [COMM_CMD_FIELD_DRAWING_122 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_122, CommPacketSizeOf_NetId },
+    [COMM_CMD_FIELD_DRAWING_123 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_123, CommPacketSizeOf_NetId },
+    [COMM_CMD_FIELD_DRAWING_124 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_124, CommPacketSizeOf_Nothing },
+    [COMM_CMD_FIELD_DRAWING_125 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_125, CommPacketSizeOf_Nothing },
+    [COMM_CMD_FIELD_DRAWING_126 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_126, sub_020961E4 },
+    [COMM_CMD_FIELD_DRAWING_127 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_127, CommPacketSizeOf_Nothing },
+    [COMM_CMD_FIELD_DRAWING_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_128, CommPacketSizeOf_Nothing },
+    [COMM_CMD_FIELD_DRAWING_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Draw_129, CommPacketSizeOf_Nothing },
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }
 };
@@ -145,7 +147,7 @@ void sub_02095E98(void *param0)
     CommCmdManager_Init(Unk_020F5A40, v0, param0);
 }
 
-void sub_02095EAC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_118(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
 
@@ -172,7 +174,7 @@ void sub_02095EAC(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095F40(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_119(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
     UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2;
@@ -182,7 +184,7 @@ void sub_02095F40(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095F68(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_120(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
     UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2;
@@ -204,7 +206,7 @@ void sub_02095F68(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095F9C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_124(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
 
@@ -218,7 +220,7 @@ void sub_02095F9C(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095FE4(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_126(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
     UnkStruct_02095FE4 v1;
@@ -265,12 +267,12 @@ void sub_02095FE4(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_020960D4(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_125(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_020960D8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_123(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
     u8 v1 = *(u8 *)param2;
@@ -283,17 +285,17 @@ void sub_020960D8(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_0209610C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_121(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_02096110(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_122(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_02096114(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_127(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
 
@@ -302,7 +304,7 @@ void sub_02096114(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_0209612C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Field_Draw_128(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
     u8 v1;
@@ -321,7 +323,7 @@ void sub_0209612C(int param0, int param1, void *param2, void *param3)
     CommManager_SetErrorHandling(0, 1);
 }
 
-static void sub_02096170(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Field_Draw_129(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3;
     v0->unk_9458 = 1;
diff --git a/src/comm_command_field.c b/src/comm_command_field.c
index 408a84b6682..12b8e918426 100644
--- a/src/comm_command_field.c
+++ b/src/comm_command_field.c
@@ -135,28 +135,28 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_FIELD_105 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_105, CommPacketSizeOf_TrainerCase, sub_0205BA5C },
     [COMM_CMD_FIELD_106 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_106, sub_0205B0E4, sub_0205B0F4 },
     [COMM_CMD_FIELD_107 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_107, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_DUMMY_START - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_109 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_110 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_111 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_112 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099548, NULL },
-    [COMM_CMD_FIELD_113 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_114 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_115 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_116 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099530, NULL },
-    [COMM_CMD_FIELD_117 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_118 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099538, NULL },
-    [COMM_CMD_FIELD_119 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099540, NULL },
-    [COMM_CMD_FIELD_120 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099544, NULL },
-    [COMM_CMD_FIELD_121 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_122 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_123 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_124 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_125 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_126 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_0209954C, NULL },
-    [COMM_CMD_FIELD_127 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_RECORD_108 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_RECORD_109 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_RECORD_110 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_RECORD_111 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_RECORD_112 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099548, NULL },
+    [COMM_CMD_FIELD_RECORD_113 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_RECORD_114 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_RECORD_115 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_RECORD_116 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099530, NULL },
+    [COMM_CMD_FIELD_RECORD_117 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_DRAWING_118 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099538, NULL },
+    [COMM_CMD_FIELD_DRAWING_119 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099540, NULL },
+    [COMM_CMD_FIELD_DRAWING_120 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099544, NULL },
+    [COMM_CMD_FIELD_DRAWING_121 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_DRAWING_122 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_DRAWING_123 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_DRAWING_124 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_DRAWING_125 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_DRAWING_126 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_0209954C, NULL },
+    [COMM_CMD_FIELD_DRAWING_127 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_DRAWING_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_FIELD_DRAWING_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_FIELD_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099504, NULL },
     [COMM_CMD_FIELD_DUMMY_END - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099508, NULL },
     [COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallSelectedSpeciesMsg, CommPacketSizeOf_Variable, NULL },
diff --git a/src/meson.build b/src/meson.build
index ddad15aeab0..8793ec17d75 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -312,7 +312,7 @@ pokeplatinum_c = files(
     'unk_02094EDC.c',
     'unk_02095AF0.c',
     'unk_02095CD4.c',
-    'unk_02095E98.c',
+    'comm_command_draw.c',
     'comm_command_record_corner.c',
     'item_use_pokemon.c',
     'unk_020972FC.c',
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index ef205b71883..0399f4260e5 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -48,7 +48,7 @@
 #include "unk_020363E8.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
-#include "unk_02095E98.h"
+#include "comm_command_draw.h"
 #include "vram_transfer.h"
 #include "wireless_manager.h"
 #include "yes_no_touch_menu.h"
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index de3292a7095..bf98b698827 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -35,7 +35,7 @@
 #include "unk_02014A84.h"
 #include "unk_02014D38.h"
 #include "unk_02033200.h"
-#include "unk_02095E98.h"
+#include "comm_command_draw.h"
 #include "comm_command_field.h"
 
 #include "constdata/const_020ED570.h"

From 6e65794afcdc5ec146d3e91e4b202f5a4120946b Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Mon, 25 May 2026 23:37:51 -0400
Subject: [PATCH 28/39] comm_command_minigame

---
 .../constants/communication/comm_command.h    |  9 ++++++
 include/overlay114/comm_command_minigame.h    |  9 ++++++
 include/overlay114/ov114_02260038.h           |  9 ------
 include/overlay114/ov114_02260044.h           | 10 +++----
 platinum.us/main.lsf                          |  2 +-
 src/meson.build                               |  2 +-
 src/overlay114/comm_command_minigame.c        | 28 +++++++++++++++++++
 src/overlay114/ov114_02260038.c               | 26 -----------------
 src/overlay114/ov114_02260044.c               | 12 ++++----
 9 files changed, 59 insertions(+), 48 deletions(-)
 create mode 100644 include/overlay114/comm_command_minigame.h
 delete mode 100644 include/overlay114/ov114_02260038.h
 create mode 100644 src/overlay114/comm_command_minigame.c
 delete mode 100644 src/overlay114/ov114_02260038.c

diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 3400df195d7..dfc6137ea96 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -220,6 +220,15 @@ enum CommCommand_Battle {
     COMM_CMD_MAX_BATTLE,
 };
 
+// Communication Commands used for Wifi Plaze Minigames
+enum CommCommand_Minigame {
+    COMM_CMD_MINIGAME_22 = COMM_CMD_MAX_BATTLE,
+    COMM_CMD_MINIGAME_23,
+    COMM_CMD_MINIGAME_24,
+    COMM_CMD_MINIGAME_25,
+    COMM_CMD_MINIGAME_26,
+};
+
 // Communication Commands used for Poffin Cooking minigame
 enum CommCommand_PoffinCooking {
     COMM_CMD_POFFIN_22 = COMM_CMD_MAX_COMMON,
diff --git a/include/overlay114/comm_command_minigame.h b/include/overlay114/comm_command_minigame.h
new file mode 100644
index 00000000000..5f0497b7611
--- /dev/null
+++ b/include/overlay114/comm_command_minigame.h
@@ -0,0 +1,9 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_MINIGAME_H
+#define POKEPLATINUM_COMM_COMMAND_MINIGAME_H
+
+#include "struct_defs/comm_cmd_table.h"
+
+const CommCmdTable *COMM_COMMAND_MINIGAME(void);
+int ov114_02260040(void);
+
+#endif // POKEPLATINUM_COMM_COMMAND_MINIGAME_H
diff --git a/include/overlay114/ov114_02260038.h b/include/overlay114/ov114_02260038.h
deleted file mode 100644
index 75950ac6a8e..00000000000
--- a/include/overlay114/ov114_02260038.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef POKEPLATINUM_OV114_02260038_H
-#define POKEPLATINUM_OV114_02260038_H
-
-#include "struct_defs/comm_cmd_table.h"
-
-const CommCmdTable *ov114_02260038(void);
-int ov114_02260040(void);
-
-#endif // POKEPLATINUM_OV114_02260038_H
diff --git a/include/overlay114/ov114_02260044.h b/include/overlay114/ov114_02260044.h
index 234c4275018..efa75c0b397 100644
--- a/include/overlay114/ov114_02260044.h
+++ b/include/overlay114/ov114_02260044.h
@@ -8,10 +8,10 @@ void ov114_02260044(UnkStruct_ov114_0225E854 *param0);
 void ov114_02260060(UnkStruct_ov114_0225D678 *param0);
 int ov114_0226007C(void);
 int ov114_02260080(void);
-void ov114_02260084(int param0, int param1, void *param2, void *param3);
-void ov114_02260090(int param0, int param1, void *param2, void *param3);
-void ov114_022600A0(int param0, int param1, void *param2, void *param3);
-void ov114_022600B0(int param0, int param1, void *param2, void *param3);
-void ov114_022600BC(int param0, int param1, void *param2, void *param3);
+void CommCmd_Minigame_26(int param0, int param1, void *param2, void *param3);
+void CommCmd_Minigame_22(int param0, int param1, void *param2, void *param3);
+void CommCmd_Minigame_23(int param0, int param1, void *param2, void *param3);
+void CommCmd_Minigame_24(int param0, int param1, void *param2, void *param3);
+void CommCmd_Minigame_25(int param0, int param1, void *param2, void *param3);
 
 #endif // POKEPLATINUM_OV114_02260044_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 97831bb8dd9..660424f88ea 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -1652,7 +1652,7 @@ Overlay overlay114
 {
 	After overlay66
 	Object main.nef.p/src_overlay114_ov114_0225C700.c.o
-	Object main.nef.p/src_overlay114_ov114_02260038.c.o
+	Object main.nef.p/src_overlay114_comm_command_minigame.c.o
 	Object main.nef.p/src_overlay114_ov114_02260044.c.o
 }
 
diff --git a/src/meson.build b/src/meson.build
index 8793ec17d75..81b66afabdf 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -986,7 +986,7 @@ pokeplatinum_c = files(
     'overlay113/ov113_02260620.c',
     'overlay113/ov113_022607D8.c',
     'overlay114/ov114_0225C700.c',
-    'overlay114/ov114_02260038.c',
+    'overlay114/comm_command_minigame.c',
     'overlay114/ov114_02260044.c',
     'overlay115/ov115_02260440.c',
     'overlay115/ov115_02260BBC.c',
diff --git a/src/overlay114/comm_command_minigame.c b/src/overlay114/comm_command_minigame.c
new file mode 100644
index 00000000000..c6dfe477e01
--- /dev/null
+++ b/src/overlay114/comm_command_minigame.c
@@ -0,0 +1,28 @@
+#include "overlay114/comm_command_minigame.h"
+
+#include "constants/communication/comm_command.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "struct_defs/comm_cmd_table.h"
+
+#include "overlay114/ov114_02260044.h"
+
+static const CommCmdTable Unk_ov114_022603E4[] = {
+    [COMM_CMD_MINIGAME_22 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_22, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_23 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_23, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_24 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_24, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_25 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_25, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_26 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_26, ov114_02260080, NULL },
+};
+
+const CommCmdTable *ov114_02260038(void)
+{
+    return Unk_ov114_022603E4;
+}
+
+int ov114_02260040(void)
+{
+    return sizeof(Unk_ov114_022603E4) / sizeof(CommCmdTable);
+}
diff --git a/src/overlay114/ov114_02260038.c b/src/overlay114/ov114_02260038.c
deleted file mode 100644
index 99b79e920f1..00000000000
--- a/src/overlay114/ov114_02260038.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "overlay114/ov114_02260038.h"
-
-#include <nitro.h>
-#include <string.h>
-
-#include "struct_defs/comm_cmd_table.h"
-
-#include "overlay114/ov114_02260044.h"
-
-static const CommCmdTable Unk_ov114_022603E4[] = {
-    { ov114_02260090, ov114_0226007C, NULL },
-    { ov114_022600A0, ov114_0226007C, NULL },
-    { ov114_022600B0, ov114_0226007C, NULL },
-    { ov114_022600BC, ov114_0226007C, NULL },
-    { ov114_02260084, ov114_02260080, NULL },
-};
-
-const CommCmdTable *ov114_02260038(void)
-{
-    return Unk_ov114_022603E4;
-}
-
-int ov114_02260040(void)
-{
-    return sizeof(Unk_ov114_022603E4) / sizeof(CommCmdTable);
-}
diff --git a/src/overlay114/ov114_02260044.c b/src/overlay114/ov114_02260044.c
index f80e93772f3..d840cc7f6f9 100644
--- a/src/overlay114/ov114_02260044.c
+++ b/src/overlay114/ov114_02260044.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "overlay114/ov114_0225C700.h"
-#include "overlay114/ov114_02260038.h"
+#include "overlay114/comm_command_minigame.h"
 #include "overlay114/struct_ov114_0225D678_decl.h"
 #include "overlay114/struct_ov114_0225E854_decl.h"
 
@@ -30,27 +30,27 @@ int ov114_02260080(void)
     return sizeof(u32);
 }
 
-void ov114_02260084(int param0, int param1, void *param2, void *param3)
+void CommCmd_Minigame_26(int param0, int param1, void *param2, void *param3)
 {
     ov114_0225CA24(param3, *((u32 *)param2));
 }
 
-void ov114_02260090(int param0, int param1, void *param2, void *param3)
+void CommCmd_Minigame_22(int param0, int param1, void *param2, void *param3)
 {
     ov114_0225CA2C(param3, param0, 1);
 }
 
-void ov114_022600A0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Minigame_23(int param0, int param1, void *param2, void *param3)
 {
     ov114_0225CA2C(param3, param0, 0);
 }
 
-void ov114_022600B0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Minigame_24(int param0, int param1, void *param2, void *param3)
 {
     ov114_0225CA44(param3, 1);
 }
 
-void ov114_022600BC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Minigame_25(int param0, int param1, void *param2, void *param3)
 {
     ov114_0225CA44(param3, 0);
 }

From c791c482c5a9bc2dcbc633cd0f77df55f464b3f9 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 26 May 2026 00:09:35 -0400
Subject: [PATCH 29/39] comm_command_swalot_plop

---
 .../constants/communication/comm_command.h    | 30 ++++++++++++------
 include/overlay115/comm_command_swalot_plop.h |  9 ++++++
 include/overlay115/ov115_02265A18.h           |  9 ------
 include/overlay115/ov115_02265A24.h           | 16 +++++-----
 platinum.us/main.lsf                          |  2 +-
 src/meson.build                               |  2 +-
 src/overlay114/comm_command_minigame.c        | 10 +++---
 src/overlay115/comm_command_swalot_plop.c     | 31 +++++++++++++++++++
 src/overlay115/ov115_02265A18.c               | 29 -----------------
 src/overlay115/ov115_02265A24.c               | 18 +++++------
 10 files changed, 85 insertions(+), 71 deletions(-)
 create mode 100644 include/overlay115/comm_command_swalot_plop.h
 delete mode 100644 include/overlay115/ov115_02265A18.h
 create mode 100644 src/overlay115/comm_command_swalot_plop.c
 delete mode 100644 src/overlay115/ov115_02265A18.c

diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index dfc6137ea96..cda8a52e5ae 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -220,15 +220,6 @@ enum CommCommand_Battle {
     COMM_CMD_MAX_BATTLE,
 };
 
-// Communication Commands used for Wifi Plaze Minigames
-enum CommCommand_Minigame {
-    COMM_CMD_MINIGAME_22 = COMM_CMD_MAX_BATTLE,
-    COMM_CMD_MINIGAME_23,
-    COMM_CMD_MINIGAME_24,
-    COMM_CMD_MINIGAME_25,
-    COMM_CMD_MINIGAME_26,
-};
-
 // Communication Commands used for Poffin Cooking minigame
 enum CommCommand_PoffinCooking {
     COMM_CMD_POFFIN_22 = COMM_CMD_MAX_COMMON,
@@ -245,6 +236,27 @@ enum CommCommand_PoffinCooking {
     COMM_CMD_MAX_POFFIN,
 };
 
+// Communication Commands used for Wifi Plaze Minigames
+enum CommCommand_Minigame {
+    COMM_CMD_MINIGAME_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_MINIGAME_23,
+    COMM_CMD_MINIGAME_24,
+    COMM_CMD_MINIGAME_25,
+    COMM_CMD_MINIGAME_26,
+};
+
+// Communication Commands used for Swalot Plop minigame
+enum CommCommand_SwalotPlop {
+    COMM_COMMAND_SWALOT_PLOP_22 = COMM_CMD_MAX_COMMON,
+    COMM_COMMAND_SWALOT_PLOP_23,
+    COMM_COMMAND_SWALOT_PLOP_24,
+    COMM_COMMAND_SWALOT_PLOP_25,
+    COMM_COMMAND_SWALOT_PLOP_26,
+    COMM_COMMAND_SWALOT_PLOP_27,
+    COMM_COMMAND_SWALOT_PLOP_28,
+    COMM_COMMAND_SWALOT_PLOP_29,
+};
+
 // Communication Commands used for Mime Jr. Top minigame
 enum CommCommand_MimeJrTop {
     COMM_CMD_MIME_TOP_22 = COMM_CMD_MAX_COMMON,
diff --git a/include/overlay115/comm_command_swalot_plop.h b/include/overlay115/comm_command_swalot_plop.h
new file mode 100644
index 00000000000..5f70ddc495a
--- /dev/null
+++ b/include/overlay115/comm_command_swalot_plop.h
@@ -0,0 +1,9 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_SWALOT_PLOP_H
+#define POKEPLATINUM_COMM_COMMAND_SWALOT_PLOP_H
+
+#include "struct_defs/comm_cmd_table.h"
+
+const CommCmdTable *ov115_02265A18(void);
+int ov115_02265A20(void);
+
+#endif // POKEPLATINUM_COMM_COMMAND_SWALOT_PLOP_H
diff --git a/include/overlay115/ov115_02265A18.h b/include/overlay115/ov115_02265A18.h
deleted file mode 100644
index 30a67b9a226..00000000000
--- a/include/overlay115/ov115_02265A18.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef POKEPLATINUM_OV115_02265A18_H
-#define POKEPLATINUM_OV115_02265A18_H
-
-#include "struct_defs/comm_cmd_table.h"
-
-const CommCmdTable *ov115_02265A18(void);
-int ov115_02265A20(void);
-
-#endif // POKEPLATINUM_OV115_02265A18_H
diff --git a/include/overlay115/ov115_02265A24.h b/include/overlay115/ov115_02265A24.h
index 4b0d29705d4..6f57099177d 100644
--- a/include/overlay115/ov115_02265A24.h
+++ b/include/overlay115/ov115_02265A24.h
@@ -5,14 +5,14 @@
 
 void ov115_02265A24(UnkStruct_ov115_0226095C *param0);
 int ov115_02265A40(void);
-void ov115_02265A44(int param0, int param1, void *param2, void *param3);
-void ov115_02265A50(int param0, int param1, void *param2, void *param3);
-void ov115_02265A5C(int param0, int param1, void *param2, void *param3);
-void ov115_02265A84(int param0, int param1, void *param2, void *param3);
-void ov115_02265A94(int param0, int param1, void *param2, void *param3);
-void ov115_02265AA4(int param0, int param1, void *param2, void *param3);
-void ov115_02265AB4(int param0, int param1, void *param2, void *param3);
-void ov115_02265AC0(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlop_22(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlot_23(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlop_24(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlop_25(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlop_26(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlop_28(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlop_29(int param0, int param1, void *param2, void *param3);
+void CommCmd_SwalotPlop_27(int param0, int param1, void *param2, void *param3);
 int ov115_02265AD0(void);
 int ov115_02265AD4(void);
 int ov115_02265AD8(void);
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 660424f88ea..f3e1c9d9a82 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -1662,7 +1662,7 @@ Overlay overlay115
 	Object main.nef.p/src_overlay115_ov115_02260440.c.o
 	Object main.nef.p/src_overlay115_ov115_02260BBC.c.o
 	Object main.nef.p/src_overlay115_ov115_02260CEC.c.o
-	Object main.nef.p/src_overlay115_ov115_02265A18.c.o
+	Object main.nef.p/src_overlay115_comm_command_swalot_plop.c.o
 	Object main.nef.p/src_overlay115_ov115_02265A24.c.o
 }
 
diff --git a/src/meson.build b/src/meson.build
index 81b66afabdf..ff6dfefc2ee 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -991,7 +991,7 @@ pokeplatinum_c = files(
     'overlay115/ov115_02260440.c',
     'overlay115/ov115_02260BBC.c',
     'overlay115/ov115_02260CEC.c',
-    'overlay115/ov115_02265A18.c',
+    'overlay115/comm_command_swalot_plop.c',
     'overlay115/ov115_02265A24.c',
     'overlay116/comm_command_mime_jr_top.c',
     'overlay116/ov116_022604C4.c',
diff --git a/src/overlay114/comm_command_minigame.c b/src/overlay114/comm_command_minigame.c
index c6dfe477e01..7da3e743ea2 100644
--- a/src/overlay114/comm_command_minigame.c
+++ b/src/overlay114/comm_command_minigame.c
@@ -10,11 +10,11 @@
 #include "overlay114/ov114_02260044.h"
 
 static const CommCmdTable Unk_ov114_022603E4[] = {
-    [COMM_CMD_MINIGAME_22 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_22, ov114_0226007C, NULL },
-    [COMM_CMD_MINIGAME_23 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_23, ov114_0226007C, NULL },
-    [COMM_CMD_MINIGAME_24 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_24, ov114_0226007C, NULL },
-    [COMM_CMD_MINIGAME_25 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_25, ov114_0226007C, NULL },
-    [COMM_CMD_MINIGAME_26 - COMM_CMD_MAX_BATTLE] = { CommCmd_Minigame_26, ov114_02260080, NULL },
+    [COMM_CMD_MINIGAME_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_22, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_23, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_24, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_25, ov114_0226007C, NULL },
+    [COMM_CMD_MINIGAME_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_26, ov114_02260080, NULL },
 };
 
 const CommCmdTable *ov114_02260038(void)
diff --git a/src/overlay115/comm_command_swalot_plop.c b/src/overlay115/comm_command_swalot_plop.c
new file mode 100644
index 00000000000..eced2ff73c4
--- /dev/null
+++ b/src/overlay115/comm_command_swalot_plop.c
@@ -0,0 +1,31 @@
+#include "overlay115/comm_command_swalot_plop.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "constants/communication/comm_command.h"
+
+#include "struct_defs/comm_cmd_table.h"
+
+#include "overlay115/ov115_02265A24.h"
+
+static const CommCmdTable Unk_ov115_0226664C[] = {
+    [COMM_COMMAND_SWALOT_PLOP_22 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_22, ov115_02265A40, NULL },
+    [COMM_COMMAND_SWALOT_PLOP_23 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlot_23, ov115_02265A40, NULL },
+    [COMM_COMMAND_SWALOT_PLOP_24 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_24, ov115_02265AD0, NULL },
+    [COMM_COMMAND_SWALOT_PLOP_25 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_25, ov115_02265AD8, NULL },
+    [COMM_COMMAND_SWALOT_PLOP_26 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_26, ov115_02265AD4, NULL },
+    [COMM_COMMAND_SWALOT_PLOP_27 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_27, ov115_02265ADC, NULL },
+    [COMM_COMMAND_SWALOT_PLOP_28 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_28, ov115_02265AD8, NULL },
+    [COMM_COMMAND_SWALOT_PLOP_29 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_29, ov115_02265A40, NULL },
+};
+
+const CommCmdTable *ov115_02265A18(void)
+{
+    return Unk_ov115_0226664C;
+}
+
+int ov115_02265A20(void)
+{
+    return sizeof(Unk_ov115_0226664C) / sizeof(CommCmdTable);
+}
diff --git a/src/overlay115/ov115_02265A18.c b/src/overlay115/ov115_02265A18.c
deleted file mode 100644
index f92f9989935..00000000000
--- a/src/overlay115/ov115_02265A18.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "overlay115/ov115_02265A18.h"
-
-#include <nitro.h>
-#include <string.h>
-
-#include "struct_defs/comm_cmd_table.h"
-
-#include "overlay115/ov115_02265A24.h"
-
-static const CommCmdTable Unk_ov115_0226664C[] = {
-    { ov115_02265A44, ov115_02265A40, NULL },
-    { ov115_02265A50, ov115_02265A40, NULL },
-    { ov115_02265A5C, ov115_02265AD0, NULL },
-    { ov115_02265A84, ov115_02265AD8, NULL },
-    { ov115_02265A94, ov115_02265AD4, NULL },
-    { ov115_02265AC0, ov115_02265ADC, NULL },
-    { ov115_02265AA4, ov115_02265AD8, NULL },
-    { ov115_02265AB4, ov115_02265A40, NULL },
-};
-
-const CommCmdTable *ov115_02265A18(void)
-{
-    return Unk_ov115_0226664C;
-}
-
-int ov115_02265A20(void)
-{
-    return sizeof(Unk_ov115_0226664C) / sizeof(CommCmdTable);
-}
diff --git a/src/overlay115/ov115_02265A24.c b/src/overlay115/ov115_02265A24.c
index af01e4e4a2e..2d7ebdf5d66 100644
--- a/src/overlay115/ov115_02265A24.c
+++ b/src/overlay115/ov115_02265A24.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "overlay115/ov115_02260440.h"
-#include "overlay115/ov115_02265A18.h"
+#include "overlay115/comm_command_swalot_plop.h"
 #include "overlay115/struct_ov115_0226095C_decl.h"
 #include "overlay115/struct_ov115_02265AD0.h"
 #include "overlay115/struct_ov115_02265AD4.h"
@@ -22,19 +22,19 @@ int ov115_02265A40(void)
     return 0;
 }
 
-void ov115_02265A44(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlop_22(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
     ov115_0226095C(v0);
 }
 
-void ov115_02265A50(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlot_23(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
     ov115_02260964(v0);
 }
 
-void ov115_02265A5C(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlop_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
 
@@ -45,33 +45,33 @@ void ov115_02265A5C(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void ov115_02265A84(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlop_25(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
 
     ov115_02260994(v0, *((u32 *)param2), param0);
 }
 
-void ov115_02265A94(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlop_26(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
     ov115_022609B4(v0, param2, param0);
 }
 
-void ov115_02265AA4(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlop_28(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
     u32 v1 = *((u32 *)param2);
     ov115_022609E4(v0, v1, param0);
 }
 
-void ov115_02265AB4(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlop_29(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
     ov115_02260A48(v0);
 }
 
-void ov115_02265AC0(int param0, int param1, void *param2, void *param3)
+void CommCmd_SwalotPlop_27(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov115_0226095C *v0 = param3;
     u32 v1 = *((u32 *)param2);

From 976706be7058c3ff49fa5207f63870fb10845249 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 26 May 2026 00:54:07 -0400
Subject: [PATCH 30/39] comm_command_waiting_room

---
 include/comm_command_waiting_room.h           |  9 +++++++
 .../constants/communication/comm_command.h    |  7 +++++
 include/unk_02039A58.h                        |  9 -------
 include/unk_0209C390.h                        |  6 ++---
 platinum.us/main.lsf                          |  2 +-
 src/comm_command_waiting_room.c               | 26 +++++++++++++++++++
 src/meson.build                               |  2 +-
 src/unk_02039A58.c                            | 24 -----------------
 src/unk_0209C390.c                            |  8 +++---
 9 files changed, 51 insertions(+), 42 deletions(-)
 create mode 100644 include/comm_command_waiting_room.h
 delete mode 100644 include/unk_02039A58.h
 create mode 100644 src/comm_command_waiting_room.c
 delete mode 100644 src/unk_02039A58.c

diff --git a/include/comm_command_waiting_room.h b/include/comm_command_waiting_room.h
new file mode 100644
index 00000000000..38602b72927
--- /dev/null
+++ b/include/comm_command_waiting_room.h
@@ -0,0 +1,9 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_WAITING_ROOM_H
+#define POKEPLATINUM_COMM_COMMAND_WAITING_ROOM_H
+
+#include "struct_defs/comm_cmd_table.h"
+
+const CommCmdTable *sub_02039A58(void);
+int sub_02039A60(void);
+
+#endif // POKEPLATINUM_COMM_COMMAND_WAITING_ROOM_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index cda8a52e5ae..6ad55e353c8 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -220,6 +220,13 @@ enum CommCommand_Battle {
     COMM_CMD_MAX_BATTLE,
 };
 
+// Communication Commands used for P2P waiting rooms
+enum CommCommand_WaitingRoom {
+    COMM_CMD_WAITING_ROOM_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_WAITING_ROOM_23,
+    COMM_CMD_WAITING_ROOM_24,
+};
+
 // Communication Commands used for Poffin Cooking minigame
 enum CommCommand_PoffinCooking {
     COMM_CMD_POFFIN_22 = COMM_CMD_MAX_COMMON,
diff --git a/include/unk_02039A58.h b/include/unk_02039A58.h
deleted file mode 100644
index 8db5ad4b16a..00000000000
--- a/include/unk_02039A58.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef POKEPLATINUM_UNK_02039A58_H
-#define POKEPLATINUM_UNK_02039A58_H
-
-#include "struct_defs/comm_cmd_table.h"
-
-const CommCmdTable *sub_02039A58(void);
-int sub_02039A60(void);
-
-#endif // POKEPLATINUM_UNK_02039A58_H
diff --git a/include/unk_0209C390.h b/include/unk_0209C390.h
index 1e9d8b6782b..fe6112e7c74 100644
--- a/include/unk_0209C390.h
+++ b/include/unk_0209C390.h
@@ -8,8 +8,8 @@ void sub_0209C3AC(void);
 int sub_0209C3C4(void);
 int sub_0209C3C8(void);
 int sub_0209C3CC(void);
-void sub_0209C3D0(int param0, int param1, void *param2, void *param3);
-void sub_0209C3E0(int param0, int param1, void *param2, void *param3);
-void sub_0209C3F0(int param0, int param1, void *param2, void *param3);
+void CommCmd_WaitingRoom_22(int param0, int param1, void *param2, void *param3);
+void CommCmd_WaitingRoom_23(int param0, int param1, void *param2, void *param3);
+void CommCmd_WaitingRoom_24(int param0, int param1, void *param2, void *param3);
 
 #endif // POKEPLATINUM_UNK_0209C390_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index f3e1c9d9a82..28893df043f 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -167,7 +167,7 @@ Static main
 	Object main.nef.p/src_unk_0203909C.c.o
 	Object main.nef.p/src_network_icon.c.o
 	Object main.nef.p/src_unk_02039814.c.o
-	Object main.nef.p/src_unk_02039A58.c.o
+	Object main.nef.p/src_comm_command_waiting_room.c.o
 	Object main.nef.p/src_unk_02039A64.c.o
 	Object main.nef.p/src_map_matrix.c.o
 	Object main.nef.p/src_map_header.c.o
diff --git a/src/comm_command_waiting_room.c b/src/comm_command_waiting_room.c
new file mode 100644
index 00000000000..e61ed889949
--- /dev/null
+++ b/src/comm_command_waiting_room.c
@@ -0,0 +1,26 @@
+#include "comm_command_waiting_room.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "constants/communication/comm_command.h"
+
+#include "struct_defs/comm_cmd_table.h"
+
+#include "unk_0209C390.h"
+
+static const CommCmdTable Unk_020E5F24[] = {
+    [COMM_CMD_WAITING_ROOM_22 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_22, sub_0209C3C8, NULL },
+    [COMM_CMD_WAITING_ROOM_23 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_23, sub_0209C3C4, NULL },
+    [COMM_CMD_WAITING_ROOM_24 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_24, sub_0209C3CC, NULL }
+};
+
+const CommCmdTable *sub_02039A58(void)
+{
+    return Unk_020E5F24;
+}
+
+int sub_02039A60(void)
+{
+    return sizeof(Unk_020E5F24) / sizeof(CommCmdTable);
+}
diff --git a/src/meson.build b/src/meson.build
index ff6dfefc2ee..22889f37805 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -156,7 +156,7 @@ pokeplatinum_c = files(
     'unk_0203909C.c',
     'network_icon.c',
     'unk_02039814.c',
-    'unk_02039A58.c',
+    'comm_command_waiting_room.c',
     'unk_02039A64.c',
     'map_matrix.c',
     'map_header_data.c',
diff --git a/src/unk_02039A58.c b/src/unk_02039A58.c
deleted file mode 100644
index b4ed3e1a7e6..00000000000
--- a/src/unk_02039A58.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "unk_02039A58.h"
-
-#include <nitro.h>
-#include <string.h>
-
-#include "struct_defs/comm_cmd_table.h"
-
-#include "unk_0209C390.h"
-
-static const CommCmdTable Unk_020E5F24[] = {
-    { sub_0209C3D0, sub_0209C3C8, NULL },
-    { sub_0209C3E0, sub_0209C3C4, NULL },
-    { sub_0209C3F0, sub_0209C3CC, NULL }
-};
-
-const CommCmdTable *sub_02039A58(void)
-{
-    return Unk_020E5F24;
-}
-
-int sub_02039A60(void)
-{
-    return sizeof(Unk_020E5F24) / sizeof(CommCmdTable);
-}
diff --git a/src/unk_0209C390.c b/src/unk_0209C390.c
index f9284147eb1..60e380ee0fa 100644
--- a/src/unk_0209C390.c
+++ b/src/unk_0209C390.c
@@ -9,7 +9,7 @@
 #include "overlay065/struct_ov65_02236760.h"
 
 #include "comm_command.h"
-#include "unk_02039A58.h"
+#include "comm_command_waiting_room.h"
 
 void sub_0209C390(UnkStruct_ov65_02236744 *param0)
 {
@@ -36,7 +36,7 @@ int sub_0209C3CC(void)
     return sizeof(UnkStruct_ov65_02236760);
 }
 
-void sub_0209C3D0(int param0, int param1, void *param2, void *param3)
+void CommCmd_WaitingRoom_22(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov65_02236744 *v0 = param3;
     UnkStruct_ov65_022366E4 *v1 = param2;
@@ -48,7 +48,7 @@ void sub_0209C3D0(int param0, int param1, void *param2, void *param3)
     ov65_022366E4(v0, v1);
 }
 
-void sub_0209C3E0(int param0, int param1, void *param2, void *param3)
+void CommCmd_WaitingRoom_23(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov65_02236744 *v0 = param3;
 
@@ -59,7 +59,7 @@ void sub_0209C3E0(int param0, int param1, void *param2, void *param3)
     ov65_02236744(v0);
 }
 
-void sub_0209C3F0(int param0, int param1, void *param2, void *param3)
+void CommCmd_WaitingRoom_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_ov65_02236744 *v0 = param3;
 

From a51d4bac8a40712dfb694b5e1dd68cbf3366ef27 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 26 May 2026 04:46:08 -0400
Subject: [PATCH 31/39] comm_command_spin_trade

---
 .../{unk_0209BDF8.h => comm_command_spin_trade.h}    |  6 +++---
 include/constants/communication/comm_command.h       |  6 +++---
 platinum.us/main.lsf                                 |  2 +-
 src/comm_command_field.c                             |  4 ++--
 src/{unk_0209BDF8.c => comm_command_spin_trade.c}    | 12 +++++++-----
 src/meson.build                                      |  2 +-
 src/overlay109/ov109_021D0D80.c                      |  2 +-
 src/overlay109/ov109_021D3D50.c                      |  2 +-
 src/unk_0209C194.c                                   |  2 +-
 9 files changed, 20 insertions(+), 18 deletions(-)
 rename include/{unk_0209BDF8.h => comm_command_spin_trade.h} (78%)
 rename src/{unk_0209BDF8.c => comm_command_spin_trade.c} (96%)

diff --git a/include/unk_0209BDF8.h b/include/comm_command_spin_trade.h
similarity index 78%
rename from include/unk_0209BDF8.h
rename to include/comm_command_spin_trade.h
index 6338ef0b189..65dfd874a73 100644
--- a/include/unk_0209BDF8.h
+++ b/include/comm_command_spin_trade.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_0209BDF8_H
-#define POKEPLATINUM_UNK_0209BDF8_H
+#ifndef POKEPLATINUM_COMM_COMMAND_SPIN_TRADE_H
+#define POKEPLATINUM_COMM_COMMAND_SPIN_TRADE_H
 
 #include "constants/heap.h"
 
@@ -14,4 +14,4 @@ BOOL sub_0209BEBC(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u3
 int sub_0209C16C(void);
 void *sub_0209C188(UnkStruct_0209BDF8 *param0, int param1);
 
-#endif // POKEPLATINUM_UNK_0209BDF8_H
+#endif // POKEPLATINUM_COMM_COMMAND_SPIN_TRADE_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 6ad55e353c8..72d1a35fa3d 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -195,9 +195,9 @@ enum CommCommand_Field {
     COMM_CMD_FIELD_DRAWING_127,
     COMM_CMD_FIELD_DRAWING_128,
     COMM_CMD_FIELD_DRAWING_129,
-    COMM_CMD_FIELD_130,
-    COMM_CMD_FIELD_DUMMY_END, //Dummy end
-    COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE = COMM_CMD_FIELD_DUMMY_END + 1,
+    COMM_CMD_FIELD_SPIN_TRADE_130,
+    COMM_CMD_FIELD_SPIN_TRADE_131,
+    COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE,
     COMM_CMD_FIELD_133,
     COMM_CMD_FIELD_134,
     COMM_CMD_MAX_FIELD
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 28893df043f..652940c59a5 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -364,7 +364,7 @@ Static main
 	Object main.nef.p/src_unk_0209B6F8.c.o
 	Object main.nef.p/src_unk_0209BA18.c.o
 	Object main.nef.p/src_comm_command_frontier.c.o
-	Object main.nef.p/src_unk_0209BDF8.c.o
+	Object main.nef.p/src_comm_command_spin_trade.c.o
 	Object main.nef.p/src_unk_0209C194.c.o
 	Object main.nef.p/src_unk_0209C370.c.o
 	Object main.nef.p/src_unk_0209C390.c.o
diff --git a/src/comm_command_field.c b/src/comm_command_field.c
index 12b8e918426..9cf48a84a71 100644
--- a/src/comm_command_field.c
+++ b/src/comm_command_field.c
@@ -157,8 +157,8 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_FIELD_DRAWING_127 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_FIELD_DRAWING_128 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_FIELD_DRAWING_129 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    [COMM_CMD_FIELD_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099504, NULL },
-    [COMM_CMD_FIELD_DUMMY_END - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099508, NULL },
+    [COMM_CMD_FIELD_SPIN_TRADE_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099504, NULL },
+    [COMM_CMD_FIELD_SPIN_TRADE_131 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_Dummy, sub_02099508, NULL },
     [COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE - COMM_CMD_MAX_COMMON] = { CommCmd_BattleHallSelectedSpeciesMsg, CommPacketSizeOf_Variable, NULL },
     [COMM_CMD_FIELD_133 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_133, CommPacketSizeOf_Variable, NULL },
     [COMM_CMD_FIELD_134 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_134, CommPacketSizeOf_Variable, NULL }
diff --git a/src/unk_0209BDF8.c b/src/comm_command_spin_trade.c
similarity index 96%
rename from src/unk_0209BDF8.c
rename to src/comm_command_spin_trade.c
index 46e5498f43b..7ca11057c06 100644
--- a/src/unk_0209BDF8.c
+++ b/src/comm_command_spin_trade.c
@@ -1,8 +1,10 @@
-#include "unk_0209BDF8.h"
+#include "comm_command_spin_trade.h"
 
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 #include "struct_defs/struct_0209BDF8.h"
 #include "struct_defs/struct_0209BF64.h"
@@ -94,7 +96,7 @@ BOOL sub_0209BEBC(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u3
     return sub_0209BE84(param0, param1, param2, param3);
 }
 
-static void sub_0209BED0(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Field_SpinTrade_130(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_0209BE84 *v0 = param2;
 
@@ -106,7 +108,7 @@ static void sub_0209BED0(int param0, int param1, void *param2, void *param3)
     Unk_020F8E60[v0->unk_00](param0, param1, v0->unk_04, param3);
 }
 
-static void sub_0209BEF0(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Field_SpinTrade_131(int param0, int param1, void *param2, void *param3)
 {
     void *v0;
     UnkStruct_0209BDF8 *v1 = param3;
@@ -466,8 +468,8 @@ static const CommCmdTable Unk_020F8EA8[135] = {
     { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
-    { sub_0209BED0, sub_0209C154, NULL },
-    { sub_0209BEF0, sub_0209C158, sub_0209C160 }
+    [COMM_CMD_FIELD_SPIN_TRADE_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_SpinTrade_130, sub_0209C154, NULL },
+    [COMM_CMD_FIELD_SPIN_TRADE_131 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_SpinTrade_131, sub_0209C158, sub_0209C160 }
 };
 
 static const CommCmdRecvFunc Unk_020F8E60[18] = {
diff --git a/src/meson.build b/src/meson.build
index 22889f37805..f892d035592 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -345,7 +345,7 @@ pokeplatinum_c = files(
     'unk_0209B6F8.c',
     'unk_0209BA18.c',
     'comm_command_frontier.c',
-    'unk_0209BDF8.c',
+    'comm_command_spin_trade.c',
     'unk_0209C194.c',
     'unk_0209C370.c',
     'unk_0209C390.c',
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 1ef44095e16..35b02e985f5 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -53,7 +53,7 @@
 #include "unk_020363E8.h"
 #include "unk_02038ED4.h"
 #include "unk_02092494.h"
-#include "unk_0209BDF8.h"
+#include "comm_command_spin_trade.h"
 #include "vram_transfer.h"
 
 typedef struct {
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 65d45f7b1f5..228ec0b8efb 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -54,7 +54,7 @@
 #include "unk_020363E8.h"
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
-#include "unk_0209BDF8.h"
+#include "comm_command_spin_trade.h"
 #include "vram_transfer.h"
 #include "wireless_manager.h"
 
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index 771f1ec693f..caf12b7a949 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -21,7 +21,7 @@
 #include "journal.h"
 #include "save_player.h"
 #include "unk_0203D1B8.h"
-#include "unk_0209BDF8.h"
+#include "comm_command_spin_trade.h"
 
 FS_EXTERN_OVERLAY(overlay109);
 

From f21c882bccaa333bbd3e5b27b29d3d8e3fa3b80f Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 26 May 2026 04:56:46 -0400
Subject: [PATCH 32/39] comm_command_trade

---
 include/comm_command_trade.h                  | 19 +++++++
 .../constants/communication/comm_command.h    | 15 +++++
 include/unk_02095CD4.h                        | 19 -------
 platinum.us/main.lsf                          |  2 +-
 src/{unk_02095CD4.c => comm_command_trade.c}  | 56 ++++++++++---------
 src/meson.build                               |  2 +-
 src/overlay088/ov88_0223B140.c                |  2 +-
 7 files changed, 66 insertions(+), 49 deletions(-)
 create mode 100644 include/comm_command_trade.h
 delete mode 100644 include/unk_02095CD4.h
 rename src/{unk_02095CD4.c => comm_command_trade.c} (60%)

diff --git a/include/comm_command_trade.h b/include/comm_command_trade.h
new file mode 100644
index 00000000000..328d1637da1
--- /dev/null
+++ b/include/comm_command_trade.h
@@ -0,0 +1,19 @@
+#ifndef POKEPLATINUM_COMM_COMMAND_TRADE_H
+#define POKEPLATINUM_COMM_COMMAND_TRADE_H
+
+#include "struct_decls/struct_02095E80_decl.h"
+
+#include "field/field_system_decl.h"
+
+void sub_02095CD4(void *param0);
+void CommCmd_Trade_22(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_23(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_24(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_25(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_26(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_27(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_30(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_28(int param0, int param1, void *param2, void *param3);
+void sub_02095E60(FieldSystem *fieldSystem, UnkStruct_02095E80 *param1);
+
+#endif // POKEPLATINUM_COMM_COMMAND_TRADE_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 72d1a35fa3d..a94ae59a017 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -220,6 +220,21 @@ enum CommCommand_Battle {
     COMM_CMD_MAX_BATTLE,
 };
 
+// Communication Commands used for trades in the Union Room
+enum CommCommand_Trade {
+    COMM_CMD_TRADE_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_TRADE_23,
+    COMM_CMD_TRADE_24,
+    COMM_CMD_TRADE_25,
+    COMM_CMD_TRADE_26,
+    COMM_CMD_TRADE_27,
+    COMM_CMD_TRADE_28,
+    COMM_CMD_TRADE_29,
+    COMM_CMD_TRADE_30,
+    COMM_CMD_TRADE_31,
+    COMM_CMD_TRADE_32,
+};
+
 // Communication Commands used for P2P waiting rooms
 enum CommCommand_WaitingRoom {
     COMM_CMD_WAITING_ROOM_22 = COMM_CMD_MAX_COMMON,
diff --git a/include/unk_02095CD4.h b/include/unk_02095CD4.h
deleted file mode 100644
index 83e6a9914c0..00000000000
--- a/include/unk_02095CD4.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef POKEPLATINUM_UNK_02095CD4_H
-#define POKEPLATINUM_UNK_02095CD4_H
-
-#include "struct_decls/struct_02095E80_decl.h"
-
-#include "field/field_system_decl.h"
-
-void sub_02095CD4(void *param0);
-void sub_02095CFC(int param0, int param1, void *param2, void *param3);
-void sub_02095D74(int param0, int param1, void *param2, void *param3);
-void sub_02095D94(int param0, int param1, void *param2, void *param3);
-void sub_02095DA4(int param0, int param1, void *param2, void *param3);
-void sub_02095DA8(int param0, int param1, void *param2, void *param3);
-void sub_02095DAC(int param0, int param1, void *param2, void *param3);
-void sub_02095DB8(int param0, int param1, void *param2, void *param3);
-void sub_02095DFC(int param0, int param1, void *param2, void *param3);
-void sub_02095E60(FieldSystem *fieldSystem, UnkStruct_02095E80 *param1);
-
-#endif // POKEPLATINUM_UNK_02095CD4_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 652940c59a5..20657dc7fe8 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -328,7 +328,7 @@ Static main
 	Object main.nef.p/src_contest.c.o
 	Object main.nef.p/src_unk_02094EDC.c.o
 	Object main.nef.p/src_unk_02095AF0.c.o
-	Object main.nef.p/src_unk_02095CD4.c.o
+	Object main.nef.p/src_comm_command_trade.c.o
 	Object main.nef.p/src_comm_command_draw.c.o
 	Object main.nef.p/src_comm_command_record_corner.c.o
 	Object main.nef.p/src_item_use_pokemon.c.o
diff --git a/src/unk_02095CD4.c b/src/comm_command_trade.c
similarity index 60%
rename from src/unk_02095CD4.c
rename to src/comm_command_trade.c
index 17cfa0188ce..86b67dbbbab 100644
--- a/src/unk_02095CD4.c
+++ b/src/comm_command_trade.c
@@ -1,8 +1,10 @@
-#include "unk_02095CD4.h"
+#include "comm_command_trade.h"
 
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_decls/struct_02095E80_decl.h"
 #include "struct_defs/comm_cmd_table.h"
 #include "struct_defs/struct_02095E80_t.h"
@@ -16,10 +18,10 @@
 #include "party.h"
 #include "unk_0202D778.h"
 
-void sub_02095DFC(int param0, int param1, void *param2, void *param3);
-void sub_02095E28(int param0, int param1, void *param2, void *param3);
-void sub_02095DBC(int param0, int param1, void *param2, void *param3);
-void sub_02095DCC(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_28(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_29(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_31(int param0, int param1, void *param2, void *param3);
+void CommCmd_Trade_32(int param0, int param1, void *param2, void *param3);
 static int sub_02095CE8(u8 param0);
 static int sub_02095E78(void);
 static int sub_02095E74(void);
@@ -28,17 +30,17 @@ static int sub_02095E68(void);
 static int sub_02095E70(void);
 
 static const CommCmdTable Unk_020F59BC[] = {
-    { sub_02095CFC, sub_02095E78, sub_02095E80 },
-    { sub_02095D74, CommPacketSizeOf_NetId },
-    { sub_02095D94, CommPacketSizeOf_NetId },
-    { sub_02095DA4, CommPacketSizeOf_NetId },
-    { sub_02095DA8, CommPacketSizeOf_NetId },
-    { sub_02095DAC, CommPacketSizeOf_NetId },
-    { sub_02095DFC, sub_02095E74, sub_02095E80 },
-    { sub_02095E28, sub_02095E68, sub_02095E80 },
-    { sub_02095DB8, CommPacketSizeOf_Nothing },
-    { sub_02095DBC, CommPacketSizeOf_NetId },
-    { sub_02095DCC, sub_02095E70 }
+    [COMM_CMD_TRADE_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_22, sub_02095E78, sub_02095E80 },
+    [COMM_CMD_TRADE_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_23, CommPacketSizeOf_NetId },
+    [COMM_CMD_TRADE_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_24, CommPacketSizeOf_NetId },
+    [COMM_CMD_TRADE_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_25, CommPacketSizeOf_NetId },
+    [COMM_CMD_TRADE_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_26, CommPacketSizeOf_NetId },
+    [COMM_CMD_TRADE_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_27, CommPacketSizeOf_NetId },
+    [COMM_CMD_TRADE_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_28, sub_02095E74, sub_02095E80 },
+    [COMM_CMD_TRADE_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_29, sub_02095E68, sub_02095E80 },
+    [COMM_CMD_TRADE_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_30, CommPacketSizeOf_Nothing },
+    [COMM_CMD_TRADE_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_31, CommPacketSizeOf_NetId },
+    [COMM_CMD_TRADE_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_32, sub_02095E70 }
 };
 
 void sub_02095CD4(void *param0)
@@ -60,7 +62,7 @@ static int sub_02095CE8(u8 param0)
     return param0 - 6;
 }
 
-void sub_02095CFC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_22(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
     UnkStruct_02095E80 *v1 = fieldSystem->unk_88;
@@ -83,7 +85,7 @@ void sub_02095CFC(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095D74(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_23(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88;
     u8 *v1 = (u8 *)param2;
@@ -93,7 +95,7 @@ void sub_02095D74(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095D94(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_24(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88;
     u8 *v1 = (u8 *)param2;
@@ -101,28 +103,28 @@ void sub_02095D94(int param0, int param1, void *param2, void *param3)
     v0->unk_60[param0] = *v1;
 }
 
-void sub_02095DA4(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_25(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_02095DA8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_26(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_02095DAC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_27(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88;
     v0->unk_54 = 2;
 }
 
-void sub_02095DB8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_30(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-void sub_02095DBC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_31(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88;
     u8 *v1 = (u8 *)param2;
@@ -130,7 +132,7 @@ void sub_02095DBC(int param0, int param1, void *param2, void *param3)
     v0->unk_2318 = *v1;
 }
 
-void sub_02095DCC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_32(int param0, int param1, void *param2, void *param3)
 {
     FieldSystem *fieldSystem = (FieldSystem *)param3;
     int v1;
@@ -150,7 +152,7 @@ void sub_02095DCC(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095DFC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_28(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88;
 
@@ -160,7 +162,7 @@ void sub_02095DFC(int param0, int param1, void *param2, void *param3)
     }
 }
 
-void sub_02095E28(int param0, int param1, void *param2, void *param3)
+void CommCmd_Trade_29(int param0, int param1, void *param2, void *param3)
 {
     UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88;
 
diff --git a/src/meson.build b/src/meson.build
index f892d035592..72826c6e8bd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -311,7 +311,7 @@ pokeplatinum_c = files(
     'contest.c',
     'unk_02094EDC.c',
     'unk_02095AF0.c',
-    'unk_02095CD4.c',
+    'comm_command_trade.c',
     'comm_command_draw.c',
     'comm_command_record_corner.c',
     'item_use_pokemon.c',
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index fbd7f921edd..49609cb08af 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -77,7 +77,7 @@
 #include "unk_02038F8C.h"
 #include "unk_0203909C.h"
 #include "unk_02092494.h"
-#include "unk_02095CD4.h"
+#include "comm_command_trade.h"
 #include "vars_flags.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"

From 3c134a72a49898494949e1935966cdc676f5475a Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 26 May 2026 05:08:40 -0400
Subject: [PATCH 33/39] comm_command_contest

---
 ...{unk_02095AF0.h => comm_command_contest.h} |  6 +-
 .../constants/communication/comm_command.h    | 20 +++++++
 include/overlay006/ov6_022489E4.h             | 16 +++---
 include/overlay017/ov17_02252CEC.h            |  4 +-
 platinum.us/main.lsf                          |  2 +-
 ...{unk_02095AF0.c => comm_command_contest.c} | 56 ++++++++++---------
 src/contest.c                                 |  2 +-
 src/meson.build                               |  2 +-
 src/overlay006/ov6_022489E4.c                 | 16 +++---
 src/overlay017/ov17_02252CEC.c                |  4 +-
 src/overlay022/ov22_02255D44.c                |  2 +-
 src/overlay022/ov22_0225A428.c                |  2 +-
 12 files changed, 77 insertions(+), 55 deletions(-)
 rename include/{unk_02095AF0.h => comm_command_contest.h} (75%)
 rename src/{unk_02095AF0.c => comm_command_contest.c} (55%)

diff --git a/include/unk_02095AF0.h b/include/comm_command_contest.h
similarity index 75%
rename from include/unk_02095AF0.h
rename to include/comm_command_contest.h
index 5b2ce341266..25067576acf 100644
--- a/include/unk_02095AF0.h
+++ b/include/comm_command_contest.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_02095AF0_H
-#define POKEPLATINUM_UNK_02095AF0_H
+#ifndef POKEPLATINUM_COMM_COMMAND_CONTEST_H
+#define POKEPLATINUM_COMM_COMMAND_CONTEST_H
 
 #include "struct_defs/struct_02029C88.h"
 #include "struct_defs/struct_02095C60.h"
@@ -12,4 +12,4 @@ BOOL sub_02095BEC(Contest *param0, UnkStruct_02029C88 **param1);
 BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1);
 BOOL sub_02095CA8(UnkStruct_02095C60 *param0, int param1);
 
-#endif // POKEPLATINUM_UNK_02095AF0_H
+#endif // POKEPLATINUM_COMM_COMMAND_CONTEST_H
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index a94ae59a017..cf140dfcf63 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -258,6 +258,26 @@ enum CommCommand_PoffinCooking {
     COMM_CMD_MAX_POFFIN,
 };
 
+// Communication Commands used for Contests
+enum CommCommand_Contest {
+    COMM_CMD_CONTEST_DUMMY = COMM_CMD_MAX_COMMON,
+    COMM_CMD_CONTEST_23,
+    COMM_CMD_CONTEST_24,
+    COMM_CMD_CONTEST_25,
+    COMM_CMD_CONTEST_26,
+    COMM_CMD_CONTEST_27,
+    COMM_CMD_CONTEST_28,
+    COMM_CMD_CONTEST_29,
+    COMM_CMD_CONTEST_30,
+    COMM_CMD_CONTEST_31,
+    COMM_CMD_CONTEST_32,
+    COMM_CMD_CONTEST_33,
+    COMM_CMD_CONTEST_34,
+    COMM_CMD_CONTEST_35,
+    COMM_CMD_CONTEST_36,
+    COMM_CMD_CONTEST_37,
+};
+
 // Communication Commands used for Wifi Plaze Minigames
 enum CommCommand_Minigame {
     COMM_CMD_MINIGAME_22 = COMM_CMD_MAX_COMMON,
diff --git a/include/overlay006/ov6_022489E4.h b/include/overlay006/ov6_022489E4.h
index 27ef22d1f46..abff7bd53e8 100644
--- a/include/overlay006/ov6_022489E4.h
+++ b/include/overlay006/ov6_022489E4.h
@@ -10,21 +10,21 @@
 #include "pokemon.h"
 #include "string_gf.h"
 
-void ov6_022489E4(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_26(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248A64(Contest *param0);
-void ov6_02248AC8(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_27(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248AF0(Contest *param0, int param1, const Pokemon *param2);
-void ov6_02248B30(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_28(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248B70(Contest *param0, Pokemon **param1);
-void ov6_02248BC0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_29(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248BE8(Contest *param0, int param1, const UnkStruct_ov6_02248BE8 *param2);
-void ov6_02248C28(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_30(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248C68(Contest *param0, int param1, const UnkStruct_020954F0 *param2);
-void ov6_02248CBC(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_31(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248CE8(Contest *param0, int param1, const String *param2);
-void ov6_02248D38(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_36(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248D64(Contest *param0, int param1, void *param2);
-void ov6_02248DA0(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_37(int param0, int param1, void *param2, void *param3);
 BOOL ov6_02248DD8(Contest *param0, int param1, const UnkStruct_ov6_02248DD8 *param2);
 
 #endif // POKEPLATINUM_OV6_022489E4_H
diff --git a/include/overlay017/ov17_02252CEC.h b/include/overlay017/ov17_02252CEC.h
index 56dc0956f07..1aeb5683a4a 100644
--- a/include/overlay017/ov17_02252CEC.h
+++ b/include/overlay017/ov17_02252CEC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV17_02252CEC_H
 #define POKEPLATINUM_OV17_02252CEC_H
 
-void ov17_02252CEC(int param0, int param1, void *param2, void *param3);
-void ov17_02252D7C(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_24(int param0, int param1, void *param2, void *param3);
+void CommCmd_Contest_25(int param0, int param1, void *param2, void *param3);
 
 #endif // POKEPLATINUM_OV17_02252CEC_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 20657dc7fe8..e9dafabfad1 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -327,7 +327,7 @@ Static main
 	Object main.nef.p/src_unk_02092494.c.o
 	Object main.nef.p/src_contest.c.o
 	Object main.nef.p/src_unk_02094EDC.c.o
-	Object main.nef.p/src_unk_02095AF0.c.o
+	Object main.nef.p/src_comm_command_contest.c.o
 	Object main.nef.p/src_comm_command_trade.c.o
 	Object main.nef.p/src_comm_command_draw.c.o
 	Object main.nef.p/src_comm_command_record_corner.c.o
diff --git a/src/unk_02095AF0.c b/src/comm_command_contest.c
similarity index 55%
rename from src/unk_02095AF0.c
rename to src/comm_command_contest.c
index f59db8a2632..49c85cbfa83 100644
--- a/src/unk_02095AF0.c
+++ b/src/comm_command_contest.c
@@ -1,8 +1,10 @@
-#include "unk_02095AF0.h"
+#include "comm_command_contest.h"
 
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 #include "struct_defs/struct_02029C88.h"
 #include "struct_defs/struct_02095B28.h"
@@ -18,32 +20,32 @@
 #include "heap.h"
 #include "unk_020298BC.h"
 
-static void sub_02095B2C(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Contest_23(int param0, int param1, void *param2, void *param3);
 static u8 *sub_02095B04(int param0, void *param1, int param2);
-static void sub_02095B30(int param0, int param1, void *param2, void *param3);
-static void sub_02095B9C(int param0, int param1, void *param2, void *param3);
-static void sub_02095C48(int param0, int param1, void *param2, void *param3);
-static void sub_02095C98(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Contest_32(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Contest_33(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Contest_34(int param0, int param1, void *param2, void *param3);
+static void CommCmd_Contest_35(int param0, int param1, void *param2, void *param3);
 static int sub_02095B24(void);
 static int sub_02095B28(void);
 
 static const CommCmdTable Unk_020F58FC[] = {
-    { NULL, CommPacketSizeOf_Nothing, NULL },
-    { sub_02095B2C, CommPacketSizeOf_Nothing, NULL },
-    { ov17_02252CEC, CommPacketSizeOf_Variable, sub_02095B04 },
-    { ov17_02252D7C, sub_02095B24, NULL },
-    { ov6_022489E4, CommPacketSizeOf_Variable, NULL },
-    { ov6_02248AC8, CommPacketSizeOf_Variable, NULL },
-    { ov6_02248B30, CommPacketSizeOf_Variable, sub_02095B04 },
-    { ov6_02248BC0, CommPacketSizeOf_Variable, NULL },
-    { ov6_02248C28, CommPacketSizeOf_Variable, NULL },
-    { ov6_02248CBC, CommPacketSizeOf_Variable, NULL },
-    { sub_02095B30, CommPacketSizeOf_Variable, NULL },
-    { sub_02095B9C, CommPacketSizeOf_Variable, sub_02095B04 },
-    { sub_02095C48, sub_02095B28, NULL },
-    { sub_02095C98, sub_02095B28, NULL },
-    { ov6_02248D38, CommPacketSizeOf_Variable, sub_02095B04 },
-    { ov6_02248DA0, CommPacketSizeOf_Variable, NULL }
+    [COMM_CMD_CONTEST_DUMMY - COMM_CMD_MAX_COMMON] = { NULL, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_CONTEST_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_23, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_CONTEST_24 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_24, CommPacketSizeOf_Variable, sub_02095B04 },
+    [COMM_CMD_CONTEST_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_25, sub_02095B24, NULL },
+    [COMM_CMD_CONTEST_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_26, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CONTEST_27 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_27, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CONTEST_28 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_28, CommPacketSizeOf_Variable, sub_02095B04 },
+    [COMM_CMD_CONTEST_29 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_29, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CONTEST_30 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_30, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CONTEST_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_31, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CONTEST_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_32, CommPacketSizeOf_Variable, NULL },
+    [COMM_CMD_CONTEST_33 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_33, CommPacketSizeOf_Variable, sub_02095B04 },
+    [COMM_CMD_CONTEST_34 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_34, sub_02095B28, NULL },
+    [COMM_CMD_CONTEST_35 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_35, sub_02095B28, NULL },
+    [COMM_CMD_CONTEST_36 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_36, CommPacketSizeOf_Variable, sub_02095B04 },
+    [COMM_CMD_CONTEST_37 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_37, CommPacketSizeOf_Variable, NULL }
 };
 
 void sub_02095AF0(void *param0)
@@ -70,12 +72,12 @@ static int sub_02095B28(void)
     return sizeof(UnkStruct_02095B28);
 }
 
-static void sub_02095B2C(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Contest_23(int param0, int param1, void *param2, void *param3)
 {
     return;
 }
 
-static void sub_02095B30(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Contest_32(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int v1;
@@ -112,7 +114,7 @@ BOOL sub_02095B5C(Contest *param0, int param1, const UnkStruct_02029C88 *param2)
     return v2;
 }
 
-static void sub_02095B9C(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Contest_33(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int v1, v2;
@@ -159,7 +161,7 @@ BOOL sub_02095BEC(Contest *param0, UnkStruct_02029C88 **param1)
     return v3;
 }
 
-static void sub_02095C48(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Contest_34(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     MI_CpuCopy8(param2, &v0->unk_1984.unk_00, param1);
@@ -185,7 +187,7 @@ BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1)
     return 0;
 }
 
-static void sub_02095C98(int param0, int param1, void *param2, void *param3)
+static void CommCmd_Contest_35(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     UnkStruct_02095B28 *v1 = param2;
diff --git a/src/contest.c b/src/contest.c
index bde60c05f03..1407b522590 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -58,7 +58,7 @@
 #include "unk_020298BC.h"
 #include "unk_020363E8.h"
 #include "unk_02094EDC.h"
-#include "unk_02095AF0.h"
+#include "comm_command_contest.h"
 #include "vars_flags.h"
 
 FS_EXTERN_OVERLAY(overlay17);
diff --git a/src/meson.build b/src/meson.build
index 72826c6e8bd..745325187d1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -310,7 +310,7 @@ pokeplatinum_c = files(
     'unk_02092494.c',
     'contest.c',
     'unk_02094EDC.c',
-    'unk_02095AF0.c',
+    'comm_command_contest.c',
     'comm_command_trade.c',
     'comm_command_draw.c',
     'comm_command_record_corner.c',
diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c
index 27117595c78..5084defde56 100644
--- a/src/overlay006/ov6_022489E4.c
+++ b/src/overlay006/ov6_022489E4.c
@@ -24,7 +24,7 @@ typedef struct {
 
 static int ov6_02248A94(UnkStruct_ov6_02248A94 *param0[4], int connectionCount, u8 *param2);
 
-void ov6_022489E4(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_26(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
 
@@ -75,7 +75,7 @@ static int ov6_02248A94(UnkStruct_ov6_02248A94 *param0[4], int connectionCount,
     return v1;
 }
 
-void ov6_02248AC8(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_27(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int v1;
@@ -112,7 +112,7 @@ BOOL ov6_02248AF0(Contest *param0, int param1, const Pokemon *param2)
     return v2;
 }
 
-void ov6_02248B30(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_28(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int v1, v2;
@@ -154,7 +154,7 @@ BOOL ov6_02248B70(Contest *param0, Pokemon **param1)
     return v3;
 }
 
-void ov6_02248BC0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_29(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int v1;
@@ -191,7 +191,7 @@ BOOL ov6_02248BE8(Contest *param0, int param1, const UnkStruct_ov6_02248BE8 *par
     return v2;
 }
 
-void ov6_02248C28(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_30(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int v1;
@@ -236,7 +236,7 @@ BOOL ov6_02248C68(Contest *param0, int param1, const UnkStruct_020954F0 *param2)
     return v2;
 }
 
-void ov6_02248CBC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_31(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int contestantID, v2, v3;
@@ -284,7 +284,7 @@ BOOL ov6_02248CE8(Contest *contest, int param1, const String *trainerNames)
     return v3;
 }
 
-void ov6_02248D38(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_36(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     int v1;
@@ -324,7 +324,7 @@ BOOL ov6_02248D64(Contest *param0, int param1, void *param2)
     return v2;
 }
 
-void ov6_02248DA0(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_37(int param0, int param1, void *param2, void *param3)
 {
     Contest *contest = param3;
     int v1;
diff --git a/src/overlay017/ov17_02252CEC.c b/src/overlay017/ov17_02252CEC.c
index 91c88a1df5e..eb2ec51fea5 100644
--- a/src/overlay017/ov17_02252CEC.c
+++ b/src/overlay017/ov17_02252CEC.c
@@ -13,7 +13,7 @@
 
 #include "contest.h"
 
-void ov17_02252CEC(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_24(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     UnkStruct_ov17_0224F30C *v1;
@@ -46,7 +46,7 @@ void ov17_02252CEC(int param0, int param1, void *param2, void *param3)
     v1->unk_A11[param0] = 1;
 }
 
-void ov17_02252D7C(int param0, int param1, void *param2, void *param3)
+void CommCmd_Contest_25(int param0, int param1, void *param2, void *param3)
 {
     Contest *v0 = param3;
     UnkStruct_ov17_0224DF54 *v1 = v0->unk_150;
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index b7e24fa7819..23fd526d88b 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -74,7 +74,7 @@
 #include "unk_020298BC.h"
 #include "unk_020363E8.h"
 #include "unk_02094EDC.h"
-#include "unk_02095AF0.h"
+#include "comm_command_contest.h"
 #include "yes_no_touch_menu.h"
 
 typedef struct {
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 928829069f0..1cbe8d4f2e8 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -29,7 +29,7 @@
 #include "string_gf.h"
 #include "sys_task.h"
 #include "text.h"
-#include "unk_02095AF0.h"
+#include "comm_command_contest.h"
 
 static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BgConfig *param1);
 static void ov22_0225A718(BgConfig *param0, const Options *options);

From ec71b61adf26b90af123b0424d5d9c0e893d7cda Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 26 May 2026 05:16:15 -0400
Subject: [PATCH 34/39] comm_command_mystery_gift

---
 include/constants/communication/comm_command.h            | 6 ++++++
 include/main_menu/comm_command_mystery_gift.h             | 6 ++++++
 include/main_menu/ov97_0222D04C.h                         | 4 ++--
 include/main_menu/ov97_0222D2F8.h                         | 6 ------
 platinum.us/main.lsf                                      | 2 +-
 .../{ov97_0222D2F8.c => comm_command_mystery_gift.c}      | 8 +++++---
 src/main_menu/ov97_0222D04C.c                             | 6 +++---
 src/meson.build                                           | 2 +-
 8 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 include/main_menu/comm_command_mystery_gift.h
 delete mode 100644 include/main_menu/ov97_0222D2F8.h
 rename src/main_menu/{ov97_0222D2F8.c => comm_command_mystery_gift.c} (52%)

diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index cf140dfcf63..7259b0c81d1 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -318,4 +318,10 @@ enum CommCommand_WobbuffetPop {
     COMM_CMD_MAX_WOB_POP,
 };
 
+// Communication Commands used for Mystery Gift
+enum CommCommand_MysteryGift {
+    COMM_CMD_MYSTERY_GIFT_22 = COMM_CMD_MAX_COMMON,
+    COMM_CMD_MYSTERY_GIFT_23
+};
+
 #endif
diff --git a/include/main_menu/comm_command_mystery_gift.h b/include/main_menu/comm_command_mystery_gift.h
new file mode 100644
index 00000000000..a4eaa1dfb21
--- /dev/null
+++ b/include/main_menu/comm_command_mystery_gift.h
@@ -0,0 +1,6 @@
+#ifndef POKEPLATINUM_MAIN_MENU_COMM_COMMAND_MYSTERY_GIFT_H
+#define POKEPLATINUM_MAIN_MENU_COMM_COMMAND_MYSTERY_GIFT_H
+
+void ov97_0222D2F8(void *param0);
+
+#endif // POKEPLATINUM_MAIN_MENU_COMM_COMMAND_MYSTERY_GIFT_H
diff --git a/include/main_menu/ov97_0222D04C.h b/include/main_menu/ov97_0222D04C.h
index 0aa10e9c937..095f53c66cd 100644
--- a/include/main_menu/ov97_0222D04C.h
+++ b/include/main_menu/ov97_0222D04C.h
@@ -10,11 +10,11 @@ void ov97_0222D1F0(const void *param0, int param1);
 void ov97_0222D200(MysteryGiftAppData *param0, int param1);
 void ov97_0222D234(int param0);
 int ov97_0222D250(MysteryGiftAppData *param0);
-void ov97_0222D284(int param0, int param1, void *param2, void *param3);
+void CommCmd_MysteryGift_22(int param0, int param1, void *param2, void *param3);
 int ov97_0222D2A0(void);
 int ov97_0222D2B0(void);
 u8 *ov97_0222D2B8(int param0, void *param1, int param2);
-void ov97_0222D2C4(int param0, int param1, void *param2, void *param3);
+void CommCmd_MysteryGift_23(int param0, int param1, void *param2, void *param3);
 void ov97_0222D2DC(void);
 
 #endif // POKEPLATINUM_MAIN_MENU_0222D04C_H
diff --git a/include/main_menu/ov97_0222D2F8.h b/include/main_menu/ov97_0222D2F8.h
deleted file mode 100644
index 497d1878582..00000000000
--- a/include/main_menu/ov97_0222D2F8.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_MAIN_MENU_0222D2F8_H
-#define POKEPLATINUM_MAIN_MENU_0222D2F8_H
-
-void ov97_0222D2F8(void *param0);
-
-#endif // POKEPLATINUM_MAIN_MENU_0222D2F8_H
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index e9dafabfad1..723c1797d50 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -1453,7 +1453,7 @@ Overlay main_menu
 	Object main.nef.p/src_main_menu_main_menu.c.o
 	Object main.nef.p/src_main_menu_ranger_link.c.o
 	Object main.nef.p/src_main_menu_ov97_0222D04C.c.o
-	Object main.nef.p/src_main_menu_ov97_0222D2F8.c.o
+	Object main.nef.p/src_main_menu_comm_command_mystery_gift.c.o
 	Object main.nef.p/src_main_menu_mystery_gift_app.c.o
 	Object main.nef.p/src_main_menu_wonder_cards_app.c.o
 	Object main.nef.p/src_main_menu_ov97_02232054.c.o
diff --git a/src/main_menu/ov97_0222D2F8.c b/src/main_menu/comm_command_mystery_gift.c
similarity index 52%
rename from src/main_menu/ov97_0222D2F8.c
rename to src/main_menu/comm_command_mystery_gift.c
index 0353060e7e9..0f795bd7bcd 100644
--- a/src/main_menu/ov97_0222D2F8.c
+++ b/src/main_menu/comm_command_mystery_gift.c
@@ -1,8 +1,10 @@
-#include "main_menu/ov97_0222D2F8.h"
+#include "main_menu/comm_command_mystery_gift.h"
 
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 
 #include "main_menu/ov97_0222D04C.h"
@@ -10,8 +12,8 @@
 #include "comm_command.h"
 
 static const CommCmdTable Unk_ov97_0223D704[] = {
-    { ov97_0222D284, ov97_0222D2B0, ov97_0222D2B8 },
-    { ov97_0222D2C4, CommPacketSizeOf_Nothing, NULL }
+    [COMM_CMD_MYSTERY_GIFT_22 - COMM_CMD_MAX_COMMON] = { CommCmd_MysteryGift_22, ov97_0222D2B0, ov97_0222D2B8 },
+    [COMM_CMD_MYSTERY_GIFT_23 - COMM_CMD_MAX_COMMON] = { CommCmd_MysteryGift_23, CommPacketSizeOf_Nothing, NULL }
 };
 
 void ov97_0222D2F8(void *param0)
diff --git a/src/main_menu/ov97_0222D04C.c b/src/main_menu/ov97_0222D04C.c
index f9ee973faae..cf4fe3e886c 100644
--- a/src/main_menu/ov97_0222D04C.c
+++ b/src/main_menu/ov97_0222D04C.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "main_menu/mystery_gift_app.h"
-#include "main_menu/ov97_0222D2F8.h"
+#include "main_menu/comm_command_mystery_gift.h"
 
 #include "comm_manager.h"
 #include "communication_information.h"
@@ -215,7 +215,7 @@ int ov97_0222D250(MysteryGiftAppData *param0)
     return -1;
 }
 
-void ov97_0222D284(int param0, int param1, void *param2, void *param3)
+void CommCmd_MysteryGift_22(int param0, int param1, void *param2, void *param3)
 {
     if (Unk_ov97_0223F1A4->unk_27 != param0) {
         return;
@@ -239,7 +239,7 @@ u8 *ov97_0222D2B8(int param0, void *param1, int param2)
     return (u8 *)&Unk_ov97_0223F1A4->unk_68;
 }
 
-void ov97_0222D2C4(int param0, int param1, void *param2, void *param3)
+void CommCmd_MysteryGift_23(int param0, int param1, void *param2, void *param3)
 {
     Unk_ov97_0223F1A4->unk_3C1[param0] = 1;
 }
diff --git a/src/meson.build b/src/meson.build
index 745325187d1..4b67322e24a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -873,7 +873,7 @@ pokeplatinum_c = files(
     'main_menu/main_menu.c',
     'main_menu/ranger_link.c',
     'main_menu/ov97_0222D04C.c',
-    'main_menu/ov97_0222D2F8.c',
+    'main_menu/comm_command_mystery_gift.c',
     'main_menu/mystery_gift_app.c',
     'main_menu/wonder_cards_app.c',
     'main_menu/ov97_02232054.c',

From 9bd8709d19325bcd8e3a3b575631075ed4d37ed3 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 26 May 2026 06:26:28 -0400
Subject: [PATCH 35/39] Add COMM_CMD constants to CommSys_Send functions

---
 include/comm_player_manager.h                 |  2 +-
 .../constants/communication/comm_command.h    | 32 +++++-----
 src/battle/battle_controller.c                |  2 +-
 src/battle/battle_controller_player.c         |  3 +-
 src/battle/battle_main.c                      |  2 +-
 src/comm_command_contest.c                    | 10 +--
 src/comm_command_draw.c                       | 12 ++--
 src/comm_command_field.c                      |  2 +-
 src/comm_command_record_corner.c              | 10 +--
 src/comm_command_spin_trade.c                 |  6 +-
 src/comm_command_trade.c                      |  4 +-
 src/comm_command_waiting_room.c               |  2 +
 src/comm_player_manager.c                     | 17 ++---
 src/contest.c                                 |  2 +-
 src/field_comm_manager.c                      | 13 ++--
 src/main_menu/comm_command_mystery_gift.c     |  2 +
 src/main_menu/ov97_0222D04C.c                 |  6 +-
 src/overlay006/ov6_022489E4.c                 | 18 +++---
 src/overlay017/ov17_0224CFB8.c                |  4 +-
 src/overlay017/ov17_0224F18C.c                |  4 +-
 src/overlay022/ov22_02255D44.c                |  2 +-
 src/overlay022/ov22_0225A428.c                |  2 +-
 src/overlay058/ov58_021D0D80.c                | 16 ++---
 src/overlay059/ov59_021D0D80.c                | 31 ++++-----
 src/overlay065/ov65_0223648C.c                | 15 ++---
 src/overlay083/ov83_0223B5A0.c                | 21 ++++---
 src/overlay083/ov83_0223D150.c                |  8 ++-
 src/overlay088/ov88_0223B140.c                | 31 ++++-----
 src/overlay109/ov109_021D0D80.c               |  5 +-
 src/overlay109/ov109_021D3D50.c               |  2 +-
 src/overlay114/comm_command_minigame.c        |  6 +-
 src/overlay114/ov114_0225C700.c               | 11 ++--
 src/overlay114/ov114_02260044.c               |  2 +-
 src/overlay115/comm_command_swalot_plop.c     |  2 +
 src/overlay115/ov115_02260440.c               | 18 +++---
 src/overlay115/ov115_02265A24.c               |  2 +-
 src/overlay116/ov116_022604C4.c               |  7 ++-
 src/overlay116/ov116_02262A8C.c               |  6 +-
 src/overlay117/ov117_02260668.c               |  2 +-
 src/scrcmd.c                                  |  2 +-
 src/scrcmd_battle_hall.c                      |  5 +-
 src/underground/comm_manager.c                |  5 +-
 src/underground/manager.c                     | 27 ++++----
 src/underground/menus.c                       |  3 +-
 src/underground/mining.c                      | 21 ++++---
 src/underground/pc.c                          |  7 ++-
 src/underground/player.c                      | 23 +++----
 src/underground/player_talk.c                 | 21 ++++---
 src/underground/records.c                     |  5 +-
 src/underground/secret_bases.c                | 35 ++++++-----
 src/underground/traps.c                       | 63 ++++++++++---------
 src/unk_0204FAB4.c                            |  6 +-
 src/unk_0205003C.c                            |  6 +-
 src/unk_0205A0D8.c                            | 10 +--
 src/unk_0205B33C.c                            | 17 ++---
 src/unk_0209C194.c                            |  2 +-
 56 files changed, 331 insertions(+), 269 deletions(-)

diff --git a/include/comm_player_manager.h b/include/comm_player_manager.h
index 20b7a994169..ecc18e705bf 100644
--- a/include/comm_player_manager.h
+++ b/include/comm_player_manager.h
@@ -138,7 +138,7 @@ int CommPlayerMan_GetLinkNetIDAtLocation(int xPos, int zPos);
 void CommPlayerMan_SetMovementEnabled(int netId, BOOL movementEnabled);
 BOOL CommPlayerMan_IsMovementEnabled(int netId);
 BOOL sub_020590C4(void);
-void CommCmd_Field_93(int netId, int unused0, void *src, void *unused3);
+void CommCmd_Field_94(int netId, int unused0, void *src, void *unused3);
 void CommPlayer_SetBattleDir(void);
 BOOL sub_0205928C(void);
 int CommPlayer_GetOppositeDir(int dir);
diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index 7259b0c81d1..f960dbd7c22 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -90,77 +90,77 @@ enum CommCommand_Field {
     COMM_CMD_RECV_PLAYER_LOCATION = COMM_CMD_MAX_COMMON,
     COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT,
     COMM_CMD_VENDOR_TALK_REQUEST,
-    COMM_CMD_VENDOR_TALK,
+    COMM_CMD_VENDOR_TALK, // 25
     COMM_CMD_VENDOR_TALK_SERVER,
     COMM_CMD_OPEN_MENU_REQUEST,
     COMM_CMD_INTERACT_EVENT,
     COMM_CMD_OPEN_MENU_EVENT,
-    COMM_CMD_TALK_EVENT,
+    COMM_CMD_TALK_EVENT, // 30
     COMM_CMD_PROCESS_ALL_DATA_SENT_MSG,
     COMM_CMD_TRY_PLACE_TRAP,
     COMM_CMD_REMOVE_BURIED_TRAP_INDEX,
     COMM_CMD_PLACE_TRAP_RESULT,
-    COMM_CMD_LOAD_LINK_TRAPS,
+    COMM_CMD_LOAD_LINK_TRAPS, // 35
     COMM_CMD_RECV_LOAD_TRAPS,
     COMM_CMD_TRIGGER_TRAP,
     COMM_CMD_CALL_SECOND_TRAP_EFFECT,
     COMM_CMD_START_SLIDE_ANIM,
-    COMM_CMD_ESCAPE_HOLE,
+    COMM_CMD_ESCAPE_HOLE, // 40
     COMM_CMD_ESCAPE_TRAP,
     COMM_CMD_ESCAPED_TRAP,
     COMM_CMD_END_TRAP_EFFECT,
     COMM_CMD_TRAP_HELP,
-    COMM_CMD_TRIGGERD_TRAP_BITS,
+    COMM_CMD_TRIGGERD_TRAP_BITS, // 45
     COMM_CMD_SEND_TRAP_RADAR_RESULTS,
     COMM_CMD_RECV_TRAP_RADAR_RESULTS,
     COMM_CMD_UNDERGROUND_TOUCH_INPUT,
     COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS,
-    COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS,
+    COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS, // 50
     COMM_CMD_DISENGAGE_TRAP,
     COMM_CMD_DELETE_PLAYER,
     COMM_CMD_BASE_INFO,
     COMM_CMD_ENTER_BASE,
-    COMM_CMD_BASE_ENTRANCE_BUFFER,
+    COMM_CMD_BASE_ENTRANCE_BUFFER, // 55
     COMM_CMD_CLEAR_TRANSITION_STATUS,
     COMM_CMD_EXIT_BASE,
     COMM_CMD_BASE_TRANSMITION_PROMPT,
     COMM_CMD_BASE_TRANSITION_EVENT,
-    COMM_CMD_SECRET_BASE_GOOD_INTERACTION,
+    COMM_CMD_SECRET_BASE_GOOD_INTERACTION, // 60
     COMM_CMD_ENTER_BASE_FAILED,
     COMM_CMD_FIELD_62,
     COMM_CMD_RETRIEVE_BURIED_SPHERES,
     COMM_CMD_INTERACT_MINING_SPOT,
-    COMM_CMD_CONFIRM_START_MINING_RESULT,
+    COMM_CMD_CONFIRM_START_MINING_RESULT, // 65
     COMM_CMD_CONFIRM_START_MINING,
     COMM_CMD_END_MINING,
     COMM_CMD_MINING_LINK_INPUT,
     COMM_CMD_MINING_LINK_INPUT_SERVER,
-    COMM_CMD_PLAYER_STATE_UNDERGROUND,
+    COMM_CMD_PLAYER_STATE_UNDERGROUND, // 70
     COMM_CMD_START_TREASURE_RADAR,
     COMM_CMD_MINING_SPOT_RADAR,
     COMM_CMD_REQUEST_TALK_UPDATE_SERVER,
     COMM_CMD_RESPONSE_TALK_UPDATE_SERVER,
-    COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER,
+    COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER, // 75
     COMM_CMD_TALK_UPDATE_SERVER,
     COMM_CMD_SEND_GIFT_SERVER,
     COMM_CMD_RECV_GIFT_OFFER,
     COMM_CMD_SEND_TALK_MSG_SERVER,
-    COMM_CMD_RECV_TALK_MSG_SERVER,
+    COMM_CMD_RECV_TALK_MSG_SERVER, // 80
     COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER,
     COMM_CMD_UNDERGROUND_RECORD,
     COMM_CMD_UNDERGROUND_PC_INTERACT,
     COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE,
-    COMM_CMD_UNDERGROUND_FLAG_EVENT,
+    COMM_CMD_UNDERGROUND_FLAG_EVENT, // 85
     COMM_CMD_CREATE_SECRET_BASE_REQUEST,
     COMM_CMD_CREATE_SECRET_BASE_EVENT,
     COMM_CMD_TRAINER_CASE_COPIED,
     COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG,
-    COMM_CMD_UNDERGROUND_TAKEN_FLAG,
+    COMM_CMD_UNDERGROUND_TAKEN_FLAG, // 90
     COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO,
     COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER,
     COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK,
-    COMM_CMD_FIELD_93,
-    COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM,
+    COMM_CMD_FIELD_94,
+    COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM, // 95
     COMM_CMD_UNDERGROUND_FLAG_RANK_UP,
     COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT,
     COMM_CMD_FIELD_98,
diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c
index 80dc568b115..117aa58c5ac 100644
--- a/src/battle/battle_controller.c
+++ b/src/battle/battle_controller.c
@@ -21,13 +21,13 @@
 #include "battle/message_defs.h"
 #include "battle/struct_ov16_0224DDA8.h"
 
+#include "comm_command_battle.h"
 #include "communication_system.h"
 #include "flags.h"
 #include "move_table.h"
 #include "party.h"
 #include "pokemon.h"
 #include "unk_0202F1D4.h"
-#include "comm_command_battle.h"
 
 static void BattleController_SendLocalMessage(BattleSystem *battleSys, int recipient, int battler, void *message, u8 size);
 static void SendMessage(BattleSystem *battleSys, int recipient, int battler, void *message, u8 size);
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 723e208ecc9..d9370dcd784 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include "constants/battle.h"
+#include "constants/communication/comm_command.h"
 #include "constants/game_options.h"
 #include "constants/heap.h"
 #include "constants/items.h"
@@ -4051,7 +4052,7 @@ static void BattleControllerPlayer_EndFight(BattleSystem *battleSys, BattleConte
     }
 
     if (battleType & BATTLE_TYPE_LINK) {
-        CommSys_SendMessage(22);
+        CommSys_SendMessage(COMM_CMD_BATTLE_22);
     }
 
     battleCtx->command = BATTLE_CONTROL_END_WAIT;
diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c
index d70d77b772f..9bcf382c89b 100644
--- a/src/battle/battle_main.c
+++ b/src/battle/battle_main.c
@@ -37,6 +37,7 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "cell_transfer.h"
+#include "comm_command_battle.h"
 #include "comm_manager.h"
 #include "communication_system.h"
 #include "evolution.h"
@@ -84,7 +85,6 @@
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_02038F8C.h"
-#include "comm_command_battle.h"
 #include "unk_0208C098.h"
 #include "vram_transfer.h"
 
diff --git a/src/comm_command_contest.c b/src/comm_command_contest.c
index 49c85cbfa83..f53c4be2201 100644
--- a/src/comm_command_contest.c
+++ b/src/comm_command_contest.c
@@ -29,6 +29,7 @@ static void CommCmd_Contest_35(int param0, int param1, void *param2, void *param
 static int sub_02095B24(void);
 static int sub_02095B28(void);
 
+// clang-format off
 static const CommCmdTable Unk_020F58FC[] = {
     [COMM_CMD_CONTEST_DUMMY - COMM_CMD_MAX_COMMON] = { NULL, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_CONTEST_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_23, CommPacketSizeOf_Nothing, NULL },
@@ -47,6 +48,7 @@ static const CommCmdTable Unk_020F58FC[] = {
     [COMM_CMD_CONTEST_36 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_36, CommPacketSizeOf_Variable, sub_02095B04 },
     [COMM_CMD_CONTEST_37 - COMM_CMD_MAX_COMMON] = { CommCmd_Contest_37, CommPacketSizeOf_Variable, NULL }
 };
+// clang-format on
 
 void sub_02095AF0(void *param0)
 {
@@ -104,7 +106,7 @@ BOOL sub_02095B5C(Contest *param0, int param1, const UnkStruct_02029C88 *param2)
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
-    if (CommSys_SendData(32, v0, v1 + 1) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_32, v0, v1 + 1) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -152,7 +154,7 @@ BOOL sub_02095BEC(Contest *param0, UnkStruct_02029C88 **param1)
         MI_CpuCopy8(param1[v4], &v0[v1 * v4], v1);
     }
 
-    if (CommSys_SendDataHuge(33, v0, v2) == 1) {
+    if (CommSys_SendDataHuge(COMM_CMD_CONTEST_33, v0, v2) == 1) {
         v3 = 1;
     } else {
         v3 = 0;
@@ -180,7 +182,7 @@ BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1)
 
     param0->unk_08.unk_00 = param1;
 
-    if (CommSys_SendData(34, &param0->unk_08, sizeof(UnkStruct_02095B28)) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_34, &param0->unk_08, sizeof(UnkStruct_02095B28)) == 1) {
         return 1;
     }
 
@@ -203,7 +205,7 @@ BOOL sub_02095CA8(UnkStruct_02095C60 *param0, int param1)
 
     param0->unk_08.unk_04 = param1;
 
-    if (CommSys_SendData(35, &param0->unk_08, sizeof(UnkStruct_02095B28)) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_35, &param0->unk_08, sizeof(UnkStruct_02095B28)) == 1) {
         return 1;
     }
 
diff --git a/src/comm_command_draw.c b/src/comm_command_draw.c
index 1406b272d31..7e0bb6d834d 100644
--- a/src/comm_command_draw.c
+++ b/src/comm_command_draw.c
@@ -15,9 +15,9 @@
 
 #include "bg_window.h"
 #include "comm_command.h"
+#include "comm_command_field.h"
 #include "comm_manager.h"
 #include "communication_system.h"
-#include "comm_command_field.h"
 #include "wireless_manager.h"
 
 typedef struct UnkStruct_02095EAC_t UnkStruct_02095EAC;
@@ -28,6 +28,7 @@ static int sub_020961E4(void);
 static void sub_0209617C(UnkStruct_02095EAC *param0, int param1);
 static void CommCmd_Field_Draw_129(int param0, int param1, void *param2, void *param3);
 
+// clang-format off
 static const CommCmdTable Unk_020F5A40[] = {
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
@@ -140,6 +141,7 @@ static const CommCmdTable Unk_020F5A40[] = {
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_NetId, NULL }
 };
+// clang-format on
 
 void sub_02095E98(void *param0)
 {
@@ -169,7 +171,7 @@ void CommCmd_Field_Draw_118(int param0, int param1, void *param2, void *param3)
             v0->unk_4430++;
             sub_0209617C(v0, v0->unk_4430);
         } else {
-            CommSys_SendDataServer(124, NULL, 0);
+            CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_124, NULL, 0);
         }
     }
 }
@@ -246,7 +248,7 @@ void CommCmd_Field_Draw_126(int param0, int param1, void *param2, void *param3)
                 break;
             }
 
-            CommSys_SendDataServer(126, &v1, sizeof(UnkStruct_02095FE4));
+            CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_126, &v1, sizeof(UnkStruct_02095FE4));
         }
     } else {
         switch (v2->unk_02) {
@@ -314,7 +316,7 @@ void CommCmd_Field_Draw_128(int param0, int param1, void *param2, void *param3)
     if (CommSys_CurNetId() == 0) {
         if (v0->unk_9460 != 0) {
             v1 = param0;
-            CommSys_SendDataServer(123, &v1, 1);
+            CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_123, &v1, 1);
         } else {
             v0->unk_9460 = 1;
         }
@@ -350,7 +352,7 @@ static void sub_0209617C(UnkStruct_02095EAC *param0, int param1)
 
     param0->unk_7C74.unk_3EC = param1;
 
-    CommSys_SendDataHugeServer(118, &param0->unk_7C74, sizeof(UnkStruct_02095EAC_sub1));
+    CommSys_SendDataHugeServer(COMM_CMD_FIELD_DRAWING_118, &param0->unk_7C74, sizeof(UnkStruct_02095EAC_sub1));
 }
 
 static u8 *sub_020961D0(int param0, void *param1, int param2)
diff --git a/src/comm_command_field.c b/src/comm_command_field.c
index 9cf48a84a71..d633081ed62 100644
--- a/src/comm_command_field.c
+++ b/src/comm_command_field.c
@@ -121,7 +121,7 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfo, CommPacketSizeOf_TrainerInfo, NULL },
     [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfoServer, CommPacketSizeOf_HeldFlagInfo, UndergroundPlayer_GetHeldFlagInfoBuffer },
     [COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundHeldFlagOwnerInfoAck, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_FIELD_93 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_93, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_FIELD_94 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_94, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM - COMM_CMD_MAX_COMMON] = { CommCmd_UpdateBattleRoomMovement, CommPacketSizeOf_NetId, NULL }, // 95
     [COMM_CMD_UNDERGROUND_FLAG_RANK_UP - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagRankUp, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundFlagRankUpEvent, CommPacketSizeOf_FlagRankUpEvent, NULL },
diff --git a/src/comm_command_record_corner.c b/src/comm_command_record_corner.c
index 42939aabb1f..a22f13cb64e 100644
--- a/src/comm_command_record_corner.c
+++ b/src/comm_command_record_corner.c
@@ -13,11 +13,11 @@
 #include "overlay059/struct_ov59_021D30E0.h"
 
 #include "comm_command.h"
+#include "comm_command_field.h"
 #include "comm_manager.h"
 #include "communication_system.h"
 #include "math_util.h"
 #include "sound_playback.h"
-#include "comm_command_field.h"
 #include "wireless_manager.h"
 
 typedef struct UnkStruct_020961E8_t UnkStruct_020961E8;
@@ -30,6 +30,7 @@ static void sub_020963C0(UnkStruct_020961E8 *param0, int param1);
 void CommCmd_Field_RecordCorner_116(int param0, int param1, void *param2, void *param3);
 void CommCmd_Field_RecordCorner_117(int param0, int param1, void *param2, void *param3);
 
+// clang-format off
 static const CommCmdTable Unk_020F5F68[] = {
     { CommCmd_Field_Dummy, sub_02096400, NULL },
     { CommCmd_Field_Dummy, sub_02096400, NULL },
@@ -142,6 +143,7 @@ static const CommCmdTable Unk_020F5F68[] = {
     { CommCmd_Field_Dummy, sub_02096400, NULL },
     { CommCmd_Field_Dummy, sub_02096400, NULL }
 };
+// clang-format on
 
 void sub_020961E8(void *param0)
 {
@@ -225,7 +227,7 @@ void CommCmd_Field_RecordCorner_112(int param0, int param1, void *param2, void *
                 break;
             }
 
-            CommSys_SendData(112, &v1, sizeof(UnkStruct_02096274));
+            CommSys_SendData(COMM_CMD_FIELD_RECORD_112, &v1, sizeof(UnkStruct_02096274));
         }
     } else {
         switch (v2->unk_02) {
@@ -283,7 +285,7 @@ void CommCmd_Field_RecordCorner_114(int param0, int param1, void *param2, void *
 
     if (CommSys_CurNetId() == 0) {
         v0 = param0;
-        CommSys_SendData(110, &v0, 1);
+        CommSys_SendData(COMM_CMD_FIELD_RECORD_110, &v0, 1);
     }
 }
 
@@ -303,7 +305,7 @@ static void sub_020963C0(UnkStruct_020961E8 *param0, int param1)
     }
 
     param0->unk_418.unk_BBC = LCRNG_Next();
-    CommSys_SendDataHuge(116, &param0->unk_418, sizeof(UnkStruct_ov59_021D30E0));
+    CommSys_SendDataHuge(COMM_CMD_FIELD_RECORD_116, &param0->unk_418, sizeof(UnkStruct_ov59_021D30E0));
 }
 
 static int sub_02096400(void)
diff --git a/src/comm_command_spin_trade.c b/src/comm_command_spin_trade.c
index 7ca11057c06..801706e73bb 100644
--- a/src/comm_command_spin_trade.c
+++ b/src/comm_command_spin_trade.c
@@ -18,13 +18,13 @@
 #include "overlay109/struct_ov109_021D17EC.h"
 
 #include "comm_command.h"
+#include "comm_command_field.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "heap.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
-#include "comm_command_field.h"
 #include "wireless_manager.h"
 
 typedef struct {
@@ -81,7 +81,7 @@ static BOOL sub_0209BE84(UnkStruct_0209BDF8 *param0, u32 param1, const void *par
 
         v1->unk_00 = param1;
         memcpy(v1->unk_04, param2, param3);
-        v0 = CommSys_SendData(130, v1, 24);
+        v0 = CommSys_SendData(COMM_CMD_FIELD_SPIN_TRADE_130, v1, 24);
 
         return v0;
     }
@@ -359,6 +359,7 @@ void *sub_0209C188(UnkStruct_0209BDF8 *param0, int param1)
     return (void *)v0;
 }
 
+// clang-format off
 static const CommCmdTable Unk_020F8EA8[135] = {
     { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
     { CommCmd_Field_Dummy, CommPacketSizeOf_Nothing, NULL },
@@ -471,6 +472,7 @@ static const CommCmdTable Unk_020F8EA8[135] = {
     [COMM_CMD_FIELD_SPIN_TRADE_130 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_SpinTrade_130, sub_0209C154, NULL },
     [COMM_CMD_FIELD_SPIN_TRADE_131 - COMM_CMD_MAX_COMMON] = { CommCmd_Field_SpinTrade_131, sub_0209C158, sub_0209C160 }
 };
+// clang-format on
 
 static const CommCmdRecvFunc Unk_020F8E60[18] = {
     sub_0209C040,
diff --git a/src/comm_command_trade.c b/src/comm_command_trade.c
index 86b67dbbbab..772607067d8 100644
--- a/src/comm_command_trade.c
+++ b/src/comm_command_trade.c
@@ -29,6 +29,7 @@ static u8 *sub_02095E80(int param0, void *param1, int param2);
 static int sub_02095E68(void);
 static int sub_02095E70(void);
 
+// clang-format off
 static const CommCmdTable Unk_020F59BC[] = {
     [COMM_CMD_TRADE_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_22, sub_02095E78, sub_02095E80 },
     [COMM_CMD_TRADE_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_23, CommPacketSizeOf_NetId },
@@ -42,6 +43,7 @@ static const CommCmdTable Unk_020F59BC[] = {
     [COMM_CMD_TRADE_31 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_31, CommPacketSizeOf_NetId },
     [COMM_CMD_TRADE_32 - COMM_CMD_MAX_COMMON] = { CommCmd_Trade_32, sub_02095E70 }
 };
+// clang-format on
 
 void sub_02095CD4(void *param0)
 {
@@ -73,7 +75,7 @@ void CommCmd_Trade_22(int param0, int param1, void *param2, void *param3)
 
         if ((v1->unk_58) * (236 * 6 + 4 * 2) >= Party_SaveSize()) {
             if (CommSys_CurNetId() == 1) {
-                ov88_0223D058(v1, 27, 0);
+                ov88_0223D058(v1, COMM_CMD_TRADE_27, 0);
             } else {
                 ov88_0223D098(CommSys_CurNetId(), v1->unk_2270, v1->unk_50);
             }
diff --git a/src/comm_command_waiting_room.c b/src/comm_command_waiting_room.c
index e61ed889949..b94232bf0df 100644
--- a/src/comm_command_waiting_room.c
+++ b/src/comm_command_waiting_room.c
@@ -9,11 +9,13 @@
 
 #include "unk_0209C390.h"
 
+// clang-format off
 static const CommCmdTable Unk_020E5F24[] = {
     [COMM_CMD_WAITING_ROOM_22 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_22, sub_0209C3C8, NULL },
     [COMM_CMD_WAITING_ROOM_23 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_23, sub_0209C3C4, NULL },
     [COMM_CMD_WAITING_ROOM_24 - COMM_CMD_MAX_COMMON] = { CommCmd_WaitingRoom_24, sub_0209C3CC, NULL }
 };
+// clang-format on
 
 const CommCmdTable *sub_02039A58(void)
 {
diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index c505f05d036..54cfec41480 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -5,6 +5,7 @@
 #include <nnsys/g3d/glbstate.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/communication/comm_packets.h"
 #include "constants/heap.h"
 #include "generated/movement_actions.h"
@@ -281,7 +282,7 @@ void CommPlayer_SendXZPos(BOOL param0, int x, int z)
         data[4] = data[4] | 0x80;
     }
 
-    CommSys_SendDataFixedSize(22, data);
+    CommSys_SendDataFixedSize(COMM_CMD_RECV_PLAYER_LOCATION, data);
     sCommPlayerManager->sendAllPos = TRUE;
 }
 
@@ -330,7 +331,7 @@ static void CommPlayer_SendPosNetId(int netId, const CommPlayerLocation *playerL
     data[0] += ((playerLocation->dir % 4) << 4);
     data[0] += (playerLocation->moveSpeed << 6);
 
-    CommSys_SendDataServer(23, data, 0);
+    CommSys_SendDataServer(COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT, data, 0);
 }
 
 void CommPlayer_SendDataTask(void *data)
@@ -548,7 +549,7 @@ void sub_02057FC4(BOOL param0)
             sCommPlayerManager->isFieldSystemActive = param0;
         }
 
-        CommSys_SendDataFixedSize(62, &sCommPlayerManager->isFieldSystemActive);
+        CommSys_SendDataFixedSize(COMM_CMD_FIELD_62, &sCommPlayerManager->isFieldSystemActive);
     }
 }
 
@@ -557,7 +558,7 @@ static void sub_02057FF0(BOOL param0)
     if (sCommPlayerManager != NULL) {
         if (sCommPlayerManager->isFieldSystemActive != param0) {
             sCommPlayerManager->isFieldSystemActive = param0;
-            CommSys_SendDataFixedSize(62, &sCommPlayerManager->isFieldSystemActive);
+            CommSys_SendDataFixedSize(COMM_CMD_FIELD_62, &sCommPlayerManager->isFieldSystemActive);
         }
     }
 }
@@ -757,7 +758,7 @@ static void CommPlayer_Move(SysTask *unused0, void *unused1)
                 u8 data = netId;
 
                 sCommPlayerManager->holeMovementsLeft[netId] = 1;
-                CommSys_SendDataFixedSizeServer(40, &data);
+                CommSys_SendDataFixedSizeServer(COMM_CMD_ESCAPE_HOLE, &data);
                 continue;
             }
 
@@ -1495,7 +1496,7 @@ BOOL sub_020590C4(void)
     return v8;
 }
 
-void CommCmd_Field_93(int netId, int unused0, void *src, void *unused3)
+void CommCmd_Field_94(int netId, int unused0, void *src, void *unused3)
 {
     u8 *buffer = src;
 
@@ -1539,7 +1540,7 @@ static void sub_020591A8(void)
         for (netJd = 0; netJd < connectedPlayers; netJd++) {
             if ((CommPlayer_GetXServerIfActive(netId) == v6[netJd].unk_00) && (CommPlayer_GetZServerIfActive(netId) == v6[netJd].unk_02)) {
                 sCommPlayerManager->unk_F2[netId] = 1;
-                CommSys_SendDataFixedSizeServer(95, &netId);
+                CommSys_SendDataFixedSizeServer(COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM, &netId);
             }
         }
     }
@@ -1677,7 +1678,7 @@ void CommPlayerMan_ResumeFieldSystemWithContextBit(int contextBit)
 
     if (sCommPlayerManager->pauseBits == PAUSE_BIT_TRAPS) {
         u8 data = 1;
-        CommSys_SendDataFixedSize(62, &data);
+        CommSys_SendDataFixedSize(COMM_CMD_FIELD_62, &data);
     }
 
     if (sCommPlayerManager->pauseBits == 0) {
diff --git a/src/contest.c b/src/contest.c
index 1407b522590..16bd45c4f41 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -32,6 +32,7 @@
 #include "assert.h"
 #include "brightness_controller.h"
 #include "chatot_cry.h"
+#include "comm_command_contest.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "field_task.h"
@@ -58,7 +59,6 @@
 #include "unk_020298BC.h"
 #include "unk_020363E8.h"
 #include "unk_02094EDC.h"
-#include "comm_command_contest.h"
 #include "vars_flags.h"
 
 FS_EXTERN_OVERLAY(overlay17);
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index e46435ee91e..6de521fa50a 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/communication/comm_sync.h"
 #include "constants/communication/comm_type.h"
 #include "constants/graphics.h"
@@ -14,6 +15,7 @@
 #include "underground/manager.h"
 
 #include "appearance.h"
+#include "comm_command_field.h"
 #include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
@@ -33,7 +35,6 @@
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_0205A0D8.h"
-#include "comm_command_field.h"
 
 static void FieldCommManager_RunTask(SysTask *task, void *unused);
 static void FieldCommManager_SetTask(FieldCommTask task, int time);
@@ -483,7 +484,7 @@ static void FieldCommTask_EnterBattleRoom_SendPos(void)
         CommPlayer_SendPos(FALSE);
 
         u8 data = 1;
-        CommSys_SendDataFixedSize(94, &data);
+        CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data);
 
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
@@ -528,7 +529,7 @@ static void FieldCommTask_WaitBattleRoomMovement(void)
         sFieldCommMan->battleRoomMovement = FALSE;
 
         u8 data = 1;
-        CommSys_SendDataFixedSize(94, &data);
+        CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data);
 
         FieldCommManager_SetTask(FieldCommTask_BattleRoomMovement, 0);
     }
@@ -553,7 +554,7 @@ static void FieldCommManager_UnknownCallback(BOOL param0, const Party *party)
         FieldCommManager_SetTask(FieldCommTask_InitializeVsBattle, 3);
     } else {
         u8 data = 3;
-        CommSys_SendDataFixedSize(94, &data);
+        CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data);
 
         FieldCommManager_SetTask(FieldCommTask_WaitBattleRoomMovement, 0);
     }
@@ -595,7 +596,7 @@ static void FieldCommTask_BattleRoomMovement(void)
         FieldCommManager_SetTask(FieldCommTask_02059C8C, 5);
 
         u8 data = 0;
-        CommSys_SendDataFixedSize(94, &data);
+        CommSys_SendDataFixedSize(COMM_CMD_FIELD_94, &data);
     }
 
     FieldCommManager_CheckExitRoom();
@@ -788,7 +789,7 @@ static void FieldCommTask_StartCopyTrainerCase(void)
     int netId = CommSys_CurNetId();
 
     if (CommTiming_IsSyncState(SYNC_SEND_TRAINER_CASE)) {
-        CommSys_SendDataHuge(88, sFieldCommMan->trainerCase[netId], sizeof(TrainerCase));
+        CommSys_SendDataHuge(COMM_CMD_TRAINER_CASE_COPIED, sFieldCommMan->trainerCase[netId], sizeof(TrainerCase));
         FieldCommManager_SetTask(FieldCommTask_CopyTrainerCase, 0);
     }
 }
diff --git a/src/main_menu/comm_command_mystery_gift.c b/src/main_menu/comm_command_mystery_gift.c
index 0f795bd7bcd..48ab69eddba 100644
--- a/src/main_menu/comm_command_mystery_gift.c
+++ b/src/main_menu/comm_command_mystery_gift.c
@@ -11,10 +11,12 @@
 
 #include "comm_command.h"
 
+// clang-format off
 static const CommCmdTable Unk_ov97_0223D704[] = {
     [COMM_CMD_MYSTERY_GIFT_22 - COMM_CMD_MAX_COMMON] = { CommCmd_MysteryGift_22, ov97_0222D2B0, ov97_0222D2B8 },
     [COMM_CMD_MYSTERY_GIFT_23 - COMM_CMD_MAX_COMMON] = { CommCmd_MysteryGift_23, CommPacketSizeOf_Nothing, NULL }
 };
+// clang-format on
 
 void ov97_0222D2F8(void *param0)
 {
diff --git a/src/main_menu/ov97_0222D04C.c b/src/main_menu/ov97_0222D04C.c
index cf4fe3e886c..699947d5138 100644
--- a/src/main_menu/ov97_0222D04C.c
+++ b/src/main_menu/ov97_0222D04C.c
@@ -3,8 +3,10 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "main_menu/mystery_gift_app.h"
+#include "constants/communication/comm_command.h"
+
 #include "main_menu/comm_command_mystery_gift.h"
+#include "main_menu/mystery_gift_app.h"
 
 #include "comm_manager.h"
 #include "communication_information.h"
@@ -172,7 +174,7 @@ void ov97_0222D1C4(MysteryGiftAppData *param0, SaveData *saveData, int param2)
 
 void ov97_0222D1F0(const void *param0, int param1)
 {
-    CommSys_SendDataHugeServer(22, param0, param1);
+    CommSys_SendDataHugeServer(COMM_CMD_MYSTERY_GIFT_22, param0, param1);
 }
 
 void ov97_0222D200(MysteryGiftAppData *param0, int param1)
diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c
index 5084defde56..f6bff3dffb9 100644
--- a/src/overlay006/ov6_022489E4.c
+++ b/src/overlay006/ov6_022489E4.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/struct_020954F0.h"
 
 #include "overlay006/struct_ov6_02248BE8.h"
@@ -54,7 +56,7 @@ BOOL ov6_02248A64(Contest *param0)
     v0.unk_01 = param0->unk_00.playerContestantID;
     v0.unk_02 = param0->unk_00.unk_112;
 
-    if (CommSys_SendData(26, &v0, sizeof(UnkStruct_ov6_02248A94)) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_26, &v0, sizeof(UnkStruct_ov6_02248A94)) == 1) {
         return 1;
     }
 
@@ -102,7 +104,7 @@ BOOL ov6_02248AF0(Contest *param0, int param1, const Pokemon *param2)
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
-    if (CommSys_SendData(27, v0, v1 + 1) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_27, v0, v1 + 1) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -145,7 +147,7 @@ BOOL ov6_02248B70(Contest *param0, Pokemon **param1)
         MI_CpuCopy8(param1[v4], &v0[v1 * v4], v1);
     }
 
-    if (CommSys_SendDataHuge(28, v0, v2) == 1) {
+    if (CommSys_SendDataHuge(COMM_CMD_CONTEST_28, v0, v2) == 1) {
         v3 = 1;
     } else {
         v3 = 0;
@@ -181,7 +183,7 @@ BOOL ov6_02248BE8(Contest *param0, int param1, const UnkStruct_ov6_02248BE8 *par
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
-    if (CommSys_SendData(29, v0, v1 + 1) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_29, v0, v1 + 1) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -226,7 +228,7 @@ BOOL ov6_02248C68(Contest *param0, int param1, const UnkStruct_020954F0 *param2)
 
     v0[v1 - 1] = param0->unk_00.unk_10E;
 
-    if (CommSys_SendData(30, v0, v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_30, v0, v1) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -274,7 +276,7 @@ BOOL ov6_02248CE8(Contest *contest, int param1, const String *trainerNames)
     v2[2] = 0;
     v2[3] = 0;
 
-    if (CommSys_SendData(31, v2, v0 + v1) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_31, v2, v0 + v1) == 1) {
         v3 = 1;
     } else {
         v3 = 0;
@@ -315,7 +317,7 @@ BOOL ov6_02248D64(Contest *param0, int param1, void *param2)
 
     v0[v1] = param1;
 
-    if (CommSys_SendDataHuge(36, v0, v1 + 1) == 1) {
+    if (CommSys_SendDataHuge(COMM_CMD_CONTEST_36, v0, v1 + 1) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
@@ -355,7 +357,7 @@ BOOL ov6_02248DD8(Contest *param0, int param1, const UnkStruct_ov6_02248DD8 *par
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
-    if (CommSys_SendData(37, v0, v1 + 1) == 1) {
+    if (CommSys_SendData(COMM_CMD_CONTEST_37, v0, v1 + 1) == 1) {
         v2 = 1;
     } else {
         v2 = 0;
diff --git a/src/overlay017/ov17_0224CFB8.c b/src/overlay017/ov17_0224CFB8.c
index 65246eccc96..36a45c62935 100644
--- a/src/overlay017/ov17_0224CFB8.c
+++ b/src/overlay017/ov17_0224CFB8.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "overlay017/ov17_0223DAD0.h"
 #include "overlay017/ov17_022492DC.h"
 #include "overlay017/ov17_0224A0FC.h"
@@ -543,7 +545,7 @@ static void ov17_0224D6CC(SysTask *param0, void *param1)
         ov17_0224B20C(v0->unk_04, &v0->unk_08);
         v0->unk_12 = 0;
     } else {
-        if (CommSys_SendDataFixedSize(25, &v0->unk_08) == 1) {
+        if (CommSys_SendDataFixedSize(COMM_CMD_CONTEST_25, &v0->unk_08) == 1) {
             v0->unk_12 = 0;
         }
     }
diff --git a/src/overlay017/ov17_0224F18C.c b/src/overlay017/ov17_0224F18C.c
index 7ab2528de40..69299bf84f5 100644
--- a/src/overlay017/ov17_0224F18C.c
+++ b/src/overlay017/ov17_0224F18C.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "overlay017/struct_ov17_02243C28.h"
 #include "overlay017/struct_ov17_02243C80.h"
 #include "overlay017/struct_ov17_0224F30C.h"
@@ -143,7 +145,7 @@ BOOL ov17_0224F35C(UnkStruct_ov17_0224F30C *param0)
 
         v0 = (void *)param0->unk_10;
 
-        if (CommSys_SendDataHuge(24, param0->unk_10, v0->unk_00) == 1) {
+        if (CommSys_SendDataHuge(COMM_CMD_CONTEST_24, param0->unk_10, v0->unk_00) == 1) {
             param0->unk_A10 = 0;
             return 1;
         }
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index 23fd526d88b..c55361c0698 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -47,6 +47,7 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
+#include "comm_command_contest.h"
 #include "font.h"
 #include "game_options.h"
 #include "game_records.h"
@@ -74,7 +75,6 @@
 #include "unk_020298BC.h"
 #include "unk_020363E8.h"
 #include "unk_02094EDC.h"
-#include "comm_command_contest.h"
 #include "yes_no_touch_menu.h"
 
 typedef struct {
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 1cbe8d4f2e8..dbe730548e9 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -16,6 +16,7 @@
 #include "overlay022/struct_ov22_0225AE9C.h"
 
 #include "bg_window.h"
+#include "comm_command_contest.h"
 #include "font.h"
 #include "game_options.h"
 #include "message.h"
@@ -29,7 +30,6 @@
 #include "string_gf.h"
 #include "sys_task.h"
 #include "text.h"
-#include "comm_command_contest.h"
 
 static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BgConfig *param1);
 static void ov22_0225A718(BgConfig *param0, const Options *options);
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 0399f4260e5..b91821e1b25 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_decls/struct_02095EAC_decl.h"
 #include "struct_defs/struct_0203DDFC.h"
 #include "struct_defs/struct_02095EAC_t.h"
@@ -13,6 +15,7 @@
 
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_command_draw.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -48,7 +51,6 @@
 #include "unk_020363E8.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
-#include "comm_command_draw.h"
 #include "vram_transfer.h"
 #include "wireless_manager.h"
 #include "yes_no_touch_menu.h"
@@ -248,7 +250,7 @@ int ov58_021D0F08(ApplicationManager *appMan, int *param1)
         if (IsScreenFadeDone()) {
             if (CommSys_CurNetId() != 0) {
                 if (ov58_021D2A30() >= 2) {
-                    CommSys_SendData(128, NULL, 0);
+                    CommSys_SendData(COMM_CMD_FIELD_DRAWING_128, NULL, 0);
                     *param1 = 1;
                 }
                 break;
@@ -1036,7 +1038,7 @@ static int ov58_021D1E4C(UnkStruct_02095EAC *param0, int param1)
 
             ov58_021D2CB0(param0, 7);
 
-            CommSys_SendData(126, &v1, sizeof(UnkStruct_02095FE4));
+            CommSys_SendData(COMM_CMD_FIELD_DRAWING_126, &v1, sizeof(UnkStruct_02095FE4));
             Window_EraseMessageBox(&param0->unk_33C, 1);
         }
 
@@ -1095,7 +1097,7 @@ static int ov58_021D1FD4(UnkStruct_02095EAC *param0, int param1)
         v0.unk_02 = 1;
         v0.unk_00 = CommSys_CurNetId();
 
-        CommSys_SendData(126, &v0, sizeof(UnkStruct_02095FE4));
+        CommSys_SendData(COMM_CMD_FIELD_DRAWING_126, &v0, sizeof(UnkStruct_02095FE4));
         param0->unk_941E = 0;
         ov58_021D2CB0(param0, 10);
     }
@@ -1186,7 +1188,7 @@ static int ov58_021D2180(UnkStruct_02095EAC *param0, int param1)
     switch (v0) {
     case YES_NO_TOUCH_MENU_YES:
         ov58_021D2CB0(param0, 15);
-        CommSys_SendDataServer(127, NULL, 0);
+        CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_127, NULL, 0);
         StringTemplate_SetPlayerName(param0->unk_0C, 0, CommInfo_TrainerInfo(0));
         param1 = 2;
         ov58_021D2D10(param0);
@@ -1653,11 +1655,11 @@ static void ov58_021D29C8(UnkStruct_02095EAC *param0)
         if (sub_02036284()) {
             param0->unk_43DC.unk_09 = param0->unk_9458;
             param0->unk_9421[0] = param0->unk_43DC;
-            CommSys_SendDataServer(120, param0->unk_9421, 10 * 5);
+            CommSys_SendDataServer(COMM_CMD_FIELD_DRAWING_120, param0->unk_9421, 10 * 5);
         }
     } else {
         if (sub_0203629C()) {
-            CommSys_SendData(119, &param0->unk_43DC, 10);
+            CommSys_SendData(COMM_CMD_FIELD_DRAWING_119, &param0->unk_43DC, 10);
         }
     }
 }
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 1dd0e323ac0..ab40d3a0e7f 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "generated/trainer_score_events.h"
 
 #include "struct_decls/struct_020961E8_decl.h"
@@ -16,6 +17,7 @@
 #include "appearance.h"
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_command_record_corner.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -54,7 +56,6 @@
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
-#include "comm_command_record_corner.h"
 #include "vram_transfer.h"
 #include "wireless_manager.h"
 
@@ -245,7 +246,7 @@ int ov59_021D0F00(ApplicationManager *appMan, int *param1)
 
             if (CommSys_CurNetId() != 0) {
                 if (ov59_021D2528() > 2) {
-                    CommSys_SendData(114, NULL, 0);
+                    CommSys_SendData(COMM_CMD_FIELD_RECORD_114, NULL, 0);
                 }
             }
         }
@@ -725,7 +726,7 @@ static void ov59_021D1864(UnkStruct_020961E8 *param0)
                 ov59_021D2628(param0, 3, 0);
                 ov59_021D19B0(param0, 22);
 
-                CommSys_SendData(117, &v0, 1);
+                CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v0, 1);
 
                 ov59_021D28D8(param0, 0);
             } else {
@@ -746,7 +747,7 @@ static void ov59_021D1864(UnkStruct_020961E8 *param0)
 
                 ov59_021D2628(param0, 4, 0);
                 ov59_021D19B0(param0, 4);
-                CommSys_SendData(117, &v1, 1);
+                CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v1, 1);
                 ov59_021D28D8(param0, 0);
             } else {
                 Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
@@ -757,7 +758,7 @@ static void ov59_021D1864(UnkStruct_020961E8 *param0)
             if ((CommSys_CurNetId() == 0) && (CommSys_ConnectedCount() == param0->unk_4AAC)) {
                 u8 v2 = 0;
 
-                CommSys_SendData(117, &v2, 1);
+                CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v2, 1);
             }
         }
     }
@@ -797,7 +798,7 @@ static int ov59_021D19E4(UnkStruct_020961E8 *param0, int param1)
     if (CommSys_CurNetId() == 0) {
         int v0 = 0;
 
-        CommSys_SendData(117, &v0, 1);
+        CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v0, 1);
     }
 
     param0->unk_3A8 = 3;
@@ -860,7 +861,7 @@ static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1)
             if (CommSys_CurNetId() == 0) {
                 int v2 = 0;
 
-                CommSys_SendData(117, &v2, 1);
+                CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v2, 1);
                 ov59_021D28D8(param0, 1);
             }
 
@@ -881,7 +882,7 @@ static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1)
                 param0->unk_4AC2 = 0;
                 param0->unk_3A8 = 6;
 
-                CommSys_SendData(112, &v3, sizeof(UnkStruct_02096274));
+                CommSys_SendData(COMM_CMD_FIELD_RECORD_112, &v3, sizeof(UnkStruct_02096274));
             }
         }
 
@@ -920,7 +921,7 @@ static int ov59_021D1B8C(UnkStruct_020961E8 *param0, int param1)
         v0.unk_02 = 1;
         v0.unk_00 = CommSys_CurNetId();
 
-        CommSys_SendData(112, &v0, sizeof(UnkStruct_02096274));
+        CommSys_SendData(COMM_CMD_FIELD_RECORD_112, &v0, sizeof(UnkStruct_02096274));
 
         param0->unk_4AC2 = 0;
         param0->unk_3A8 = 9;
@@ -967,7 +968,7 @@ static int ov59_021D1C64(UnkStruct_020961E8 *param0, int param1)
         if (v1 == 0xfffffffe) {
             int v2 = 0;
 
-            CommSys_SendData(117, &v2, 1);
+            CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v2, 1);
             ov59_021D28D8(param0, 1);
             ov59_021D19B0(param0, 0);
         } else {
@@ -990,7 +991,7 @@ static int ov59_021D1C64(UnkStruct_020961E8 *param0, int param1)
 static int ov59_021D1D14(UnkStruct_020961E8 *param0, int param1)
 {
     if (param0->unk_4ABB == 0) {
-        if (CommSys_SendData(115, NULL, 0) == 1) {
+        if (CommSys_SendData(COMM_CMD_FIELD_RECORD_115, NULL, 0) == 1) {
             param0->unk_4ABB = 1;
         }
     }
@@ -1126,11 +1127,11 @@ static int ov59_021D1F24(UnkStruct_020961E8 *param0, int param1)
 
             param0->unk_3A8 = 0;
 
-            CommSys_SendData(117, &v1, 1);
+            CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v1, 1);
             ov59_021D28D8(param0, 1);
         } else {
             param0->unk_3A8 = 13;
-            CommSys_SendData(113, NULL, 0);
+            CommSys_SendData(COMM_CMD_FIELD_RECORD_113, NULL, 0);
             StringTemplate_SetPlayerName(param0->unk_24, 0, CommInfo_TrainerInfo(0));
         }
 
@@ -1343,7 +1344,7 @@ void ov59_021D22EC(UnkStruct_020961E8 *param0, int param1, u8 param2)
 
             if (CommSys_CurNetId() == 0) {
                 int v0 = 1;
-                CommSys_SendData(117, &v0, 1);
+                CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v0, 1);
             }
             break;
         case 19:
@@ -1660,7 +1661,7 @@ static int ov59_021D292C(UnkStruct_020961E8 *param0, int param1)
     if (v0 > param0->unk_4AAC) {
         u8 v1 = 1;
 
-        CommSys_SendData(117, &v1, 1);
+        CommSys_SendData(COMM_CMD_FIELD_RECORD_117, &v1, 1);
         param0->unk_4AB0 = 1;
     } else {
         param0->unk_4AB0 = 0;
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index 6f3c67d49dd..e737efb332d 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "generated/journal_online_events.h"
 
 #include "struct_defs/struct_0207DE04.h"
@@ -1279,7 +1280,7 @@ static void ov65_0223758C(UnkStruct_ov65_022367A8 *param0)
     for (v0 = 1; v0 < 4; v0++) {
         if (sub_02032DC4(v0) == 1) {
             v1.unk_00 = v0;
-            v2 = CommSys_SendData(22, &v1, sizeof(UnkStruct_ov65_022366E4));
+            v2 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v1, sizeof(UnkStruct_ov65_022366E4));
             GF_ASSERT(v2 == 1);
             CommInfo_InitPlayer(v0);
         }
@@ -1297,7 +1298,7 @@ static void ov65_022375CC(UnkStruct_ov65_022367A8 *param0)
     for (v0 = 1; v0 < 4; v0++) {
         if (sub_02032DE0(v0) == 1) {
             v1.unk_00 = v0;
-            v2 = CommSys_SendData(22, &v1, sizeof(UnkStruct_ov65_022366E4));
+            v2 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v1, sizeof(UnkStruct_ov65_022366E4));
             GF_ASSERT(v2 == 1);
             CommInfo_InitPlayer(v0);
         }
@@ -1438,7 +1439,7 @@ static void ov65_02237808(UnkStruct_ov65_022367A8 *param0, u32 param1)
 
     v0.unk_00 = param1;
     v0.unk_04 = 2;
-    v1 = CommSys_SendData(22, &v0, sizeof(UnkStruct_ov65_022366E4));
+    v1 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v0, sizeof(UnkStruct_ov65_022366E4));
 
     GF_ASSERT(v1 == 1);
 }
@@ -1571,7 +1572,7 @@ static void ov65_02237970(UnkStruct_ov65_022367A8 *param0)
         BOOL v6;
 
         memcpy(v5.unk_00, param0->unk_00.unk_20, sizeof(u8) * 4);
-        CommSys_SendData(24, &v5, sizeof(UnkStruct_ov65_02236760));
+        CommSys_SendData(COMM_CMD_WAITING_ROOM_24, &v5, sizeof(UnkStruct_ov65_02236760));
     }
 }
 
@@ -1662,7 +1663,7 @@ static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
 
                     CommInfo_InitPlayer(v1);
 
-                    v3 = CommSys_SendData(22, &v2, sizeof(UnkStruct_ov65_022366E4));
+                    v3 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v2, sizeof(UnkStruct_ov65_022366E4));
                     GF_ASSERT(v3 == 1);
                 } else {
                     param0->unk_00.unk_06 = v1;
@@ -1769,7 +1770,7 @@ static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
             param0->unk_00.unk_05 = 1;
         }
 
-        v2 = CommSys_SendData(22, &v1, sizeof(UnkStruct_ov65_022366E4));
+        v2 = CommSys_SendData(COMM_CMD_WAITING_ROOM_22, &v1, sizeof(UnkStruct_ov65_022366E4));
         GF_ASSERT(v2 == 1);
 
         param0->unk_00.unk_06 = 0xff;
@@ -1884,7 +1885,7 @@ static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
     BOOL v0;
 
     if (param0->unk_00.unk_08 == 0) {
-        v0 = CommSys_SendData(23, NULL, 0);
+        v0 = CommSys_SendData(COMM_CMD_WAITING_ROOM_23, NULL, 0);
 
         if (v0) {
             param0->unk_00.unk_05 = 14;
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index 73ce4831e20..d2a8f88f202 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "generated/game_records.h"
 #include "generated/trainer_score_events.h"
 
@@ -305,7 +306,7 @@ static int ov83_0223B920(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
     BOOL v0;
 
     if (ov83_0223D570(param1->unk_148C) == 0) {
-        v0 = ov83_0223D508(22, NULL, 0, param1->unk_148C);
+        v0 = ov83_0223D508(COMM_CMD_POFFIN_22, NULL, 0, param1->unk_148C);
 
         if (v0 == 0) {
             return param1->unk_0C;
@@ -349,7 +350,7 @@ static int ov83_0223B964(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
         break;
 
     case 2:
-        v0 = ov83_0223D508(25, &param1->unk_1494.unk_00, ov83_0223D4B8(), param1->unk_148C);
+        v0 = ov83_0223D508(COMM_CMD_POFFIN_25, &param1->unk_1494.unk_00, ov83_0223D4B8(), param1->unk_148C);
 
         if (v0 == 1) {
             return param1->unk_0C + 1;
@@ -447,7 +448,7 @@ static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
         v0 = ov83_0223FDD8(&param1->unk_34C, &param1->unk_1494, param1->unk_1488);
 
         if (v0 == 1) {
-            v0 = ov83_0223D508(23, NULL, 0, param1->unk_148C);
+            v0 = ov83_0223D508(COMM_CMD_POFFIN_23, NULL, 0, param1->unk_148C);
             return param1->unk_0C;
         } else {
             ov83_0223FFA0(&param1->unk_34C);
@@ -481,7 +482,7 @@ static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
                     }
 
                     if (v1) {
-                        v0 = ov83_0223D508(26, &param1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C);
+                        v0 = ov83_0223D508(COMM_CMD_POFFIN_26, &param1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C);
                         param1->unk_15DC = 0;
 
                         for (v2 = 1; v2 < (7 + 1); v2++) {
@@ -493,13 +494,13 @@ static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
                 }
             } else {
                 if (param1->unk_1666) {
-                    v0 = ov83_0223D508(32, &param1->unk_1494.unk_04.unk_00, ov83_0223D4C8(), param1->unk_148C);
+                    v0 = ov83_0223D508(COMM_CMD_POFFIN_32, &param1->unk_1494.unk_04.unk_00, ov83_0223D4C8(), param1->unk_148C);
                     param1->unk_1666--;
                 }
             }
         }
     } else {
-        v0 = ov83_0223D508(26, &param1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C);
+        v0 = ov83_0223D508(COMM_CMD_POFFIN_26, &param1->unk_1494.unk_04, ov83_0223D4BC(), param1->unk_148C);
         param1->unk_15DC = 0;
     }
 
@@ -599,7 +600,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
         if (ov83_0223D570(param1->unk_148C) == 0) {
             v0 = Poffin_New(param1->heapID);
             ov83_0223FFD4(&param1->unk_34C, v0, &param1->unk_1494, param1->unk_1488, param1->heapID);
-            v1 = ov83_0223D508(28, v0, Poffin_SizeOf(), param1->unk_148C);
+            v1 = ov83_0223D508(COMM_CMD_POFFIN_28, v0, Poffin_SizeOf(), param1->unk_148C);
             Heap_Free(v0);
 
             if (v1 == 1) {
@@ -612,7 +613,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
     case 5:
         if (ov83_0223D570(param1->unk_148C) == 0) {
             ov83_022401AC(&param1->unk_34C, &param1->unk_1494, param1->unk_1488);
-            v1 = ov83_0223D508(27, &param1->unk_1494.unk_20, ov83_0223D4C0(), param1->unk_148C);
+            v1 = ov83_0223D508(COMM_CMD_POFFIN_27, &param1->unk_1494.unk_20, ov83_0223D4C0(), param1->unk_148C);
 
             if (v1 == 1) {
                 (*param2)++;
@@ -739,7 +740,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
         break;
     case 9:
         param1->unk_3B4 = 1;
-        v1 = ov83_0223D508(30, &param1->unk_3B4, ov83_0223D4B0(), param1->unk_148C);
+        v1 = ov83_0223D508(COMM_CMD_POFFIN_30, &param1->unk_3B4, ov83_0223D4B0(), param1->unk_148C);
 
         if (v1 == 1) {
             return param1->unk_0C + 1;
@@ -758,7 +759,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
         break;
     case 11:
         param1->unk_3B4 = 0;
-        v1 = ov83_0223D508(30, &param1->unk_3B4, ov83_0223D4B0(), param1->unk_148C);
+        v1 = ov83_0223D508(COMM_CMD_POFFIN_30, &param1->unk_3B4, ov83_0223D4B0(), param1->unk_148C);
 
         if (v1 == 1) {
             return param1->unk_0C + 1;
diff --git a/src/overlay083/ov83_0223D150.c b/src/overlay083/ov83_0223D150.c
index 373466b03f9..93344d30705 100644
--- a/src/overlay083/ov83_0223D150.c
+++ b/src/overlay083/ov83_0223D150.c
@@ -3,8 +3,10 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "overlay083/ov83_0223B5A0.h"
+#include "constants/communication/comm_command.h"
+
 #include "overlay083/comm_command_poffin_cooking.h"
+#include "overlay083/ov83_0223B5A0.h"
 #include "overlay083/ov83_0223D4CC.h"
 #include "overlay083/ov83_0223F7F4.h"
 #include "overlay083/struct_ov83_0223B784.h"
@@ -97,7 +99,7 @@ void CommCmd_Poffin_25(int param0, int param1, void *param2, void *param3)
 
         if (v2 >= v0->unk_1488) {
             ov83_0223FF44(&v0->unk_34C, &v0->unk_1494.unk_34.unk_10, v0->unk_1488);
-            ov83_0223D508(24, &v0->unk_1494.unk_34, ov83_0223D4B4(), v0->unk_148C);
+            ov83_0223D508(COMM_CMD_POFFIN_24, &v0->unk_1494.unk_34, ov83_0223D4B4(), v0->unk_148C);
         }
     }
 }
@@ -206,7 +208,7 @@ void CommCmd_Poffin_30(int param0, int param1, void *param2, void *param3)
         }
 
         if (v2 >= v0->unk_1488) {
-            ov83_0223D508(29, &v3, ov83_0223D4B0(), v0->unk_148C);
+            ov83_0223D508(COMM_CMD_POFFIN_29, &v3, ov83_0223D4B0(), v0->unk_148C);
         }
     }
 }
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 49609cb08af..97ebd7f235b 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/communication/comm_error.h"
 #include "generated/game_records.h"
 #include "generated/species.h"
@@ -25,6 +26,7 @@
 #include "character_sprite.h"
 #include "charcode_util.h"
 #include "chatot_cry.h"
+#include "comm_command_trade.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -77,7 +79,6 @@
 #include "unk_02038F8C.h"
 #include "unk_0203909C.h"
 #include "unk_02092494.h"
-#include "comm_command_trade.h"
 #include "vars_flags.h"
 #include "vram_transfer.h"
 #include "wifi_list.h"
@@ -585,7 +586,7 @@ static int ov88_0223B914(UnkStruct_02095E80 *param0)
             }
 
             if (CommSys_CurNetId() == 0) {
-                ov88_0223D044(CommSys_CurNetId(), 31, LCRNG_RandMod(60) + 3);
+                ov88_0223D044(CommSys_CurNetId(), COMM_CMD_TRADE_31, LCRNG_RandMod(60) + 3);
             }
 
             ov88_0223D0C0(param0->saveData);
@@ -819,7 +820,7 @@ static int ov88_0223BED8(UnkStruct_02095E80 *param0)
 
     ov88_0223CFF4(&param0->unk_14C[1], &param0->unk_88[1], param0->unk_39C[1], param0->unk_6F4, 1);
     ov88_0223CEF0(&param0->unk_90);
-    ov88_0223D058(param0, 23, param0->unk_88[0]);
+    ov88_0223D058(param0, COMM_CMD_TRADE_23, param0->unk_88[0]);
 
     return 1;
 }
@@ -1624,7 +1625,7 @@ static void *ov88_0223D08C(Party *param0, int param1)
 void ov88_0223D098(int param0, Party *param1, int param2)
 {
     if (CommSys_IsPlayerConnected(param0)) {
-        CommSys_SendDataHuge(22, ov88_0223D08C(param1, param2), 236 * 6 + 4 * 2);
+        CommSys_SendDataHuge(COMM_CMD_TRADE_22, ov88_0223D08C(param1, param2), 236 * 6 + 4 * 2);
     }
 }
 
@@ -1632,7 +1633,7 @@ static void ov88_0223D0C0(SaveData *saveData)
 {
     u8 *v0 = SaveData_GetRibbons(saveData);
 
-    CommSys_SendData(32, v0, 14);
+    CommSys_SendData(COMM_CMD_TRADE_32, v0, 14);
 }
 
 static void ov88_0223D0D4(TrainerInfo *param0, PalPad *param1, PalPad *param2)
@@ -1654,12 +1655,12 @@ static void ov88_0223D0D4(TrainerInfo *param0, PalPad *param1, PalPad *param2)
         param2->associatedTrainerGenders[v0] = param1[v0].gender;
     }
 
-    CommSys_SendDataHuge(28, param2, sizeof(PalPad));
+    CommSys_SendDataHuge(COMM_CMD_TRADE_28, param2, sizeof(PalPad));
 }
 
 static void ov88_0223D140(ChatotCry *param0)
 {
-    CommSys_SendDataHuge(29, param0, 1000);
+    CommSys_SendDataHuge(COMM_CMD_TRADE_29, param0, 1000);
 }
 
 static int ov88_0223D150(UnkStruct_02095E80 *param0)
@@ -1746,7 +1747,7 @@ static int ov88_0223D318(UnkStruct_02095E80 *param0)
     case 0:
         Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
         ov88_0223ECBC(&param0->unk_49C[23], 28, FONT_MESSAGE, param0->unk_184, param0->unk_178);
-        ov88_0223D058(param0, 24, 1);
+        ov88_0223D058(param0, COMM_CMD_TRADE_24, 1);
         param0->unk_226C = ov88_0223DA00;
         param0->unk_5C = 0;
         break;
@@ -2113,7 +2114,7 @@ static int ov88_0223DC84(UnkStruct_02095E80 *param0)
 {
     Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
     ov88_0223ECBC(&param0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178);
-    ov88_0223D058(param0, 24, 2);
+    ov88_0223D058(param0, COMM_CMD_TRADE_24, 2);
 
     param0->unk_226C = ov88_0223DCE0;
 
@@ -2279,7 +2280,7 @@ static int ov88_0223E110(UnkStruct_02095E80 *param0)
 
 static void ov88_0223E1AC(UnkStruct_02095E80 *param0)
 {
-    ov88_0223D058(param0, 24, 3);
+    ov88_0223D058(param0, COMM_CMD_TRADE_24, 3);
     param0->unk_5C = 1;
 }
 
@@ -2308,17 +2309,17 @@ static int ov88_0223E20C(UnkStruct_02095E80 *param0)
             case 1:
                 ov88_0223E1C0(param0, 23, 37);
                 param0->unk_226C = ov88_0223E41C;
-                ov88_0223D058(param0, 24, 4);
+                ov88_0223D058(param0, COMM_CMD_TRADE_24, 4);
                 break;
             case 2:
                 ov88_0223E1C0(param0, 23, 38);
                 param0->unk_226C = ov88_0223E41C;
-                ov88_0223D058(param0, 24, 4);
+                ov88_0223D058(param0, COMM_CMD_TRADE_24, 4);
                 break;
             }
         } else {
             param0->unk_226C = ov88_0223E41C;
-            ov88_0223D058(param0, 24, 4);
+            ov88_0223D058(param0, COMM_CMD_TRADE_24, 4);
         }
 
         break;
@@ -2326,7 +2327,7 @@ static int ov88_0223E20C(UnkStruct_02095E80 *param0)
         Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
         ov88_0223ECBC(&param0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178);
         param0->unk_226C = ov88_0223E41C;
-        ov88_0223D058(param0, 24, 4);
+        ov88_0223D058(param0, COMM_CMD_TRADE_24, 4);
         break;
     default:
         break;
@@ -2355,7 +2356,7 @@ static int ov88_0223E384(UnkStruct_02095E80 *param0)
         Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
         ov88_0223ECBC(&param0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178);
         param0->unk_226C = ov88_0223E41C;
-        ov88_0223D058(param0, 24, 4);
+        ov88_0223D058(param0, COMM_CMD_TRADE_24, 4);
         break;
     default:
         break;
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 35b02e985f5..08f673a8382 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "generated/game_records.h"
 #include "generated/journal_online_events.h"
 #include "generated/text_banks.h"
@@ -18,6 +19,7 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "camera.h"
+#include "comm_command_spin_trade.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -53,7 +55,6 @@
 #include "unk_020363E8.h"
 #include "unk_02038ED4.h"
 #include "unk_02092494.h"
-#include "comm_command_spin_trade.h"
 #include "vram_transfer.h"
 
 typedef struct {
@@ -724,7 +725,7 @@ static int ov109_021D11A0(UnkStruct_ov109_021D0F70 *param0)
 {
     int v0;
     u32 v1 = (u32)param0->unk_24;
-    v0 = CommSys_SendDataHuge(131, (void *)v1, 236 * 6 + 4 * 2);
+    v0 = CommSys_SendDataHuge(COMM_CMD_FIELD_SPIN_TRADE_131, (void *)v1, 236 * 6 + 4 * 2);
 
     if (v0) {
         param0->unk_00 = 14;
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 228ec0b8efb..a8f79fa4509 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -16,6 +16,7 @@
 #include "appearance.h"
 #include "bg_window.h"
 #include "char_transfer.h"
+#include "comm_command_spin_trade.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -54,7 +55,6 @@
 #include "unk_020363E8.h"
 #include "unk_02038ED4.h"
 #include "unk_0205B33C.h"
-#include "comm_command_spin_trade.h"
 #include "vram_transfer.h"
 #include "wireless_manager.h"
 
diff --git a/src/overlay114/comm_command_minigame.c b/src/overlay114/comm_command_minigame.c
index 7da3e743ea2..04bef7112dc 100644
--- a/src/overlay114/comm_command_minigame.c
+++ b/src/overlay114/comm_command_minigame.c
@@ -1,14 +1,15 @@
 #include "overlay114/comm_command_minigame.h"
 
-#include "constants/communication/comm_command.h"
-
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_defs/comm_cmd_table.h"
 
 #include "overlay114/ov114_02260044.h"
 
+// clang-format off
 static const CommCmdTable Unk_ov114_022603E4[] = {
     [COMM_CMD_MINIGAME_22 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_22, ov114_0226007C, NULL },
     [COMM_CMD_MINIGAME_23 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_23, ov114_0226007C, NULL },
@@ -16,6 +17,7 @@ static const CommCmdTable Unk_ov114_022603E4[] = {
     [COMM_CMD_MINIGAME_25 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_25, ov114_0226007C, NULL },
     [COMM_CMD_MINIGAME_26 - COMM_CMD_MAX_COMMON] = { CommCmd_Minigame_26, ov114_02260080, NULL },
 };
+// clang-format on
 
 const CommCmdTable *ov114_02260038(void)
 {
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 23270c4c5d9..50cc6edd6e6 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/graphics.h"
 
 #include "struct_decls/wi_fi_list.h"
@@ -1823,7 +1824,7 @@ static void ov114_0225D688(SysTask *param0, void *param1)
                 break;
             }
 
-            CommSys_SendData(26, &v8, sizeof(u32));
+            CommSys_SendData(COMM_CMD_MINIGAME_26, &v8, sizeof(u32));
         }
 
         v0->unk_00++;
@@ -3231,9 +3232,9 @@ static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_022
 
         if (v0 == YES_NO_TOUCH_MENU_YES || v0 == YES_NO_TOUCH_MENU_NO) {
             if (v0 == YES_NO_TOUCH_MENU_YES) {
-                CommSys_SendData(22, NULL, 0);
+                CommSys_SendData(COMM_CMD_MINIGAME_22, NULL, 0);
             } else if (v0 == YES_NO_TOUCH_MENU_NO) {
-                CommSys_SendData(23, NULL, 0);
+                CommSys_SendData(COMM_CMD_MINIGAME_23, NULL, 0);
             }
 
             ov114_0225D368(param1, param2, 15, 1);
@@ -3322,9 +3323,9 @@ static void ov114_0225F424(UnkStruct_ov114_0225F270 *param0, u32 param1, BOOL pa
 
         if (v1 == param3) {
             if (param0->unk_1D) {
-                CommSys_SendData(24, NULL, 0);
+                CommSys_SendData(COMM_CMD_MINIGAME_24, NULL, 0);
             } else {
-                CommSys_SendData(25, NULL, 0);
+                CommSys_SendData(COMM_CMD_MINIGAME_25, NULL, 0);
             }
         }
     }
diff --git a/src/overlay114/ov114_02260044.c b/src/overlay114/ov114_02260044.c
index d840cc7f6f9..23c5f28be37 100644
--- a/src/overlay114/ov114_02260044.c
+++ b/src/overlay114/ov114_02260044.c
@@ -3,8 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "overlay114/ov114_0225C700.h"
 #include "overlay114/comm_command_minigame.h"
+#include "overlay114/ov114_0225C700.h"
 #include "overlay114/struct_ov114_0225D678_decl.h"
 #include "overlay114/struct_ov114_0225E854_decl.h"
 
diff --git a/src/overlay115/comm_command_swalot_plop.c b/src/overlay115/comm_command_swalot_plop.c
index eced2ff73c4..577025b58b5 100644
--- a/src/overlay115/comm_command_swalot_plop.c
+++ b/src/overlay115/comm_command_swalot_plop.c
@@ -9,6 +9,7 @@
 
 #include "overlay115/ov115_02265A24.h"
 
+// clang-format off
 static const CommCmdTable Unk_ov115_0226664C[] = {
     [COMM_COMMAND_SWALOT_PLOP_22 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_22, ov115_02265A40, NULL },
     [COMM_COMMAND_SWALOT_PLOP_23 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlot_23, ov115_02265A40, NULL },
@@ -19,6 +20,7 @@ static const CommCmdTable Unk_ov115_0226664C[] = {
     [COMM_COMMAND_SWALOT_PLOP_28 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_28, ov115_02265AD8, NULL },
     [COMM_COMMAND_SWALOT_PLOP_29 - COMM_CMD_MAX_COMMON] = { CommCmd_SwalotPlop_29, ov115_02265A40, NULL },
 };
+// clang-format on
 
 const CommCmdTable *ov115_02265A18(void)
 {
diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c
index 9858a583b16..b7cfcd23dfa 100644
--- a/src/overlay115/ov115_02260440.c
+++ b/src/overlay115/ov115_02260440.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "nintendo_wfc/main.h"
 #include "overlay114/ov114_0225C700.h"
 #include "overlay114/struct_ov114_0225C76C.h"
@@ -206,7 +208,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1)
 
         if (IsScreenFadeDone()) {
             if (v0->unk_44 == 0) {
-                v2 = CommSys_SendData(22, NULL, 0);
+                v2 = CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_22, NULL, 0);
 
                 if (v2) {
                     (*param1)++;
@@ -235,7 +237,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1)
             u32 v5;
 
             v5 = ov115_02261274(v0->unk_34);
-            v2 = CommSys_SendData(25, &v5, sizeof(u32));
+            v2 = CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_25, &v5, sizeof(u32));
 
             if (v2) {
                 (*param1)++;
@@ -251,7 +253,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1)
                 BOOL v7;
 
                 v6 = ov115_02260C64(v0->unk_30);
-                v7 = ov115_02260BA0(v0, 27, &v6, sizeof(u32));
+                v7 = ov115_02260BA0(v0, COMM_COMMAND_SWALOT_PLOP_27, &v6, sizeof(u32));
 
                 if (v7 == 1) {
                     ov115_02260C5C(v0->unk_30);
@@ -259,7 +261,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1)
             }
 
             if (v2 == 0) {
-                ov115_02260BA0(v0, 23, NULL, 0);
+                ov115_02260BA0(v0, COMM_COMMAND_SWALOT_PLOP_23, NULL, 0);
             }
         }
 
@@ -277,7 +279,7 @@ int ov115_0226048C(ApplicationManager *appMan, int *param1)
                 UnkStruct_ov115_02265AD4 v8;
 
                 ov115_02260CBC(v0->unk_30, &v8);
-                v2 = CommSys_SendData(26, &v8, sizeof(UnkStruct_ov115_02265AD4));
+                v2 = CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_26, &v8, sizeof(UnkStruct_ov115_02265AD4));
 
                 if (v2) {
                     (*param1)++;
@@ -470,7 +472,7 @@ void ov115_022609E4(UnkStruct_ov115_0226095C *param0, u32 param1, u32 param2)
 
         if (v2 == 1) {
             param0->unk_7C++;
-            CommSys_SendData(29, NULL, 0);
+            CommSys_SendData(COMM_COMMAND_SWALOT_PLOP_29, NULL, 0);
         }
     }
 }
@@ -492,7 +494,7 @@ static void ov115_02260A5C(UnkStruct_ov115_0226095C *param0)
     UnkStruct_ov115_02265AD0 v0;
 
     while (ov115_02261224(param0->unk_34, &v0) == 1) {
-        ov115_02260BA0(param0, 24, &v0, sizeof(UnkStruct_ov115_02265AD0));
+        ov115_02260BA0(param0, COMM_COMMAND_SWALOT_PLOP_24, &v0, sizeof(UnkStruct_ov115_02265AD0));
     }
 }
 
@@ -511,7 +513,7 @@ static void ov115_02260A90(UnkStruct_ov115_0226095C *param0)
     if ((v0 % 30) == 0) {
         if (param0->unk_80 == 1) {
             v1 = ov115_02261274(param0->unk_34);
-            v2 = ov115_02260BA0(param0, 28, &v1, sizeof(u32));
+            v2 = ov115_02260BA0(param0, COMM_COMMAND_SWALOT_PLOP_28, &v1, sizeof(u32));
             GF_ASSERT(v2);
 
             param0->unk_80 = 0;
diff --git a/src/overlay115/ov115_02265A24.c b/src/overlay115/ov115_02265A24.c
index 2d7ebdf5d66..1289cd86ed6 100644
--- a/src/overlay115/ov115_02265A24.c
+++ b/src/overlay115/ov115_02265A24.c
@@ -3,8 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "overlay115/ov115_02260440.h"
 #include "overlay115/comm_command_swalot_plop.h"
+#include "overlay115/ov115_02260440.h"
 #include "overlay115/struct_ov115_0226095C_decl.h"
 #include "overlay115/struct_ov115_02265AD0.h"
 #include "overlay115/struct_ov115_02265AD4.h"
diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c
index bcbbaaada22..c949b0c9610 100644
--- a/src/overlay116/ov116_022604C4.c
+++ b/src/overlay116/ov116_022604C4.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/graphics.h"
 
 #include "nintendo_wfc/main.h"
@@ -484,7 +485,7 @@ int ov116_02260CF4(ApplicationManager *appMan, int *param1)
         if (v1) {
             if (ov116_022617C4(v0) == 1) {
                 v0->unk_14.unk_04 = v0->unk_78;
-                CommSys_SendData(22, &v0->unk_14, sizeof(UnkStruct_ov116_0226048C));
+                CommSys_SendData(COMM_CMD_MIME_TOP_22, &v0->unk_14, sizeof(UnkStruct_ov116_0226048C));
             }
         }
 
@@ -523,7 +524,7 @@ int ov116_02260CF4(ApplicationManager *appMan, int *param1)
             if (ov116_022617C4(v0) == 1) {
                 if (ov116_02262A74(v0->unk_00) == 0) {
                     Sound_StopEffect(1393, 0);
-                    CommSys_SendData(23, NULL, 0);
+                    CommSys_SendData(COMM_CMD_MIME_TOP_23, NULL, 0);
                 }
             }
             ov116_02263B30(v0->unk_04);
@@ -553,7 +554,7 @@ int ov116_02260CF4(ApplicationManager *appMan, int *param1)
             v0->unk_1C.unk_00 = 1;
         }
 
-        CommSys_SendData(25, &v0->unk_1C, sizeof(UnkStruct_ov116_02260494));
+        CommSys_SendData(COMM_CMD_MIME_TOP_25, &v0->unk_1C, sizeof(UnkStruct_ov116_02260494));
         ov116_0226178C(v0, v1, 14, param1);
         break;
     case 14:
diff --git a/src/overlay116/ov116_02262A8C.c b/src/overlay116/ov116_02262A8C.c
index df420c8c785..0abfa60d7f3 100644
--- a/src/overlay116/ov116_02262A8C.c
+++ b/src/overlay116/ov116_02262A8C.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "overlay116/ov116_02261870.h"
 #include "overlay116/ov116_0226432C.h"
 #include "overlay116/ov116_02266FEC.h"
@@ -896,7 +898,7 @@ static void ov116_022639BC(UnkStruct_ov116_02262A8C *param0)
             ov116_02263DB8(param0);
             param0->unk_2858[param0->unk_00].unk_00 = 1;
 
-            CommSys_SendData(24, &param0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490));
+            CommSys_SendData(COMM_CMD_MIME_TOP_24, &param0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490));
 
             param0->unk_279C.unk_38 = 0;
             param0->unk_279C.unk_1E = 0;
@@ -930,7 +932,7 @@ static void ov116_022639BC(UnkStruct_ov116_02262A8C *param0)
             }
 
             ov116_02262AE4(param0);
-            CommSys_SendData(24, &param0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490));
+            CommSys_SendData(COMM_CMD_MIME_TOP_24, &param0->unk_2858[param0->unk_00], sizeof(UnkStruct_ov116_02260490));
         } else {
             param0->unk_2858[param0->unk_00].unk_00 = 0;
         }
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index 56caec2ed29..af8bdee8b42 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -8,9 +8,9 @@
 
 #include "nintendo_wfc/main.h"
 #include "overlay114/ov114_0225C700.h"
+#include "overlay117/comm_command_wobbuffet_pop.h"
 #include "overlay117/ov117_022626B0.h"
 #include "overlay117/ov117_02263AF0.h"
-#include "overlay117/comm_command_wobbuffet_pop.h"
 #include "overlay117/ov117_022666C0.h"
 #include "overlay117/struct_ov117_02261280.h"
 #include "overlay117/struct_ov117_02261C2C.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 4de3bafa3cf..f977cf88672 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -97,6 +97,7 @@
 #include "binoculars_vista_lighthouse.h"
 #include "camera.h"
 #include "clear_game.h"
+#include "comm_command_field.h"
 #include "comm_manager.h"
 #include "comm_player_manager.h"
 #include "communication_system.h"
@@ -213,7 +214,6 @@
 #include "unk_0207DA28.h"
 #include "unk_02097B18.h"
 #include "unk_020985E4.h"
-#include "comm_command_field.h"
 #include "unk_02099604.h"
 #include "unk_0209ACF4.h"
 #include "unk_0209B344.h"
diff --git a/src/scrcmd_battle_hall.c b/src/scrcmd_battle_hall.c
index 9ec6fe3c125..703355e3917 100644
--- a/src/scrcmd_battle_hall.c
+++ b/src/scrcmd_battle_hall.c
@@ -4,6 +4,7 @@
 #include <string.h>
 
 #include "constants/battle_frontier.h"
+#include "constants/communication/comm_command.h"
 #include "generated/game_records.h"
 
 #include "struct_decls/struct_02030114_decl.h"
@@ -17,6 +18,7 @@
 #include "bag.h"
 #include "battle_frontier_stats.h"
 #include "battle_hall_win_records.h"
+#include "comm_command_field.h"
 #include "communication_system.h"
 #include "dexmode_checker.h"
 #include "field_script_context.h"
@@ -37,7 +39,6 @@
 #include "unk_02030108.h"
 #include "unk_0204FA34.h"
 #include "unk_0205DFC4.h"
-#include "comm_command_field.h"
 
 #include "constdata/const_020F410C.h"
 
@@ -221,7 +222,7 @@ static BOOL CheckPartnerUsesDifferentSpeciesTask(FieldTask *task)
 
     switch (data->taskState) {
     case 0:
-        if (CommSys_SendData(132, data, sizeof(BattleHallSameSpeciesCheck)) == TRUE) {
+        if (CommSys_SendData(COMM_CMD_BATTLE_HALL_SELECT_SPECIES_MESSAGE, data, sizeof(BattleHallSameSpeciesCheck)) == TRUE) {
             data->taskState++;
         }
         break;
diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c
index 2dea4ff7eae..a15fa32615a 100644
--- a/src/underground/comm_manager.c
+++ b/src/underground/comm_manager.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "generated/trainer_score_events.h"
 
 #include "field/field_system.h"
@@ -382,7 +383,7 @@ static void CommManUnderground_MainTaskServer(void)
         UndergroundPlayer_ClearHeldFlagInfo();
         SecretBases_AbortBaseEnter();
 
-        CommSys_SendMessage(43);
+        CommSys_SendMessage(COMM_CMD_END_TRAP_EFFECT);
 
         Traps_ForceEndCurrentTrapEffectClient(CommSys_CurNetId(), TRUE);
         UndergroundMan_ForceEndCurrentSysTask();
@@ -477,7 +478,7 @@ static void CommManUnderground_WaitForBaseDataReceiptTaskClient(void)
         CommManUnderground_DebugPrintDummy("\u0094\u00E9\u0096\u00A7\u008A\u00EE\u0092\u006E\u0082\u00CC\u0088\u00CA\u0092\u0075\u0082\u00AA\u0082\u00AB\u0082\u00BD"); // 秘密基地の位置がきた
         SecretBases_ClearLinksReceivedBaseData();
         CommPlayer_SendPos(TRUE);
-        CommSys_SendMessage(31);
+        CommSys_SendMessage(COMM_CMD_PROCESS_ALL_DATA_SENT_MSG);
         CommManUnderground_SetFieldCommManTask(CommManUnderground_MainTaskClient, 0);
         return;
     }
diff --git a/src/underground/manager.c b/src/underground/manager.c
index 3158d935908..d6cf4bb533b 100644
--- a/src/underground/manager.c
+++ b/src/underground/manager.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/field/map.h"
 #include "constants/field/map_matrix.h"
 #include "constants/field_base_tiles.h"
@@ -369,7 +370,7 @@ BOOL UndergroundMan_CheckForTouchInput(void)
                 sUndergroundMan->touchedTileCoords.x = x;
                 sUndergroundMan->touchedTileCoords.z = z;
 
-                CommSys_SendData(48, &touchedTileCoords, sizeof(CoordinatesU16));
+                CommSys_SendData(COMM_CMD_UNDERGROUND_TOUCH_INPUT, &touchedTileCoords, sizeof(CoordinatesU16));
 
                 return TRUE;
             }
@@ -417,10 +418,10 @@ static void UndergroundMan_StartTouchRadar(int netID, CoordinatesU16 *touchedTil
     buffer[0] = netID;
 
     size = UndergroundMan_TouchRadarSearch(buffer, Traps_IsTrapAtCoordinates, touchedTileCoords);
-    CommSys_SendDataServer(49, buffer, size);
+    CommSys_SendDataServer(COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS, buffer, size);
 
     size = UndergroundMan_TouchRadarSearch(buffer, Mining_IsMiningSpotAtCoordinates, touchedTileCoords);
-    CommSys_SendDataServer(50, buffer, size);
+    CommSys_SendDataServer(COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS, buffer, size);
 }
 
 void CommCmd_UndergroundTouchInput(int netID, int unused1, void *data, void *unused3)
@@ -541,7 +542,7 @@ void UndergroundMan_InitCoordsOrderingState(int orderedArrayLength, GetCoordinat
 void UndergroundMan_OpenMenu(void)
 {
     if (CommPlayer_GetMovementTimer(CommSys_CurNetId()) == 0) {
-        CommSys_SendMessage(27);
+        CommSys_SendMessage(COMM_CMD_OPEN_MENU_REQUEST);
         CommSys_Dummy();
     }
 }
@@ -581,7 +582,7 @@ void UndergroundMan_ProcessInteract(u8 flags)
         .pos = COORDS_TO_EVENT_POS(x, z)
     };
 
-    CommSys_SendDataFixedSize(28, &event);
+    CommSys_SendDataFixedSize(COMM_CMD_INTERACT_EVENT, &event);
     CommSys_Dummy();
 
     sUndergroundMan->interactCooldown = 8;
@@ -623,7 +624,7 @@ void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *
             talkEvent.talkTargetNetID = linkNetID;
             talkEvent.netID = netID;
 
-            CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent));
+            CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent));
             CommPlayerMan_SetMovementEnabled(netID, FALSE);
         } else if (UndergroundPlayer_TalkHeldFlagCheck(netID, linkNetID, FALSE)) {
             return;
@@ -635,7 +636,7 @@ void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *
                 talkEvent.talkTargetNetID = linkNetID;
                 talkEvent.netID = netID;
 
-                CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent));
+                CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent));
                 CommPlayerMan_SetMovementEnabled(netID, FALSE);
             }
         } else if (!CommPlayerMan_IsMovementEnabled(netID)) {
@@ -645,7 +646,7 @@ void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *
             talkEvent.talkTargetNetID = linkNetID;
             talkEvent.netID = netID;
 
-            CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent));
+            CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent));
             CommPlayerMan_SetMovementEnabled(netID, FALSE);
         } else {
             talkEvent.result = TALK_RESULT_SUCCESS;
@@ -653,7 +654,7 @@ void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *
             talkEvent.netID = netID;
 
             if (CommPlayerMan_IsMovementEnabled(linkNetID)) {
-                if (CommSys_SendDataServer(30, &talkEvent, sizeof(talkEvent))) {
+                if (CommSys_SendDataServer(COMM_CMD_TALK_EVENT, &talkEvent, sizeof(talkEvent))) {
                     CommPlayerMan_SetMovementEnabled(netID, FALSE);
                     CommPlayerMan_SetMovementEnabled(linkNetID, FALSE);
                     CommPlayer_LookTowardsServer(netID, linkNetID);
@@ -689,7 +690,7 @@ void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *
             return;
         }
 
-        CommSys_SendDataFixedSizeServer(24, &netIDBuffer);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_VENDOR_TALK_REQUEST, &netIDBuffer);
         CommPlayerMan_SetMovementEnabled(netID, FALSE);
 
         return;
@@ -701,7 +702,7 @@ void CommCmd_UndergroundInteractEvent(int netID, int unused1, void *data, void *
         }
 
         if (event->pos == COORDS_TO_EVENT_POS(coordinates.x, coordinates.z)) {
-            CommSys_SendDataFixedSizeServer(63, &netIDBuffer);
+            CommSys_SendDataFixedSizeServer(COMM_CMD_RETRIEVE_BURIED_SPHERES, &netIDBuffer);
             CommPlayerMan_SetMovementEnabled(netID, FALSE);
         }
     }
@@ -1108,7 +1109,7 @@ void CommCmd_VendorTalkRequest(int unused0, int unused1, void *data, void *unuse
 
     if (netID == CommSys_CurNetId()) {
         UndergroundVendors_StartShopMenuTask(sUndergroundMan->fieldSystem);
-        CommSys_SendMessage(25);
+        CommSys_SendMessage(COMM_CMD_VENDOR_TALK);
         CommPlayerMan_PauseFieldSystem();
     }
 }
@@ -1198,7 +1199,7 @@ void UndergroundMan_SendPlayerState(void)
         .isMining = Mining_IsMiningGameTaskActive()
     };
 
-    CommSys_SendDataFixedSize(70, &playerState);
+    CommSys_SendDataFixedSize(COMM_CMD_PLAYER_STATE_UNDERGROUND, &playerState);
 }
 
 void CommCmd_UndergroundPlayerState(int netID, int unused1, void *data, void *unused3)
diff --git a/src/underground/menus.c b/src/underground/menus.c
index 7f33dca3b65..a7f7cb28a78 100644
--- a/src/underground/menus.c
+++ b/src/underground/menus.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/heap.h"
 #include "constants/start_menu.h"
 #include "generated/traps.h"
@@ -1488,7 +1489,7 @@ static void UndergroundMenu_MainHoldingFlag(SysTask *sysTask, void *data)
         UndergroundMan_ClearCurrentSysTaskInfo();
         UndergroundMenu_Free(sysTask, data, TRUE);
         u8 flagEventType = FLAG_EVENT_DISCARD;
-        CommSys_SendDataFixedSize(84, &flagEventType);
+        CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE, &flagEventType);
         return;
     case UNDERGROUND_MENU_STATE_UNUSED:
         if (!UndergroundTextPrinter_IsPrinterActive(UndergroundMan_GetCaptureFlagTextPrinter())) {
diff --git a/src/underground/mining.c b/src/underground/mining.c
index 0d0ba29d88a..f97522f5c8a 100644
--- a/src/underground/mining.c
+++ b/src/underground/mining.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/field/map.h"
 #include "constants/field/map_matrix.h"
 #include "constants/field_base_tiles.h"
@@ -814,7 +815,7 @@ BOOL Mining_CheckForMiningSpotInteract(int netID, CoordinatesU16 *coordinates)
             return TRUE;
         }
 
-        CommSys_SendDataServer(64, &buffer, 1);
+        CommSys_SendDataServer(COMM_CMD_INTERACT_MINING_SPOT, &buffer, 1);
         CommPlayerMan_SetMovementEnabled(netID, 0);
 
         sMiningEnv->currentUsedMiningSpots[netID] = miningSpot;
@@ -1137,7 +1138,7 @@ static void Mining_ConfirmStartMiningTask(SysTask *sysTask, void *unused)
             CommPlayerMan_ResumeFieldSystem();
         }
 
-        CommSys_SendDataFixedSize(65, &confirmResult);
+        CommSys_SendDataFixedSize(COMM_CMD_CONFIRM_START_MINING_RESULT, &confirmResult);
         sMiningEnv->confirmStartMiningMenu = NULL;
 
         UndergroundTextPrinter_EraseMessageBoxWindow(UndergroundMan_GetCommonTextPrinter());
@@ -1157,7 +1158,7 @@ void CommCmd_ConfirmStartMiningResult(int netID, int unused1, void *data, void *
 
     if (*confirmResult && miningSpot) {
         if (miningSpot->alwaysFF == 0xFF) {
-            CommSys_SendDataServer(66, &buffer, 1);
+            CommSys_SendDataServer(COMM_CMD_CONFIRM_START_MINING, &buffer, 1);
 
             miningSpot->alwaysFF = 0xFF;
             miningSpot->x = 0xffff;
@@ -1201,7 +1202,7 @@ void CommCmd_MiningLinkInput(int netID, int unused1, void *data, void *unused3)
     linkInputWithNetID.touchX = linkInput->touchX;
     linkInputWithNetID.touchY = linkInput->touchY;
 
-    CommSys_SendDataFixedSizeServer(69, &linkInputWithNetID);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_LINK_INPUT_SERVER, &linkInputWithNetID);
 }
 
 int CommPacketSizeOf_MiningLinkInput(void)
@@ -1656,7 +1657,7 @@ static void Mining_GameTask(SysTask *sysTask, void *data)
             SecretBases_EnableBaseEntranceGraphics();
             Spheres_EnableBuriedSphereSparkles();
 
-            CommSys_SendDataFixedSize(67, &ctx->dugUpAllItems);
+            CommSys_SendDataFixedSize(COMM_CMD_END_MINING, &ctx->dugUpAllItems);
             CommPlayerMan_ResumeFieldSystem();
 
             sMiningEnv->miningGameTask = NULL;
@@ -2731,7 +2732,7 @@ static BOOL Mining_MainGameLoop(MiningGameContext *ctx)
                 damageToWall = 8;
             }
 
-            CommSys_SendDataFixedSize(68, &input);
+            CommSys_SendDataFixedSize(COMM_CMD_MINING_LINK_INPUT, &input);
 
             if (sMiningEnv->wallIntegrity > damageToWall) {
                 sMiningEnv->wallIntegrity -= damageToWall;
@@ -2980,7 +2981,7 @@ void TreasureRadar_Start(void)
     TreasureRadarContext *ctx = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(TreasureRadarContext));
 
     MI_CpuFill8(ctx, 0, sizeof(TreasureRadarContext));
-    CommSys_SendMessage(71);
+    CommSys_SendMessage(COMM_CMD_START_TREASURE_RADAR);
 
     ctx->timer = MAX_MINING_SPOTS / 3 - 10;
 
@@ -3018,7 +3019,7 @@ static void Mining_SendTreasureRadarResults(void)
                     result.x = miningSpot->x;
                     result.z = miningSpot->z;
                     result.netID = netID;
-                    CommSys_SendDataFixedSizeServer(72, &result);
+                    CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_SPOT_RADAR, &result);
                     // bug: can potentially lead to out of bounds array access
                     sMiningEnv->treasureRadarIndex[netID] = index + 3;
                     break;
@@ -3104,7 +3105,7 @@ static void Mining_SendNormalRadarResults(void)
                 result.x = miningSpot->x;
                 result.z = miningSpot->z;
 
-                CommSys_SendDataFixedSizeServer(72, &result);
+                CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_SPOT_RADAR, &result);
             }
         } else {
             MiningSpotRadarResult result;
@@ -3113,7 +3114,7 @@ static void Mining_SendNormalRadarResults(void)
             result.x = 0;
             result.z = 0;
 
-            CommSys_SendDataFixedSizeServer(72, &result);
+            CommSys_SendDataFixedSizeServer(COMM_CMD_MINING_SPOT_RADAR, &result);
         }
     }
 }
diff --git a/src/underground/pc.c b/src/underground/pc.c
index 7f532f8bdc8..10bc29c3676 100644
--- a/src/underground/pc.c
+++ b/src/underground/pc.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/field_base_tiles.h"
 #include "constants/map_object.h"
 
@@ -205,7 +206,7 @@ BOOL UndergroundPC_TryUsePC(int netID, CoordinatesU16 *coordinates)
             }
         }
 
-        CommSys_SendDataFixedSizeServer(83, &pcInteraction);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_PC_INTERACT, &pcInteraction);
         return TRUE;
     }
 
@@ -876,7 +877,7 @@ static void UndergroundPC_TakeFlagPromptTask(SysTask *sysTask, void *data)
         if (input == MENU_NOTHING_CHOSEN) {
             return;
         } else if (input == MENU_YES) {
-            CommSys_SendDataFixedSize(89, &ctx->pcInteraction);
+            CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG, &ctx->pcInteraction);
         } else {
             CommPlayerMan_ResumeFieldSystemWithContextBit(PAUSE_BIT_LINK_PC);
             UndergroundTextPrinter_EraseMessageBoxWindow(UndergroundMan_GetCommonTextPrinter());
@@ -930,7 +931,7 @@ void CommCmd_AttemptUndergroundTakeFlag(int unused0, int unused1, void *data, vo
     PCInteraction *pcInteraction = data;
 
     if (UndergroundPlayer_TryTakeFlagFromBase(pcInteraction->playerNetID, pcInteraction->pcNetID)) {
-        CommSys_SendDataFixedSizeServer(90, pcInteraction);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_TAKEN_FLAG, pcInteraction);
     }
 }
 
diff --git a/src/underground/player.c b/src/underground/player.c
index 057ddc21cde..4366f745f48 100644
--- a/src/underground/player.c
+++ b/src/underground/player.c
@@ -4,6 +4,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "generated/trainer_score_events.h"
 
 #include "struct_defs/comm_player_location.h"
@@ -177,7 +178,7 @@ void CommCmd_UndergroundOpenMenuRequest(int netID, int unused1, void *unused2, v
         }
     }
 
-    if (CommSys_SendDataServer(29, &event, sizeof(OpenMenuEvent))) {
+    if (CommSys_SendDataServer(COMM_CMD_OPEN_MENU_EVENT, &event, sizeof(OpenMenuEvent))) {
         if (event.result != MENU_RESULT_FAIL) {
             CommPlayerMan_SetMovementEnabled(netID, FALSE);
         }
@@ -270,11 +271,11 @@ void CommCmd_UndergroundFlagEventType(int netID, int unused1, void *data, void *
     switch (*flagEventType) {
     case FLAG_EVENT_DISCARD:
         event.type = FLAG_EVENT_DISCARD;
-        CommSys_SendDataFixedSizeServer(85, &event);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event);
         break;
     case FLAG_EVENT_REGISTER:
         event.type = FLAG_EVENT_REGISTER;
-        CommSys_SendDataFixedSizeServer(85, &event);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event);
         CommPlayerMan_SetMovementEnabled(netID, FALSE);
         break;
     }
@@ -350,7 +351,7 @@ BOOL UndergroundPlayer_TalkHeldFlagCheck(int netID, int targetNetID, BOOL blockI
     event.targetNetID = targetNetID;
 
     CommPlayerMan_SetMovementEnabled(netID, FALSE);
-    CommSys_SendDataFixedSizeServer(85, &event);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event);
 
     return TRUE;
 }
@@ -366,7 +367,7 @@ BOOL UndergroundPlayer_BuriedObjectHeldFlagCheck(int netID)
     }
 
     event.netID = netID;
-    CommSys_SendDataFixedSizeServer(85, &event);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_EVENT, &event);
 
     return TRUE;
 }
@@ -493,7 +494,7 @@ void CommCmd_UndergroundFlagEvent(int unused0, int unused1, void *data, void *un
             if (prevFlagRank == UndergroundRecord_GetFlagRank(undergroundRecord)) {
                 UndergroundTextPrinter_PrintText(UndergroundMan_GetCaptureFlagTextPrinter(), UndergroundCaptureFlag_Text_ObtainedFlagWasRegistered, TRUE, UndergroundPlayer_ResumeFieldSystemCallback);
             } else {
-                CommSys_SendDataFixedSize(96, &prevFlagRank);
+                CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_RANK_UP, &prevFlagRank);
             }
 
             Sound_FadeOutAndPlayBGM(4, SEQ_TANKOU, 60, 0, 0xFF, NULL);
@@ -532,7 +533,7 @@ void UndergroundPlayer_SendHeldFlagOwnerInfo(void)
     commPlayerMan->linksReceivedHeldFlagData = FALSE;
 
     if (commPlayerMan->heldFlagOwnerInfo[CommSys_CurNetId()]) {
-        CommSys_SendDataFixedSize(91, commPlayerMan->heldFlagOwnerInfo[CommSys_CurNetId()]);
+        CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO, commPlayerMan->heldFlagOwnerInfo[CommSys_CurNetId()]);
     } else {
         TrainerInfo *trainerInfo = TrainerInfo_New(HEAP_ID_COMMUNICATION);
         String *name = String_Init(20, HEAP_ID_COMMUNICATION);
@@ -541,7 +542,7 @@ void UndergroundPlayer_SendHeldFlagOwnerInfo(void)
         GF_ASSERT(name);
 
         TrainerInfo_SetNameFromString(trainerInfo, name);
-        CommSys_SendDataFixedSize(91, trainerInfo);
+        CommSys_SendDataFixedSize(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO, trainerInfo);
         String_Free(name);
         Heap_Free(trainerInfo);
     }
@@ -570,11 +571,11 @@ void CommCmd_UndergroundHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, void
         for (int netID = 0; netID < MAX_CONNECTED_PLAYERS; netID++) {
             if (commPlayerMan->heldFlagInfo[netID].netID != NETID_NONE) {
                 commPlayerMan->heldFlagInfo[netID].netID = netID;
-                CommSys_SendDataHugeServer(92, &commPlayerMan->heldFlagInfo[netID], sizeof(HeldFlagInfo));
+                CommSys_SendDataHugeServer(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER, &commPlayerMan->heldFlagInfo[netID], sizeof(HeldFlagInfo));
             }
         }
 
-        CommSys_SendDataServer(93, &buffer, sizeof(u8));
+        CommSys_SendDataServer(COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK, &buffer, sizeof(u8));
         String_Free(name);
 
         commPlayerMan->updatingHeldFlags = TRUE;
@@ -666,7 +667,7 @@ BOOL UndergroundPlayer_IsAffectedByTrap(int netID)
 void CommCmd_UndergroundVendorTalk(int netID, int unused1, void *unused2, void *unused3)
 {
     u8 data = netID;
-    CommSys_SendDataFixedSizeServer(26, &data);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_VENDOR_TALK_SERVER, &data);
 }
 
 void CommCmd_UndergroundVendorTalkServer(int unused0, int unused1, void *data, void *unused3)
diff --git a/src/underground/player_talk.c b/src/underground/player_talk.c
index eadba947bd6..7baf10acdd3 100644
--- a/src/underground/player_talk.c
+++ b/src/underground/player_talk.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/field_base_tiles.h"
 #include "generated/trainer_score_events.h"
 
@@ -261,7 +262,7 @@ static void UndergroundTalkResponse_RequestLinkTalkStateUpdate(ResponseMenu *men
         .newState = newState
     };
 
-    CommSys_SendDataFixedSize(74, &req);
+    CommSys_SendDataFixedSize(COMM_CMD_RESPONSE_TALK_UPDATE_SERVER, &req);
 }
 
 static void UndergroundTalk_RequestLinkTalkStateUpdate(TalkMenu *menu, int newState)
@@ -271,7 +272,7 @@ static void UndergroundTalk_RequestLinkTalkStateUpdate(TalkMenu *menu, int newSt
         .newState = newState
     };
 
-    CommSys_SendDataFixedSize(73, &req);
+    CommSys_SendDataFixedSize(COMM_CMD_REQUEST_TALK_UPDATE_SERVER, &req);
 }
 
 static void UndergroundTalk_PrintMessage(TalkMenu *menu, int bankEntry)
@@ -443,7 +444,7 @@ static BOOL UndergroundTalk_HandleQuestionsMenu(SysTask *sysTask, void *data)
         message.recipientNetID = menu->linkNetID;
         message.type = MESSAGE_TYPE_QUESTION;
 
-        CommSys_SendDataFixedSize(79, &message);
+        CommSys_SendDataFixedSize(COMM_CMD_SEND_TALK_MSG_SERVER, &message);
 
         menu->questionIndex = input;
         menu->state = TALK_MENU_STATE_PRINT_SELECTED_QUESTION;
@@ -506,7 +507,7 @@ static BOOL UndergroundTalk_HandleAnswersMenu(SysTask *sysTask, void *data)
         message.index = menu->questionIndex * ANSWERS_PER_QUESTION + input;
         message.recipientNetID = menu->linkNetID;
         message.type = MESSAGE_TYPE_TALK_ANSWER;
-        CommSys_SendDataFixedSize(79, &message);
+        CommSys_SendDataFixedSize(COMM_CMD_SEND_TALK_MSG_SERVER, &message);
         UndergroundTextPrinter_SetUndergroundAnswer(UndergroundMan_GetCommonTextPrinter(), message.index);
         UndergroundTextPrinter_SetUndergroundAnswerWithIndex(UndergroundMan_GetCommonTextPrinter(), 6, menu->linkAnswerIndex);
 
@@ -551,7 +552,7 @@ static void UndergroundTalk_HandleGiftConfirmMenu(SysTask *unused, TalkMenu *men
 
     if (input == MENU_YES) {
         menu->sentGift.recipientNetID = menu->linkNetID;
-        CommSys_SendDataFixedSize(77, &menu->sentGift);
+        CommSys_SendDataFixedSize(COMM_CMD_SEND_GIFT_SERVER, &menu->sentGift);
         menu->state = TALK_MENU_STATE_GIFT_OFFERED;
     } else {
         UndergroundTalk_PrintMessage(menu, UndergroundCommon_Text_NextTimeWillBeFine);
@@ -1102,7 +1103,7 @@ static BOOL UndergroundTalkResponse_HandleAnswersMenu(SysTask *sysTask, void *da
         message.recipientNetID = menu->linkNetID;
         message.type = MESSAGE_TYPE_RESPONSE_ANSWER;
 
-        CommSys_SendDataFixedSize(79, &message);
+        CommSys_SendDataFixedSize(COMM_CMD_SEND_TALK_MSG_SERVER, &message);
         UndergroundTalkResponse_RequestLinkTalkStateUpdate(menu, TALK_MENU_STATE_LINK_ANSWERED);
         break;
     }
@@ -1341,12 +1342,12 @@ void UndergroundTalkResponse_Start(int unused, int linkNetID, FieldSystem *field
 
 void CommCmd_RequestUndergroundTalkStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3)
 {
-    CommSys_SendDataFixedSizeServer(75, data);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER, data);
 }
 
 void CommCmd_RequestUndergroundTalkResponseStateAndUpdateServer(int unused0, int unused1, void *data, void *unused3)
 {
-    CommSys_SendDataFixedSizeServer(76, data);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_TALK_UPDATE_SERVER, data);
 }
 
 void CommCmd_UndergroundTalkResponseStateUpdateServer(int unused0, int size, void *data, void *unused3)
@@ -1378,7 +1379,7 @@ int CommPacketSizeOf_TalkStateChangeRequest(void)
 
 void CommCmd_UndergroundSendGiftServer(int unused0, int unused1, void *data, void *unused3)
 {
-    CommSys_SendDataFixedSizeServer(78, data);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_RECV_GIFT_OFFER, data);
 }
 
 void CommCmd_UndergroundRecvGiftOffer(int unused0, int unused1, void *data, void *unused3)
@@ -1414,7 +1415,7 @@ int CommPacketSizeOf_Gift(void)
 
 void CommCmd_SendUndergroundTalkMessageServer(int unused0, int unused1, void *data, void *unused3)
 {
-    CommSys_SendDataFixedSizeServer(80, data);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_RECV_TALK_MSG_SERVER, data);
 }
 
 void CommCmd_RecvUndergroundTalkMessage(int unused0, int unused1, void *data, void *unused3)
diff --git a/src/underground/records.c b/src/underground/records.c
index 8408699ae57..2adf0d57476 100644
--- a/src/underground/records.c
+++ b/src/underground/records.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/field_base_tiles.h"
 #include "constants/heap.h"
 
@@ -249,7 +250,7 @@ void UndergroundRecords_SendRecord(int targetNetID)
 
     MI_CpuCopy8(recordsEnv->record, &buffer->undergroundRecord, size);
 
-    CommSys_SendData(81, buffer, size + 1);
+    CommSys_SendData(COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER, buffer, size + 1);
     Heap_Free(buffer);
 }
 
@@ -266,7 +267,7 @@ void UndergroundRecords_RetrieveTrainerScore(void)
 
 void CommCmd_SendUndergroundRecordServer(int unused0, int size, void *data, void *unused3)
 {
-    CommSys_SendDataServer(82, data, size);
+    CommSys_SendDataServer(COMM_CMD_UNDERGROUND_RECORD, data, size);
 }
 
 void CommCmd_UndergroundRecord(int unused0, int size, void *data, void *unused3)
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index f3ff1db1a8b..1f7a96677eb 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/field_base_tiles.h"
 #include "constants/heap.h"
 #include "constants/map_object.h"
@@ -703,7 +704,7 @@ void CommCmd_SecretBaseTransitionEvent(int netID, int unused1, void *data, void
         if (event->entering) {
             if (!SecretBases_TryEnterBase(event->baseOwnerNetID, netID)) {
                 secretBasesEnv->baseTransitioningOwnerNetIDs[netID] = NETID_NONE;
-                CommSys_SendDataFixedSizeServer(61, &buffer);
+                CommSys_SendDataFixedSizeServer(COMM_CMD_ENTER_BASE_FAILED, &buffer);
             }
         } else {
             SecretBases_ExitBase(event->baseOwnerNetID, netID, FALSE);
@@ -784,7 +785,7 @@ static void SecretBases_ExitBase(int baseOwnerNetID, int netID, BOOL forceExit)
     event.dir = dir;
     event.forceExit = forceExit;
 
-    CommSys_SendDataFixedSizeServer(57, &event);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_EXIT_BASE, &event);
     CommPlayerMan_SetMovementEnabled(netID, FALSE);
 }
 
@@ -822,7 +823,7 @@ BOOL SecretBases_CheckForEnterExit(int netID, int x, int z)
         promptEvent.netID = netID;
         promptEvent.baseOwnerNetID = baseOwnerNetID;
 
-        CommSys_SendDataFixedSizeServer(58, &promptEvent);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_BASE_TRANSMITION_PROMPT, &promptEvent);
         CommPlayerMan_SetMovementEnabled(netID, FALSE);
 
         return TRUE;
@@ -847,7 +848,7 @@ BOOL SecretBases_CheckForEnterExit(int netID, int x, int z)
             promptEvent.netID = netID;
             promptEvent.baseOwnerNetID = baseOwnerNetID;
 
-            CommSys_SendDataFixedSizeServer(58, &promptEvent);
+            CommSys_SendDataFixedSizeServer(COMM_CMD_BASE_TRANSMITION_PROMPT, &promptEvent);
             CommPlayerMan_SetMovementEnabled(netID, FALSE);
 
             return TRUE;
@@ -864,7 +865,7 @@ BOOL SecretBases_CheckForEnterExit(int netID, int x, int z)
         secretBasesEnv->baseTransitioningOwnerNetIDs[netID] = 0;
 
         UndergroundPlayer_MoveToFromSecretBaseServer(netID, exitEvent.x, exitEvent.z, exitEvent.dir);
-        CommSys_SendDataFixedSizeServer(57, &exitEvent);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_EXIT_BASE, &exitEvent);
         return TRUE;
     }
 
@@ -898,7 +899,7 @@ static void SecretBases_EndBaseTransitionPromptTaskFail(SysTask *sysTask, void *
     event.baseOwnerNetID = ctx->baseOwnerNetID;
     event.entering = FALSE;
 
-    CommSys_SendDataFixedSize(59, &event);
+    CommSys_SendDataFixedSize(COMM_CMD_BASE_TRANSITION_EVENT, &event);
     SysTask_Done(sysTask);
     Heap_Free(ctx);
 
@@ -987,7 +988,7 @@ static void SecretBases_ExitBasePromptTask(SysTask *sysTask, void *data)
         event.baseOwnerNetID = ctx->baseOwnerNetID;
         event.entering = FALSE;
 
-        CommSys_SendDataFixedSize(59, &event);
+        CommSys_SendDataFixedSize(COMM_CMD_BASE_TRANSITION_EVENT, &event);
         SecretBases_EndBaseTransitionPromptTaskSuccess(sysTask, ctx);
         return;
     }
@@ -1202,7 +1203,7 @@ static void SecretBases_EnterBasePromptTask(SysTask *sysTask, void *data)
     case ENTER_PROMPT_STATE_ENTER_CLOSE_DOOR_AND_END:
         if (CommServerClient_IsInClosedSecretBase() && CommSys_CurNetId() == 0) {
             u8 type = BASE_CREATE_REQ_CLOSE_BASE;
-            CommSys_SendDataFixedSize(86, &type);
+            CommSys_SendDataFixedSize(COMM_CMD_CREATE_SECRET_BASE_REQUEST, &type);
 
             SecretBases_EndBaseTransitionPromptTaskSuccess(sysTask, ctx);
 
@@ -1217,7 +1218,7 @@ static void SecretBases_EnterBasePromptTask(SysTask *sysTask, void *data)
         event.baseOwnerNetID = ctx->baseOwnerNetID;
         event.entering = TRUE;
 
-        CommSys_SendDataFixedSize(59, &event);
+        CommSys_SendDataFixedSize(COMM_CMD_BASE_TRANSITION_EVENT, &event);
         SecretBases_EndBaseTransitionPromptTaskSuccess(sysTask, ctx);
 
         secretBasesEnv->moveStatus = MOVE_STATUS_ENTERING;
@@ -1277,7 +1278,7 @@ void CommCmd_SecretBaseExit(int unused0, int unused1, void *data, void *unused3)
         UndergroundMan_ForceEndCurrentSysTask();
         Traps_ForceEndCurrentTrapEffectClient(CommSys_CurNetId(), FALSE);
 
-        CommSys_SendMessage(43);
+        CommSys_SendMessage(COMM_CMD_END_TRAP_EFFECT);
         secretBasesEnv->currentPlayerInBase = FALSE;
         sub_02059638(TRUE);
 
@@ -1291,7 +1292,7 @@ void CommCmd_SecretBaseExit(int unused0, int unused1, void *data, void *unused3)
 
 void SecretBases_RequestClearTransitioningStatus(void)
 {
-    CommSys_SendMessage(56);
+    CommSys_SendMessage(COMM_CMD_CLEAR_TRANSITION_STATUS);
 }
 
 void CommCmd_SecretBaseClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3)
@@ -1348,7 +1349,7 @@ void CommCmd_EnterSecretBase(int unused0, int unused1, void *data, void *unused3
         secretBasesEnv->moveStatus = MOVE_STATUS_NONE;
 
         CommPlayerMan_ResumeFieldSystem();
-        CommSys_SendMessage(56);
+        CommSys_SendMessage(COMM_CMD_CLEAR_TRANSITION_STATUS);
         CommPlayer_SendPos(FALSE);
 
         ov23_0224DC24();
@@ -1886,7 +1887,7 @@ static void SecretBases_DiggerDrillTask(SysTask *sysTask, void *data)
 
             SecretBases_CreateBase();
 
-            CommSys_SendDataFixedSize(86, &type);
+            CommSys_SendDataFixedSize(COMM_CMD_CREATE_SECRET_BASE_REQUEST, &type);
             SysTask_Done(sysTask);
             Heap_Free(ctx);
 
@@ -1916,7 +1917,7 @@ static void SecretBases_DiggerDrillTask(SysTask *sysTask, void *data)
 void SecretBases_UseDiggerDrill(void)
 {
     u8 type = BASE_CREATE_REQ_USE_DIGGER_DRILL;
-    CommSys_SendDataFixedSize(86, &type);
+    CommSys_SendDataFixedSize(COMM_CMD_CREATE_SECRET_BASE_REQUEST, &type);
 }
 
 int CommPacketSizeOf_SecretBaseCreateEvent(void)
@@ -1983,7 +1984,7 @@ void CommCmd_CreateSecretBaseRequest(int netID, int unused1, void *data, void *u
         }
     }
 
-    CommSys_SendDataFixedSizeServer(87, &event);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_CREATE_SECRET_BASE_EVENT, &event);
 }
 
 static void SecretBases_EndDiggerDrillTask(SysTask *sysTask, void *data)
@@ -2321,7 +2322,7 @@ BOOL SecretBases_CheckForInteractableGood(int netID, CoordinatesU16 *coordinates
 
         if (event.bankEntry != 0) {
             CommPlayerMan_SetMovementEnabled(netID, FALSE);
-            CommSys_SendDataFixedSizeServer(60, &event);
+            CommSys_SendDataFixedSizeServer(COMM_CMD_SECRET_BASE_GOOD_INTERACTION, &event);
 
             return TRUE;
         }
@@ -2433,7 +2434,7 @@ void CommCmd_UndergroundFlagRankUp(int netID, int unused1, void *data, void *unu
         .prevFlagRank = *prevFlagRank,
     };
 
-    CommSys_SendDataFixedSizeServer(97, &event);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT, &event);
 }
 
 void CommCmd_UndergroundFlagRankUpEvent(int unused0, int unused1, void *data, void *unused3)
diff --git a/src/underground/traps.c b/src/underground/traps.c
index 0e4f4868ca6..475bf8ef6a5 100644
--- a/src/underground/traps.c
+++ b/src/underground/traps.c
@@ -4,6 +4,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/map_object.h"
 #include "generated/trainer_score_events.h"
 #include "generated/traps.h"
@@ -1159,7 +1160,7 @@ static BuriedTrap *Traps_AddBuriedTrap(int x, int z, BuriedTrap *dest, enum Trap
 
 void Underground_SendPlacedTrap(u8 trapID)
 {
-    CommSys_SendDataFixedSize(32, &trapID);
+    CommSys_SendDataFixedSize(COMM_CMD_TRY_PLACE_TRAP, &trapID);
 }
 
 void Traps_SendTrapRadarResults(void)
@@ -1189,31 +1190,31 @@ void CommCmd_TryPlaceTrap(int netID, int unused1, void *data, void *unused3)
 
     if (CommPlayer_GetXServerIfActive(netID) == 0xFFFF && CommPlayer_GetZServerIfActive(netID) == 0xFFFF) {
         placeResult.result = PLACE_TRAP_FAIL;
-        CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult));
+        CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult));
         return;
     }
 
     if (CommPlayerMan_GetLinkNetIDAtLocation(x, z) != NETID_NONE) {
         placeResult.result = PLACE_TRAP_PERSON_IN_WAY;
-        CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult));
+        CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult));
         return;
     }
 
     if (CommPlayer_CheckNPCCollision(x, z)) {
         placeResult.result = PLACE_TRAP_PERSON_IN_WAY;
-        CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult));
+        CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult));
         return;
     }
 
     if (UndergroundMan_AreCoordinatesInSecretBase(x, z)) {
         placeResult.result = PLACE_TRAP_NOT_IN_SECRET_BASE;
-        CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult));
+        CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult));
         return;
     }
 
     if (TerrainCollisionManager_CheckCollision(trapsEnv->fieldSystem, x, z)) {
         placeResult.result = PLACE_TRAP_WALL_IN_WAY;
-        CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult));
+        CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult));
         return;
     }
 
@@ -1227,7 +1228,7 @@ void CommCmd_TryPlaceTrap(int netID, int unused1, void *data, void *unused3)
         }
     }
 
-    CommSys_SendDataServer(34, &placeResult, sizeof(PlaceTrapResult));
+    CommSys_SendDataServer(COMM_CMD_PLACE_TRAP_RESULT, &placeResult, sizeof(PlaceTrapResult));
 }
 
 int CommPacketSizeOf_PlaceTrapResult(void)
@@ -1446,7 +1447,7 @@ void CommCmd_LoadPlacedTraps(int netID, int size, void *data, void *unused3)
     result.netID = netID;
     result.success = TRUE;
 
-    CommSys_SendDataServer(36, &result, 2);
+    CommSys_SendDataServer(COMM_CMD_RECV_LOAD_TRAPS, &result, 2);
     Traps_SendTriggeredTrapBits();
 }
 
@@ -1512,7 +1513,7 @@ BOOL Traps_TryDisengageTrap(int netID, CoordinatesU16 *unused, u8 flags)
         }
 
         CommPlayerMan_SetMovementEnabled(netID, FALSE);
-        CommSys_SendDataServer(51, &retrievedTrap, sizeof(TriggeredTrap));
+        CommSys_SendDataServer(COMM_CMD_DISENGAGE_TRAP, &retrievedTrap, sizeof(TriggeredTrap));
 
         return TRUE;
     }
@@ -1651,7 +1652,7 @@ static BOOL CheckPlayerSteppedOnTrap(int netID)
         Underground_RemoveSpawnedTrapAtIndex(underground, triggeredTrap.trap.spawnedTrapIndex);
     }
 
-    CommSys_SendDataServer(37, &triggeredTrap, sizeof(TriggeredTrap));
+    CommSys_SendDataServer(COMM_CMD_TRIGGER_TRAP, &triggeredTrap, sizeof(TriggeredTrap));
     trapsEnv->triggeredTrapIDs[netID] = trap->trapID;
     Traps_RemoveBuriedTrap(trap);
 
@@ -1675,7 +1676,7 @@ void Traps_HandleTriggeredTool(int victimNetID, int setterNetID, enum Trap trapI
     trap.trap.z = z;
     trap.toolInitialDir = victimDir;
 
-    CommSys_SendDataServer(37, &trap, sizeof(TriggeredTrap));
+    CommSys_SendDataServer(COMM_CMD_TRIGGER_TRAP, &trap, sizeof(TriggeredTrap));
     trapsEnv->triggeredTrapIDs[victimNetID] = trapID;
 }
 
@@ -1786,7 +1787,7 @@ void Traps_SendTriggeredTrapBits(void)
             }
         }
 
-        CommSys_SendDataFixedSizeServer(45, &bits);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_TRIGGERD_TRAP_BITS, &bits);
     }
 }
 
@@ -2177,7 +2178,7 @@ static void Traps_MoveTrapClientTask(SysTask *sysTask, void *data)
         if (ctx->timer == 28) {
             u8 trapID = trapsEnv->triggeredTrapIDClient;
 
-            CommSys_SendDataFixedSize(38, &trapID);
+            CommSys_SendDataFixedSize(COMM_CMD_CALL_SECOND_TRAP_EFFECT, &trapID);
         }
 
         if (ctx->timer > 30) {
@@ -2519,7 +2520,7 @@ static void Traps_SmokeTrapClientTask(SysTask *sysTask, void *data)
                 if (ctx->isTool) {
                     ctx->state = SMOKE_TRAP_STATE_TOOL_STEP_BACK;
                 } else {
-                    CommSys_SendMessage(41);
+                    CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
                     ctx->state = SMOKE_TRAP_STATE_WAIT_FOR_END;
                 }
             }
@@ -2552,7 +2553,7 @@ static void Traps_SmokeTrapClientTask(SysTask *sysTask, void *data)
         ctx->timer++;
 
         if (ctx->timer > 8) {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = SMOKE_TRAP_STATE_WAIT_FOR_END;
         }
         break;
@@ -2576,7 +2577,7 @@ void CommCmd_EscapeTrapServer(int netID, int unused1, void *unused2, void *unuse
         trap.netID = netID;
         trap.showOKEmote = TRUE;
 
-        CommSys_SendDataFixedSizeServer(42, &trap);
+        CommSys_SendDataFixedSizeServer(COMM_CMD_ESCAPED_TRAP, &trap);
     }
 
     trapsEnv->triggeredTrapIDs[netID] = TRAP_NONE;
@@ -2656,7 +2657,7 @@ void Traps_HelpLink(int netID, int linkNetID)
     helpData.helperNetID = netID;
     helpData.trapID = trapsEnv->triggeredTrapIDs[linkNetID];
 
-    CommSys_SendDataFixedSizeServer(44, &helpData);
+    CommSys_SendDataFixedSizeServer(COMM_CMD_TRAP_HELP, &helpData);
     trapsEnv->triggeredTrapIDs[linkNetID] = TRAP_NONE;
     CommPlayerMan_SetMovementEnabled(netID, FALSE);
 }
@@ -2754,7 +2755,7 @@ void TrapRadar_Start(void)
 
     TrapRadarContext *ctx = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(TrapRadarContext));
     MI_CpuFill8(ctx, 0, sizeof(TrapRadarContext));
-    CommSys_SendMessage(46);
+    CommSys_SendMessage(COMM_CMD_SEND_TRAP_RADAR_RESULTS);
 
     trapsEnv->trapRadarContext = ctx;
     trapsEnv->trapRadarTask = SysTask_Start(TrapRadar_TimerTask, ctx, 100);
@@ -2796,7 +2797,7 @@ static void SendTrapRadarResults(void)
                         radarResult.x = trap->x;
                         radarResult.z = trap->z;
                         radarResult.netID = netID;
-                        CommSys_SendDataFixedSizeServer(47, &radarResult);
+                        CommSys_SendDataFixedSizeServer(COMM_CMD_RECV_TRAP_RADAR_RESULTS, &radarResult);
                         trapsEnv->trapRadarIndex[netID] = index + 2;
                         break;
                     }
@@ -3090,7 +3091,7 @@ static void Traps_HoleTrapClientTask(SysTask *sysTask, void *data)
         ctx->timer++;
 
         if (Traps_CheckPlayerPosRelativeToTrap(ctx->toolInitialDir, PLAYER_TILE_BACK_FROM_TRAP) || ctx->timer > 60) {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = HOLE_TRAP_STATE_WAIT_FOR_FORCE_END;
         }
         break;
@@ -3108,7 +3109,7 @@ static void Traps_HoleTrapClientTask(SysTask *sysTask, void *data)
                 if (ctx->isTool) {
                     ctx->state = HOLE_TRAP_STATE_TOOL_STEP_BACK;
                 } else {
-                    CommSys_SendMessage(41);
+                    CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
                     ctx->state = HOLE_TRAP_STATE_END;
                 }
             }
@@ -3264,7 +3265,7 @@ static void Traps_LeafTrapClientTask(SysTask *sysTask, void *data)
             if (ctx->isTool) {
                 ctx->state = LEAF_TRAP_STATE_TOOL_STEP_BACK;
             } else {
-                CommSys_SendMessage(41);
+                CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
                 ctx->state = LEAF_TRAP_STATE_WAIT_FOR_END;
             }
         }
@@ -3295,7 +3296,7 @@ static void Traps_LeafTrapClientTask(SysTask *sysTask, void *data)
         ctx->timer++;
 
         if (ctx->timer > 8) {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = LEAF_TRAP_STATE_WAIT_FOR_END;
         }
         break;
@@ -3688,7 +3689,7 @@ static void Traps_BubbleTrapClientTask(SysTask *sysTask, void *data)
             if (ctx->isTool) {
                 ctx->state = BUBBLE_TRAP_STATE_TOOL_STEP_BACK;
             } else {
-                CommSys_SendMessage(41);
+                CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
                 ctx->state = BUBBLE_TRAP_STATE_WAIT_FOR_END;
             }
         }
@@ -3722,7 +3723,7 @@ static void Traps_BubbleTrapClientTask(SysTask *sysTask, void *data)
         ctx->timer++;
 
         if (ctx->timer > 8) {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = BUBBLE_TRAP_STATE_WAIT_FOR_END;
         }
         break;
@@ -4303,7 +4304,7 @@ static void Traps_RockTrapClientTask(SysTask *sysTask, void *data)
             if (ctx->isTool) {
                 ctx->state = ROCK_TRAP_STATE_TOOL_STEP_BACK;
             } else {
-                CommSys_SendMessage(41);
+                CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
                 ctx->state = ROCK_TRAP_STATE_WAIT_FOR_END;
             }
         }
@@ -4333,7 +4334,7 @@ static void Traps_RockTrapClientTask(SysTask *sysTask, void *data)
         ctx->timer++;
 
         if (ctx->timer > 8) {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = ROCK_TRAP_STATE_WAIT_FOR_END;
         }
         break;
@@ -4606,7 +4607,7 @@ static void Traps_FireTrapClientTask(SysTask *sysTask, void *data)
             if (ctx->isTool) {
                 ctx->state = FIRE_TRAP_STATE_TOOL_STEP_BACK;
             } else {
-                CommSys_SendMessage(41);
+                CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
                 ctx->state = FIRE_TRAP_STATE_WAIT_FOR_END;
             }
         }
@@ -4636,7 +4637,7 @@ static void Traps_FireTrapClientTask(SysTask *sysTask, void *data)
         ctx->timer++;
 
         if (ctx->timer > 8) {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = FIRE_TRAP_STATE_WAIT_FOR_END;
         }
         break;
@@ -4732,7 +4733,7 @@ static void Traps_AlertTrapClientTask(SysTask *sysTask, void *data)
         if (ctx->isTool) {
             ctx->state = ALERT_TRAP_STATE_TOOL_STEP_BACK;
         } else {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = ALERT_TRAP_STATE_WAIT_FOR_END;
         }
         break;
@@ -4754,7 +4755,7 @@ static void Traps_AlertTrapClientTask(SysTask *sysTask, void *data)
         ctx->timer++;
 
         if (ctx->timer > 8) {
-            CommSys_SendMessage(41);
+            CommSys_SendMessage(COMM_CMD_ESCAPE_TRAP);
             ctx->state = ALERT_TRAP_STATE_WAIT_FOR_END;
         }
         break;
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index 0d6620ad6d6..1cdd10b259c 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -4,6 +4,8 @@
 #include <nitro/code16.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_decls/struct_020302DC_decl.h"
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_defs/battle_tower.h"
@@ -16,6 +18,7 @@
 
 #include "bag.h"
 #include "battle_frontier_stats.h"
+#include "comm_command_field.h"
 #include "communication_system.h"
 #include "dexmode_checker.h"
 #include "field_script_context.h"
@@ -32,7 +35,6 @@
 #include "unk_020302D0.h"
 #include "unk_02049D08.h"
 #include "unk_0205DFC4.h"
-#include "comm_command_field.h"
 
 #include "constdata/const_020F410C.h"
 
@@ -165,7 +167,7 @@ static BOOL sub_0204FD38(FieldTask *param0)
 
     switch (v0->unk_00) {
     case 0:
-        if (CommSys_SendData(133, v0, sizeof(UnkStruct_0204FCF8)) == 1) {
+        if (CommSys_SendData(COMM_CMD_FIELD_133, v0, sizeof(UnkStruct_0204FCF8)) == 1) {
             v0->unk_00++;
         }
         break;
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index c70608d175e..a3280ca84c4 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -4,6 +4,8 @@
 #include <nitro/code16.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "struct_decls/struct_020304A0_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
 #include "struct_defs/battle_tower.h"
@@ -16,6 +18,7 @@
 
 #include "bag.h"
 #include "battle_frontier_stats.h"
+#include "comm_command_field.h"
 #include "communication_system.h"
 #include "dexmode_checker.h"
 #include "field_script_context.h"
@@ -32,7 +35,6 @@
 #include "unk_02030494.h"
 #include "unk_02049D08.h"
 #include "unk_0205DFC4.h"
-#include "comm_command_field.h"
 
 #include "constdata/const_020F410C.h"
 
@@ -157,7 +159,7 @@ static BOOL sub_02050264(FieldTask *param0)
 
     switch (v0->unk_00) {
     case 0:
-        if (CommSys_SendData(134, v0, sizeof(UnkStruct_02050224)) == 1) {
+        if (CommSys_SendData(COMM_CMD_FIELD_134, v0, sizeof(UnkStruct_02050224)) == 1) {
             v0->unk_00++;
         }
         break;
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 84b9df21f32..5a8548e6d5f 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
+
 #include "applications/party_menu/defs.h"
 #include "applications/party_menu/main.h"
 #include "applications/pokemon_summary_screen/main.h"
@@ -771,9 +773,9 @@ static BOOL sub_0205ACC8(UnkStruct_0205A0D8 *param0)
         v2 = sub_0205B0E4();
 
         if (param0->unk_86 == 0) {
-            v0 = CommSys_SendDataHugeServer(106, v1, v2);
+            v0 = CommSys_SendDataHugeServer(COMM_CMD_FIELD_106, v1, v2);
         } else {
-            v0 = CommSys_SendDataHuge(106, v1, v2);
+            v0 = CommSys_SendDataHuge(COMM_CMD_FIELD_106, v1, v2);
         }
 
         if (v0) {
@@ -804,9 +806,9 @@ static BOOL sub_0205AD34(UnkStruct_0205A0D8 *param0)
     BOOL v0;
 
     if (param0->unk_86 == 0) {
-        v0 = CommSys_SendDataServer(107, &(param0->unk_84), 1);
+        v0 = CommSys_SendDataServer(COMM_CMD_FIELD_107, &(param0->unk_84), 1);
     } else {
-        v0 = CommSys_SendData(107, &(param0->unk_84), 1);
+        v0 = CommSys_SendData(COMM_CMD_FIELD_107, &(param0->unk_84), 1);
     }
 
     if (v0) {
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index bf98b698827..2d493cc4712 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -3,6 +3,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/communication/comm_command.h"
 #include "constants/union_room_message_types.h"
 
 #include "struct_decls/struct_02014EC4_decl.h"
@@ -15,6 +16,8 @@
 #include "global/pm_version.h"
 
 #include "appearance.h"
+#include "comm_command_draw.h"
+#include "comm_command_field.h"
 #include "comm_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -35,8 +38,6 @@
 #include "unk_02014A84.h"
 #include "unk_02014D38.h"
 #include "unk_02033200.h"
-#include "comm_command_draw.h"
-#include "comm_command_field.h"
 
 #include "constdata/const_020ED570.h"
 #include "res/text/bank/country_names.h"
@@ -604,19 +605,19 @@ void sub_0205B930(UnkStruct_0205B43C *param0, int param1, u32 param2)
     case 0:
         if (param0->unk_44 == 0) {
             param0->unk_34 = v0;
-            CommSys_SendData(99, &v0, 1);
+            CommSys_SendData(COMM_CMD_FIELD_99, &v0, 1);
         }
         break;
     case 1:
         if (param2 == 0) {
             u8 v1 = param0->unk_30;
 
-            CommSys_SendDataServer(103, &v1, 1);
+            CommSys_SendDataServer(COMM_CMD_FIELD_103, &v1, 1);
             param0->unk_3C = param2;
         } else {
             u8 v2 = 7;
 
-            CommSys_SendDataServer(103, &v2, 1);
+            CommSys_SendDataServer(COMM_CMD_FIELD_103, &v2, 1);
             param0->unk_3C = param2;
         }
         break;
@@ -682,7 +683,7 @@ int sub_0205B9E8(UnkStruct_0205B43C *param0)
 int sub_0205B9EC(UnkStruct_0205B43C *param0, int param1)
 {
     if (param0->unk_30 == 0) {
-        CommSys_SendData(104, NULL, 0);
+        CommSys_SendData(COMM_CMD_FIELD_104, NULL, 0);
         return param1;
     }
 
@@ -746,7 +747,7 @@ u16 sub_0205BA7C(UnkStruct_0205B43C *param0)
 void sub_0205BAAC(int param0)
 {
     u8 v0 = param0;
-    CommSys_SendData(101, &v0, 1);
+    CommSys_SendData(COMM_CMD_FIELD_101, &v0, 1);
 }
 
 static const int sMessagesShowingTrainerCase[][2] = {
@@ -1378,5 +1379,5 @@ void sub_0205C1F0(UnkStruct_0205B43C *param0)
 
 void UnionRoom_SendTrainerCase(UnkStruct_0205B43C *param0)
 {
-    CommSys_SendDataHuge(105, param0->unk_184, sizeof(TrainerCase));
+    CommSys_SendDataHuge(COMM_CMD_FIELD_105, param0->unk_184, sizeof(TrainerCase));
 }
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index caf12b7a949..e37e740b785 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -12,6 +12,7 @@
 #include "overlay109/ov109_021D0D80.h"
 #include "overlay109/ov109_021D3D50.h"
 
+#include "comm_command_spin_trade.h"
 #include "comm_manager.h"
 #include "field_system.h"
 #include "field_task.h"
@@ -21,7 +22,6 @@
 #include "journal.h"
 #include "save_player.h"
 #include "unk_0203D1B8.h"
-#include "comm_command_spin_trade.h"
 
 FS_EXTERN_OVERLAY(overlay109);
 

From 4930f03d1bb0a2bc7028f4f952d4bff8e16da09f Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Thu, 28 May 2026 10:00:49 -0400
Subject: [PATCH 36/39] Requested changes

---
 include/comm_manager.h                        | 10 +++++-----
 .../comm_available_connections.h              |  8 ++++++++
 .../comm_avaliable_connections.h              |  8 --------
 src/battle/battle_main.c                      |  4 ++--
 src/comm_manager.c                            | 20 +++++++++----------
 src/error_handling.c                          |  2 +-
 src/field_comm_manager.c                      |  8 ++++----
 src/heap.c                                    |  2 +-
 src/main_menu/main_menu.c                     |  2 +-
 src/main_menu/wonder_cards_app.c              |  2 +-
 src/overlay017/ov17_0223B140.c                |  2 +-
 src/overlay017/ov17_0223CB1C.c                |  2 +-
 src/overlay017/ov17_0223DAD0.c                |  2 +-
 src/overlay017/ov17_0224F4D4.c                |  2 +-
 src/overlay065/ov65_0222DCE0.c                |  4 ++--
 src/overlay067/ov67_0225C700.c                |  6 +++---
 src/overlay083/ov83_0223B5A0.c                |  2 +-
 src/overlay088/ov88_0223B140.c                |  4 ++--
 src/overlay104/frscrcmd.c                     |  2 +-
 src/overlay117/ov117_02260668.c               |  2 +-
 src/scrcmd.c                                  |  2 +-
 src/underground/comm_manager.c                |  2 +-
 22 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 include/constants/communication/comm_available_connections.h
 delete mode 100644 include/constants/communication/comm_avaliable_connections.h

diff --git a/include/comm_manager.h b/include/comm_manager.h
index 9c61632ec1b..7ebf4ab114d 100644
--- a/include/comm_manager.h
+++ b/include/comm_manager.h
@@ -8,7 +8,7 @@
 #include "enums.h"
 #include "savedata.h"
 
-BOOL CommMan_IsInitialized(void);
+BOOL CommManager_IsInitialized(void);
 void CommManager_StartUnderground(SaveData *saveData);
 void CommManager_EndUnderground(void);
 void CommManager_ResetUnderground(void);
@@ -17,9 +17,9 @@ void CommManager_ResetUndergroundServer(void);
 BOOL CommManager_IsConnectingUnderground(void);
 void CommManager_CloseSecretBase(void);
 void CommManager_SetDoNotConnectUndergroundFlag(void);
-void CommMan_ReopenSecretBase(void);
-void CommMan_StartBattleServer(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool);
-void CommMan_StartBattleClient(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool);
+void CommManager_ReopenSecretBase(void);
+void CommManager_StartBattleServer(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool);
+void CommManager_StartBattleClient(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool);
 void CommManager_ConnectBattleClient(int connectionID);
 void CommManager_ResetBattleClient(void);
 void CommManager_EndBattle(void);
@@ -96,7 +96,7 @@ void CommManager_SetResetType(u8 resetType);
 u8 CommManager_GetResetType(void);
 void NetworkError_DisplayFatalError(int param0);
 void NetworkError_DisplayGTSCriticalError(void);
-void CommManager_deadstripped_02038A1C(int unused_0, BgConfig *bgConfig);
+void CommManager_Dummy_02038A1C(int unused_0, BgConfig *bgConfig);
 void CommManager_DisplayError(int unused);
 BOOL CommManager_CheckResetFinished(void);
 BOOL CommManager_SetCommError(int error);
diff --git a/include/constants/communication/comm_available_connections.h b/include/constants/communication/comm_available_connections.h
new file mode 100644
index 00000000000..9b07e7d14d9
--- /dev/null
+++ b/include/constants/communication/comm_available_connections.h
@@ -0,0 +1,8 @@
+#ifndef POKEPLATINUM_CONSTANTS_COMM_AVAILABLE_CONNECTIONS_H
+#define POKEPLATINUM_CONSTANTS_COMM_AVAILABLE_CONNECTIONS_H
+
+#define AV_CONNECT_MYSTERY_GIFT (1 << 0)
+#define AV_CONNECT_RANGER_LINK  (1 << 1)
+#define AV_CONNECT_WII          (1 << 2)
+
+#endif // POKEPLATINUM_CONSTANTS_COMM_AVAILABLE_CONNECTIONS_H
diff --git a/include/constants/communication/comm_avaliable_connections.h b/include/constants/communication/comm_avaliable_connections.h
deleted file mode 100644
index 854537e0a58..00000000000
--- a/include/constants/communication/comm_avaliable_connections.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef POKEPLATINUM_CONSTANTS_COMM_AVALIABLE_CONNECTIONS_H
-#define POKEPLATINUM_CONSTANTS_COMM_AVALIABLE_CONNECTIONS_H
-
-#define AV_CONNECT_MYSTERY_GIFT (1 << 0)
-#define AV_CONNECT_RANGER_LINK  (1 << 1)
-#define AV_CONNECT_WII          (1 << 2)
-
-#endif
diff --git a/src/battle/battle_main.c b/src/battle/battle_main.c
index 932d3edff32..f0e529b3b2e 100644
--- a/src/battle/battle_main.c
+++ b/src/battle/battle_main.c
@@ -1508,7 +1508,7 @@ static void SysTask_DrawSprites(SysTask *task, void *inBattleSys)
 {
     BattleSystem *battleSys = inBattleSys;
 
-    CommManager_deadstripped_02038A1C(HEAP_ID_BATTLE, battleSys->bgConfig);
+    CommManager_Dummy_02038A1C(HEAP_ID_BATTLE, battleSys->bgConfig);
 
     if (battleSys->renderMode == 0 || battleSys->renderMode == 3) {
         if (battleSys->renderMode == 0) {
@@ -1704,7 +1704,7 @@ static BOOL BattleMain_HandleLinkCommHandshake(ApplicationManager *appMan)
 {
     LinkBattleCommState *linkBattleCommState = ApplicationManager_Data(appMan);
 
-    CommManager_deadstripped_02038A1C(HEAP_ID_BATTLE, linkBattleCommState->bgConfig);
+    CommManager_Dummy_02038A1C(HEAP_ID_BATTLE, linkBattleCommState->bgConfig);
 
     BOOL result = 0;
 
diff --git a/src/comm_manager.c b/src/comm_manager.c
index fdfd204b69d..1101c3c1275 100644
--- a/src/comm_manager.c
+++ b/src/comm_manager.c
@@ -4,7 +4,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "constants/communication/comm_avaliable_connections.h"
+#include "constants/communication/comm_available_connections.h"
 #include "constants/communication/comm_error.h"
 #include "constants/communication/comm_type.h"
 
@@ -185,7 +185,7 @@ static void CommManager_Initialize(SaveData *saveData, int commType)
 /**
  * @brief Frees sCommMan, if it exists
  */
-static void CommMan_Free(void)
+static void CommManager_Free(void)
 {
     if (sCommMan == NULL) {
         return;
@@ -214,7 +214,7 @@ static void CommMan_Free(void)
  *
  * @return TRUE if sCommMan is not NULL
  */
-BOOL CommMan_IsInitialized(void)
+BOOL CommManager_IsInitialized(void)
 {
     if (sCommMan) {
         return TRUE;
@@ -326,7 +326,7 @@ void CommManager_SetDoNotConnectUndergroundFlag(void)
 /**
  * @brief Reopens the underground secret base to Wireless/Online play
  */
-void CommMan_ReopenSecretBase(void)
+void CommManager_ReopenSecretBase(void)
 {
     WirelessDriver_Init();
     CommManager_SetTask(CommTask_StartUndergroundWifiClient, 0);
@@ -341,7 +341,7 @@ void CommMan_ReopenSecretBase(void)
  * @param battleRegulation
  * @param unusedBool
  */
-void CommMan_StartBattleServer(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool)
+void CommManager_StartBattleServer(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool)
 {
     if (CommSys_IsInitialized()) {
         return;
@@ -365,7 +365,7 @@ void CommMan_StartBattleServer(SaveData *saveData, int commType, int contestRegu
  * @param battleRegulation
  * @param unusedBool
  */
-void CommMan_StartBattleClient(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool)
+void CommManager_StartBattleClient(SaveData *saveData, int commType, int contestRegulation, const BattleRegulation *battleRegulation, BOOL unusedBool)
 {
     if (CommSys_IsInitialized()) {
         return;
@@ -1208,7 +1208,7 @@ static void CommTask_End(void)
         return;
     }
 
-    CommMan_Free();
+    CommManager_Free();
 }
 
 /**
@@ -3050,12 +3050,12 @@ void NetworkError_DisplayGTSCriticalError(void)
 }
 
 /**
- * @brief Deadstripped function. Does nothing when called
+ * @brief Former debug function. Does nothing when called
  *
  * @param unused_int
  * @param unused_BgConfig
  */
-void CommManager_deadstripped_02038A1C(int unused_int, BgConfig *bgConfig)
+void CommManager_Dummy_02038A1C(int unused_int, BgConfig *bgConfig)
 {
     return;
 }
@@ -3096,7 +3096,7 @@ void CommManager_DisplayError(int unused)
  */
 BOOL CommManager_CheckResetFinished(void)
 {
-    if (CommServerClient_IsInClosedSecretBase() || !CommMan_IsInitialized()) {
+    if (CommServerClient_IsInClosedSecretBase() || !CommManager_IsInitialized()) {
         return TRUE;
     }
 
diff --git a/src/error_handling.c b/src/error_handling.c
index cf929623dfe..c63be256611 100644
--- a/src/error_handling.c
+++ b/src/error_handling.c
@@ -10,7 +10,7 @@ void ErrorHandling_AssertFail(void);
 
 void ErrorHandling_AssertFail(void)
 {
-    if (CommMan_IsInitialized() && (OS_GetProcMode() != OS_PROCMODE_IRQ)) {
+    if (CommManager_IsInitialized() && (OS_GetProcMode() != OS_PROCMODE_IRQ)) {
         ErrorMessageReset_PrintErrorAndReset();
     }
 }
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index f1bb6f320cd..c3867d83f82 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -123,7 +123,7 @@ void FieldCommMan_StartBattleServer(FieldSystem *fieldSystem, int param1, int pa
         return;
     }
 
-    CommMan_StartBattleServer(FieldSystem_GetSaveData(fieldSystem), param1, param2, fieldSystem->unk_B0, 0);
+    CommManager_StartBattleServer(FieldSystem_GetSaveData(fieldSystem), param1, param2, fieldSystem->unk_B0, 0);
     FieldCommMan_Init(fieldSystem);
     FieldCommMan_SetTask(Task_StartBattleServer, 0);
 }
@@ -134,7 +134,7 @@ void FieldCommMan_StartBattleClient(FieldSystem *fieldSystem, int param1, int pa
         return;
     }
 
-    CommMan_StartBattleClient(FieldSystem_GetSaveData(fieldSystem), param1, param2, fieldSystem->unk_B0, 0);
+    CommManager_StartBattleClient(FieldSystem_GetSaveData(fieldSystem), param1, param2, fieldSystem->unk_B0, 0);
     FieldCommMan_Init(fieldSystem);
     FieldCommMan_SetTask(Task_StartBattleClient, 0);
 }
@@ -156,7 +156,7 @@ void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem)
     SetupScreenFadeRegisters(DS_SCREEN_SUB, COLOR_BLACK);
     CommManager_SetErrorHandling(1, 1);
 
-    if (!CommMan_IsInitialized()) {
+    if (!CommManager_IsInitialized()) {
         return;
     }
 
@@ -413,7 +413,7 @@ static void sub_02059B74(void)
         }
     }
 
-    CommManager_deadstripped_02038A1C(4, sFieldCommMan->fieldSystem->bgConfig);
+    CommManager_Dummy_02038A1C(4, sFieldCommMan->fieldSystem->bgConfig);
 }
 
 static void sub_02059BF4(void)
diff --git a/src/heap.c b/src/heap.c
index e980cb05ca1..c4cacfd8f50 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -202,7 +202,7 @@ static void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignmen
 
 static void AllocFail(void)
 {
-    if (CommMan_IsInitialized()) {
+    if (CommManager_IsInitialized()) {
         ErrorMessageReset_PrintErrorAndReset();
     }
 }
diff --git a/src/main_menu/main_menu.c b/src/main_menu/main_menu.c
index c7f1a636a05..247e54f553d 100644
--- a/src/main_menu/main_menu.c
+++ b/src/main_menu/main_menu.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "constants/communication/comm_avaliable_connections.h"
+#include "constants/communication/comm_available_connections.h"
 #include "constants/graphics.h"
 #include "constants/narc.h"
 #include "generated/genders.h"
diff --git a/src/main_menu/wonder_cards_app.c b/src/main_menu/wonder_cards_app.c
index 6cf638c42fa..b450e938c12 100644
--- a/src/main_menu/wonder_cards_app.c
+++ b/src/main_menu/wonder_cards_app.c
@@ -1578,7 +1578,7 @@ static int WonderCardsApp_Main(ApplicationManager *appMan, enum WonderCardsAppSt
         DoScreenTransitionToState(appData, FADE_TYPE_BRIGHTNESS_IN, WC_APP_STATE_SHOW_WONDERCARD_ACTIONS, state);
         break;
     case WC_APP_STATE_WAIT_FOR_COMM_MAN_EXIT:
-        if (CommMan_IsInitialized() == FALSE) {
+        if (CommManager_IsInitialized() == FALSE) {
             *state = appData->queuedState;
         }
         break;
diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c
index df37ca3e943..954049a3278 100644
--- a/src/overlay017/ov17_0223B140.c
+++ b/src/overlay017/ov17_0223B140.c
@@ -403,7 +403,7 @@ static void ov17_0223B6F0(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    CommManager_deadstripped_02038A1C(21, v0->unk_0C.unk_24);
+    CommManager_Dummy_02038A1C(21, v0->unk_0C.unk_24);
 }
 
 static void ov17_0223B728(BgConfig *param0)
diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c
index 7eabacc4f5a..2247c52445b 100644
--- a/src/overlay017/ov17_0223CB1C.c
+++ b/src/overlay017/ov17_0223CB1C.c
@@ -397,7 +397,7 @@ static void ov17_0223D164(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    CommManager_deadstripped_02038A1C(22, v0->unk_0C.unk_24);
+    CommManager_Dummy_02038A1C(22, v0->unk_0C.unk_24);
 }
 
 static void ov17_0223D1B8(BgConfig *param0)
diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c
index a63a50af54d..472cc6c4cc0 100644
--- a/src/overlay017/ov17_0223DAD0.c
+++ b/src/overlay017/ov17_0223DAD0.c
@@ -557,7 +557,7 @@ static void ov17_0223E1FC(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    CommManager_deadstripped_02038A1C(23, v0->unk_14.unk_60);
+    CommManager_Dummy_02038A1C(23, v0->unk_14.unk_60);
 }
 
 static void ov17_0223E250(BgConfig *param0)
diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c
index 0c37fb6bfb4..3f193f5af94 100644
--- a/src/overlay017/ov17_0224F4D4.c
+++ b/src/overlay017/ov17_0224F4D4.c
@@ -399,7 +399,7 @@ static void ov17_0224FAFC(SysTask *param0, void *param1)
         G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
     }
 
-    CommManager_deadstripped_02038A1C(24, v0->unk_10.unk_20);
+    CommManager_Dummy_02038A1C(24, v0->unk_10.unk_20);
 }
 
 static void ov17_0224FB34(BgConfig *param0)
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index e3df7c4c387..e96968a4bdd 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -4417,7 +4417,7 @@ static int ov65_02232698(UnkStruct_ov65_0222EBE0 *param0, int param1)
         CommManager_LogoutWifi();
     }
 
-    if (!CommMan_IsInitialized()) {
+    if (!CommManager_IsInitialized()) {
         sub_0202B0F8(param0->unk_00);
         ov65_02232B58(param0, 27, 1);
 
@@ -4638,7 +4638,7 @@ static int ov65_0223294C(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
 static int ov65_02232B28(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
-    if (!CommMan_IsInitialized()) {
+    if (!CommManager_IsInitialized()) {
         StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_54);
         param1 = 2;
     }
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index 4bf62a733d5..3b99c86de13 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -333,7 +333,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         }
     } break;
     case 13:
-        if (CommMan_IsInitialized() == 0) {
+        if (CommManager_IsInitialized() == 0) {
             (*param1) = 4;
         }
         break;
@@ -345,7 +345,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
         (*param1)++;
         break;
     case 15:
-        if (CommMan_IsInitialized() == 0) {
+        if (CommManager_IsInitialized() == 0) {
             ov67_0225D294(&v0->unk_40);
             ov67_0225D294(&v0->unk_70);
             (*param1) = 7;
@@ -465,7 +465,7 @@ int ov67_0225CC6C(ApplicationManager *appMan, int *param1)
         (*param1) = 6;
         break;
     case 6:
-        if (CommMan_IsInitialized() == 0) {
+        if (CommManager_IsInitialized() == 0) {
             ov67_0225D310(&v0->unk_70);
             ov66_0222F198(v1->unk_04);
             (*param1) = 7;
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index 73ce4831e20..0d4b8fbaec6 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -195,7 +195,7 @@ int ov83_0223B65C(ApplicationManager *appMan, int *param1)
     }
 
     ov83_0223CBA4(v3);
-    CommManager_deadstripped_02038A1C(v3->heapID, v3->unk_20);
+    CommManager_Dummy_02038A1C(v3->heapID, v3->unk_20);
 
     if (v3->unk_04) {
         return 1;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index fbd7f921edd..ac1262bb273 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -314,7 +314,7 @@ int ov88_0223B140(ApplicationManager *appMan, int *param1)
     sub_02095CD4(v0->fieldSystem);
     Bg_ToggleLayer(BG_LAYER_MAIN_0, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
-    CommManager_deadstripped_02038A1C(26, v0->unk_174);
+    CommManager_Dummy_02038A1C(26, v0->unk_174);
     NetworkIcon_Init();
 
     if (IsNight() == FALSE) {
@@ -485,7 +485,7 @@ int ov88_0223B57C(ApplicationManager *appMan, int *param1)
         SpriteList_Update(v0->unk_194);
     }
 
-    CommManager_deadstripped_02038A1C(26, v0->unk_174);
+    CommManager_Dummy_02038A1C(26, v0->unk_174);
 
     return v1;
 }
diff --git a/src/overlay104/frscrcmd.c b/src/overlay104/frscrcmd.c
index 934936a7c8e..2aa123cd603 100644
--- a/src/overlay104/frscrcmd.c
+++ b/src/overlay104/frscrcmd.c
@@ -1631,7 +1631,7 @@ static BOOL FrontierScrCmd_EndCommunication(FrontierScriptContext *ctx)
 
 static BOOL WaitForCommManIsDeleted(FrontierScriptContext *ctx)
 {
-    return CommMan_IsInitialized() != TRUE && CommServerClient_IsInitialized() != TRUE;
+    return CommManager_IsInitialized() != TRUE && CommServerClient_IsInitialized() != TRUE;
 }
 
 static BOOL FrontierScrCmd_GetRandom(FrontierScriptContext *ctx)
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index c95da80f720..cf608a1eea2 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -621,7 +621,7 @@ static void ov117_02260F7C(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_28);
     SpriteSystem_UpdateTransfer();
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    CommManager_deadstripped_02038A1C(110, v0->unk_2C);
+    CommManager_Dummy_02038A1C(110, v0->unk_2C);
 }
 
 static void ov117_022610D8(BgConfig *param0)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index de8b3bd1ab5..2a3180f2f17 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -4528,7 +4528,7 @@ static BOOL ScrCmd_EndCommunication(ScriptContext *ctx)
 
 static BOOL ScriptContext_WaitForCommManIsDeleted(ScriptContext *ctx)
 {
-    if (CommMan_IsInitialized() != TRUE) {
+    if (CommManager_IsInitialized() != TRUE) {
         if (CommServerClient_IsInitialized() != TRUE) {
             return TRUE;
         }
diff --git a/src/underground/comm_manager.c b/src/underground/comm_manager.c
index 3e1221a056f..25236fcfccc 100644
--- a/src/underground/comm_manager.c
+++ b/src/underground/comm_manager.c
@@ -122,7 +122,7 @@ static void CommManUnderground_ReopenSecretBaseTask(void)
 
 void CommManUnderground_ReopenSecretBase(void)
 {
-    CommMan_ReopenSecretBase();
+    CommManager_ReopenSecretBase();
     CommManUnderground_SetFieldCommManTask(CommManUnderground_ReopenSecretBaseTask, 0);
 }
 

From f0feb411e8f4b7420073c4ff9acc9a129c822b40 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Sun, 31 May 2026 00:40:26 -0400
Subject: [PATCH 37/39] Requested changes

---
 src/field_comm_manager.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 161ddee3067..6055f930cc6 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -78,7 +78,7 @@ FieldCommunicationManager *FieldCommManager_Get(void)
 /**
  * @brief Deadstripped function. Does nothing when called.
  */
-static void FieldCommManager_deadstripped_02059658(void)
+static void FieldCommManager_Dummy(void)
 {
     return;
 }
@@ -104,7 +104,7 @@ void FieldCommManager_Init(FieldSystem *fieldSystem)
     sFieldCommMan->fieldSystem = fieldSystem;
     sFieldCommMan->party = NULL;
 
-    FieldCommManager_deadstripped_02059658();
+    FieldCommManager_Dummy();
     CommSys_Seed(&sFieldCommMan->rand);
 }
 
@@ -304,7 +304,7 @@ static void FieldCommTask_StartBattleServer(void)
 }
 
 /**
- * @brief Inidicator task that the Field Communication Manager initialized as a server is waiting for battles. Does nothing when called.
+ * @brief Indicator task that the Field Communication Manager initialized as a server is waiting for battles. Does nothing when called.
  */
 static void FieldCommTask_WaitBattleServer(void)
 {
@@ -325,7 +325,7 @@ static void FieldCommTask_StartBattleClient(void)
 }
 
 /**
- * @brief Inidicator task that the Field Communication Manager initialized as a client is scanning for battles. Does nothing when called.
+ * @brief Indicator task that the Field Communication Manager initialized as a client is scanning for battles. Does nothing when called.
  */
 static void FieldCommTask_ScanBattleClient(void)
 {
@@ -355,7 +355,7 @@ static void FieldCommTask_SendPlayerInfoClient(void)
 }
 
 /**
- * @brief Inidicator task that the Field Communication Manager initialized as a client is waiting for battles. Does nothing when called.
+ * @brief Indicator task that the Field Communication Manager initialized as a client is waiting for battles. Does nothing when called.
  */
 static void FieldCommTask_WaitBattleClient(void)
 {
@@ -367,10 +367,8 @@ static void FieldCommTask_WaitBattleClient(void)
  */
 static void FieldCommTask_ReturnToBattleRoom(void)
 {
-    void *commPlayerData;
-
     if (CommTiming_IsSyncState(SYNC_CHANGE_TO_BATTLE_ROOM)) {
-        commPlayerData = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        void *commPlayerData = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
         CommPlayerMan_Init(commPlayerData, sFieldCommMan->fieldSystem, 0);
         sub_02059524();
         CommSys_DisableSendMovementData();
@@ -450,10 +448,8 @@ static void FieldCommTask_ReturnToBattleRoom_WaitForScreenFade(void)
  */
 static void FieldCommTask_EnterBattleRoom(void)
 {
-    void *commPlayerData;
-
     if (CommTiming_IsSyncState(SYNC_CHANGE_TO_BATTLE_ROOM)) {
-        commPlayerData = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        void *commPlayerData = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
         CommPlayerMan_Init(commPlayerData, sFieldCommMan->fieldSystem, 0);
         sub_02059524();
         CommTiming_StartSync(SYNC_PAUSE_BATTLE);
@@ -640,7 +636,7 @@ BOOL FieldCommManager_IsInMovementState(void)
 static void FieldCommTask_StartVsLinkBattle(void)
 {
     int battleType;
-    u8 party[6];
+    u8 partyOrder[MAX_PARTY_SIZE];
 
     if (sFieldCommMan->timer != 0) {
         sFieldCommMan->timer--;
@@ -659,10 +655,10 @@ static void FieldCommTask_StartVsLinkBattle(void)
         break;
     }
 
-    CommManager_GetParty(party);
+    CommManager_GetParty(partyOrder);
 
     if (sFieldCommMan->party == NULL) {
-        Encounter_NewVsLinkWithRecording(sFieldCommMan->fieldSystem, party, battleType);
+        Encounter_NewVsLinkWithRecording(sFieldCommMan->fieldSystem, partyOrder, battleType);
     } else {
         Encounter_NewVsLinkWithRecordingAndParty(sFieldCommMan->fieldSystem, sFieldCommMan->party, battleType);
         Heap_Free(sFieldCommMan->party);
@@ -753,7 +749,7 @@ static void FieldCommTask_ReinitBattleClient(void)
 }
 
 /**
- * @brief Sets the flag that indicates the player indicated by the netId had their trainer case successfuly copied
+ * @brief Sets the flag that indicates the player indicated by the netId had their trainer case successfully copied
  *
  * @param netId
  * @param unused1
@@ -913,7 +909,7 @@ static void FieldCommTask_EndConnection(void)
  *
  * @param saveData
  *
- * @return The current SecretBase* if underground, NULL if not underground
+ * @return The current occupied SecretBase* if underground, NULL if not underground and in a secret base
  */
 SecretBase *FieldCommManager_GetCurrentOccupiedSecretBase(SaveData *saveData)
 {

From e1cd38571be316562a341d42c8f120bc84b3bc09 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 16 Jun 2026 18:43:59 -0400
Subject: [PATCH 38/39] Fix issues caused by merge

---
 src/comm_command_frontier.c           | 3 ++-
 src/overlay104/frscrcmd_battle_hall.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/comm_command_frontier.c b/src/comm_command_frontier.c
index 64e4273c5fe..013fb31fd3e 100644
--- a/src/comm_command_frontier.c
+++ b/src/comm_command_frontier.c
@@ -18,6 +18,7 @@
 #include "overlay104/ov104_0222ECE8.h"
 #include "overlay104/ov104_0223C164.h"
 
+#include "battle_frontier_save.h"
 #include "battle_frontier_stats.h"
 #include "comm_command.h"
 #include "communication_system.h"
@@ -204,7 +205,7 @@ BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0)
     param0->unk_08[0] = param0->unk_A0;
 
     v2 = ov104_0223C264(param0->unk_A0);
-    param0->unk_08[1] = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->saveData), v2, BattleFrontierStats_GetHostFriendIdx(v2));
+    param0->unk_08[1] = BattleFrontierSave_GetStat(SaveData_GetBattleFrontier(param0->saveData), v2, BattleFrontierStats_GetHostFriendIdx(v2));
 
     if (CommSys_SendData(COMM_CMD_F_57, param0->unk_08, v1) == 1) {
         v0 = 1;
diff --git a/src/overlay104/frscrcmd_battle_hall.c b/src/overlay104/frscrcmd_battle_hall.c
index 4bd5563b29b..a06748b1741 100644
--- a/src/overlay104/frscrcmd_battle_hall.c
+++ b/src/overlay104/frscrcmd_battle_hall.c
@@ -19,8 +19,8 @@
 #include "overlay104/struct_ov104_02230BE4.h"
 #include "savedata/save_table.h"
 
-#include "comm_command_frontier.h"
 #include "battle_hall_save.h"
+#include "comm_command_frontier.h"
 #include "field_battle_data_transfer.h"
 #include "gx_layers.h"
 #include "heap.h"

From 4a68d5c9a51e44e2249aa93c73da7ca710160dd9 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 17 Jun 2026 14:36:26 -0400
Subject: [PATCH 39/39] Requested Changes

---
 .../constants/communication/comm_command.h    | 50 +++++++++----------
 include/underground/mining.h                  |  2 +-
 include/underground/secret_bases.h            |  4 +-
 include/underground/traps.h                   |  8 +--
 src/comm_command_field.c                      | 14 +++---
 src/underground/mining.c                      |  4 +-
 src/underground/secret_bases.c                |  4 +-
 src/underground/traps.c                       | 10 ++--
 8 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/include/constants/communication/comm_command.h b/include/constants/communication/comm_command.h
index f960dbd7c22..f016b063334 100644
--- a/include/constants/communication/comm_command.h
+++ b/include/constants/communication/comm_command.h
@@ -8,12 +8,12 @@ enum CommCommand_Common {
     COMM_CMD_2,
     COMM_CMD_RECV_PLAYER_INFO,
     COMM_CMD_RECV_PLAYER_INFO_ARRAY,
-    COMM_CMD_RECV_PLAYER_INFO_FINISH, // 5
+    COMM_CMD_RECV_PLAYER_INFO_FINISH,
     COMM_CMD_VALIDATE_CONFIRMATION,
     COMM_CMD_VALIDATE_CONFIRMATION_RESPONSE,
     COMM_CMD_8,
     COMM_CMD_9,
-    COMM_CMD_10, // 10
+    COMM_CMD_10,
     COMM_CMD_11,
     COMM_CMD_12,
     COMM_CMD_SWAP_CMD_TABLE,
@@ -38,7 +38,7 @@ enum CommCommand_Frontier {
     COMM_CMD_F_27,
     COMM_CMD_F_28,
     COMM_CMD_FACTORY_DUMMY,
-    COMM_CMD_FACTORY_SELECTION_UPDATE, // 30
+    COMM_CMD_FACTORY_SELECTION_UPDATE,
     COMM_CMD_FACTORY_DUMMY2,
     COMM_CMD_FACTORY_TRADE_RESULT,
     COMM_CMD_F_33,
@@ -48,7 +48,7 @@ enum CommCommand_Frontier {
     COMM_CMD_F_37,
     COMM_CMD_F_38,
     COMM_CMD_HALL_DUMMY,
-    COMM_CMD_HALL_TYPE_SELECTION_MSG, // 40
+    COMM_CMD_HALL_TYPE_SELECTION_MSG,
     COMM_CMD_HALL_PARTNER_DECISION,
     COMM_CMD_F_42,
     COMM_CMD_F_43,
@@ -58,12 +58,12 @@ enum CommCommand_Frontier {
     COMM_CMD_F_47,
     COMM_CMD_F_48,
     COMM_CMD_CASTLE_PLAYER_INFO,
-    COMM_CMD_CASTLE_PURCHASE_INFO, // 50
+    COMM_CMD_CASTLE_PURCHASE_INFO,
     COMM_CMD_CASTLE_UPDATE_CURSOR,
     COMM_CMD_CASTLE_EXIT,
     COMM_CMD_CASTLE_OPP_PLAYER_INFO,
     COMM_CMD_CASTLE_OPP_PURCHASE_INFO,
-    COMM_CMD_CASTLE_OPP_UPDATE_CURSOR, // 55
+    COMM_CMD_CASTLE_OPP_UPDATE_CURSOR,
     COMM_CMD_CASTLE_OPP_EXIT,
     COMM_CMD_F_57,
     COMM_CMD_F_58,
@@ -90,77 +90,77 @@ enum CommCommand_Field {
     COMM_CMD_RECV_PLAYER_LOCATION = COMM_CMD_MAX_COMMON,
     COMM_CMD_RECV_PLAYER_LOCATION_AND_INIT,
     COMM_CMD_VENDOR_TALK_REQUEST,
-    COMM_CMD_VENDOR_TALK, // 25
+    COMM_CMD_VENDOR_TALK,
     COMM_CMD_VENDOR_TALK_SERVER,
     COMM_CMD_OPEN_MENU_REQUEST,
     COMM_CMD_INTERACT_EVENT,
     COMM_CMD_OPEN_MENU_EVENT,
-    COMM_CMD_TALK_EVENT, // 30
+    COMM_CMD_TALK_EVENT,
     COMM_CMD_PROCESS_ALL_DATA_SENT_MSG,
     COMM_CMD_TRY_PLACE_TRAP,
-    COMM_CMD_REMOVE_BURIED_TRAP_INDEX,
+    COMM_CMD_REMOVE_BURIED_TRAP_INDEX_UNUSED,
     COMM_CMD_PLACE_TRAP_RESULT,
-    COMM_CMD_LOAD_LINK_TRAPS, // 35
+    COMM_CMD_LOAD_LINK_TRAPS,
     COMM_CMD_RECV_LOAD_TRAPS,
     COMM_CMD_TRIGGER_TRAP,
     COMM_CMD_CALL_SECOND_TRAP_EFFECT,
-    COMM_CMD_START_SLIDE_ANIM,
-    COMM_CMD_ESCAPE_HOLE, // 40
+    COMM_CMD_START_SLIDE_ANIM_UNUSED,
+    COMM_CMD_ESCAPE_HOLE,
     COMM_CMD_ESCAPE_TRAP,
     COMM_CMD_ESCAPED_TRAP,
     COMM_CMD_END_TRAP_EFFECT,
     COMM_CMD_TRAP_HELP,
-    COMM_CMD_TRIGGERD_TRAP_BITS, // 45
-    COMM_CMD_SEND_TRAP_RADAR_RESULTS,
+    COMM_CMD_TRIGGERD_TRAP_BITS,
+    COMM_CMD_QUEUE_SEND_TRAP_RADAR_RESULTS,
     COMM_CMD_RECV_TRAP_RADAR_RESULTS,
     COMM_CMD_UNDERGROUND_TOUCH_INPUT,
     COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS,
-    COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS, // 50
+    COMM_CMD_UNDERGROUND_RADAR_MINING_RESULTS,
     COMM_CMD_DISENGAGE_TRAP,
     COMM_CMD_DELETE_PLAYER,
     COMM_CMD_BASE_INFO,
     COMM_CMD_ENTER_BASE,
-    COMM_CMD_BASE_ENTRANCE_BUFFER, // 55
+    COMM_CMD_BASE_ENTRANCE_BUFFER,
     COMM_CMD_CLEAR_TRANSITION_STATUS,
     COMM_CMD_EXIT_BASE,
     COMM_CMD_BASE_TRANSMITION_PROMPT,
     COMM_CMD_BASE_TRANSITION_EVENT,
-    COMM_CMD_SECRET_BASE_GOOD_INTERACTION, // 60
+    COMM_CMD_SECRET_BASE_GOOD_INTERACTION,
     COMM_CMD_ENTER_BASE_FAILED,
     COMM_CMD_FIELD_62,
     COMM_CMD_RETRIEVE_BURIED_SPHERES,
     COMM_CMD_INTERACT_MINING_SPOT,
-    COMM_CMD_CONFIRM_START_MINING_RESULT, // 65
+    COMM_CMD_CONFIRM_START_MINING_RESULT,
     COMM_CMD_CONFIRM_START_MINING,
-    COMM_CMD_END_MINING,
+    COMM_CMD_RECV_MINING_END,
     COMM_CMD_MINING_LINK_INPUT,
     COMM_CMD_MINING_LINK_INPUT_SERVER,
-    COMM_CMD_PLAYER_STATE_UNDERGROUND, // 70
+    COMM_CMD_PLAYER_STATE_UNDERGROUND,
     COMM_CMD_START_TREASURE_RADAR,
     COMM_CMD_MINING_SPOT_RADAR,
     COMM_CMD_REQUEST_TALK_UPDATE_SERVER,
     COMM_CMD_RESPONSE_TALK_UPDATE_SERVER,
-    COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER, // 75
+    COMM_CMD_RESPONSE_REQUEST_TALK_UPDATE_SERVER,
     COMM_CMD_TALK_UPDATE_SERVER,
     COMM_CMD_SEND_GIFT_SERVER,
     COMM_CMD_RECV_GIFT_OFFER,
     COMM_CMD_SEND_TALK_MSG_SERVER,
-    COMM_CMD_RECV_TALK_MSG_SERVER, // 80
+    COMM_CMD_RECV_TALK_MSG_SERVER,
     COMM_CMD_SEND_UNDERGROUND_RECORD_SERVER,
     COMM_CMD_UNDERGROUND_RECORD,
     COMM_CMD_UNDERGROUND_PC_INTERACT,
     COMM_CMD_UNDERGROUND_FLAG_EVENT_TYPE,
-    COMM_CMD_UNDERGROUND_FLAG_EVENT, // 85
+    COMM_CMD_UNDERGROUND_FLAG_EVENT,
     COMM_CMD_CREATE_SECRET_BASE_REQUEST,
     COMM_CMD_CREATE_SECRET_BASE_EVENT,
     COMM_CMD_TRAINER_CASE_COPIED,
     COMM_CMD_UNDERGROUND_TRY_TAKE_FLAG,
-    COMM_CMD_UNDERGROUND_TAKEN_FLAG, // 90
+    COMM_CMD_UNDERGROUND_TAKEN_FLAG,
     COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO,
     COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_SERVER,
     COMM_CMD_UNDERGROUND_FLAG_OWNER_INFO_ACK,
     COMM_CMD_FIELD_94,
-    COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM, // 95
+    COMM_CMD_UPDATE_MOVEMENT_BATTLE_ROOM,
     COMM_CMD_UNDERGROUND_FLAG_RANK_UP,
     COMM_CMD_UNDERGROUND_FLAG_RANK_UP_EVENT,
     COMM_CMD_FIELD_98,
diff --git a/include/underground/mining.h b/include/underground/mining.h
index 9ffa8804f35..1eb1c46ccff 100644
--- a/include/underground/mining.h
+++ b/include/underground/mining.h
@@ -20,7 +20,7 @@ void Mining_SendRadarResults(void);
 void CommCmd_InteractMiningSpot(int unused0, int unused1, void *data, void *unused3);
 void CommCmd_ConfirmStartMiningResult(int netID, int unused1, void *data, void *unused3);
 void CommCmd_ConfirmStartMining(int unused0, int unused1, void *data, void *unused3);
-void CommCmd_EndMiningGame(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_RecvMiningGameEnd(int netID, int unused1, void *unused2, void *unused3);
 void CommCmd_MiningLinkInput(int netID, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_MiningLinkInput(void);
 void CommCmd_MiningLinkInputServer(int unused0, int unused1, void *data, void *unused3);
diff --git a/include/underground/secret_bases.h b/include/underground/secret_bases.h
index 8e6da5ddd6c..7a02bbe08e4 100644
--- a/include/underground/secret_bases.h
+++ b/include/underground/secret_bases.h
@@ -41,11 +41,11 @@ BOOL SecretBases_CheckForEnterExit(int netID, int x, int z);
 int CommPacketSizeOf_BaseExitEvent(void);
 void CommCmd_SecretBaseExit(int unused0, int unused1, void *data, void *unused3);
 void SecretBases_RequestClearTransitioningStatus(void);
-void CommCmd_SecretBaseClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_ClearSecretBaseTransitioningStatus(int netID, int unused1, void *unused2, void *unused3);
 BOOL SecretBases_IsPlayerMidBaseTransition(int netID);
 void SecretBases_SendBaseInfo(void);
 void SecretBases_SendEnteredBase(int baseOwnerNetID);
-void CommCmd_EnterSecretBase(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_RecvSecretBaseEnter(int unused0, int unused1, void *data, void *unused3);
 void CommCmd_SecretBaseInfo(int netID, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_SecretBaseInfo(void);
 BOOL SecretBases_HaveLinksReceivedBaseData(void);
diff --git a/include/underground/traps.h b/include/underground/traps.h
index 7ecf0eab40f..0d8bf3b2e36 100644
--- a/include/underground/traps.h
+++ b/include/underground/traps.h
@@ -28,9 +28,9 @@ int CommPacketSizeOf_PlaceTrapResult(void);
 enum Trap Traps_SpawnRandomTrap(int x, int z, MATHRandContext16 *rand, int index);
 void Traps_LoadSpawnedTraps(void);
 void CommCmd_PlaceTrapResult(int unused0, int unused1, void *data, void *unused3);
-void CommCmd_RemoveBuriedTrapAtIndex(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_2Bytes_Unused(void);
-void CommCmd_LoadPlacedTraps(int netID, int size, void *data, void *unused3);
+void CommCmd_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3);
 void CommCmd_RecvLoadTraps(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_LoadTrapsResult(void);
 BOOL Traps_HaveLinksReceivedPlacedTraps(void);
@@ -46,7 +46,7 @@ BOOL Traps_CheckPlayerSteppedOnTrap(int netID);
 BOOL Traps_HasPlayerTriggeredTool(int netID);
 void CommCmd_TriggeredTraps(int unused0, int unused1, void *data, void *unused3);
 void CommCmd_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data, void *unused3);
-void CommCmd_StartSlideAnimation(int unused0, int unused1, void *data, void *unused3);
+void CommCmd_StartSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3);
 void Traps_SendTriggeredTrapBits(void);
 void CommCmd_TriggeredTrapBits(int unused0, int unused1, void *data, void *unused3);
 BOOL Traps_GetQueuedMessage(String *dest);
@@ -64,7 +64,7 @@ int TrapRadar_GetXCoordOfBuriedTrap(int radarIndex);
 int TrapRadar_GetZCoordOfBuriedTrap(int radarIndex);
 void TrapRadar_Start(void);
 void TrapRadar_Exit(void);
-void CommCmd_SendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3);
+void CommCmd_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3);
 void CommCmd_RecvTrapRadarResults(int unused0, int unused1, void *data, void *unused3);
 int CommPacketSizeOf_TrapRadarResult(void);
 void Traps_Dummy2(BgConfig *bgConfig);
diff --git a/src/comm_command_field.c b/src/comm_command_field.c
index d633081ed62..ce16ef6c58f 100644
--- a/src/comm_command_field.c
+++ b/src/comm_command_field.c
@@ -60,20 +60,20 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_TALK_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTalkEvent, CommPacketSizeOf_Variable, NULL }, // 30
     [COMM_CMD_PROCESS_ALL_DATA_SENT_MSG - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundProcessAllDataSentMessage, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_TRY_PLACE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_TryPlaceTrap, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_REMOVE_BURIED_TRAP_INDEX - COMM_CMD_MAX_COMMON] = { CommCmd_RemoveBuriedTrapAtIndex, CommPacketSizeOf_2Bytes_Unused, NULL }, // corresponding cmd never sent
+    [COMM_CMD_REMOVE_BURIED_TRAP_INDEX_UNUSED - COMM_CMD_MAX_COMMON] = { CommCmd_RemoveBuriedTrapAtIndex_Unused, CommPacketSizeOf_2Bytes_Unused, NULL }, // corresponding cmd never sent
     [COMM_CMD_PLACE_TRAP_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_PlaceTrapResult, CommPacketSizeOf_PlaceTrapResult, NULL },
-    [COMM_CMD_LOAD_LINK_TRAPS - COMM_CMD_MAX_COMMON] = { CommCmd_LoadPlacedTraps, CommPacketSizeOf_AllTrapsPlacedPlayer, NULL }, // 35
+    [COMM_CMD_LOAD_LINK_TRAPS - COMM_CMD_MAX_COMMON] = { CommCmd_LoadLinkPlacedTraps, CommPacketSizeOf_AllTrapsPlacedPlayer, NULL }, // 35
     [COMM_CMD_RECV_LOAD_TRAPS - COMM_CMD_MAX_COMMON] = { CommCmd_RecvLoadTraps, CommPacketSizeOf_LoadTrapsResult, NULL },
     [COMM_CMD_TRIGGER_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_TriggeredTraps, CommPacketSizeOf_TriggeredTrap2, NULL },
     [COMM_CMD_CALL_SECOND_TRAP_EFFECT - COMM_CMD_MAX_COMMON] = { CommCmd_CallSecondTrapEffectServerFunc, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_START_SLIDE_ANIM - COMM_CMD_MAX_COMMON] = { CommCmd_StartSlideAnimation, CommPacketSizeOf_3Bytes_Unused, NULL }, // corresponding cmd never sent
+    [COMM_CMD_START_SLIDE_ANIM_UNUSED - COMM_CMD_MAX_COMMON] = { CommCmd_StartSlideAnimation_Unused, CommPacketSizeOf_3Bytes_Unused, NULL }, // corresponding cmd never sent
     [COMM_CMD_ESCAPE_HOLE - COMM_CMD_MAX_COMMON] = { CommCmd_EscapeHole, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_ESCAPE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_EscapeTrapServer, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_ESCAPED_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_EscapedTrap, CommPacketSizeOf_EscapedTrap, NULL },
     [COMM_CMD_END_TRAP_EFFECT - COMM_CMD_MAX_COMMON] = { CommCmd_EndCurrentTrapEffectServer, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_TRAP_HELP - COMM_CMD_MAX_COMMON] = { CommCmd_TrapHelp, CommPacketSizeOf_TrapHelpData, NULL },
     [COMM_CMD_TRIGGERD_TRAP_BITS - COMM_CMD_MAX_COMMON] = { CommCmd_TriggeredTrapBits, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_SEND_TRAP_RADAR_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_SendTrapRadarResults, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_QUEUE_SEND_TRAP_RADAR_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_QueueSendTrapRadarResults, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_RECV_TRAP_RADAR_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_RecvTrapRadarResults, CommPacketSizeOf_TrapRadarResult, NULL },
     [COMM_CMD_UNDERGROUND_TOUCH_INPUT - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchInput, CommPacketSizeOf_CoordinatesU16, NULL },
     [COMM_CMD_UNDERGROUND_RADAR_TRAP_RESULTS - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundTouchRadarTrapResults, CommPacketSizeOf_Variable, NULL },
@@ -81,9 +81,9 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_DISENGAGE_TRAP - COMM_CMD_MAX_COMMON] = { CommCmd_DisengagedTrap, CommPacketSizeOf_TriggeredTrap, NULL },
     [COMM_CMD_DELETE_PLAYER - COMM_CMD_MAX_COMMON] = { CommCmd_DeletePlayer, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_BASE_INFO - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseInfo, CommPacketSizeOf_SecretBaseInfo, NULL },
-    [COMM_CMD_ENTER_BASE - COMM_CMD_MAX_COMMON] = { CommCmd_EnterSecretBase, CommPacketSizeOf_SecretBaseInfo, NULL },
+    [COMM_CMD_ENTER_BASE - COMM_CMD_MAX_COMMON] = { CommCmd_RecvSecretBaseEnter, CommPacketSizeOf_SecretBaseInfo, NULL },
     [COMM_CMD_BASE_ENTRANCE_BUFFER - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseEntranceBuffer, CommPacketSizeOf_BaseEntrancesBuffer, NULL }, // 55
-    [COMM_CMD_CLEAR_TRANSITION_STATUS - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseClearTransitioningStatus, CommPacketSizeOf_Nothing, NULL },
+    [COMM_CMD_CLEAR_TRANSITION_STATUS - COMM_CMD_MAX_COMMON] = { CommCmd_ClearSecretBaseTransitioningStatus, CommPacketSizeOf_Nothing, NULL },
     [COMM_CMD_EXIT_BASE - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseExit, CommPacketSizeOf_BaseExitEvent, NULL },
     [COMM_CMD_BASE_TRANSMITION_PROMPT - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseTransitionPrompt, CommPacketSizeOf_BaseTransitionPromptEvent, NULL },
     [COMM_CMD_BASE_TRANSITION_EVENT - COMM_CMD_MAX_COMMON] = { CommCmd_SecretBaseTransitionEvent, CommPacketSizeOf_BaseTransitionEvent, NULL },
@@ -94,7 +94,7 @@ static const CommCmdTable Unk_020F68A4[] = {
     [COMM_CMD_INTERACT_MINING_SPOT - COMM_CMD_MAX_COMMON] = { CommCmd_InteractMiningSpot, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_CONFIRM_START_MINING_RESULT - COMM_CMD_MAX_COMMON] = { CommCmd_ConfirmStartMiningResult, CommPacketSizeOf_NetId, NULL }, // 65
     [COMM_CMD_CONFIRM_START_MINING - COMM_CMD_MAX_COMMON] = { CommCmd_ConfirmStartMining, CommPacketSizeOf_NetId, NULL },
-    [COMM_CMD_END_MINING - COMM_CMD_MAX_COMMON] = { CommCmd_EndMiningGame, CommPacketSizeOf_NetId, NULL },
+    [COMM_CMD_RECV_MINING_END - COMM_CMD_MAX_COMMON] = { CommCmd_RecvMiningGameEnd, CommPacketSizeOf_NetId, NULL },
     [COMM_CMD_MINING_LINK_INPUT - COMM_CMD_MAX_COMMON] = { CommCmd_MiningLinkInput, CommPacketSizeOf_MiningLinkInput, NULL },
     [COMM_CMD_MINING_LINK_INPUT_SERVER - COMM_CMD_MAX_COMMON] = { CommCmd_MiningLinkInputServer, CommPacketSizeOf_MiningLinkInputWithNetID, NULL },
     [COMM_CMD_PLAYER_STATE_UNDERGROUND - COMM_CMD_MAX_COMMON] = { CommCmd_UndergroundPlayerState, CommPacketSizeOf_UndergroundPlayerState, NULL },
diff --git a/src/underground/mining.c b/src/underground/mining.c
index f97522f5c8a..a18eead8d76 100644
--- a/src/underground/mining.c
+++ b/src/underground/mining.c
@@ -1187,7 +1187,7 @@ void CommCmd_ConfirmStartMining(int unused0, int unused1, void *data, void *unus
     sMiningEnv->miningMessagesQueued[*netID] = TRUE;
 }
 
-void CommCmd_EndMiningGame(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_RecvMiningGameEnd(int netID, int unused1, void *unused2, void *unused3)
 {
     sMiningEnv->isPlayerMining[netID] = FALSE;
     sMiningEnv->normalRadarTimer[netID] = 0;
@@ -1657,7 +1657,7 @@ static void Mining_GameTask(SysTask *sysTask, void *data)
             SecretBases_EnableBaseEntranceGraphics();
             Spheres_EnableBuriedSphereSparkles();
 
-            CommSys_SendDataFixedSize(COMM_CMD_END_MINING, &ctx->dugUpAllItems);
+            CommSys_SendDataFixedSize(COMM_CMD_RECV_MINING_END, &ctx->dugUpAllItems);
             CommPlayerMan_ResumeFieldSystem();
 
             sMiningEnv->miningGameTask = NULL;
diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c
index 0cefb05b32a..f159f427bcb 100644
--- a/src/underground/secret_bases.c
+++ b/src/underground/secret_bases.c
@@ -1295,7 +1295,7 @@ void SecretBases_RequestClearTransitioningStatus(void)
     CommSys_SendMessage(COMM_CMD_CLEAR_TRANSITION_STATUS);
 }
 
-void CommCmd_SecretBaseClearTransitioningStatus(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_ClearSecretBaseTransitioningStatus(int netID, int unused1, void *unused2, void *unused3)
 {
     secretBasesEnv->baseTransitioningOwnerNetIDs[netID] = NETID_NONE;
     secretBasesEnv->baseEnteringOwnerNetIDs[netID] = NETID_NONE;
@@ -1337,7 +1337,7 @@ void SecretBases_SendEnteredBase(int baseOwnerNetID)
     CommSys_WriteToQueueServer(54, &secretBasesEnv->baseInfo[baseOwnerNetID], sizeof(SecretBaseInfo));
 }
 
-void CommCmd_EnterSecretBase(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RecvSecretBaseEnter(int unused0, int unused1, void *data, void *unused3)
 {
     SecretBaseInfo *baseInfo = data;
 
diff --git a/src/underground/traps.c b/src/underground/traps.c
index 25dcd1df20e..97e6442d008 100644
--- a/src/underground/traps.c
+++ b/src/underground/traps.c
@@ -1405,7 +1405,7 @@ void CommCmd_PlaceTrapResult(int unused0, int unused1, void *data, void *unused3
     }
 }
 
-void CommCmd_RemoveBuriedTrapAtIndex(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_RemoveBuriedTrapAtIndex_Unused(int unused0, int unused1, void *data, void *unused3)
 {
     u16 *buffer = data;
     int index = buffer[0];
@@ -1418,7 +1418,7 @@ int CommPacketSizeOf_2Bytes_Unused(void)
     return 2;
 }
 
-void CommCmd_LoadPlacedTraps(int netID, int size, void *data, void *unused3)
+void CommCmd_LoadLinkPlacedTraps(int netID, int size, void *data, void *unused3)
 {
     BuriedTrap *trapPtr = &trapsEnv->buriedTraps[netID * MAX_PLACED_TRAPS];
 
@@ -1767,7 +1767,7 @@ void CommCmd_CallSecondTrapEffectServerFunc(int netID, int unused1, void *data,
     }
 }
 
-void CommCmd_StartSlideAnimation(int unused0, int unused1, void *data, void *unused3)
+void CommCmd_StartSlideAnimation_Unused(int unused0, int unused1, void *data, void *unused3)
 {
     u8 *buffer = data;
 
@@ -2755,7 +2755,7 @@ void TrapRadar_Start(void)
 
     TrapRadarContext *ctx = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(TrapRadarContext));
     MI_CpuFill8(ctx, 0, sizeof(TrapRadarContext));
-    CommSys_SendMessage(COMM_CMD_SEND_TRAP_RADAR_RESULTS);
+    CommSys_SendMessage(COMM_CMD_QUEUE_SEND_TRAP_RADAR_RESULTS);
 
     trapsEnv->trapRadarContext = ctx;
     trapsEnv->trapRadarTask = SysTask_Start(TrapRadar_TimerTask, ctx, 100);
@@ -2774,7 +2774,7 @@ void TrapRadar_Exit(void)
     }
 }
 
-void CommCmd_SendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3)
+void CommCmd_QueueSendTrapRadarResults(int netID, int unused1, void *unused2, void *unused3)
 {
     trapsEnv->trapRadarIndex[netID] = 1;
 }