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:
+114
-114
@@ -310,11 +310,11 @@ static void (*const sChatMainFunctions[])(void) = {
|
||||
[CHAT_FUNC_SAVE_AND_EXIT] = Chat_SaveAndExit
|
||||
};
|
||||
|
||||
static const u8 sKeyboardPageMaxRow[UNION_ROOM_KB_PAGE_COUNT] =
|
||||
static const u8 sKeyboardPageMaxRow[UNION_ROOM_KB_PAGE_COUNT] =
|
||||
{
|
||||
[UNION_ROOM_KB_PAGE_UPPER] = 9,
|
||||
[UNION_ROOM_KB_PAGE_LOWER] = 9,
|
||||
[UNION_ROOM_KB_PAGE_EMOJI] = 9,
|
||||
[UNION_ROOM_KB_PAGE_UPPER] = 9,
|
||||
[UNION_ROOM_KB_PAGE_LOWER] = 9,
|
||||
[UNION_ROOM_KB_PAGE_EMOJI] = 9,
|
||||
[UNION_ROOM_KB_PAGE_REGISTER] = 9
|
||||
};
|
||||
|
||||
@@ -466,45 +466,45 @@ static const u8 sCaseToggleTable[256] = {
|
||||
};
|
||||
|
||||
// Excludes UNION_ROOM_KB_PAGE_REGISTER, the text for which is chosen by the player
|
||||
static const u8 *const sUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT - 1][UNION_ROOM_KB_ROW_COUNT] =
|
||||
static const u8 *const sUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT - 1][UNION_ROOM_KB_ROW_COUNT] =
|
||||
{
|
||||
[UNION_ROOM_KB_PAGE_UPPER] =
|
||||
[UNION_ROOM_KB_PAGE_UPPER] =
|
||||
{
|
||||
gText_UnionRoomChatKeyboard_ABCDE,
|
||||
gText_UnionRoomChatKeyboard_FGHIJ,
|
||||
gText_UnionRoomChatKeyboard_KLMNO,
|
||||
gText_UnionRoomChatKeyboard_PQRST,
|
||||
gText_UnionRoomChatKeyboard_UVWXY,
|
||||
gText_UnionRoomChatKeyboard_Z,
|
||||
gText_UnionRoomChatKeyboard_01234Upper,
|
||||
gText_UnionRoomChatKeyboard_56789Upper,
|
||||
gText_UnionRoomChatKeyboard_PunctuationUpper,
|
||||
gText_UnionRoomChatKeyboard_ABCDE,
|
||||
gText_UnionRoomChatKeyboard_FGHIJ,
|
||||
gText_UnionRoomChatKeyboard_KLMNO,
|
||||
gText_UnionRoomChatKeyboard_PQRST,
|
||||
gText_UnionRoomChatKeyboard_UVWXY,
|
||||
gText_UnionRoomChatKeyboard_Z,
|
||||
gText_UnionRoomChatKeyboard_01234Upper,
|
||||
gText_UnionRoomChatKeyboard_56789Upper,
|
||||
gText_UnionRoomChatKeyboard_PunctuationUpper,
|
||||
gText_UnionRoomChatKeyboard_SymbolsUpper
|
||||
},
|
||||
[UNION_ROOM_KB_PAGE_LOWER] =
|
||||
[UNION_ROOM_KB_PAGE_LOWER] =
|
||||
{
|
||||
gText_UnionRoomChatKeyboard_abcde,
|
||||
gText_UnionRoomChatKeyboard_fghij,
|
||||
gText_UnionRoomChatKeyboard_klmno,
|
||||
gText_UnionRoomChatKeyboard_pqrst,
|
||||
gText_UnionRoomChatKeyboard_uvwxy,
|
||||
gText_UnionRoomChatKeyboard_z,
|
||||
gText_UnionRoomChatKeyboard_01234Lower,
|
||||
gText_UnionRoomChatKeyboard_56789Lower,
|
||||
gText_UnionRoomChatKeyboard_PunctuationLower,
|
||||
gText_UnionRoomChatKeyboard_abcde,
|
||||
gText_UnionRoomChatKeyboard_fghij,
|
||||
gText_UnionRoomChatKeyboard_klmno,
|
||||
gText_UnionRoomChatKeyboard_pqrst,
|
||||
gText_UnionRoomChatKeyboard_uvwxy,
|
||||
gText_UnionRoomChatKeyboard_z,
|
||||
gText_UnionRoomChatKeyboard_01234Lower,
|
||||
gText_UnionRoomChatKeyboard_56789Lower,
|
||||
gText_UnionRoomChatKeyboard_PunctuationLower,
|
||||
gText_UnionRoomChatKeyboard_SymbolsLower
|
||||
},
|
||||
[UNION_ROOM_KB_PAGE_EMOJI] =
|
||||
[UNION_ROOM_KB_PAGE_EMOJI] =
|
||||
{
|
||||
gText_UnionRoomChatKeyboard_Emoji1,
|
||||
gText_UnionRoomChatKeyboard_Emoji2,
|
||||
gText_UnionRoomChatKeyboard_Emoji3,
|
||||
gText_UnionRoomChatKeyboard_Emoji4,
|
||||
gText_UnionRoomChatKeyboard_Emoji5,
|
||||
gText_UnionRoomChatKeyboard_Emoji6,
|
||||
gText_UnionRoomChatKeyboard_Emoji7,
|
||||
gText_UnionRoomChatKeyboard_Emoji8,
|
||||
gText_UnionRoomChatKeyboard_Emoji9,
|
||||
gText_UnionRoomChatKeyboard_Emoji1,
|
||||
gText_UnionRoomChatKeyboard_Emoji2,
|
||||
gText_UnionRoomChatKeyboard_Emoji3,
|
||||
gText_UnionRoomChatKeyboard_Emoji4,
|
||||
gText_UnionRoomChatKeyboard_Emoji5,
|
||||
gText_UnionRoomChatKeyboard_Emoji6,
|
||||
gText_UnionRoomChatKeyboard_Emoji7,
|
||||
gText_UnionRoomChatKeyboard_Emoji8,
|
||||
gText_UnionRoomChatKeyboard_Emoji9,
|
||||
gText_UnionRoomChatKeyboard_Emoji10
|
||||
}
|
||||
};
|
||||
@@ -610,113 +610,113 @@ static const struct SubtaskInfo sDisplaySubtasks[] = {
|
||||
|
||||
static const struct MessageWindowInfo sDisplayStdMessages[] = {
|
||||
[STDMESSAGE_QUIT_CHATTING] = {
|
||||
.text = gText_QuitChatting,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_QuitChatting,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = FALSE
|
||||
},
|
||||
[STDMESSAGE_REGISTER_WHERE] = {
|
||||
.text = gText_RegisterTextWhere,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_RegisterTextWhere,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = FALSE
|
||||
},
|
||||
[STDMESSAGE_REGISTER_HERE] = {
|
||||
.text = gText_RegisterTextHere,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_RegisterTextHere,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = FALSE
|
||||
},
|
||||
[STDMESSAGE_INPUT_TEXT] = {
|
||||
.text = gText_InputText,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_InputText,
|
||||
.boxType = 1,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = FALSE
|
||||
},
|
||||
[STDMESSAGE_EXITING_CHAT] = {
|
||||
.text = gText_ExitingChat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_ExitingChat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = FALSE
|
||||
},
|
||||
[STDMESSAGE_LEADER_LEFT] = {
|
||||
.text = gText_LeaderLeftEndingChat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = TRUE,
|
||||
.text = gText_LeaderLeftEndingChat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = TRUE,
|
||||
.useWiderBox = FALSE
|
||||
},
|
||||
[STDMESSAGE_ASK_SAVE] = {
|
||||
.text = gText_RegisteredTextChangedOKToSave,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_RegisteredTextChangedOKToSave,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = TRUE
|
||||
},
|
||||
[STDMESSAGE_ASK_OVERWRITE] = {
|
||||
.text = gText_AlreadySavedFile_Chat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_AlreadySavedFile_Chat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = TRUE
|
||||
},
|
||||
[STDMESSAGE_SAVING_NO_OFF] = {
|
||||
.text = gText_SavingDontTurnOff_Chat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_SavingDontTurnOff_Chat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = TRUE
|
||||
},
|
||||
[STDMESSAGE_SAVED_THE_GAME] = {
|
||||
.text = gText_PlayerSavedGame_Chat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = TRUE,
|
||||
.text = gText_PlayerSavedGame_Chat,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = TRUE,
|
||||
.useWiderBox = TRUE
|
||||
},
|
||||
[STDMESSAGE_WARN_LEADER_LEAVE] = {
|
||||
.text = gText_IfLeaderLeavesChatEnds,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.text = gText_IfLeaderLeavesChatEnds,
|
||||
.boxType = 2,
|
||||
.x = 0,
|
||||
.y = 1,
|
||||
.letterSpacing = 0,
|
||||
.lineSpacing = 0,
|
||||
.hasPlaceholders = FALSE,
|
||||
.useWiderBox = TRUE
|
||||
}
|
||||
};
|
||||
@@ -1629,7 +1629,7 @@ static bool32 HandleDPadInput(void)
|
||||
return FALSE;
|
||||
} while (0);
|
||||
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void AppendTextToMessage(void)
|
||||
@@ -1642,7 +1642,7 @@ static void AppendTextToMessage(void)
|
||||
|
||||
if (sChat->currentPage != UNION_ROOM_KB_PAGE_REGISTER)
|
||||
{
|
||||
// Going to append a single character
|
||||
// Going to append a single character
|
||||
charsStr = sUnionRoomKeyboardText[sChat->currentPage][sChat->currentRow];
|
||||
for (i = 0; i < sChat->currentCol; i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user