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:
+13
-13
@@ -857,7 +857,7 @@ static const struct WindowTemplate sEasyChatYesNoWindowTemplate = {
|
||||
|
||||
static const u8 sText_Clear17[] = _("{CLEAR 17}");
|
||||
|
||||
static const u8 *const sEasyChatKeyboardAlphabet[NUM_ALPHABET_ROWS] =
|
||||
static const u8 *const sEasyChatKeyboardAlphabet[NUM_ALPHABET_ROWS] =
|
||||
{
|
||||
gText_EasyChatKeyboard_ABCDEFothers,
|
||||
gText_EasyChatKeyboard_GHIJKL,
|
||||
@@ -2908,7 +2908,7 @@ static void GetQuizTitle(u8 *dst)
|
||||
u8 name[32];
|
||||
struct SaveBlock1 *saveBlock1 = gSaveBlock1Ptr;
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
|
||||
|
||||
// Buffer author's name
|
||||
if (StringLength(saveBlock1->lilycoveLady.quiz.playerName) != 0)
|
||||
{
|
||||
@@ -4118,7 +4118,7 @@ static void BufferFrameTilemap(u16 *tilemap)
|
||||
// These frames fill the screen, no need to draw top/bottom edges
|
||||
right = sPhraseFrameDimensions[frameId].left + sPhraseFrameDimensions[frameId].width;
|
||||
bottom = sPhraseFrameDimensions[frameId].top + sPhraseFrameDimensions[frameId].height;
|
||||
|
||||
|
||||
// Draw middle section
|
||||
for (y = sPhraseFrameDimensions[frameId].top; y < bottom; y++)
|
||||
{
|
||||
@@ -4516,7 +4516,7 @@ static void BufferLowerWindowFrame(int left, int top, int width, int height)
|
||||
bottom = top + height - 1;
|
||||
x = left;
|
||||
y = top;
|
||||
|
||||
|
||||
// Draw top edge
|
||||
tilemap[y * 32 + x] = FRAME_OFFSET_GREEN + FRAME_TILE_TOP_L_CORNER;
|
||||
x++;
|
||||
@@ -4688,7 +4688,7 @@ static void UpdateRectangleCursorPos(void)
|
||||
s8 column;
|
||||
s8 row;
|
||||
|
||||
if (sScreenControl->rectangleCursorSpriteRight
|
||||
if (sScreenControl->rectangleCursorSpriteRight
|
||||
&& sScreenControl->rectangleCursorSpriteLeft)
|
||||
{
|
||||
GetKeyboardCursorColAndRow(&column, &row);
|
||||
@@ -5532,16 +5532,16 @@ void InitEasyChatPhrases(void)
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(sDefaultProfileWords); i++)
|
||||
gSaveBlock1Ptr->easyChatProfile[i] = sDefaultProfileWords[i];
|
||||
|
||||
|
||||
for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
|
||||
gSaveBlock1Ptr->easyChatBattleStart[i] = sDefaultBattleStartWords[i];
|
||||
|
||||
|
||||
for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
|
||||
gSaveBlock1Ptr->easyChatBattleWon[i] = sDefaultBattleWonWords[i];
|
||||
|
||||
|
||||
for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
|
||||
gSaveBlock1Ptr->easyChatBattleLost[i] = sDefaultBattleLostWords[i];
|
||||
|
||||
|
||||
for (i = 0; i < MAIL_COUNT; i++)
|
||||
{
|
||||
for (j = 0; j < MAIL_WORDS_COUNT; j++)
|
||||
@@ -5585,11 +5585,11 @@ static void SetUnlockedEasyChatGroups(void)
|
||||
sWordData->numUnlockedGroups = 0;
|
||||
if (GetNationalPokedexCount(FLAG_GET_SEEN))
|
||||
sWordData->unlockedGroupIds[sWordData->numUnlockedGroups++] = EC_GROUP_POKEMON;
|
||||
|
||||
|
||||
// These groups are unlocked automatically
|
||||
for (i = EC_GROUP_TRAINER; i <= EC_GROUP_ADJECTIVES; i++)
|
||||
sWordData->unlockedGroupIds[sWordData->numUnlockedGroups++] = i;
|
||||
|
||||
|
||||
if (FlagGet(FLAG_SYS_GAME_CLEAR))
|
||||
{
|
||||
sWordData->unlockedGroupIds[sWordData->numUnlockedGroups++] = EC_GROUP_EVENTS;
|
||||
@@ -5627,7 +5627,7 @@ static u8 *BufferEasyChatWordGroupName(u8 *dest, u8 groupId, u16 totalChars)
|
||||
*str = CHAR_SPACE;
|
||||
str++;
|
||||
}
|
||||
|
||||
|
||||
*str = EOS;
|
||||
return str;
|
||||
}
|
||||
@@ -5646,7 +5646,7 @@ static u8 *CopyEasyChatWordPadded(u8 *dest, u16 easyChatWord, u16 totalChars)
|
||||
*str = CHAR_SPACE;
|
||||
str++;
|
||||
}
|
||||
|
||||
|
||||
*str = EOS;
|
||||
return str;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user