diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-26 06:45:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 06:45:00 -0400 |
| commit | eafb77fbb912d22294f168c1e6e89575b35f0d6c (patch) | |
| tree | 286f735ca16bd576926197f4f6a80ab6f0c24dc4 /src/trainer_tower.c | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
| parent | 0ae4d58e985dcc3d265ea30505f439c34eab21ab (diff) | |
Merge pull request #125 from jiangzhengwenjz/battle
battle (3rd take)
Diffstat (limited to 'src/trainer_tower.c')
| -rw-r--r-- | src/trainer_tower.c | 2 |
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); } } |