ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/battle_transition.h
View File

@ -1,12 +1,11 @@
#ifndef GUARD_BATTLE_TRANSITION_H #ifndef GUARD_BATTLE_TRANSITION_H
#define GUARD_BATTLE_TRANSITION_H #define GUARD_BATTLE_TRANSITION_H
void TestBattleTransition(u8 transitionId);
void BattleTransition_StartOnField(u8 transitionId); void BattleTransition_StartOnField(u8 transitionId);
void BattleTransition_Start(u8 transitionId); void BattleTransition_Start(u8 transitionId);
bool8 IsBattleTransitionDone(void); bool8 IsBattleTransitionDone(void);
bool8 FldEff_Pokeball(void); bool8 FldEff_Pokeball(void);
void TransitionPhase1_Task_RunFuncs(u8 taskId); void Task_BattleTransition_Intro(u8 taskId);
void GetBg0TilesDst(u16 **tilemap, u16 **tileset); void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
extern const struct SpritePalette gSpritePalette_Pokeball; extern const struct SpritePalette gSpritePalette_Pokeball;

16
include/battle_transition_frontier.h
View File

@ -1,13 +1,13 @@
#ifndef GUARD_BATTLE_TRANSITION_FRONTIER_H #ifndef GUARD_BATTLE_TRANSITION_FRONTIER_H
#define GUARD_BATTLE_TRANSITION_FRONTIER_H #define GUARD_BATTLE_TRANSITION_FRONTIER_H
void Phase2Task_FrontierCirclesMeet(u8 taskId); void Task_FrontierCirclesMeet(u8 taskId);
void Phase2Task_FrontierCirclesCross(u8 taskId); void Task_FrontierCirclesCross(u8 taskId);
void Phase2Task_FrontierCirclesAsymmetricSpiral(u8 taskId); void Task_FrontierCirclesAsymmetricSpiral(u8 taskId);
void Phase2Task_FrontierCirclesSymmetricSpiral(u8 taskId); void Task_FrontierCirclesSymmetricSpiral(u8 taskId);
void Phase2Task_FrontierCirclesMeetInSeq(u8 taskId); void Task_FrontierCirclesMeetInSeq(u8 taskId);
void Phase2Task_FrontierCirclesCrossInSeq(u8 taskId); void Task_FrontierCirclesCrossInSeq(u8 taskId);
void Phase2Task_FrontierCirclesAsymmetricSpiralInSeq(u8 taskId); void Task_FrontierCirclesAsymmetricSpiralInSeq(u8 taskId);
void Phase2Task_FrontierCirclesSymmetricSpiralInSeq(u8 taskId); void Task_FrontierCirclesSymmetricSpiralInSeq(u8 taskId);
#endif // GUARD_BATTLE_TRANSITION_FRONTIER_H #endif // GUARD_BATTLE_TRANSITION_FRONTIER_H

1361
src/battle_transition.c
View File

File diff suppressed because it is too large Load Diff

67
src/battle_transition_frontier.c
View File

@ -21,7 +21,6 @@
typedef bool8 (*TransitionStateFunc)(struct Task *task); typedef bool8 (*TransitionStateFunc)(struct Task *task);
// this file's functions
static void SpriteCB_LogoCircleSlide(struct Sprite *sprite); static void SpriteCB_LogoCircleSlide(struct Sprite *sprite);
static void SpriteCB_LogoCircleSpiral(struct Sprite *sprite); static void SpriteCB_LogoCircleSpiral(struct Sprite *sprite);
static bool8 WaitForLogoCirclesAnim(struct Task *task); static bool8 WaitForLogoCirclesAnim(struct Task *task);
@ -46,7 +45,6 @@ static bool8 CirclesSymmetricSpiralInSeq_End(struct Task *task);
#define PALTAG_LOGO_CIRCLES 0x2E90 #define PALTAG_LOGO_CIRCLES 0x2E90
// const rom data
static const u32 sLogoCenter_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.4bpp.lz"); static const u32 sLogoCenter_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.4bpp.lz");
static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.bin"); static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_center.bin");
static const u32 sLogoCircles_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_circles.4bpp.lz"); static const u32 sLogoCircles_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_circles.4bpp.lz");
@ -121,7 +119,7 @@ static const struct SpriteTemplate sSpriteTemplate_LogoCircles =
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesMeet_Funcs[] = static const TransitionStateFunc sFrontierCirclesMeet_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesMeet_CreateSprites, CirclesMeet_CreateSprites,
@ -130,7 +128,7 @@ static const TransitionStateFunc sPhase2_FrontierCirclesMeet_Funcs[] =
CirclesMeet_End CirclesMeet_End
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesCross_Funcs[] = static const TransitionStateFunc sFrontierCirclesCross_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesCross_CreateSprites, CirclesCross_CreateSprites,
@ -139,7 +137,7 @@ static const TransitionStateFunc sPhase2_FrontierCirclesCross_Funcs[] =
CirclesCross_End CirclesCross_End
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesAsymmetricSpiral_Funcs[] = static const TransitionStateFunc sFrontierCirclesAsymmetricSpiral_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesAsymmetricSpiral_CreateSprites, CirclesAsymmetricSpiral_CreateSprites,
@ -148,7 +146,7 @@ static const TransitionStateFunc sPhase2_FrontierCirclesAsymmetricSpiral_Funcs[]
CirclesAsymmetricSpiral_End CirclesAsymmetricSpiral_End
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesSymmetricSpiral_Funcs[] = static const TransitionStateFunc sFrontierCirclesSymmetricSpiral_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesSymmetricSpiral_CreateSprites, CirclesSymmetricSpiral_CreateSprites,
@ -157,7 +155,7 @@ static const TransitionStateFunc sPhase2_FrontierCirclesSymmetricSpiral_Funcs[]
CirclesSymmetricSpiral_End CirclesSymmetricSpiral_End
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesMeetInSeq_Funcs[] = static const TransitionStateFunc sFrontierCirclesMeetInSeq_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesMeetInSeq_CreateSprites, CirclesMeetInSeq_CreateSprites,
@ -166,7 +164,7 @@ static const TransitionStateFunc sPhase2_FrontierCirclesMeetInSeq_Funcs[] =
CirclesMeetInSeq_End CirclesMeetInSeq_End
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesCrossInSeq_Funcs[] = static const TransitionStateFunc sFrontierCirclesCrossInSeq_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesCrossInSeq_CreateSprites, CirclesCrossInSeq_CreateSprites,
@ -175,7 +173,7 @@ static const TransitionStateFunc sPhase2_FrontierCirclesCrossInSeq_Funcs[] =
CirclesCrossInSeq_End CirclesCrossInSeq_End
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesAsymmetricSpiralInSeq_Funcs[] = static const TransitionStateFunc sFrontierCirclesAsymmetricSpiralInSeq_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesAsymmetricSpiralInSeq_CreateSprites, CirclesAsymmetricSpiralInSeq_CreateSprites,
@ -184,7 +182,7 @@ static const TransitionStateFunc sPhase2_FrontierCirclesAsymmetricSpiralInSeq_Fu
CirclesAsymmetricSpiralInSeq_End CirclesAsymmetricSpiralInSeq_End
}; };
static const TransitionStateFunc sPhase2_FrontierCirclesSymmetricSpiralInSeq_Funcs[] = static const TransitionStateFunc sFrontierCirclesSymmetricSpiralInSeq_Funcs[] =
{ {
Circles_Init, Circles_Init,
CirclesSymmetricSpiralInSeq_CreateSprites, CirclesSymmetricSpiralInSeq_CreateSprites,
@ -193,7 +191,6 @@ static const TransitionStateFunc sPhase2_FrontierCirclesSymmetricSpiralInSeq_Fun
CirclesSymmetricSpiralInSeq_End CirclesSymmetricSpiralInSeq_End
}; };
// code
static void LoadLogoGfx(void) static void LoadLogoGfx(void)
{ {
u16 *dst1, *dst2; u16 *dst1, *dst2;
@ -401,9 +398,9 @@ static bool8 WaitForLogoCirclesAnim(struct Task *task)
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesMeet(u8 taskId) void Task_FrontierCirclesMeet(u8 taskId)
{ {
while (sPhase2_FrontierCirclesMeet_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesMeet_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesMeet_CreateSprites(struct Task *task) static bool8 CirclesMeet_CreateSprites(struct Task *task)
@ -421,15 +418,15 @@ static bool8 CirclesMeet_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesMeet)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesMeet));
} }
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesCross(u8 taskId) void Task_FrontierCirclesCross(u8 taskId)
{ {
while (sPhase2_FrontierCirclesCross_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesCross_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesCross_CreateSprites(struct Task *task) static bool8 CirclesCross_CreateSprites(struct Task *task)
@ -447,15 +444,15 @@ static bool8 CirclesCross_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesCross)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesCross));
} }
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesAsymmetricSpiral(u8 taskId) void Task_FrontierCirclesAsymmetricSpiral(u8 taskId)
{ {
while (sPhase2_FrontierCirclesAsymmetricSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesAsymmetricSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesAsymmetricSpiral_CreateSprites(struct Task *task) static bool8 CirclesAsymmetricSpiral_CreateSprites(struct Task *task)
@ -473,15 +470,15 @@ static bool8 CirclesAsymmetricSpiral_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesAsymmetricSpiral)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesAsymmetricSpiral));
} }
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesSymmetricSpiral(u8 taskId) void Task_FrontierCirclesSymmetricSpiral(u8 taskId)
{ {
while (sPhase2_FrontierCirclesSymmetricSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesSymmetricSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesSymmetricSpiral_CreateSprites(struct Task *task) static bool8 CirclesSymmetricSpiral_CreateSprites(struct Task *task)
@ -499,15 +496,15 @@ static bool8 CirclesSymmetricSpiral_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesSymmetricSpiral)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesSymmetricSpiral));
} }
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesMeetInSeq(u8 taskId) void Task_FrontierCirclesMeetInSeq(u8 taskId)
{ {
while (sPhase2_FrontierCirclesMeetInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesMeetInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesMeetInSeq_CreateSprites(struct Task *task) static bool8 CirclesMeetInSeq_CreateSprites(struct Task *task)
@ -535,15 +532,15 @@ static bool8 CirclesMeetInSeq_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesMeetInSeq)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesMeetInSeq));
} }
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesCrossInSeq(u8 taskId) void Task_FrontierCirclesCrossInSeq(u8 taskId)
{ {
while (sPhase2_FrontierCirclesCrossInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesCrossInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesCrossInSeq_CreateSprites(struct Task *task) static bool8 CirclesCrossInSeq_CreateSprites(struct Task *task)
@ -571,15 +568,15 @@ static bool8 CirclesCrossInSeq_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesCrossInSeq)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesCrossInSeq));
} }
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesAsymmetricSpiralInSeq(u8 taskId) void Task_FrontierCirclesAsymmetricSpiralInSeq(u8 taskId)
{ {
while (sPhase2_FrontierCirclesAsymmetricSpiralInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesAsymmetricSpiralInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesAsymmetricSpiralInSeq_CreateSprites(struct Task *task) static bool8 CirclesAsymmetricSpiralInSeq_CreateSprites(struct Task *task)
@ -607,15 +604,15 @@ static bool8 CirclesAsymmetricSpiralInSeq_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesAsymmetricSpiralInSeq)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesAsymmetricSpiralInSeq));
} }
return FALSE; return FALSE;
} }
void Phase2Task_FrontierCirclesSymmetricSpiralInSeq(u8 taskId) void Task_FrontierCirclesSymmetricSpiralInSeq(u8 taskId)
{ {
while (sPhase2_FrontierCirclesSymmetricSpiralInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId])); while (sFrontierCirclesSymmetricSpiralInSeq_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
} }
static bool8 CirclesSymmetricSpiralInSeq_CreateSprites(struct Task *task) static bool8 CirclesSymmetricSpiralInSeq_CreateSprites(struct Task *task)
@ -643,7 +640,7 @@ static bool8 CirclesSymmetricSpiralInSeq_End(struct Task *task)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
DestroyLogoCirclesGfx(task); DestroyLogoCirclesGfx(task);
DestroyTask(FindTaskIdByFunc(Phase2Task_FrontierCirclesSymmetricSpiralInSeq)); DestroyTask(FindTaskIdByFunc(Task_FrontierCirclesSymmetricSpiralInSeq));
} }
return FALSE; return FALSE;

4
src/tileset_anims.c
View File

@ -1169,7 +1169,7 @@ static void BlendAnimPalette_BattleDome_FloorLights(u16 timer)
{ {
CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32);
BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != TASK_NONE) if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) != TASK_NONE)
{ {
sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2; sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2;
sSecondaryTilesetAnimCounterMax = 32; sSecondaryTilesetAnimCounterMax = 32;
@ -1179,7 +1179,7 @@ static void BlendAnimPalette_BattleDome_FloorLights(u16 timer)
static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer)
{ {
CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32);
if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == TASK_NONE) if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) == TASK_NONE)
{ {
BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
if (!--sSecondaryTilesetAnimCounterMax) if (!--sSecondaryTilesetAnimCounterMax)