diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
| commit | 2d141bc612ffecc984f6b4238c2791ba8419a192 (patch) | |
| tree | 04800ef37ba17134a216c3e679a1d0bb046f0bf8 /src/battle_setup.c | |
| parent | e1f2f7d5daee0fead0b8aed8413977e7cad990eb (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (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; |