diff options
author | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
---|---|---|
committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
commit | d87ed69449da253a374170a8135200657fb0426b (patch) | |
tree | 94baba568fc6dd25d082b309746198d41d07bd1b /include/battle_transition.h | |
parent | aecddc277130652a90e00ad0cc314b7ef9765bbb (diff) | |
parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) |
Merge branch 'master' into field_effect_helpers
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 |