summaryrefslogtreecommitdiff
path: root/src/cable_club.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-05-30 04:09:21 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-05-31 13:11:18 -0400
commit4fe507e4539f2c349a7297c31f66893bbf775ff5 (patch)
treec635a3405cd1b11fd17479d28fe3040daec77714 /src/cable_club.c
parent24075e9e7299327288737d7347e9c83ac391c787 (diff)
Document union_room.c
Diffstat (limited to 'src/cable_club.c')
-rw-r--r--src/cable_club.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cable_club.c b/src/cable_club.c
index c2ac72883..2a53c64b2 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -849,7 +849,7 @@ static void sub_80B32B4(u8 taskId)
CleanupOverworldWindowsAndTilemaps();
gTrainerBattleOpponent_A = 0x800;
SetMainCallback2(CB2_InitBattle);
- gMain.savedCallback = sub_80B360C;
+ gMain.savedCallback = CB2_ReturnFromCableClubBattle;
DestroyTask(taskId);
break;
}
@@ -915,7 +915,7 @@ static void sub_80B33BC(u8 taskId)
CleanupOverworldWindowsAndTilemaps();
gTrainerBattleOpponent_A = 0x800;
SetMainCallback2(CB2_InitBattle);
- gMain.savedCallback = sub_80B360C;
+ gMain.savedCallback = CB2_ReturnFromCableClubBattle;
DestroyTask(taskId);
break;
}
@@ -965,7 +965,7 @@ static void sub_80B3554(void)
RunTasks();
}
-void sub_80B360C(void)
+void CB2_ReturnFromCableClubBattle(void)
{
gBattleTypeFlags &= ~BATTLE_TYPE_20;
Overworld_ResetMapMusic();
@@ -1129,7 +1129,7 @@ static void sub_80B3894(u8 taskId)
case 3:
if (IsLinkTaskFinished())
{
- sub_8013F78();
+ CreateTask_ReturnFromLinkTrade();
DestroyTask(taskId);
}
break;