From 4e98ffed3339ca9fd7c4f0915da707aa8b2417ef Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 14:54:37 -0500
Subject: through sub_80C8604

---
 src/battle/contest_link_80C857C.c | 46 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 616a72d27..e0b24b9e1 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -1,6 +1,52 @@
 #include "global.h"
+#include "ewram.h"
+#include "task.h"
 #include "link.h"
 
+void sub_80C8644(u8 taskId);
+
+void sub_80C857C(const void *data, u16 size)
+{
+    memcpy(eContestLinkSendBuffer, data, size);
+    SendBlock(bitmask_all_link_players_but_self(), eContestLinkSendBuffer, size);
+}
+
+bool8 sub_80C85AC(u8 who)
+{
+    u8 flag = 1 << who;
+    if (!(GetBlockReceivedStatus() & flag))
+        return FALSE;
+    ResetBlockReceivedFlag(flag);
+    return TRUE;
+}
+
+bool8 sub_80C85D8(void)
+{
+    int i;
+
+    for (i = 0; i < MAX_LINK_PLAYERS; i++)
+    {
+        if (!((GetBlockReceivedStatus() >> i) & 1))
+            return FALSE;
+    }
+    ResetBlockReceivedFlags();
+    return TRUE;
+}
+
+void sub_80C8604(u8 taskId)
+{
+#if ENGLISH
+    u8 i;
+
+    for (i = 0; i < 4; i++)
+        gBlockRecvBuffer[i][0] = 0xff;
+#endif
+    gTasks[taskId].data[0] = 0;
+    gTasks[taskId].func = sub_80C8644;
+}
+
+asm(".section .text_de");
+
 #if GERMAN
 
 void de_sub_80C9274(bool32 arg0)
-- 
cgit v1.2.3


From fc504ce61b8698bc4777bbd37a8766b8c35a5814 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 15:51:57 -0500
Subject: through (nonmatching) sub_80C86A0

---
 src/battle/contest_link_80C857C.c | 150 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 149 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index e0b24b9e1..3360ecbb6 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -1,9 +1,13 @@
 #include "global.h"
 #include "ewram.h"
 #include "task.h"
+#include "contest.h"
+#include "text.h"
+#include "string_util.h"
 #include "link.h"
 
-void sub_80C8644(u8 taskId);
+static void sub_80C8644(u8 taskId);
+static void sub_80C8660(u8 taskId);
 
 void sub_80C857C(const void *data, u16 size)
 {
@@ -45,6 +49,150 @@ void sub_80C8604(u8 taskId)
     gTasks[taskId].func = sub_80C8644;
 }
 
+static void sub_80C8644(u8 taskId)
+{
+    gTasks[taskId].func = sub_80C8660;
+}
+
+static void sub_80C8660(u8 taskId)
+{
+    if (gReceivedRemoteLinkPlayers)
+    {
+        gContestPlayerMonIndex = GetMultiplayerId();
+        if (GetLinkPlayerCount() == MAX_LINK_PLAYERS)
+        {
+            gIsLinkContest = TRUE;
+            SwitchTaskToFollowupFunc(taskId);
+        }
+    }
+}
+
+#ifdef NONMATCHING
+u8 sub_80C86A0(const u8 *string)
+{
+    u8 language = GAME_LANGUAGE;
+    if (string[0] == EXT_CTRL_CODE_BEGIN && string[1] == 0x15)
+        return language;
+    if (StringLength(string) > 5)
+        return language;
+    for (; *string != EOS; string++)
+    {
+        if (!((*string >= CHAR_A && *string <= CHAR_z) ||
+            (*string >= CHAR_0 + 0 && *string <= CHAR_0 + 9) ||
+            *string == CHAR_SPACE ||
+            *string == CHAR_PERIOD ||
+            *string == CHAR_COMMA ||
+            *string == 0xAB ||
+            *string == CHAR_QUESTION_MARK ||
+            *string == CHAR_MALE ||
+            *string == CHAR_FEMALE ||
+            *string == CHAR_SLASH ||
+            *string == CHAR_HYPHEN ||
+            *string == CHAR_ELLIPSIS ||
+            *string == 0xB1 ||
+            *string == 0xB2 ||
+            *string == 0xB3 ||
+            *string == 0xB1
+        ))
+        {
+            language = LANGUAGE_JAPANESE;
+            break;
+        }
+    }
+    return language;
+}
+#else
+__attribute__((naked)) u8 sub_80C86A0(const u8 *string)
+{
+    asm_unified("\tpush {r4,r5,lr}\n"
+                    "\tadds r4, r0, 0\n"
+                    ".ifdef ENGLISH\n"
+                    "\tmovs r5, 0x2\n"
+                    ".else\n"
+                    "\tmovs r5, 0x5\n"
+                    ".endif\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tcmp r0, 0xFC\n"
+                    "\tbne _080C86B6\n"
+                    "\tldrb r0, [r4, 0x1]\n"
+                    "\tcmp r0, 0x15\n"
+                    "\tbne _080C86B6\n"
+                    ".ifdef ENGLISH\n"
+                    "\tmovs r0, 0x2\n"
+                    ".else\n"
+                    "\tmovs r0, 0x5\n"
+                    ".endif\n"
+                    "\tb _080C872C\n"
+                    "_080C86B6:\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl StringLength\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tcmp r0, 0x5\n"
+                    "\tbhi _080C872A\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbeq _080C872A\n"
+                    "_080C86CA:\n"
+                    "\tldrb r1, [r4]\n"
+                    "\tadds r0, r1, 0\n"
+                    "\tadds r0, 0x45\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r0, 0x33\n"
+                    "\tbls _080C871E\n"
+                    "\tadds r0, r1, 0\n"
+                    "\tadds r0, 0x5F\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r0, 0x9\n"
+                    "\tbls _080C871E\n"
+                    "\tadds r0, r1, 0\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xAD\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB8\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xAB\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xAC\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB5\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB6\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xBA\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xAE\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB0\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB1\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB2\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB3\n"
+                    "\tbeq _080C871E\n"
+                    "\tcmp r0, 0xB1\n"
+                    "\tbne _080C8728\n"
+                    "_080C871E:\n"
+                    "\tadds r4, 0x1\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbne _080C86CA\n"
+                    "\tb _080C872A\n"
+                    "_080C8728:\n"
+                    "\tmovs r5, 0x1\n"
+                    "_080C872A:\n"
+                    "\tadds r0, r5, 0\n"
+                    "_080C872C:\n"
+                    "\tpop {r4,r5}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1");
+}
+#endif
+
 asm(".section .text_de");
 
 #if GERMAN
-- 
cgit v1.2.3


From b2ea9aec023be26a83853ca53134ce78b95ac2e6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 17:33:02 -0500
Subject: sub_80C8734

---
 src/battle/contest_link_80C857C.c | 104 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 3360ecbb6..b86e7bb9c 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -8,6 +8,10 @@
 
 static void sub_80C8644(u8 taskId);
 static void sub_80C8660(u8 taskId);
+#if GERMAN
+void de_sub_80C9274(bool32 arg0);
+void de_sub_80C9294(bool32 arg0);
+#endif
 
 void sub_80C857C(const void *data, u16 size)
 {
@@ -193,6 +197,106 @@ __attribute__((naked)) u8 sub_80C86A0(const u8 *string)
 }
 #endif
 
+void sub_80C8734(u8 taskId)
+{
+    int i;
+    u8 *name;
+
+    switch (gTasks[taskId].data[0]) {
+#if ENGLISH
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+#elif GERMAN
+            case 8:
+#endif
+        case 0:
+            if (GetMultiplayerId() == 0) {
+                if (sub_8007ECC()) {
+#if GERMAN
+                    if (gTasks[taskId].data[0] == 0)
+                    {
+                        gTasks[taskId].data[0] = 3;
+                    }
+                    else
+                    {
+#endif
+                    memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon));
+#if GERMAN
+                    de_sub_80C9274(FALSE);
+#endif
+                    sub_8007E9C(2);
+#if GERMAN
+                    gTasks[taskId].data[0] = 1;
+                    }
+#else
+                    gTasks[taskId].data[0]++;
+#endif
+                }
+            }
+            else
+            {
+                memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon));
+#if GERMAN
+                de_sub_80C9294(FALSE);
+#endif
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                for (i = 0; i < MAX_LINK_PLAYERS; i++)
+                {
+                    memcpy(gContestMons + i, gBlockRecvBuffer[i], sizeof(struct ContestPokemon));
+                    name = gContestMons[i].nickname;
+                    if (gLinkPlayers[i].language == LANGUAGE_JAPANESE)
+                    {
+                        ConvertInternationalString(name, sub_80C86A0(name));
+                    }
+                    else if (name[10] == EXT_CTRL_CODE_BEGIN)
+                    {
+                        ConvertInternationalString(name, LANGUAGE_JAPANESE);
+                    } else
+                    {
+                        name[5] = name[10];
+                        name[10] = EOS;
+                    }
+                    name = gContestMons[i].trainerName;
+                    if (gLinkPlayers[i].language == LANGUAGE_JAPANESE)
+                    {
+                        name[7] = EOS;
+                        name[6] = name[4];
+                        name[5] = name[3];
+                        name[4] = name[2];
+                        name[3] = name[1];
+                        name[2] = name[0];
+                        name[1] = 0x15;
+                        name[0] = EXT_CTRL_CODE_BEGIN;
+                    }
+                    else
+                    {
+                        name[5] = name[7];
+                        name[7] = EOS;
+                    }
+                }
+                gTasks[taskId].data[0]++;
+            }
+            break;
+#if GERMAN
+        case 2:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        default:
+            gTasks[taskId].data[0]++;
+            break;
+#endif
+    }
+}
+
+
 asm(".section .text_de");
 
 #if GERMAN
-- 
cgit v1.2.3


From 84769240d2002281c7bc274f18aab76fbe908483 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 18:04:04 -0500
Subject: sub_80C88AC

---
 src/battle/contest_link_80C857C.c | 33 +++++++++++++++++++++++++++++++++
 src/contest.c                     |  6 +++---
 src/script_pokemon_util_80C4BF0.c |  6 +++---
 3 files changed, 39 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index b86e7bb9c..937193172 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ewram.h"
+#include "random.h"
 #include "task.h"
 #include "contest.h"
 #include "text.h"
@@ -296,6 +297,38 @@ void sub_80C8734(u8 taskId)
     }
 }
 
+void sub_80C88AC(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 0:
+            if (GetMultiplayerId() == 0)
+            {
+                if (sub_8007ECC())
+                {
+                    sub_80C857C(&gRngValue, sizeof(u32));
+                    gTasks[taskId].data[0]++;
+                }
+            }
+            else
+            {
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85AC(0))
+            {
+                memcpy(&gRngValue, gBlockRecvBuffer[0], sizeof(u32));
+                memcpy(&gContestRngValue, gBlockRecvBuffer[0], sizeof(u32));
+                gTasks[taskId].data[0]++;
+            }
+            break;
+    }
+}
 
 asm(".section .text_de");
 
diff --git a/src/contest.c b/src/contest.c
index 93d1a8efc..ce29d80b0 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -59,7 +59,7 @@ extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_WIN0H;
-extern u32 gUnknown_03005D28;  // saved RNG value
+extern u32 gContestRngValue;  // saved RNG value
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
@@ -495,7 +495,7 @@ void sub_80AB6B4(u8 taskId)
         GetMultiplayerId();  // unused return value
         DestroyTask(taskId);
         gTasks[sContest.mainTaskId].func = sub_80AB960;
-        gRngValue = gUnknown_03005D28;
+        gRngValue = gContestRngValue;
     }
 }
 
@@ -1812,7 +1812,7 @@ void sub_80ADDA4(u8 taskId)
     sub_80AF668();
     sub_80AF138();
     sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove);
-    gUnknown_03005D28 = gRngValue;
+    gContestRngValue = gRngValue;
     StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C);
     Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
     gTasks[taskId].data[2] = 0;
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index f991297ab..e51bc3522 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -45,7 +45,7 @@ extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
 extern u16 gSpecialVar_Result;
 
-extern u32 gUnknown_03005D28;
+extern u32 gContestRngValue;
 
 extern u8 gUnknown_02038694;
 extern u8 gUnknown_0203856C;
@@ -373,8 +373,8 @@ void ScriptRandom(void)
 
     if(gIsLinkContest & 1)
     {
-        gUnknown_03005D28 = 1103515245 * gUnknown_03005D28 + 24691;
-        random = gUnknown_03005D28 >> 16;
+        gContestRngValue = 1103515245 * gContestRngValue + 24691;
+        random = gContestRngValue >> 16;
         scriptPtr = &gSpecialVar_Result;
     }
     else
-- 
cgit v1.2.3


From 9474c491c070fe38e89f7b3848a5820c763fe045 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 19:03:23 -0500
Subject: sub_80C8938

---
 src/battle/contest_link_80C857C.c | 68 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 937193172..17b82388c 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -330,6 +330,74 @@ void sub_80C88AC(u8 taskId)
     }
 }
 
+void sub_80C8938(u8 taskId)
+{
+    int i;
+
+    switch (gTasks[taskId].data[0])
+    {
+#if ENGLISH
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+#elif GERMAN
+        case 8:
+#endif
+        case 0:
+            gBlockSendBuffer[0] = gTasks[taskId].data[9];
+            if (GetMultiplayerId() == 0)
+            {
+                if (sub_8007ECC())
+                {
+#if GERMAN
+                    if (gTasks[taskId].data[0] == 0)
+                    {
+                        gTasks[taskId].data[0] = 3;
+                    }
+                    else
+                    {
+                        de_sub_80C9274(TRUE);
+#endif
+                    sub_8007E9C(2);
+#if ENGLISH
+                    gTasks[taskId].data[0]++;
+#elif GERMAN
+                        gTasks[taskId].data[0] = 1;
+                    }
+#endif
+                }
+            }
+            else
+            {
+#if GERMAN
+                de_sub_80C9294(TRUE);
+#endif
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                for (i = 0; i < MAX_LINK_PLAYERS; i++)
+                {
+                    gTasks[taskId].data[i + 1] = gBlockRecvBuffer[i][0];
+                }
+                gTasks[taskId].data[0]++;
+            }
+            break;
+#if GERMAN
+        case 2:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        default:
+            gTasks[taskId].data[0]++;
+            break;
+#endif
+    }
+}
+
 asm(".section .text_de");
 
 #if GERMAN
-- 
cgit v1.2.3


From 5312cf566196e662aa7edd4ef68f32922eb54180 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 19:20:26 -0500
Subject: through sub_80C8A38

---
 src/battle/contest_link_80C857C.c | 54 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 17b82388c..cef290adf 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -398,6 +398,60 @@ void sub_80C8938(u8 taskId)
     }
 }
 
+void sub_80C89DC(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 0:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(&gContestPlayerMonIndex, sizeof(u8));
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                gTasks[taskId].data[0]++;
+            }
+            break;
+    }
+}
+
+void sub_80C8A38(u8 taskId)
+{
+    int i;
+
+    switch (gTasks[taskId].data[0])
+    {
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 0:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(&sContestantStatus[gContestPlayerMonIndex].currMove, sizeof(u16));
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                for (i = 0; i < MAX_LINK_PLAYERS; i++)
+                {
+                    *&sContestantStatus[i].currMove = gBlockRecvBuffer[i][0];
+                }
+                gTasks[taskId].data[0]++;
+            }
+            break;
+    }
+}
+
 asm(".section .text_de");
 
 #if GERMAN
-- 
cgit v1.2.3


From cbab0f740349cbeece60f2155537c2a9870d2318 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 20:24:02 -0500
Subject: sub_80C8AD0

---
 src/battle/contest_link_80C857C.c | 77 +++++++++++++++++++++++++++++++++++++++
 src/debug/matsuda_debug_menu.c    |  8 ----
 src/script_pokemon_util_80C4BF0.c | 12 ------
 3 files changed, 77 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index cef290adf..465bb0487 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -452,6 +452,83 @@ void sub_80C8A38(u8 taskId)
     }
 }
 
+void sub_80C8AD0(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+        case 0:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(gUnknown_02038678, sizeof gUnknown_02038678);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                memcpy(gUnknown_02038678, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038678);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 2:
+        case 5:
+        case 8:
+        case 11:
+            if (gTasks[taskId].data[1]++ > 10)
+            {
+                gTasks[taskId].data[1] = 0;
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 3:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(gUnknown_02038680, sizeof gUnknown_02038680);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 4:
+            if (sub_80C85D8())
+            {
+                memcpy(gUnknown_02038680, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038680);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 6:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(gUnknown_02038688, sizeof gUnknown_02038688);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 7:
+            if (sub_80C85D8())
+            {
+                memcpy(gUnknown_02038688, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038688);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 9:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(gContestFinalStandings, sizeof gContestFinalStandings);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 10:
+            if (sub_80C85D8())
+            {
+                memcpy(gContestFinalStandings, gBlockRecvBuffer[gUnknown_0203869B], sizeof gContestFinalStandings);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+    }
+}
+
 asm(".section .text_de");
 
 #if GERMAN
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index da1937adb..15d28df09 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -19,13 +19,7 @@
 
 extern u8 gUnknown_0203856C;
 extern s16 gUnknown_02038670[];
-extern s16 gUnknown_02038678[];
-extern s16 gUnknown_02038680[];
-extern u8 gContestFinalStandings[];
 extern u8 gUnknown_02038694;
-extern u8 gIsLinkContest;
-extern u8 gUnknown_0203869B;
-extern u8 gContestPlayerMonIndex;
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
 
@@ -40,8 +34,6 @@ extern u16 gBattle_BG3_Y;
 
 extern u8 (*gMenuCallback)(void);
 
-extern bool8 gReceivedRemoteLinkPlayers;
-
 static bool8 sub_80A9B78(void);
 static void sub_80A9BE4(u8 taskId);
 static void sub_80A9C98(u8);
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index e51bc3522..513f6ce2a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -32,26 +32,14 @@ extern void sub_80C4698(u8 *, u8);
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
-extern u8 gContestPlayerMonIndex;
-extern u8 gIsLinkContest;
-extern u8 gPlayerPartyCount;
 extern u8 gSelectedOrderFromParty[];
 
-extern u16 gSpecialVar_0x8004;
-extern u16 gSpecialVar_0x8005;
-extern u16 gSpecialVar_0x8006;
-
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
-extern u16 gSpecialVar_Result;
-
-extern u32 gContestRngValue;
 
 extern u8 gUnknown_02038694;
 extern u8 gUnknown_0203856C;
-extern u8 gContestFinalStandings[];
 extern s16 gUnknown_02038670[];
-extern s16 gUnknown_02038678[];
 
 void SetContestTrainerGfxIds(void)
 {
-- 
cgit v1.2.3


From 399856bc7ead101718891712dd20dd85e138e640 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 20:30:31 -0500
Subject: sub_80C8C80

---
 src/battle/contest_link_80C857C.c | 77 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 465bb0487..84695fb37 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -529,6 +529,83 @@ void sub_80C8AD0(u8 taskId)
     }
 }
 
+void sub_80C8C80(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+        case 0:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(sContestantStatus, 4 * sizeof(struct ContestantStatus));
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                memcpy(sContestantStatus, gBlockRecvBuffer[gUnknown_0203869B], 4 * sizeof(struct ContestantStatus));
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 2:
+        case 5:
+        case 8:
+        case 11:
+            if (gTasks[taskId].data[1]++ > 10)
+            {
+                gTasks[taskId].data[1] = 0;
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 3:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(&shared192D0, sizeof shared192D0);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 4:
+            if (sub_80C85D8())
+            {
+                memcpy(&shared192D0, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared192D0);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 6:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(&shared19328, sizeof shared19328);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 7:
+            if (sub_80C85D8())
+            {
+                memcpy(&shared19328, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared19328);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 9:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 10:
+            if (sub_80C85D8())
+            {
+                memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+    }
+}
+
 asm(".section .text_de");
 
 #if GERMAN
-- 
cgit v1.2.3


From 765b2ffe3f7f49e49cc416a930a6e60ee265ce14 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 20:38:05 -0500
Subject: sub_80C8E1C

---
 src/battle/contest_link_80C857C.c | 68 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 84695fb37..f505fa658 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -606,6 +606,74 @@ void sub_80C8C80(u8 taskId)
     }
 }
 
+void sub_80C8E1C(u8 taskId)
+{
+    int i;
+
+    switch (gTasks[taskId].data[0])
+    {
+#if ENGLISH
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+#elif GERMAN
+        case 8:
+#endif
+        case 0:
+            gBlockSendBuffer[0] = 0x64;
+            if (GetMultiplayerId() == 0)
+            {
+                if (sub_8007ECC())
+                {
+#if GERMAN
+                    if (gTasks[taskId].data[0] == 0)
+                    {
+                        gTasks[taskId].data[0] = 3;
+                    }
+                    else
+                    {
+                        de_sub_80C9274(FALSE);
+#endif
+                    sub_8007E9C(2);
+#if ENGLISH
+                    gTasks[taskId].data[0]++;
+#else
+                    gTasks[taskId].data[0] = 1;
+                    }
+#endif
+                }
+            }
+            else
+            {
+#if GERMAN
+                de_sub_80C9294(FALSE);
+#endif
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                for (i = 0; i < MAX_LINK_PLAYERS; i++)
+                {
+                    gTasks[taskId].data[5 + i] = gBlockRecvBuffer[i][0];
+                }
+                gTasks[taskId].data[0]++;
+            }
+            break;
+#if GERMAN
+        case 2:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        default:
+            gTasks[taskId].data[0]++;
+            break;
+#endif
+    }
+}
+
 asm(".section .text_de");
 
 #if GERMAN
-- 
cgit v1.2.3


From c723b341c50df19f8951353a7efd4ab83bf56833 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 20:52:41 -0500
Subject: through sub_80C8F34

---
 src/battle/contest_link_80C857C.c | 60 +++++++++++++++++++++++++++++++++++----
 src/contest_ai.c                  |  1 -
 src/debug/matsuda_debug_menu.c    |  1 -
 src/script_pokemon_util_80C4BF0.c |  1 -
 4 files changed, 54 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index f505fa658..e85350aea 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -228,11 +228,11 @@ void sub_80C8734(u8 taskId)
                     de_sub_80C9274(FALSE);
 #endif
                     sub_8007E9C(2);
-#if GERMAN
-                    gTasks[taskId].data[0] = 1;
-                    }
-#else
+#if ENGLISH
                     gTasks[taskId].data[0]++;
+#elif GERMAN
+                    gTasks[taskId].data[0] = 1;
+                }
 #endif
                 }
             }
@@ -638,7 +638,7 @@ void sub_80C8E1C(u8 taskId)
                     sub_8007E9C(2);
 #if ENGLISH
                     gTasks[taskId].data[0]++;
-#else
+#elif GERMAN
                     gTasks[taskId].data[0] = 1;
                     }
 #endif
@@ -674,7 +674,55 @@ void sub_80C8E1C(u8 taskId)
     }
 }
 
-asm(".section .text_de");
+void sub_80C8EBC(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 0:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(gUnknown_02038670, sizeof gUnknown_02038670);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                memcpy(gUnknown_02038670, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038670);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+    }
+}
+
+void sub_80C8F34(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 0:
+            if (sub_8007ECC())
+            {
+                sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85D8())
+            {
+                memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696);
+                gTasks[taskId].data[0]++;
+            }
+            break;
+    }
+}
 
 #if GERMAN
 
diff --git a/src/contest_ai.c b/src/contest_ai.c
index 66b387270..1e249083b 100644
--- a/src/contest_ai.c
+++ b/src/contest_ai.c
@@ -8,7 +8,6 @@ extern u8 AreMovesContestCombo(u16, u16);
 extern bool8 sub_80B214C(u8);
 extern bool8 Contest_IsMonsTurnDisabled(u8);
 
-extern s16 gUnknown_02038670[];
 extern u16 gSpecialVar_ContestCategory;
 
 extern u8 *gAIScriptPtr;
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 15d28df09..efd952ef7 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -18,7 +18,6 @@
 #include "ewram.h"
 
 extern u8 gUnknown_0203856C;
-extern s16 gUnknown_02038670[];
 extern u8 gUnknown_02038694;
 extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 513f6ce2a..02e66d313 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -39,7 +39,6 @@ extern u16 gSpecialVar_ContestRank;
 
 extern u8 gUnknown_02038694;
 extern u8 gUnknown_0203856C;
-extern s16 gUnknown_02038670[];
 
 void SetContestTrainerGfxIds(void)
 {
-- 
cgit v1.2.3


From cc0d7a675d5fc85adac3bd94387c54e0eb507495 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 22 Jan 2018 21:01:33 -0500
Subject: Rename some static functions

---
 src/battle/battle_2.c             |  16 +++---
 src/battle/contest_link_80C857C.c | 104 +++++++++++++++++++-------------------
 src/engine/link.c                 |   9 +---
 src/engine/trade.c                |  16 +++---
 src/field/field_fadetransition.c  |   2 +-
 src/rom3.c                        |   2 +-
 src/scene/berry_blender.c         |  16 +++---
 7 files changed, 80 insertions(+), 85 deletions(-)

(limited to 'src')

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index b00c35312..2ad2adb04 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -396,7 +396,7 @@ void sub_800EC9C(void)
     case 0:
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC())
+            if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
             {
                 gBattleStruct->unk0 = 1;
                 gBattleStruct->unk1 = 1;
@@ -464,7 +464,7 @@ void sub_800EC9C(void)
         }
         break;
     case 2:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(*gPlayerParty) * 2);
             gBattleCommunication[0]++;
@@ -479,7 +479,7 @@ void sub_800EC9C(void)
         }
         break;
     case 4:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(*gPlayerParty) * 2);
             gBattleCommunication[0]++;
@@ -494,7 +494,7 @@ void sub_800EC9C(void)
         }
         break;
     case 6:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(*gPlayerParty) * 2);
             gBattleCommunication[0]++;
@@ -579,7 +579,7 @@ void sub_800F104(void)
     switch (gBattleCommunication[0])
     {
     case 0:
-        if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC())
+        if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
         {
             sub_800F02C();
             SendBlock(bitmask_all_link_players_but_self(), gSharedMem, 0x60);
@@ -639,7 +639,7 @@ void sub_800F298(void)
     switch (gBattleCommunication[0])
     {
     case 0:
-        if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC())
+        if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
         {
             gBattleStruct->unk0 = 1;
             gBattleStruct->unk1 = 1;
@@ -732,7 +732,7 @@ void sub_800F298(void)
         break;
     case 2:
       step_2:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             SendBlock(bitmask_all_link_players_but_self(), ewram1D000, sizeof(struct Pokemon) * 2);
             gBattleCommunication[0]++;
@@ -795,7 +795,7 @@ void sub_800F298(void)
         }
         break;
     case 4:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             SendBlock(bitmask_all_link_players_but_self(), ewram1D000 + 2, sizeof(struct Pokemon));
             gBattleCommunication[0]++;
diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index e85350aea..01088bf53 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -10,17 +10,17 @@
 static void sub_80C8644(u8 taskId);
 static void sub_80C8660(u8 taskId);
 #if GERMAN
-void de_sub_80C9274(bool32 arg0);
-void de_sub_80C9294(bool32 arg0);
+static void de_sub_80C9274(bool32 arg0);
+static void de_sub_80C9294(bool32 arg0);
 #endif
 
-void sub_80C857C(const void *data, u16 size)
+static void SendBlockToAllOpponents(const void *data, u16 size)
 {
     memcpy(eContestLinkSendBuffer, data, size);
     SendBlock(bitmask_all_link_players_but_self(), eContestLinkSendBuffer, size);
 }
 
-bool8 sub_80C85AC(u8 who)
+static bool8 HasPlayerReceivedBlock(u8 who)
 {
     u8 flag = 1 << who;
     if (!(GetBlockReceivedStatus() & flag))
@@ -29,7 +29,7 @@ bool8 sub_80C85AC(u8 who)
     return TRUE;
 }
 
-bool8 sub_80C85D8(void)
+static bool8 HaveAllPlayersReceivedBlock(void)
 {
     int i;
 
@@ -214,7 +214,7 @@ void sub_80C8734(u8 taskId)
 #endif
         case 0:
             if (GetMultiplayerId() == 0) {
-                if (sub_8007ECC()) {
+                if (IsLinkTaskFinished()) {
 #if GERMAN
                     if (gTasks[taskId].data[0] == 0)
                     {
@@ -246,7 +246,7 @@ void sub_80C8734(u8 taskId)
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 for (i = 0; i < MAX_LINK_PLAYERS; i++)
                 {
@@ -308,9 +308,9 @@ void sub_80C88AC(u8 taskId)
         case 0:
             if (GetMultiplayerId() == 0)
             {
-                if (sub_8007ECC())
+                if (IsLinkTaskFinished())
                 {
-                    sub_80C857C(&gRngValue, sizeof(u32));
+                    SendBlockToAllOpponents(&gRngValue, sizeof(u32));
                     gTasks[taskId].data[0]++;
                 }
             }
@@ -320,7 +320,7 @@ void sub_80C88AC(u8 taskId)
             }
             break;
         case 1:
-            if (sub_80C85AC(0))
+            if (HasPlayerReceivedBlock(0))
             {
                 memcpy(&gRngValue, gBlockRecvBuffer[0], sizeof(u32));
                 memcpy(&gContestRngValue, gBlockRecvBuffer[0], sizeof(u32));
@@ -348,7 +348,7 @@ void sub_80C8938(u8 taskId)
             gBlockSendBuffer[0] = gTasks[taskId].data[9];
             if (GetMultiplayerId() == 0)
             {
-                if (sub_8007ECC())
+                if (IsLinkTaskFinished())
                 {
 #if GERMAN
                     if (gTasks[taskId].data[0] == 0)
@@ -377,7 +377,7 @@ void sub_80C8938(u8 taskId)
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 for (i = 0; i < MAX_LINK_PLAYERS; i++)
                 {
@@ -407,14 +407,14 @@ void sub_80C89DC(u8 taskId)
             SwitchTaskToFollowupFunc(taskId);
             break;
         case 0:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(&gContestPlayerMonIndex, sizeof(u8));
+                SendBlockToAllOpponents(&gContestPlayerMonIndex, sizeof(u8));
                 gTasks[taskId].data[0]++;
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 gTasks[taskId].data[0]++;
             }
@@ -433,14 +433,14 @@ void sub_80C8A38(u8 taskId)
             SwitchTaskToFollowupFunc(taskId);
             break;
         case 0:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(&sContestantStatus[gContestPlayerMonIndex].currMove, sizeof(u16));
+                SendBlockToAllOpponents(&sContestantStatus[gContestPlayerMonIndex].currMove, sizeof(u16));
                 gTasks[taskId].data[0]++;
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 for (i = 0; i < MAX_LINK_PLAYERS; i++)
                 {
@@ -457,14 +457,14 @@ void sub_80C8AD0(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
         case 0:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(gUnknown_02038678, sizeof gUnknown_02038678);
+                SendBlockToAllOpponents(gUnknown_02038678, sizeof gUnknown_02038678);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(gUnknown_02038678, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038678);
                 gTasks[taskId].data[0]++;
@@ -481,42 +481,42 @@ void sub_80C8AD0(u8 taskId)
             }
             break;
         case 3:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(gUnknown_02038680, sizeof gUnknown_02038680);
+                SendBlockToAllOpponents(gUnknown_02038680, sizeof gUnknown_02038680);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 4:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(gUnknown_02038680, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038680);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 6:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(gUnknown_02038688, sizeof gUnknown_02038688);
+                SendBlockToAllOpponents(gUnknown_02038688, sizeof gUnknown_02038688);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 7:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(gUnknown_02038688, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038688);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 9:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(gContestFinalStandings, sizeof gContestFinalStandings);
+                SendBlockToAllOpponents(gContestFinalStandings, sizeof gContestFinalStandings);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 10:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(gContestFinalStandings, gBlockRecvBuffer[gUnknown_0203869B], sizeof gContestFinalStandings);
                 gTasks[taskId].data[0]++;
@@ -534,14 +534,14 @@ void sub_80C8C80(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
         case 0:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(sContestantStatus, 4 * sizeof(struct ContestantStatus));
+                SendBlockToAllOpponents(sContestantStatus, 4 * sizeof(struct ContestantStatus));
                 gTasks[taskId].data[0]++;
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(sContestantStatus, gBlockRecvBuffer[gUnknown_0203869B], 4 * sizeof(struct ContestantStatus));
                 gTasks[taskId].data[0]++;
@@ -558,42 +558,42 @@ void sub_80C8C80(u8 taskId)
             }
             break;
         case 3:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(&shared192D0, sizeof shared192D0);
+                SendBlockToAllOpponents(&shared192D0, sizeof shared192D0);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 4:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(&shared192D0, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared192D0);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 6:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(&shared19328, sizeof shared19328);
+                SendBlockToAllOpponents(&shared19328, sizeof shared19328);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 7:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(&shared19328, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared19328);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 9:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696);
+                SendBlockToAllOpponents(gUnknown_02038696, sizeof gUnknown_02038696);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 10:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696);
                 gTasks[taskId].data[0]++;
@@ -624,7 +624,7 @@ void sub_80C8E1C(u8 taskId)
             gBlockSendBuffer[0] = 0x64;
             if (GetMultiplayerId() == 0)
             {
-                if (sub_8007ECC())
+                if (IsLinkTaskFinished())
                 {
 #if GERMAN
                     if (gTasks[taskId].data[0] == 0)
@@ -653,7 +653,7 @@ void sub_80C8E1C(u8 taskId)
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 for (i = 0; i < MAX_LINK_PLAYERS; i++)
                 {
@@ -683,14 +683,14 @@ void sub_80C8EBC(u8 taskId)
             SwitchTaskToFollowupFunc(taskId);
             break;
         case 0:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(gUnknown_02038670, sizeof gUnknown_02038670);
+                SendBlockToAllOpponents(gUnknown_02038670, sizeof gUnknown_02038670);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(gUnknown_02038670, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038670);
                 gTasks[taskId].data[0]++;
@@ -708,14 +708,14 @@ void sub_80C8F34(u8 taskId)
             SwitchTaskToFollowupFunc(taskId);
             break;
         case 0:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
-                sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696);
+                SendBlockToAllOpponents(gUnknown_02038696, sizeof gUnknown_02038696);
                 gTasks[taskId].data[0]++;
             }
             break;
         case 1:
-            if (sub_80C85D8())
+            if (HaveAllPlayersReceivedBlock())
             {
                 memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696);
                 gTasks[taskId].data[0]++;
@@ -726,7 +726,7 @@ void sub_80C8F34(u8 taskId)
 
 #if GERMAN
 
-void de_sub_80C9274(bool32 arg0)
+static void de_sub_80C9274(bool32 arg0)
 {
     if (deUnkValue2 == 1)
     {
@@ -737,7 +737,7 @@ void de_sub_80C9274(bool32 arg0)
     }
 }
 
-void de_sub_80C9294(bool32 arg0)
+static void de_sub_80C9294(bool32 arg0)
 {
     if (deUnkValue2 == 1)
     {
diff --git a/src/engine/link.c b/src/engine/link.c
index ec94295d7..33037b817 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -898,14 +898,9 @@ bool8 sub_8007E9C(u8 a1)
     }
 }
 
-bool8 sub_8007ECC(void)
+bool8 IsLinkTaskFinished(void)
 {
-    u8 retVal = FALSE;
-
-    if (!gLinkCallback)
-        retVal = TRUE;
-
-    return retVal;
+    return gLinkCallback == NULL;
 }
 
 u8 GetBlockReceivedStatus(void)
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 4dc27ea6f..4bd39c4ef 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -1711,7 +1711,7 @@ static bool8 sub_8048D44(void)
             gUnknown_03004824->unk_0075 ++;
             break;
         case  1:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
                 if (GetBlockReceivedStatus() == 0)
                 {
@@ -2210,7 +2210,7 @@ static void sub_8049A20(void)
     {
         sub_804AADC(3, 1);
         gUnknown_03004824->linkData[0] = 0xbbbb;
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             Trade_SendData(gUnknown_03004824);
         }
@@ -2239,7 +2239,7 @@ static void sub_8049AC0(void)
         else
         {
             sub_804AADC(3, 1);
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
                 gUnknown_03004824->linkData[0] = 0xbbcc;
                 Trade_SendData(gUnknown_03004824);
@@ -4632,7 +4632,7 @@ static void sub_804BB78(void)
     switch (gUnknown_03004828->unk_00bd)
     {
         case 1:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
                 Trade_SendData(gUnknown_03004828);
                 gUnknown_03004828->unk_00bd ++;
@@ -5534,13 +5534,13 @@ static void sub_804DC88(void)
                 gMain.state = 101;
                 gUnknown_03004828->unk_00c0 = 0;
             }
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
                 gMain.state = 2;
             }
             break;
         case 101:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
                 gMain.state = 2;
             }
@@ -5592,7 +5592,7 @@ static void sub_804DC88(void)
             gMain.state = 42;
             break;
         case 42:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
                 sub_8125E04();
                 gSoftResetDisabled = FALSE;
@@ -5607,7 +5607,7 @@ static void sub_804DC88(void)
             }
             break;
         case 6:
-            if (sub_8007ECC())
+            if (IsLinkTaskFinished())
             {
                 BeginNormalPaletteFade(-1, 0, 0, 16, 0);
                 gMain.state ++;
diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c
index ad1cd4a59..d68be3b36 100644
--- a/src/field/field_fadetransition.c
+++ b/src/field/field_fadetransition.c
@@ -146,7 +146,7 @@ void sub_8080A5C(u8 taskId)
         task->data[0]++;
         break;
     case 1:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             pal_fill_for_map_transition();
             task->data[0]++;
diff --git a/src/rom3.c b/src/rom3.c
index 713713162..000de8356 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -463,7 +463,7 @@ void sub_800C1A8(u8 taskId)
         }
         break;
     case 4:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             var = (ewram14004arr(0, gTasks[taskId].data[15]) | (ewram14004arr(1, gTasks[taskId].data[15]) << 8));
             gTasks[taskId].data[13] = 1;
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 7567899ae..2cb68ccf1 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -1163,7 +1163,7 @@ static void sub_804E9F8(void)
         gBerryBlenderData->framesToWait = 0;
         break;
     case 9:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             ResetBlockReceivedFlags();
             if (GetMultiplayerId() == 0)
@@ -1215,7 +1215,7 @@ static void sub_804E9F8(void)
         }
         break;
     case 13:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             gBerryBlenderData->field_0++;
             sub_8051414(&gBerryBlenderData->field_168);
@@ -1257,7 +1257,7 @@ static void sub_804E9F8(void)
         gBerryBlenderData->field_0++;
         break;
     case 20:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             sub_8007E24();
             gBerryBlenderData->field_0++;
@@ -2506,7 +2506,7 @@ static void sub_8050954(void)
     case 3:
         if (/*multiplayerID != 0*/ GetMultiplayerId() != 0)
             gBerryBlenderData->field_6F++;
-        else if (sub_8007ECC())
+        else if (IsLinkTaskFinished())
         {
             gBerryBlenderData->field_1BC = gBerryBlenderData->gameFrameTime;
             gBerryBlenderData->field_1C0 = gBerryBlenderData->max_RPM;
@@ -2646,7 +2646,7 @@ bool8 sub_8050CE8(void)
         gBerryBlenderData->framesToWait = 0;
         break;
     case 1:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             gBerryBlenderData->field_1C4++;
             gSoftResetDisabled = TRUE;
@@ -2665,7 +2665,7 @@ bool8 sub_8050CE8(void)
         }
         break;
     case 4:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             if (sub_8125E6C())
                 gBerryBlenderData->field_1C4 = 5;
@@ -2752,7 +2752,7 @@ static void sub_8050E30(void)
         gBerryBlenderData->field_6F++;
         break;
     case 6:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             gBerryBlenderData->framesToWait = 0;
             gBerryBlenderData->field_6F++;
@@ -2771,7 +2771,7 @@ static void sub_8050E30(void)
         sub_80084A4();
         break;
     case 9:
-        if (sub_8007ECC())
+        if (IsLinkTaskFinished())
         {
             BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
             gBerryBlenderData->field_6F++;
-- 
cgit v1.2.3


From 76c40aac928d139afa725182ab291436f809258d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 23 Jan 2018 08:09:31 -0500
Subject: Clean up English/German blocks (fingers crossed)

---
 src/battle/contest_link_80C857C.c | 46 ++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 01088bf53..4fb236294 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -215,24 +215,22 @@ void sub_80C8734(u8 taskId)
         case 0:
             if (GetMultiplayerId() == 0) {
                 if (IsLinkTaskFinished()) {
-#if GERMAN
+#if ENGLISH
+                    memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon));
+                    sub_8007E9C(2);
+                    gTasks[taskId].data[0]++;
+#elif GERMAN
                     if (gTasks[taskId].data[0] == 0)
                     {
                         gTasks[taskId].data[0] = 3;
                     }
                     else
                     {
-#endif
-                    memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon));
-#if GERMAN
-                    de_sub_80C9274(FALSE);
-#endif
-                    sub_8007E9C(2);
-#if ENGLISH
-                    gTasks[taskId].data[0]++;
-#elif GERMAN
-                    gTasks[taskId].data[0] = 1;
-                }
+                        memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon));
+                        de_sub_80C9274(FALSE);
+                        sub_8007E9C(2);
+                        gTasks[taskId].data[0] = 1;
+                    }
 #endif
                 }
             }
@@ -350,7 +348,10 @@ void sub_80C8938(u8 taskId)
             {
                 if (IsLinkTaskFinished())
                 {
-#if GERMAN
+#if ENGLISH
+                    sub_8007E9C(2);
+                    gTasks[taskId].data[0]++;
+#elif GERMAN
                     if (gTasks[taskId].data[0] == 0)
                     {
                         gTasks[taskId].data[0] = 3;
@@ -358,11 +359,7 @@ void sub_80C8938(u8 taskId)
                     else
                     {
                         de_sub_80C9274(TRUE);
-#endif
-                    sub_8007E9C(2);
-#if ENGLISH
-                    gTasks[taskId].data[0]++;
-#elif GERMAN
+                        sub_8007E9C(2);
                         gTasks[taskId].data[0] = 1;
                     }
 #endif
@@ -626,7 +623,10 @@ void sub_80C8E1C(u8 taskId)
             {
                 if (IsLinkTaskFinished())
                 {
-#if GERMAN
+#if ENGLISH
+                    sub_8007E9C(2);
+                    gTasks[taskId].data[0]++;
+#elif GERMAN
                     if (gTasks[taskId].data[0] == 0)
                     {
                         gTasks[taskId].data[0] = 3;
@@ -634,12 +634,8 @@ void sub_80C8E1C(u8 taskId)
                     else
                     {
                         de_sub_80C9274(FALSE);
-#endif
-                    sub_8007E9C(2);
-#if ENGLISH
-                    gTasks[taskId].data[0]++;
-#elif GERMAN
-                    gTasks[taskId].data[0] = 1;
+                        sub_8007E9C(2);
+                        gTasks[taskId].data[0] = 1;
                     }
 #endif
                 }
-- 
cgit v1.2.3