Removed trailing spaces in the most relevant files
Command used for the job: egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.
This commit is contained in:
+11
-11
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user