dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Drop battle transition 'phase' terminology

Browse Source
This commit is contained in:
GriffinR
2021-10-25 10:20:48 -04:00
parent 6dc3c9864c
commit a612c27f2d
5 changed files with 723 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_transition.h
+1 -2
View File
@@ -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;
include/battle_transition_frontier.h
+8 -8
View File
@@ -1,13 +1,13 @@
#ifndef GUARD_BATTLE_TRANSITION_FRONTIER_H
#define GUARD_BATTLE_TRANSITION_FRONTIER_H
void Phase2Task_FrontierCirclesMeet(u8 taskId);
void Phase2Task_FrontierCirclesCross(u8 taskId);
void Phase2Task_FrontierCirclesAsymmetricSpiral(u8 taskId);
void Phase2Task_FrontierCirclesSymmetricSpiral(u8 taskId);
void Phase2Task_FrontierCirclesMeetInSeq(u8 taskId);
void Phase2Task_FrontierCirclesCrossInSeq(u8 taskId);
void Phase2Task_FrontierCirclesAsymmetricSpiralInSeq(u8 taskId);
void Phase2Task_FrontierCirclesSymmetricSpiralInSeq(u8 taskId);
void Task_FrontierCirclesMeet(u8 taskId);
void Task_FrontierCirclesCross(u8 taskId);
void Task_FrontierCirclesAsymmetricSpiral(u8 taskId);
void Task_FrontierCirclesSymmetricSpiral(u8 taskId);
void Task_FrontierCirclesMeetInSeq(u8 taskId);
void Task_FrontierCirclesCrossInSeq(u8 taskId);
void Task_FrontierCirclesAsymmetricSpiralInSeq(u8 taskId);
void Task_FrontierCirclesSymmetricSpiralInSeq(u8 taskId);
#endif // GUARD_BATTLE_TRANSITION_FRONTIER_H