Document cable_club.c

2020-06-03 18:00:53 -04:00
parent 9190af73b7
commit 3f97763181
32 changed files with 591 additions and 535 deletions
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -36,7 +36,7 @@ void HandleLinkBattleSetup(void)
            SetWirelessCommType1();
        if (!gReceivedRemoteLinkPlayers)
            OpenLink();
-        CreateTask(task00_08081A90, 0);
+        CreateTask(Task_WaitForLinkPlayerConnection, 0);
        CreateTasksForSendRecvLinkBuffers();
    }
 }
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -3013,10 +3013,10 @@ static u32 sub_8024134(struct BerryCrushGame *r5, u8 *r4)
        DrawDialogueFrame(0, 0);
        AddTextPrinterParameterized2(0, 1, gText_SavingDontTurnOffPower, 0, 0, 2, 1, 3);
        CopyWindowToVram(0, 3);
-        CreateTask(sub_8153688, 0);
+        CreateTask(Task_LinkSave, 0);
        break;
    case 3:
-        if (FuncIsActiveTask(sub_8153688))
+        if (FuncIsActiveTask(Task_LinkSave))
            return 0;
        break;
    case 4:
--- a/src/cable_club.c
+++ b/src/cable_club.c
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -4483,12 +4483,12 @@ static void sub_802A380(void)
    case 2:
        if (!IsDma3ManagerBusyWithBgCopy())
        {
-            CreateTask(sub_8153688, 0);
+            CreateTask(Task_LinkSave, 0);
            gUnknown_02022CF8->state++;
        }
        break;
    case 3:
-        if (!FuncIsActiveTask(sub_8153688))
+        if (!FuncIsActiveTask(Task_LinkSave))
            gUnknown_02022CF8->state++;
        break;
    default:
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -85,10 +85,10 @@ static u8 sub_81D4DE8(struct Unk03006370 *arg0)
    return var0;
 }

-static void sub_81D4E30(void)
+static void OpenEReaderLink(void)
 {
    memset(gDecompressionBuffer, 0, 0x2000);
-    gLinkType = LINKTYPE_0x5503;
+    gLinkType = LINKTYPE_EREADER;
    OpenLink();
    SetSuppressLinkErrorMessage(TRUE);
 }
@@ -255,7 +255,7 @@ static void sub_81D5084(u8 taskId)
            data->unk8 = 1;
        break;
    case 1:
-        sub_81D4E30();
+        OpenEReaderLink();
        sub_81D505C(&data->unk0);
        data->unk8 = 2;
        break;
@@ -285,7 +285,7 @@ static void sub_81D5084(u8 taskId)
    case 5:
        if (sub_81D5064(&data->unk0, 90))
        {
-            sub_81D4E30();
+            OpenEReaderLink();
            data->unk8 = 6;
        }
        else if (gMain.newKeys & B_BUTTON)
@@ -319,7 +319,7 @@ static void sub_81D5084(u8 taskId)
        else if (sub_81D5064(&data->unk0, 10))
        {
            CloseLink();
-            sub_81D4E30();
+            OpenEReaderLink();
            sub_81D505C(&data->unk0);
        }
        break;
@@ -360,7 +360,7 @@ static void sub_81D5084(u8 taskId)
            data->unk8 = 12;
        break;
    case 12:
-        sub_81D4E30();
+        OpenEReaderLink();
        AddTextPrinterToWindow1(gJPText_AllowEReaderToLoadCard);
        data->unk8 = 13;
        break;
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -148,7 +148,7 @@ void sub_8098358(void)
    sFieldMessageBoxMode = 0;
 }

-void sub_8098374(void)
+void StopFieldMessage(void)
 {
    task_del_textbox();
    sFieldMessageBoxMode = 0;
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -162,7 +162,7 @@ static void Task_ReturnToFieldCableLink(u8 taskId)
    switch (task->data[0])
    {
    case 0:
-        task->data[1] = sub_80B3050();
+        task->data[1] = CreateTask_ReestablishCableClubLink();
        task->data[0]++;
        break;
    case 1:
--- a/src/link.c
+++ b/src/link.c
@@ -282,7 +282,7 @@ void LinkTestScreen(void)
    ResetTasks();
    SetVBlankCallback(sub_80096BC);
    ResetBlockSend();
-    gLinkType = LINKTYPE_0x1111;
+    gLinkType = LINKTYPE_TRADE;
    OpenLink();
    SeedRng(gMain.vblankCounter2);
    for (i = 0; i < MAX_LINK_PLAYERS; i++)
@@ -826,23 +826,23 @@ void OpenLinkTimed(void)
    OpenLink();
 }

-u8 GetLinkPlayerDataExchangeStatusTimed(int lower, int upper)
+u8 GetLinkPlayerDataExchangeStatusTimed(int minPlayers, int maxPlayers)
 {
    int i;
    int count;
    u32 index;
-    u8 cmpVal;
+    u8 numPlayers;
    u32 linkType1;
    u32 linkType2;

    count = 0;
    if (gReceivedRemoteLinkPlayers == TRUE)
    {
-        cmpVal = GetLinkPlayerCount_2();
-        if (lower > cmpVal || cmpVal > upper)
+        numPlayers = GetLinkPlayerCount_2();
+        if (minPlayers > numPlayers || numPlayers > maxPlayers)
        {
-            sPlayerDataExchangeStatus = EXCHANGE_STAT_6;
-            return 6;
+            sPlayerDataExchangeStatus = EXCHANGE_WRONG_NUM_PLAYERS;
+            return sPlayerDataExchangeStatus;
        }
        else
        {
@@ -860,19 +860,19 @@ u8 GetLinkPlayerDataExchangeStatusTimed(int lower, int upper)
            }
            if (count == GetLinkPlayerCount())
            {
-                if (gLinkPlayers[0].linkType == 0x1133)
+                if (gLinkPlayers[0].linkType == LINKTYPE_TRADE_SETUP)
                {
                    switch (GetGameProgressForLinkTrade())
                    {
-                        case TRADE_PLAYER_NOT_READY:
-                            sPlayerDataExchangeStatus = EXCHANGE_PLAYER_NOT_READY;
-                            break;
-                        case TRADE_PARTNER_NOT_READY:
-                            sPlayerDataExchangeStatus = EXCHANGE_PARTNER_NOT_READY;
-                            break;
-                        case TRADE_BOTH_PLAYERS_READY:
-                            sPlayerDataExchangeStatus = EXCHANGE_COMPLETE;
-                            break;
+                    case TRADE_PLAYER_NOT_READY:
+                        sPlayerDataExchangeStatus = EXCHANGE_PLAYER_NOT_READY;
+                        break;
+                    case TRADE_PARTNER_NOT_READY:
+                        sPlayerDataExchangeStatus = EXCHANGE_PARTNER_NOT_READY;
+                        break;
+                    case TRADE_BOTH_PLAYERS_READY:
+                        sPlayerDataExchangeStatus = EXCHANGE_COMPLETE;
+                        break;
                    }
                }
                else
@@ -882,11 +882,14 @@ u8 GetLinkPlayerDataExchangeStatusTimed(int lower, int upper)
            }
            else
            {
-                sPlayerDataExchangeStatus = EXCHANGE_IN_PROGRESS;
+                sPlayerDataExchangeStatus = EXCHANGE_DIFF_SELECTIONS;
                linkType1 = gLinkPlayers[GetMultiplayerId()].linkType;
                linkType2 = gLinkPlayers[GetMultiplayerId() ^ 1].linkType;
-                if ((linkType1 == 0x2266 && linkType2 == 0x2277) || (linkType1 == 0x2277 && linkType2 == 0x2266))
+                if ((linkType1 == LINKTYPE_BATTLE_TOWER_50 && linkType2 == LINKTYPE_BATTLE_TOWER_OPEN) 
+                 || (linkType1 == LINKTYPE_BATTLE_TOWER_OPEN && linkType2 == LINKTYPE_BATTLE_TOWER_50))
                {
+                    // 3 below indicates partner made different level mode selection
+                    // See BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections
                    gSpecialVar_0x8005 = 3;
                }
            }
@@ -921,7 +924,7 @@ bool8 IsLinkPlayerDataExchangeComplete(void)
    else
    {
        retval = FALSE;
-        sPlayerDataExchangeStatus = EXCHANGE_IN_PROGRESS;
+        sPlayerDataExchangeStatus = EXCHANGE_DIFF_SELECTIONS;
    }
    return retval;
 }
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -2408,7 +2408,7 @@ void sub_8011AFC(void)
    SetVBlankCallback(sub_8011AE8);
    if (IsWirelessAdapterConnected())
    {
-        gLinkType = LINKTYPE_0x1111;
+        gLinkType = LINKTYPE_TRADE;
        SetWirelessCommType1();
        OpenLink();
        SeedRng(gMain.vblankCounter2);
--- a/src/mevent2.c
+++ b/src/mevent2.c
@@ -569,7 +569,7 @@ bool32 MEventHandleReceivedWonderCard(u16 a0)
    return TRUE;
 }

-void sub_801B990(u32 a0, u32 a1)
+void RecordIdOfWonderCardSenderByEventType(u32 a0, u32 a1)
 {
    if (gUnknown_02022C70)
    {
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -152,7 +152,7 @@ static void CB2_MysteryEventMenu(void)
        if (!IsTextPrinterActive(0))
        {
            gMain.state++;
-            gLinkType = LINKTYPE_0x5501;
+            gLinkType = LINKTYPE_MYSTERY_EVENT;
            OpenLink();
        }
        break;
@@ -206,7 +206,7 @@ static void CB2_MysteryEventMenu(void)
        {
            if (gReceivedRemoteLinkPlayers != 0)
            {
-                if (GetLinkPlayerDataExchangeStatusTimed(2, 2) == 3)
+                if (GetLinkPlayerDataExchangeStatusTimed(2, 2) == EXCHANGE_DIFF_SELECTIONS)
                {
                    sub_800AC34();
                    GetEventLoadMessage(gStringVar4, 1);
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -1148,12 +1148,12 @@ static bool32 sub_802B720(void)
    case 2:
        if (sub_802C70C())
        {
-            CreateTask(sub_8153688, 6);
+            CreateTask(Task_LinkSave, 6);
            gUnknown_02022CFC->unk8++;
        }
        break;
    case 3:
-        if (!FuncIsActiveTask(sub_8153688))
+        if (!FuncIsActiveTask(Task_LinkSave))
        {
            sub_802DA14();
            gUnknown_02022CFC->unk8++;
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -169,10 +169,9 @@ static const u8 gUnknown_0858CFBE[3][4] =

 #define BUFFER_CHUNK_SIZE 200

-// Note: VAR_0x8005 contains the spotId.
 void RecordMixingPlayerSpotTriggered(void)
 {
-    sub_80B37D4(Task_RecordMixing_Main);
+    CreateTask_EnterCableClubSeat(Task_RecordMixing_Main);
 }

 // these variables were const in R/S, but had to become changeable because of saveblocks changing RAM position
@@ -351,7 +350,7 @@ static void Task_RecordMixing_Main(u8 taskId)
        {
            tState = 4;
            if (gWirelessCommType == 0)
-                data[10] = sub_80B3050();
+                data[10] = CreateTask_ReestablishCableClubLink();

            PrintTextOnRecordMixing(gText_RecordMixingComplete);
            data[8] = 0;
@@ -987,12 +986,12 @@ static void Task_DoRecordMixing(u8 taskId)
    case 6:
        if (!sub_801048C(FALSE))
        {
-            CreateTask(sub_8153688, 5);
+            CreateTask(Task_LinkSave, 5);
            task->data[0] ++;
        }
        break;
-    case 7: // wait for sub_8153688 to finish.
-        if (!FuncIsActiveTask(sub_8153688))
+    case 7: // wait for Task_LinkSave to finish.
+        if (!FuncIsActiveTask(Task_LinkSave))
        {
            if (gWirelessCommType)
            {
--- a/src/save.c
+++ b/src/save.c
@@ -897,74 +897,78 @@ u32 TryWriteSpecialSaveSection(u8 sector, u8* src)
    return SAVE_STATUS_OK;
 }

-void sub_8153688(u8 taskId)
-{
-    s16* taskData = gTasks[taskId].data;
+#define tState       data[0]
+#define tTimer       data[1]
+#define tPartialSave data[2]

-    switch (taskData[0])
+void Task_LinkSave(u8 taskId)
+{
+    s16* data = gTasks[taskId].data;
+
+    switch (tState)
    {
    case 0:
        gSoftResetDisabled = TRUE;
-        taskData[0] = 1;
+        tState = 1;
        break;
    case 1:
        sub_800ADF8();
-        taskData[0] = 2;
+        tState = 2;
        break;
    case 2:
        if (IsLinkTaskFinished())
        {
-            if (taskData[2] == 0)
+            if (!tPartialSave)
                save_serialize_map();
-            taskData[0] = 3;
+            tState = 3;
        }
        break;
    case 3:
-        if (taskData[2] == 0)
+        if (!tPartialSave)
            SetContinueGameWarpStatusToDynamicWarp();
        sub_8153380();
-        taskData[0] = 4;
+        tState = 4;
        break;
    case 4:
-        if (++taskData[1] == 5)
+        if (++tTimer == 5)
        {
-            taskData[1] = 0;
-            taskData[0] = 5;
+            tTimer = 0;
+            tState = 5;
        }
        break;
    case 5:
        if (sub_81533AC())
-            taskData[0] = 6;
+            tState = 6;
        else
-            taskData[0] = 4;
+            tState = 4;
        break;
    case 6:
        sub_81533E0();
-        taskData[0] = 7;
+        tState = 7;
        break;
    case 7:
-        if (taskData[2] == 0)
+        if (!tPartialSave)
            ClearContinueGameWarpStatus2();
        sub_800ADF8();
-        taskData[0] = 8;
+        tState = 8;
        break;
    case 8:
        if (IsLinkTaskFinished())
        {
            sub_8153408();
-            taskData[0] = 9;
+            tState = 9;
        }
        break;
    case 9:
        sub_800ADF8();
-        taskData[0] = 10;
+        tState = 10;
        break;
    case 10:
        if (IsLinkTaskFinished())
-            taskData[0]++;
+            tState++;
        break;
    case 11:
-        if (++taskData[1] > 5)
+        if (++tTimer > 5)
        {
            gSoftResetDisabled = FALSE;
            DestroyTask(taskId);
@@ -972,3 +976,7 @@ void sub_8153688(u8 taskId)
        break;
    }
 }
+
+#undef tState
+#undef tTimer
+#undef tPartialSave
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -133,8 +133,8 @@ static u8 BattlePyramidRetireInputCallback(void);
 // Task callbacks
 static void StartMenuTask(u8 taskId);
 static void SaveGameTask(u8 taskId);
-static void sub_80A0550(u8 taskId);
-static void sub_80A08A4(u8 taskId);
+static void Task_SaveAfterLinkBattle(u8 taskId);
+static void Task_WaitForBattleTowerLinkSave(u8 taskId);
 static bool8 FieldCB_ReturnToFieldStartMenu(void);

 static const struct WindowTemplate sSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};
@@ -219,8 +219,8 @@ static bool8 SaveSuccesTimer(void);
 static bool8 SaveErrorTimer(void);
 static void InitBattlePyramidRetire(void);
 static void sub_80A03D8(void);
-static bool32 sub_80A03E4(u8 *par1);
-static void sub_80A0540(void);
+static bool32 InitSaveWindowAfterLinkBattle(u8 *par1);
+static void CB2_SaveAfterLinkBattle(void);
 static void ShowSaveInfoWindow(void);
 static void RemoveSaveInfoWindow(void);
 static void HideStartMenuWindow(void);
@@ -1159,9 +1159,9 @@ static void sub_80A03D8(void)
    TransferPlttBuffer();
 }

-static bool32 sub_80A03E4(u8 *par1)
+static bool32 InitSaveWindowAfterLinkBattle(u8 *state)
 {
-    switch (*par1)
+    switch (*state)
    {
    case 0:
        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0);
@@ -1193,43 +1193,43 @@ static bool32 sub_80A03E4(u8 *par1)
        return TRUE;
    }

-    (*par1)++;
+    (*state)++;
    return FALSE;
 }

-void sub_80A0514(void)
+void CB2_SetUpSaveAfterLinkBattle(void)
 {
-    if (sub_80A03E4(&gMain.state))
+    if (InitSaveWindowAfterLinkBattle(&gMain.state))
    {
-        CreateTask(sub_80A0550, 0x50);
-        SetMainCallback2(sub_80A0540);
+        CreateTask(Task_SaveAfterLinkBattle, 0x50);
+        SetMainCallback2(CB2_SaveAfterLinkBattle);
    }
 }

-static void sub_80A0540(void)
+static void CB2_SaveAfterLinkBattle(void)
 {
    RunTasks();
    UpdatePaletteFade();
 }

-static void sub_80A0550(u8 taskId)
+static void Task_SaveAfterLinkBattle(u8 taskId)
 {
-    s16 *step = gTasks[taskId].data;
+    s16 *state = gTasks[taskId].data;

    if (!gPaletteFade.active)
    {
-        switch (*step)
+        switch (*state)
        {
        case 0:
            FillWindowPixelBuffer(0, PIXEL_FILL(1));
            AddTextPrinterParameterized2(0,
                                        1,
                                        gText_SavingDontTurnOffPower,
-                                        255,
+                                        TEXT_SPEED_FF,
                                        NULL,
-                                        2,
-                                        1,
-                                        3);
+                                        TEXT_COLOR_DARK_GREY,
+                                        TEXT_COLOR_WHITE,
+                                        TEXT_COLOR_LIGHT_GREY);
            DrawTextBorderOuter(0, 8, 14);
            PutWindowTilemap(0);
            CopyWindowToVram(0, 3);
@@ -1239,35 +1239,35 @@ static void sub_80A0550(u8 taskId)
            {
                if (sub_800A07C())
                {
-                    *step = 1;
+                    *state = 1;
                }
                else
                {
-                    *step = 5;
+                    *state = 5;
                }
            }
            else
            {
                gSoftResetDisabled = 1;
-                *step = 1;
+                *state = 1;
            }
            break;
        case 1:
            SetContinueGameWarpStatusToDynamicWarp();
            FullSaveGame();
-            *step = 2;
+            *state = 2;
            break;
        case 2:
            if (CheckSaveFile())
            {
                ClearContinueGameWarpStatus2();
-                *step = 3;
+                *state = 3;
                gSoftResetDisabled = 0;
            }
            break;
        case 3:
            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
-            *step = 4;
+            *state = 4;
            break;
        case 4:
            FreeAllWindowBuffers();
@@ -1275,13 +1275,13 @@ static void sub_80A0550(u8 taskId)
            DestroyTask(taskId);
            break;
        case 5:
-            CreateTask(sub_8153688, 0x5);
-            *step = 6;
+            CreateTask(Task_LinkSave, 5);
+            *state = 6;
            break;
        case 6:
-            if (!FuncIsActiveTask(sub_8153688))
+            if (!FuncIsActiveTask(Task_LinkSave))
            {
-                *step = 3;
+                *state = 3;
            }
            break;
        }
@@ -1357,22 +1357,26 @@ static void RemoveSaveInfoWindow(void)
    RemoveWindow(sSaveInfoWindowId);
 }

-static void sub_80A08A4(u8 taskId)
+static void Task_WaitForBattleTowerLinkSave(u8 taskId)
 {
-    if (!FuncIsActiveTask(sub_8153688))
+    if (!FuncIsActiveTask(Task_LinkSave))
    {
        DestroyTask(taskId);
        EnableBothScriptContexts();
    }
 }

-void sub_80A08CC(void)
+#define tPartialSave data[2]
+
+void SaveForBattleTowerLink(void)
 {
-    u8 taskId = CreateTask(sub_8153688, 0x5);
-    gTasks[taskId].data[2] = 1;
-    gTasks[CreateTask(sub_80A08A4, 0x6)].data[1] = taskId;
+    u8 taskId = CreateTask(Task_LinkSave, 5);
+    gTasks[taskId].tPartialSave = TRUE;
+    gTasks[CreateTask(Task_WaitForBattleTowerLinkSave, 6)].data[1] = taskId;
 }

+#undef tPartialSave
+
 static void HideStartMenuWindow(void)
 {
    ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE);
--- a/src/strings.c
+++ b/src/strings.c
@@ -1492,7 +1492,7 @@ const u8 gText_FrameTypeNumber[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}");
 const u8 gText_ButtonTypeNormal[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}NORMAL");
 const u8 gText_ButtonTypeLR[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}LR");
 const u8 gText_ButtonTypeLEqualsA[] = _("{COLOR GREEN}{SHADOW LIGHT_GREEN}L=A");
-const u8 gText_XPLink[] = _("{STR_VAR_1}P LINK");
+const u8 gText_NumPlayerLink[] = _("{STR_VAR_1}P LINK");
 const u8 gText_BronzeCard[] = _("BRONZE");
 const u8 gText_CopperCard[] = _("COPPER");
 const u8 gText_SilverCard[] = _("SILVER");
--- a/src/trade.c
+++ b/src/trade.c
@@ -389,7 +389,7 @@ static void CB2_CreateTradeMenu(void)

        if (!gReceivedRemoteLinkPlayers)
        {
-            gLinkType = LINKTYPE_0x1122;
+            gLinkType = LINKTYPE_TRADE_CONNECTING;
            sTradeMenuData->timer = 0;

            if (gWirelessCommType)
@@ -402,7 +402,7 @@ static void CB2_CreateTradeMenu(void)
            {
                OpenLink();
                gMain.state++;
-                CreateTask(task00_08081A90, 1);
+                CreateTask(Task_WaitForLinkPlayerConnection, 1);
            }
        }
        else
@@ -2750,7 +2750,7 @@ void CB2_LinkTrade(void)
    case 0:
        if (!gReceivedRemoteLinkPlayers)
        {
-            gLinkType = LINKTYPE_0x1144;
+            gLinkType = LINKTYPE_TRADE_DISCONNECTED;
            CloseLink();
        }
        sTradeData = AllocZeroed(sizeof(*sTradeData));
@@ -4597,7 +4597,7 @@ static void CB2_SaveAndEndTrade(void)
            IncrementGameStat(GAME_STAT_POKEMON_TRADES);
        if (gWirelessCommType)
        {
-            sub_801B990(2, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
+            RecordIdOfWonderCardSenderByEventType(2, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
        }
        SetContinueGameWarpStatusToDynamicWarp();
        sub_8153380();
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1298,15 +1298,15 @@ static u8 GetNewLeaderCandidate(void)
    return ret;
 }

-static void Task_ReturnFromLinkTrade(u8 taskId)
+static void Task_CreateTradeMenu(u8 taskId)
 {
    CB2_StartCreateTradeMenu();
    DestroyTask(taskId);
 }

-u8 CreateTask_ReturnFromLinkTrade(void)
+u8 CreateTask_CreateTradeMenu(void)
 {
-    u8 taskId = CreateTask(Task_ReturnFromLinkTrade, 0);
+    u8 taskId = CreateTask(Task_CreateTradeMenu, 0);

    return taskId;
 }
@@ -1589,7 +1589,7 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
    switch (data[0])
    {
    case 0:
-        gSpecialVar_Result = 1;
+        gSpecialVar_Result = LINKUP_SUCCESS;
        switch (gPlayerCurrActivity)
        {
        case ACTIVITY_BATTLE_TOWER:
@@ -1655,9 +1655,9 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
        if (GetBlockReceivedStatus() == 3)
        {
            ResetBlockReceivedFlags();
-            if (sub_80B2AF4(gBlockRecvBuffer[0], gBlockRecvBuffer[1]))
+            if (AreBattleTowerLinkSpeciesSame(gBlockRecvBuffer[0], gBlockRecvBuffer[1]))
            {
-                gSpecialVar_Result = 11;
+                gSpecialVar_Result = LINKUP_FAILED_BATTLE_TOWER;
                data[0] = 7;
            }
            else