diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-26 21:24:02 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-26 21:24:02 -0400 |
commit | 47b9907ec58c55759a95aed1f31e92fb72031a5f (patch) | |
tree | 5a473edae75105a009135ded3d096f133c34d72b /src/battle/battle_setup.c | |
parent | 613fd1aa059d6894662566049840f3e1fd8cb02e (diff) | |
parent | 1a33ca381de71bb3b4b250a2f3b41b0c15ed5f21 (diff) |
merge
Diffstat (limited to 'src/battle/battle_setup.c')
-rw-r--r-- | src/battle/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 04674e739..31c127416 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -438,7 +438,7 @@ void task01_battle_start(u8 taskId) } break; case 1: - if (sub_811AAE8() == TRUE) + if (IsBattleTransitionDone() == TRUE) { SetMainCallback2(sub_800E7C4); prev_quest_postbuffer_cursor_backup_reset(); @@ -827,7 +827,7 @@ void CB2_StartFirstBattle(void) UpdatePaletteFade(); RunTasks(); - if (sub_811AAE8() == TRUE) + if (IsBattleTransitionDone() == TRUE) { gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE; gMain.savedCallback = HandleFirstBattleEnd; |