summaryrefslogtreecommitdiff
path: root/src/intro.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-09-23 21:49:49 -0400
committerGitHub <noreply@github.com>2021-09-23 21:49:49 -0400
commit9d0f9042febd46d506110778a3beeec90c8c9c1e (patch)
treec3bf2f4b0b3183de111bfcc89fac3316f562c937 /src/intro.c
parent0c2e9a5b4c1c0c0f2a62be6165e826760dd572cb (diff)
parenta6ab2eb883b4cef727a6caee993745cfeff1274b (diff)
Merge pull request #1498 from LOuroboros/trailingSpaces
Removed trailing spaces in the most relevant files
Diffstat (limited to 'src/intro.c')
-rw-r--r--src/intro.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/intro.c b/src/intro.c
index 9fe9169da..d027c7230 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1421,7 +1421,7 @@ static void Task_Scene2_BikeRide(u8 taskId)
gIntroCredits_MovingSceneryState = INTROCRED_SCENERY_FROZEN;
DestroyTask(gTasks[taskId].tBgAnimTaskId);
}
-
+
if (gIntroFrameCounter > TIMER_END_SCENE_2)
{
// Fade out to next scene
@@ -1671,7 +1671,7 @@ static void SpriteCB_Manectric(struct Sprite *sprite)
sprite->x -= 2;
if (gIntroFrameCounter != TIMER_MANECTRIC_RUN_CIRCULAR)
break;
-
+
// Initialize circular pattern running
sprite->y -= 12;
sprite->sSinIdx = 0x80;
@@ -2205,7 +2205,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
}
}
-#undef tScreenX
+#undef tScreenX
#undef tScreenY
#undef tZoom
#undef tDelay
@@ -2219,7 +2219,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
#define sUnk data[7] // Never read
// taskId is used inconsistently for these two functions.
-// The sprite callback for the bubbles will always read it, unless delay is 0 to
+// The sprite callback for the bubbles will always read it, unless delay is 0 to
// start (it never is), but the first function is often passed 0 instead of a
// taskId, and the second function doesn't take/assign a taskId at all.
// The only time an actual taskId is given is when it actually needs the
@@ -2233,9 +2233,9 @@ static void CreateKyogreBubbleSprites_Body(u8 taskId)
for (i = 0; i < NUM_BUBBLES_IN_SET; i++)
{
- spriteId = CreateSprite(&sSpriteTemplate_Bubbles,
- sKyogreBubbleData[i][0],
- sKyogreBubbleData[i][1],
+ spriteId = CreateSprite(&sSpriteTemplate_Bubbles,
+ sKyogreBubbleData[i][0],
+ sKyogreBubbleData[i][1],
i);
gSprites[spriteId].invisible = TRUE;
gSprites[spriteId].sTaskId = taskId;
@@ -2252,14 +2252,14 @@ static void CreateKyogreBubbleSprites_Fins(void)
for (i = 0; i < NUM_BUBBLES_IN_SET; i++)
{
- spriteId = CreateSprite(&sSpriteTemplate_Bubbles,
- sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][0],
- sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][1],
+ spriteId = CreateSprite(&sSpriteTemplate_Bubbles,
+ sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][0],
+ sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][1],
i);
gSprites[spriteId].invisible = TRUE;
#ifdef BUGFIX
gSprites[spriteId].sDelay = sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][2];
-#else
+#else
gSprites[spriteId].sDelay = sKyogreBubbleData[i][2]; // Using the wrong set of delays here
#endif
gSprites[spriteId].sUnk = 64;