diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
commit | 6235276ca255a2b345c3a97be23c6b53be6eba0f (patch) | |
tree | 81930ebec5d50f4b44575b28979549c34f2e1b0e /include/battle_transition.h | |
parent | 170c82f299905b6e55b20a5c2c04f92353131d0e (diff) | |
parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) |
Merge branch 'master' into daycare
Diffstat (limited to 'include/battle_transition.h')
-rw-r--r-- | include/battle_transition.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h index ca6869c93..0b8766e87 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -1,8 +1,8 @@ #ifndef GUARD_BATTLE_TRANSITION_H #define GUARD_BATTLE_TRANSITION_H -void sub_811AABC(u8 transitionID); -void sub_811AAD8(u8 transitionID); +void BattleTransition_StartOnField(u8 transitionID); +void BattleTransition_Start(u8 transitionID); bool8 IsBattleTransitionDone(void); #define TRANSITIONS_NO 17 |