diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-23 21:49:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 21:49:49 -0400 |
| commit | 9d0f9042febd46d506110778a3beeec90c8c9c1e (patch) | |
| tree | c3bf2f4b0b3183de111bfcc89fac3316f562c937 /src/hall_of_fame.c | |
| parent | 0c2e9a5b4c1c0c0f2a62be6165e826760dd572cb (diff) | |
| parent | a6ab2eb883b4cef727a6caee993745cfeff1274b (diff) | |
Merge pull request #1498 from LOuroboros/trailingSpaces
Removed trailing spaces in the most relevant files
Diffstat (limited to 'src/hall_of_fame.c')
| -rw-r--r-- | src/hall_of_fame.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 590c0d01d..e9d6b6070 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) { |