diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 15:42:40 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 16:06:44 -0800 |
| commit | 267ada5ce6e2876c4df64275da9ee879a385c6f6 (patch) | |
| tree | 559417726bbd5f3b18c153c1435f872decfe18b1 /include/battle_transition.h | |
| parent | 20d00c58ef49fa88533fa07ab1801c381f02b7bf (diff) | |
| parent | 67ad331441f29545b84d152cbbb4f188098a9c5a (diff) | |
Merge remote-tracking branch 'upstream/master' into 80c
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 |