summaryrefslogtreecommitdiff
path: root/src/trainer_tower.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-07-30 19:39:07 -0400
committerGitHub <noreply@github.com>2019-07-30 19:39:07 -0400
commit1a34a06758175b4d39ee0a81c3441ac958d005fd (patch)
tree6d45cd2c009eabf36e6a34550607bfa80cad5ed9 /src/trainer_tower.c
parentd4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff)
parentd4ace1162fd85d0531da5bf2296102bf1f503073 (diff)
Merge pull request #84 from jiangzhengwenjz/battle_transition
battle_transition
Diffstat (limited to 'src/trainer_tower.c')
-rw-r--r--src/trainer_tower.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index f1ae2d4e5..d80be781d 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -1111,7 +1111,7 @@ void sub_815E114(void)
void sub_815E124(u8 taskId)
{
- if (sub_80D08F8() == TRUE)
+ if (BT_IsDone() == TRUE)
{
gMain.savedCallback = sub_815E114;
CleanupOverworldWindowsAndTilemaps();
@@ -1129,7 +1129,7 @@ void sub_815E160(void)
sub_815E9FC();
CreateTask(sub_815E124, 1);
PlayMapChosenOrBattleBGM(0);
- sub_80D08B8(sub_8080060());
+ BT_StartOnField(sub_8080060());
}
void sub_815E1C0(void)