diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-08-24 17:14:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 17:14:00 -0500 |
| commit | 7db1772ece6ceac2a7b22ae6c8f7bf7891a26812 (patch) | |
| tree | f3491eadda9a2b7b3a653379e5964bd6366ae7ae /src/battle_setup.c | |
| parent | 33e3813b68aabb0e5ccf471c9f4e24f4ac478097 (diff) | |
| parent | 8bd3b74b8dcce8b18a3310f61a07ecd4d98ec0a5 (diff) | |
Merge pull request #410 from DizzyEggg/decompile_battle_transition
decompile battle transition
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; |