summaryrefslogtreecommitdiff
path: root/src/apprentice.c
diff options
context:
space:
mode:
authorLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
committerLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
commit554210c5e315e786ddc6eef888e9ff6065ad73f8 (patch)
tree66bb5065902fb10a4ad007e53cb61f90fd68e624 /src/apprentice.c
parent63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff)
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.
Diffstat (limited to 'src/apprentice.c')
-rw-r--r--src/apprentice.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/apprentice.c b/src/apprentice.c
index 00157dc1a..f881c3bef 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -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++)
{