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:
+7
-7
@@ -759,7 +759,7 @@ static void Task_UpdatePage(u8 taskId)
|
||||
for (i = 0; i < ENTRIES_PER_PAGE; i++)
|
||||
PrintCreditsText(
|
||||
sCreditsEntryPointerTable[gTasks[taskId].tCurrentPage][i]->text,
|
||||
5 + i * 16,
|
||||
5 + i * 16,
|
||||
sCreditsEntryPointerTable[gTasks[taskId].tCurrentPage][i]->isTitle);
|
||||
CopyWindowToVram(0, 2);
|
||||
|
||||
@@ -911,9 +911,9 @@ static void Task_ShowMons(u8 taskId)
|
||||
case 2:
|
||||
if (sCreditsData->imgCounter == NUM_MON_SLIDES || gTasks[gTasks[taskId].tMainTaskId].func != Task_CreditsMain)
|
||||
break;
|
||||
spriteId = CreateCreditsMonSprite(sCreditsData->monToShow[sCreditsData->currShownMon],
|
||||
sMonSpritePos[sCreditsData->nextImgPos][0],
|
||||
sMonSpritePos[sCreditsData->nextImgPos][1],
|
||||
spriteId = CreateCreditsMonSprite(sCreditsData->monToShow[sCreditsData->currShownMon],
|
||||
sMonSpritePos[sCreditsData->nextImgPos][0],
|
||||
sMonSpritePos[sCreditsData->nextImgPos][1],
|
||||
sCreditsData->nextImgPos);
|
||||
if (sCreditsData->currShownMon < sCreditsData->numMonToShow - 1)
|
||||
{
|
||||
@@ -1532,7 +1532,7 @@ static u8 CreateCreditsMonSprite(u16 nationalDexNum, s16 x, s16 y, u16 position)
|
||||
|
||||
static void SpriteCB_CreditsMonBg(struct Sprite *sprite)
|
||||
{
|
||||
if (gSprites[sprite->sMonSpriteId].data[0] == 10
|
||||
if (gSprites[sprite->sMonSpriteId].data[0] == 10
|
||||
|| gIntroCredits_MovingSceneryState != INTROCRED_SCENERY_NORMAL)
|
||||
{
|
||||
DestroySprite(sprite);
|
||||
@@ -1554,7 +1554,7 @@ static void DeterminePokemonToShow(void)
|
||||
u16 page;
|
||||
u16 dexNum;
|
||||
u16 j;
|
||||
|
||||
|
||||
// Go through the Pokedex, and anything that has gotten caught we put into our massive array.
|
||||
// This basically packs all of the caught pokemon into the front of the array
|
||||
for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++)
|
||||
@@ -1584,7 +1584,7 @@ static void DeterminePokemonToShow(void)
|
||||
// Select a random mon, insert into array
|
||||
page = Random() % sCreditsData->numCaughtMon;
|
||||
sCreditsData->monToShow[j] = sCreditsData->caughtMonIds[page];
|
||||
|
||||
|
||||
// Remove the select mon from the array, and condense array entries
|
||||
j++;
|
||||
sCreditsData->caughtMonIds[page] = 0;
|
||||
|
||||
Reference in New Issue
Block a user