summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-02-29 21:00:31 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2020-02-29 21:00:31 -0500
commitc36ef94a0dae1e60a8e641aced35ee2084c183eb (patch)
treef2da1e7beaddf0579426a18519d7c331d7ff19e1 /src
parentcbd380f2bf6738ec9222a2284e9de2297f0dc413 (diff)
address review comments
Diffstat (limited to 'src')
-rw-r--r--src/cable_club.c6
-rw-r--r--src/union_room.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cable_club.c b/src/cable_club.c
index c2f87a7a7..e7277ed07 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -26,7 +26,7 @@
#include "constants/cable_club.h"
#include "constants/field_weather.h"
-u32 UnusedVarNeededToMatch;
+u32 UnusedVarNeededToMatch[8];
static void Task_Linkup0(u8 taskId);
static void Task_Linkup1(u8 taskId);
@@ -403,7 +403,7 @@ static void Task_Linkup_6a(u8 taskId)
{
// Dumb trick required to match
if (gLinkType == LINKTYPE_0x4411)
- UnusedVarNeededToMatch += 0;
+ *UnusedVarNeededToMatch += 0;
DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]);
EnableBothScriptContexts();
DestroyTask(taskId);
@@ -876,7 +876,7 @@ static void Task_StartWirelessCableClubTrade(u8 taskId)
case 3:
if (IsLinkTaskFinished())
{
- UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade();
+ UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade();
DestroyTask(taskId);
}
break;
diff --git a/src/union_room.c b/src/union_room.c
index 03517b408..f4169b65b 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1735,7 +1735,7 @@ static void Task_CallCB2ReturnFromLinkTrade(u8 taskId)
DestroyTask(taskId);
}
-u8 UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade(void)
+u8 UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade(void)
{
u8 taskId = CreateTask(Task_CallCB2ReturnFromLinkTrade, 0);