dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Removed trailing spaces in the most relevant files

Browse Source 
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:
LOuroboros
2021-08-24 19:59:32 -03:00
parent 63e6b914e4
commit 554210c5e3
466 changed files with 26928 additions and 26928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade.c
+10 -10
View File
@@ -773,8 +773,8 @@ static void CB2_ReturnToTradeMenu(void)
else
sTradeMenuData->cursorPosition = gLastViewedMonIndex + PARTY_SIZE;
sTradeMenuData->cursorSpriteId = CreateSprite(&sSpriteTemplate_Cursor,
sTradeMonSpriteCoords[sTradeMenuData->cursorPosition][0] * 8 + 32,
sTradeMenuData->cursorSpriteId = CreateSprite(&sSpriteTemplate_Cursor,
sTradeMonSpriteCoords[sTradeMenuData->cursorPosition][0] * 8 + 32,
sTradeMonSpriteCoords[sTradeMenuData->cursorPosition][1] * 8, 2);
gMain.state = 16;
break;
@@ -1545,8 +1545,8 @@ static bool32 CheckMonsBeforeTrade(void)
aliveMons[i] = sTradeMenuData->isLiveMon[TRADE_PLAYER][i];
}
switch (CheckValidityOfTradeMons(aliveMons, sTradeMenuData->partyCounts[TRADE_PLAYER],
sTradeMenuData->cursorPosition,
switch (CheckValidityOfTradeMons(aliveMons, sTradeMenuData->partyCounts[TRADE_PLAYER],
sTradeMenuData->cursorPosition,
sTradeMenuData->partnerCursorPosition))
{
case PLAYER_MON_INVALID:
@@ -1588,7 +1588,7 @@ static void ConfirmOrCancelTrade(void)
}
}
// Only when choosing Yes to cancel, when No is chosen all are redrawn anyway
// Only when choosing Yes to cancel, when No is chosen all are redrawn anyway
static void RestoreNicknamesCoveredByYesNo(void)
{
int i;
@@ -3612,7 +3612,7 @@ static bool8 AnimateTradeSequenceCable(void)
case TS_STATE_CROSSING_MON_PICS_MOVE:
gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 -= 3;
gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y2 += 3;
if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 < -DISPLAY_HEIGHT
if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 < -DISPLAY_HEIGHT
&& gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 >= -DISPLAY_HEIGHT - 3)
{
PlaySE(SE_WARP_IN);
@@ -3979,7 +3979,7 @@ static bool8 AnimateTradeSequenceWireless(void)
BLDCNT_EFFECT_BLEND |
BLDCNT_TGT2_BG2);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 4));
// Start wireless signal effect
CreateTask(Task_AnimateWirelessSignal, 5);
sTradeData->state++;
@@ -4264,9 +4264,9 @@ static bool8 AnimateTradeSequenceWireless(void)
case TS_STATE_POKEBALL_ARRIVE_WAIT:
if (gSprites[sTradeData->bouncingPokeballSpriteId].callback == SpriteCallbackDummy)
{
HandleLoadSpecialPokePic_2(&gMonFrontPicTable[sTradeData->monSpecies[TRADE_PARTNER]],
gMonSpritesGfxPtr->sprites.ptr[3],
sTradeData->monSpecies[TRADE_PARTNER],
HandleLoadSpecialPokePic_2(&gMonFrontPicTable[sTradeData->monSpecies[TRADE_PARTNER]],
gMonSpritesGfxPtr->sprites.ptr[3],
sTradeData->monSpecies[TRADE_PARTNER],
sTradeData->monPersonalities[TRADE_PARTNER]);
sTradeData->state++;
}