Merge branch 'followers' into lighting

This commit is contained in:
Ariel A 2022-10-15 15:16:45 -04:00
commit e32232f9e8

View File

@ -93,14 +93,16 @@ static void Task_TryFieldPoisonWhiteOut(u8 taskId)
if (InBattlePyramid() | InBattlePike() || InTrainerHillChallenge())
gSpecialVar_Result = FLDPSN_FRONTIER_WHITEOUT;
else
{
gSpecialVar_Result = FLDPSN_NO_WHITEOUT;
UpdateFollowingPokemon();
}
ScriptContext_Enable();
DestroyTask(taskId);
break;
gSpecialVar_Result = FLDPSN_WHITEOUT;
}
else
{
gSpecialVar_Result = FLDPSN_NO_WHITEOUT;
UpdateFollowingPokemon();
}
ScriptContext_Enable();
DestroyTask(taskId);
break;
}
}