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:
@@ -1404,7 +1404,7 @@ static void Select_HandleMonSelectionChange(void)
|
||||
if (sFactorySelectScreen->mons[cursorPos].selectedId) // Deselect a mon.
|
||||
{
|
||||
paletteNum = IndexOfSpritePaletteTag(PALTAG_BALL_GRAY);
|
||||
if (sFactorySelectScreen->selectingMonsState == FRONTIER_PARTY_SIZE
|
||||
if (sFactorySelectScreen->selectingMonsState == FRONTIER_PARTY_SIZE
|
||||
&& sFactorySelectScreen->mons[cursorPos].selectedId == 1)
|
||||
{
|
||||
for (i = 0; i < SELECTABLE_MONS_COUNT; i++)
|
||||
@@ -3057,7 +3057,7 @@ static void Swap_Task_ScreenInfoTransitionOut(u8 taskId)
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
if (gTasks[taskId].tSlideFinishedPkmn == TRUE
|
||||
if (gTasks[taskId].tSlideFinishedPkmn == TRUE
|
||||
&& gTasks[taskId].tSlideFinishedCancel == TRUE)
|
||||
{
|
||||
gTasks[taskId].tState = gTasks[taskId].tFollowUpTaskState;
|
||||
@@ -3123,7 +3123,7 @@ static void Swap_Task_ScreenInfoTransitionIn(u8 taskId)
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (gTasks[taskId].tSlideFinishedPkmn == TRUE
|
||||
if (gTasks[taskId].tSlideFinishedPkmn == TRUE
|
||||
&& gTasks[taskId].tSlideFinishedCancel == TRUE)
|
||||
{
|
||||
gPlttBufferFaded[226] = sPokeballGray_Pal[37];
|
||||
@@ -3205,7 +3205,7 @@ static void Swap_Task_SwitchPartyScreen(u8 taskId)
|
||||
gTasks[taskId].tState++;
|
||||
break;
|
||||
case 3:
|
||||
if (!FuncIsActiveTask(Swap_Task_SlideCycleBalls)
|
||||
if (!FuncIsActiveTask(Swap_Task_SlideCycleBalls)
|
||||
&& gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].tFadeOutFinished == TRUE)
|
||||
{
|
||||
Swap_EraseSpeciesWindow();
|
||||
@@ -3679,7 +3679,7 @@ static void Swap_HideActionButtonHighlights(void)
|
||||
{
|
||||
// Hide button highlight on "Pkmn for Swap"
|
||||
gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][i]].invisible = TRUE;
|
||||
|
||||
|
||||
// Hide button highlight on Cancel
|
||||
if (i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0]))
|
||||
gSprites[sFactorySwapScreen->cancelButtonSpriteIds[1][i]].invisible = TRUE;
|
||||
|
||||
Reference in New Issue
Block a user