dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
nullableVoidPtr
2018-12-08 12:13:15 +08:00
parent 907ed3f5f5 6068495619
commit 8a8baaeaaa
345 changed files with 8673 additions and 8660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/trainer_see.c
View File

@@ -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;
}
}