summaryrefslogtreecommitdiff
path: root/src/trainer_tower.c
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-08-04 15:23:09 -0700
committerultima-soul <akshayjhanji@hotmail.com>2019-08-04 15:23:09 -0700
commited90bf2430290853bd9376d53c70055fa07634be (patch)
tree39f67b5cbd0c0ef9e1a4763a052fd07924349940 /src/trainer_tower.c
parentbbc7c6ccfc7d59f61f406849f752fdd5038a6a80 (diff)
parentd58bf398b2b83a326d23d14d531de7f45a1058bb (diff)
Merge branch 'master' into pokedex_2
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)