diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-19 22:16:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 22:16:59 -0600 |
| commit | 6ef96717181dfa1cda548cbe405410aba065e41c (patch) | |
| tree | 82ed2fe52d25d624d49bc2ee7499a7de006bd70f /src/battle_setup.c | |
| parent | c74bfbe11017e4f937dc6466a93a6d3dc72cdac7 (diff) | |
| parent | 5eac3ce1a2503a2d358033b7e0242c1ecd2b63e3 (diff) | |
Merge pull request #440 from garakmon/fldeff
Decompile / port fldeff_80F9BCC
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 5377f39b5..83ced1b7c 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -57,7 +57,7 @@ struct TrainerBattleParameter }; extern bool32 InTrainerHill(void); -extern bool32 FieldPoisonEffectIsRunning(void); +extern bool32 FldEffPoison_IsActive(void); extern void RestartWildEncounterImmunitySteps(void); extern void ClearPoisonStepCounter(void); extern void sub_81BE72C(void); @@ -338,7 +338,7 @@ static void Task_BattleStart(u8 taskId) switch (tState) { case 0: - if (!FieldPoisonEffectIsRunning()) // is poison not active? + if (!FldEffPoison_IsActive()) // is poison not active? { BattleTransition_StartOnField(tTransition); sub_81BE72C(); |