diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-08-25 22:13:55 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-08-25 22:13:55 -0500 |
| commit | b40b8dd1bbeb196231ca24a16553bd75490edce5 (patch) | |
| tree | 49e1fd92499e77a2d74af6885c1c7ec4a83a2cdb /src/battle_setup.c | |
| parent | 406ced34a1db5a700a542eb2b7a629b0e31c992d (diff) | |
| parent | 4df36cd814d6bf045d56bc4c30b611838333b705 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 04674e739..31c127416 100644 --- a/src/battle_setup.c +++ b/src/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; |