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:
@@ -48,7 +48,7 @@
|
||||
* - Asking which move a mon should use, which they will ask at most 5 times
|
||||
* - Asking what held item to give to a mon, which they will ask at most 3 times (once for each mon)
|
||||
* - Asking what they should say when they win a battle, which will always be their final question before departing
|
||||
*
|
||||
*
|
||||
* ## After departing
|
||||
* After telling them what they should say when they win a battle they will leave the lobby for a final time
|
||||
* They will then be replaced by a new random Apprentice (they can repeat)
|
||||
@@ -274,7 +274,7 @@ static void SetRandomQuestionData(void)
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(questionOrder); i++)
|
||||
questionOrder[i] = sQuestionPossibilities[i];
|
||||
|
||||
|
||||
// Shuffle the questions an arbitrary 50 times
|
||||
for (i = 0; i < 50; i++)
|
||||
{
|
||||
@@ -788,7 +788,7 @@ static void GetNumApprenticePartyMonsAssigned(void)
|
||||
static void IsFinalQuestion(void)
|
||||
{
|
||||
s32 questionNum = CURRENT_QUESTION_NUM;
|
||||
|
||||
|
||||
if (questionNum < 0)
|
||||
{
|
||||
// Not finished asking initial questions
|
||||
@@ -941,7 +941,7 @@ static void ApprenticeGetQuestion(void)
|
||||
gSpecialVar_Result = APPRENTICE_QUESTION_WHICH_FIRST;
|
||||
break;
|
||||
default:
|
||||
//case QUESTION_ID_WIN_SPEECH:
|
||||
//case QUESTION_ID_WIN_SPEECH:
|
||||
gSpecialVar_Result = APPRENTICE_QUESTION_WIN_SPEECH;
|
||||
break;
|
||||
}
|
||||
@@ -1107,7 +1107,7 @@ static void TrySetApprenticeHeldItem(void)
|
||||
|
||||
if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS)
|
||||
return;
|
||||
|
||||
|
||||
count = 0;
|
||||
for (j = 0; j < APPRENTICE_MAX_QUESTIONS; j++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user