diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-03 18:00:53 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-06-06 16:10:03 -0400 |
| commit | 3f97763181c486cf537ac187036b086e1f222cfc (patch) | |
| tree | 07ea98a326f5bbd570f7babc94f2662c4833f43d /src/union_room.c | |
| parent | 9190af73b7ebe690be7204c023d4c14d0241af29 (diff) | |
Document cable_club.c
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/union_room.c b/src/union_room.c index a13f57c79..8f49add80 100644 --- 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 |