summaryrefslogtreecommitdiff
path: root/include/battle_transition.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-10-27 16:17:27 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-10-29 11:24:36 -0400
commit07bf225f9416b3d75fb69101d1d5ec87a19031b6 (patch)
treea3080c9735beded4c0e0eab0b2127a02e9ad4549 /include/battle_transition.h
parentbf87faa9225445a0b1065acada9398917558ba97 (diff)
Continue battle_transition documenting
Diffstat (limited to 'include/battle_transition.h')
-rw-r--r--include/battle_transition.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h
index e978e9094..1e7339fa2 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -4,7 +4,7 @@
void BattleTransition_StartOnField(u8 transitionId);
void BattleTransition_Start(u8 transitionId);
bool8 IsBattleTransitionDone(void);
-bool8 FldEff_Pokeball(void);
+bool8 FldEff_PokeballTrail(void);
void Task_BattleTransition_Intro(u8 taskId);
void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
@@ -25,13 +25,13 @@ enum {
B_TRANSITION_SHUFFLE,
B_TRANSITION_BIG_POKEBALL,
B_TRANSITION_POKEBALLS_TRAIL,
- B_TRANSITION_CLOCKWISE_BLACKFADE,
+ B_TRANSITION_CLOCKWISE_WIPE,
B_TRANSITION_RIPPLE,
B_TRANSITION_WAVE,
B_TRANSITION_SLICE,
- B_TRANSITION_WHITEFADE,
+ B_TRANSITION_WHITE_BARS_FADE,
B_TRANSITION_GRID_SQUARES,
- B_TRANSITION_SHARDS,
+ B_TRANSITION_ANGLED_WIPES,
B_TRANSITION_SIDNEY,
B_TRANSITION_PHOEBE,
B_TRANSITION_GLACIA,
@@ -46,8 +46,8 @@ enum {
B_TRANSITION_GROUDON,
B_TRANSITION_RAYQUAZA,
B_TRANSITION_SHRED_SPLIT,
- B_TRANSITION_BLACKHOLE1,
- B_TRANSITION_BLACKHOLE2,
+ B_TRANSITION_BLACKHOLE,
+ B_TRANSITION_BLACKHOLE_PULSATE,
B_TRANSITION_RECTANGULAR_SPIRAL,
B_TRANSITION_FRONTIER_LOGO_WIGGLE,
B_TRANSITION_FRONTIER_LOGO_WAVE,