summaryrefslogtreecommitdiff
path: root/src/hall_of_fame.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-09-24 10:17:34 -0400
committerGitHub <noreply@github.com>2021-09-24 10:17:34 -0400
commit42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch)
treedb4ae87659baced2022e440109306266c1c80e3b /src/hall_of_fame.c
parentf8f7617946e150514313267ba52a35ebd9052936 (diff)
parent09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff)
Merge branch 'master' into tag-none
Diffstat (limited to 'src/hall_of_fame.c')
-rw-r--r--src/hall_of_fame.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 929e019f1..5d8233b23 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -298,21 +298,21 @@ static const union AnimCmd sAnim_WhiteConfettiC[] =
static const union AnimCmd * const sAnims_Confetti[] =
{
- sAnim_PinkConfettiA,
- sAnim_RedConfettiA,
- sAnim_BlueConfettiA,
+ sAnim_PinkConfettiA,
+ sAnim_RedConfettiA,
+ sAnim_BlueConfettiA,
sAnim_RedConfettiB,
- sAnim_BlueConfettiB,
- sAnim_YellowConfettiA,
- sAnim_WhiteConfettiA,
+ sAnim_BlueConfettiB,
+ sAnim_YellowConfettiA,
+ sAnim_WhiteConfettiA,
sAnim_GreenConfettiA,
- sAnim_PinkConfettiB,
- sAnim_BlueConfettiC,
- sAnim_YellowConfettiB,
+ sAnim_PinkConfettiB,
+ sAnim_BlueConfettiC,
+ sAnim_YellowConfettiB,
sAnim_WhiteConfettiB,
- sAnim_GreenConfettiB,
- sAnim_PinkConfettiC,
- sAnim_RedConfettiC,
+ sAnim_GreenConfettiB,
+ sAnim_PinkConfettiC,
+ sAnim_RedConfettiC,
sAnim_YellowConfettiC,
sAnim_WhiteConfettiC
};
@@ -334,17 +334,17 @@ static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/misc/japanese_hof.4bpp
static const struct HallofFameMon sDummyFameMon =
{
- .tid = 0x3EA03EA,
- .personality = 0,
- .species = SPECIES_NONE,
- .lvl = 0,
+ .tid = 0x3EA03EA,
+ .personality = 0,
+ .species = SPECIES_NONE,
+ .lvl = 0,
.nick = {0}
};
// Unused, order of party slots on Hall of Fame screen
static const u8 sHallOfFame_SlotOrder[] = {
- 2, 1, 3,
- 6, 4, 5,
+ 2, 1, 3,
+ 6, 4, 5,
0, 0
};
@@ -662,7 +662,7 @@ static void Task_Hof_DoConfetti(u8 taskId)
if (gTasks[taskId].tFrameCount != 0)
{
gTasks[taskId].tFrameCount--;
-
+
// Create new confetti every 4th frame for the first 290 frames
// For the last 110 frames wait for the existing confetti to fall offscreen
if ((gTasks[taskId].tFrameCount & 3) == 0 && gTasks[taskId].tFrameCount > 110)
@@ -1507,12 +1507,12 @@ static void Task_DoDomeConfetti(u8 taskId)
if (tTimer != 0 && tTimer % 3 == 0)
{
// Create new confetti every 3 frames
- id = ConfettiUtil_AddNew(&sOamData_Confetti,
- TAG_CONFETTI,
- TAG_CONFETTI,
- Random() % DISPLAY_WIDTH,
- -(Random() % 8),
- Random() % ARRAY_COUNT(sAnims_Confetti),
+ id = ConfettiUtil_AddNew(&sOamData_Confetti,
+ TAG_CONFETTI,
+ TAG_CONFETTI,
+ Random() % DISPLAY_WIDTH,
+ -(Random() % 8),
+ Random() % ARRAY_COUNT(sAnims_Confetti),
id);
if (id != 0xFF)
{