summaryrefslogtreecommitdiff
path: root/src/trainer_tower.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-26 10:23:13 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-26 10:23:13 -0400
commit93f0703fcdda810062071fde4febe111146c18cc (patch)
tree241164c7e5fd5e71a9e3eca6eb8d6a918566d963 /src/trainer_tower.c
parentfd78afa5a7d4441fe0d76693e301deb6bc2557dc (diff)
parent1f569f0136952135a0e17fe22cf180c0e87dd007 (diff)
Merge branch 'master' of github.com:pret/pokefirered into script_menu
Diffstat (limited to 'src/trainer_tower.c')
-rw-r--r--src/trainer_tower.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 5acac299f..cd796bf3a 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -940,7 +940,7 @@ static void sub_815E124(u8 taskId)
{
gMain.savedCallback = sub_815E114;
CleanupOverworldWindowsAndTilemaps();
- SetMainCallback2(sub_800FD9C);
+ SetMainCallback2(CB2_InitBattle);
DestroyTask(taskId);
}
}