diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-14 18:22:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 18:22:35 -0500 |
| commit | 26962b7725ffc5df719a0eea9442735b9dc04b5c (patch) | |
| tree | 4c9e4215bd686793e82ec3df20f7ed8829d1c40a /src/field_poison.c | |
| parent | 9b9b14ad0a711288446f9ba863eb0e3fe956ddd4 (diff) | |
| parent | bb23128b77a01d3c39b11aef978acf437ae71974 (diff) | |
Merge pull request #830 from GriffinRichards/doc-inc
Document some .incs split from event_scripts
Diffstat (limited to 'src/field_poison.c')
| -rw-r--r-- | src/field_poison.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/field_poison.c b/src/field_poison.c index 532c7f027..d10a28a76 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -14,6 +14,7 @@ #include "strings.h" #include "task.h" #include "trainer_hill.h" +#include "constants/field_poison.h" #include "constants/species.h" static bool32 IsMonValidSpecies(struct Pokemon *pokemon) @@ -62,7 +63,7 @@ static bool32 MonFaintedFromPoison(u8 partyIdx) return FALSE; } -static void Task_WhiteOut(u8 taskId) +static void Task_TryFieldPoisonWhiteOut(u8 taskId) { s16 *data = gTasks[taskId].data; switch (data[0]) @@ -89,18 +90,18 @@ static void Task_WhiteOut(u8 taskId) case 2: if (AllMonsFainted()) { - if (InBattlePyramid() | InBattlePike() || sub_81D5C18()) + if (InBattlePyramid() | InBattlePike() || InTrainerHillChallenge()) { - gSpecialVar_Result = 2; + gSpecialVar_Result = FLDPSN_FRONTIER_WHITEOUT; } else { - gSpecialVar_Result = 1; + gSpecialVar_Result = FLDPSN_WHITEOUT; } } else { - gSpecialVar_Result = 0; + gSpecialVar_Result = FLDPSN_NO_WHITEOUT; } EnableBothScriptContexts(); DestroyTask(taskId); @@ -108,9 +109,9 @@ static void Task_WhiteOut(u8 taskId) } } -void ExecuteWhiteOut(void) +void TryFieldPoisonWhiteOut(void) { - CreateTask(Task_WhiteOut, 80); + CreateTask(Task_TryFieldPoisonWhiteOut, 80); ScriptContext1_Stop(); } |