sub_800ADF8

3 files changed, 68 insertions, 109 deletions

diff --git a/asm/link.s b/asm/link.s
index d333c26f5..75fec838b 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -5,98 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_800ADF8
-sub_800ADF8: @ 800ADF8
-	push {lr}
-	ldr r0, =gSerialIsRFU
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _0800AE0C
-	bl sub_8010434
-	b _0800AE1E
-	.pool
-_0800AE0C:
-	ldr r1, =gLinkCallback
-	ldr r0, [r1]
-	cmp r0, 0
-	bne _0800AE18
-	ldr r0, =sub_800AE30
-	str r0, [r1]
-_0800AE18:
-	ldr r1, =gUnknown_030030E4
-	movs r0, 0
-	strb r0, [r1]
-_0800AE1E:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_800ADF8
-
-	thumb_func_start sub_800AE30
-sub_800AE30: @ 800AE30
-	push {lr}
-	ldr r0, =gUnknown_03004130
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0800AE46
-	ldr r0, =0x00002ffe
-	bl BuildSendCmd
-	ldr r1, =gLinkCallback
-	ldr r0, =sub_800AE5C
-	str r0, [r1]
-_0800AE46:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_800AE30
-
-	thumb_func_start sub_800AE5C
-sub_800AE5C: @ 800AE5C
-	push {r4,lr}
-	bl GetLinkPlayerCount
-	lsls r0, 24
-	lsrs r2, r0, 24
-	movs r1, 0
-	cmp r1, r2
-	bcs _0800AE86
-	ldr r3, =gUnknown_030030EC
-	ldrb r0, [r3]
-	cmp r0, 0
-	beq _0800AE86
-_0800AE74:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, r2
-	bcs _0800AE86
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0800AE74
-_0800AE86:
-	cmp r1, r2
-	bne _0800AEA4
-	movs r1, 0
-	ldr r4, =gLinkCallback
-	ldr r3, =gUnknown_030030EC
-	movs r2, 0
-_0800AE92:
-	adds r0, r1, r3
-	strb r2, [r0]
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x3
-	bls _0800AE92
-	movs r0, 0
-	str r0, [r4]
-_0800AEA4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_800AE5C
-
 	thumb_func_start sub_800AEB4
 sub_800AEB4: @ 800AEB4
 	push {lr}
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 39f68d1f1..59cdc82d0 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -23,5 +23,6 @@ bool8 sub_8010100(u8 a0);
 bool8 sub_8010500(void);
 bool8 Rfu_IsMaster(void);
 void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
+void sub_8010434(void);
 
 #endif //GUARD_LINK_RFU_H
diff --git a/src/link.c b/src/link.c
index b01e53789..291c32e5b 100644
--- a/src/link.c
+++ b/src/link.c
@@ -71,10 +71,10 @@ u32 gFiller_03003080;
 u16 gLinkHeldKeys;
 u16 gRecvCmds[MAX_RFU_PLAYERS][8];
 u32 gLinkStatus;
-u8 gUnknown_030030E4;
+bool8 gUnknown_030030E4;
 bool8 gUnknown_030030E8;
-u8 gUnknown_030030EC[MAX_LINK_PLAYERS];
-u8 gUnknown_030030F0[MAX_LINK_PLAYERS];
+bool8 gUnknown_030030EC[MAX_LINK_PLAYERS];
+bool8 gUnknown_030030F0[MAX_LINK_PLAYERS];
 u16 gUnknown_030030F4;
 u8 gSuppressLinkErrorMessage;
 bool8 gSerialIsRFU;
@@ -136,6 +136,8 @@ static void sub_800AC80(void);
 static void sub_800ACAC(void);
 static void sub_800AD5C(void);
 static void sub_800AD88(void);
+static void sub_800AE30(void);
+static void sub_800AE5C(void);
 void sub_800AEB4(void);
 u8 sub_800B2F8(void);
 void sub_800B4A4(void);
@@ -339,8 +341,8 @@ void OpenLink(void)
         ResetBlockReceivedFlags();
         ResetBlockSend();
         gUnknown_03000D54 = 0;
-        gUnknown_030030E8 = 0;
-        gUnknown_030030E4 = 0;
+        gUnknown_030030E8 = FALSE;
+        gUnknown_030030E4 = FALSE;
         gUnknown_030030F4 = 0;
         CreateTask(Task_TriggerHandshake, 2);
     }
@@ -351,9 +353,9 @@ void OpenLink(void)
     gReceivedRemoteLinkPlayers = 0;
     for (i = 0; i < MAX_LINK_PLAYERS; i ++)
     {
-        gUnknown_03003078[i] = 1;
-        gUnknown_030030F0[i] = 0;
-        gUnknown_030030EC[i] = 0;
+        gUnknown_03003078[i] = TRUE;
+        gUnknown_030030F0[i] = FALSE;
+        gUnknown_030030EC[i] = FALSE;
     }
 }
 
@@ -518,10 +520,10 @@ static void ProcessRecvCmds(u8 unused)
                 gUnknown_03003020[i] = gRecvCmds[i][1];
                 break;
             case 0x5555:
-                gUnknown_030030E8 = 1;
+                gUnknown_030030E8 = TRUE;
                 break;
             case 0x5566:
-                gUnknown_030030E8 = 1;
+                gUnknown_030030E8 = TRUE;
                 break;
             case 0xBBBB:
             {
@@ -593,10 +595,10 @@ static void ProcessRecvCmds(u8 unused)
             }
                 break;
             case 0x5FFF:
-                gUnknown_030030F0[i] = 1;
+                gUnknown_030030F0[i] = TRUE;
                 break;
             case 0x2FFE:
-                gUnknown_030030EC[i] = 1;
+                gUnknown_030030EC[i] = TRUE;
                 break;
             case 0xAAAA:
                 sub_800A418();
@@ -1405,7 +1407,7 @@ void sub_800ABF4(u16 a0)
         if (gLinkCallback == NULL)
         {
             gLinkCallback = sub_800AC80;
-            gUnknown_030030E4 = 0;
+            gUnknown_030030E4 = FALSE;
             gUnknown_030030F4 = a0;
         }
     }
@@ -1426,7 +1428,7 @@ void sub_800AC34(void)
         else
         {
             gLinkCallback = sub_800AC80;
-            gUnknown_030030E4 = 0;
+            gUnknown_030030E4 = FALSE;
             gUnknown_030030F4 = 0;
         }
     }
@@ -1462,7 +1464,7 @@ static void sub_800ACAC(void)
         gLinkVSyncDisabled = TRUE;
         CloseLink();
         gLinkCallback = NULL;
-        gUnknown_030030E4 = 1;
+        gUnknown_030030E4 = TRUE;
     }
 }
 
@@ -1481,7 +1483,7 @@ void sub_800AD10(void)
         else
         {
             gLinkCallback = sub_800AD5C;
-            gUnknown_030030E4 = 0;
+            gUnknown_030030E4 = FALSE;
             gUnknown_030030F4 = 0;
         }
     }
@@ -1521,6 +1523,54 @@ static void sub_800AD88(void)
         gLinkVSyncDisabled = TRUE;
         CloseLink();
         gLinkCallback = NULL;
-        gUnknown_030030E4 = 1;
+        gUnknown_030030E4 = TRUE;
+    }
+}
+
+void sub_800ADF8(void)
+{
+    if (gSerialIsRFU == TRUE)
+    {
+        sub_8010434();
+    }
+    else
+    {
+        if (gLinkCallback == NULL)
+        {
+            gLinkCallback = sub_800AE30;
+        }
+        gUnknown_030030E4 = FALSE;
+    }
+}
+
+static void sub_800AE30(void)
+{
+    if (gUnknown_03004130 == 0)
+    {
+        BuildSendCmd(0x2ffe);
+        gLinkCallback = sub_800AE5C;
+    }
+}
+
+static void sub_800AE5C(void)
+{
+    u8 i;
+    u8 linkPlayerCount;
+
+    linkPlayerCount = GetLinkPlayerCount();
+    for (i = 0; i < linkPlayerCount; i ++)
+    {
+        if (!gUnknown_030030EC[i])
+        {
+            break;
+        }
+    }
+    if (i == linkPlayerCount)
+    {
+        for (i = 0; i < MAX_LINK_PLAYERS; i ++)
+        {
+            gUnknown_030030EC[i] = FALSE;
+        }
+        gLinkCallback = NULL;
     }
 }