diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
| commit | fba22dbd24a797a45345dbc7e0ff8fb520ecba19 (patch) | |
| tree | 961ec5145112e039542f50a79032a06481cf12a0 /src/trainer_tower.c | |
| parent | 9b3b3244f7dad9c0a1d6335a8786da1fdfedd870 (diff) | |
| parent | 1a34a06758175b4d39ee0a81c3441ac958d005fd (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/trainer_tower.c')
| -rw-r--r-- | src/trainer_tower.c | 4 |
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) |