From a612c27f2ded23f713b2199764b65c6b8b4aaf9d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 25 Oct 2021 10:20:48 -0400 Subject: Drop battle transition 'phase' terminology --- include/battle_transition.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 784c5f968..e978e9094 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -1,12 +1,11 @@ #ifndef GUARD_BATTLE_TRANSITION_H #define GUARD_BATTLE_TRANSITION_H -void TestBattleTransition(u8 transitionId); void BattleTransition_StartOnField(u8 transitionId); void BattleTransition_Start(u8 transitionId); bool8 IsBattleTransitionDone(void); bool8 FldEff_Pokeball(void); -void TransitionPhase1_Task_RunFuncs(u8 taskId); +void Task_BattleTransition_Intro(u8 taskId); void GetBg0TilesDst(u16 **tilemap, u16 **tileset); extern const struct SpritePalette gSpritePalette_Pokeball; -- cgit v1.2.3 From 07bf225f9416b3d75fb69101d1d5ec87a19031b6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 27 Oct 2021 16:17:27 -0400 Subject: Continue battle_transition documenting --- include/battle_transition.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/battle_transition.h') 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, -- cgit v1.2.3