summaryrefslogtreecommitdiff
path: root/src/trainer_see.c
diff options
context:
space:
mode:
authornullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-08 12:13:15 +0800
committernullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-08 12:13:15 +0800
commit8a8baaeaaaffd7528c13f064b664c31e747c8fdc (patch)
treebbd238d169df88dc2dbbed17956daae2ad630227 /src/trainer_see.c
parent907ed3f5f5537d14ed6136daeb81e38c383239c2 (diff)
parent6068495619364c8e0ccae15ad036a1b5a9eef171 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/trainer_see.c')
-rw-r--r--src/trainer_see.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 17781bf4e..eeebcb575 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -630,26 +630,26 @@ static void Task_DestroyTrainerApproachTask(u8 taskId)
EnableBothScriptContexts();
}
-void sub_80B45D0(void)
+void TryPrepareSecondApproachingTrainer(void)
{
if (gNoOfApproachingTrainers == 2)
{
if (gApproachingTrainerId == 0)
{
gApproachingTrainerId++;
- gSpecialVar_Result = 1;
+ gSpecialVar_Result = TRUE;
UnfreezeEventObjects();
FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId);
}
else
{
gApproachingTrainerId = 0;
- gSpecialVar_Result = 0;
+ gSpecialVar_Result = FALSE;
}
}
else
{
- gSpecialVar_Result = 0;
+ gSpecialVar_Result = FALSE;
}
}