diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-29 21:50:48 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-29 21:50:48 -0500 |
| commit | 46bc01f0dd1a3435b3c6ce71e1be0d19b7aaa5bd (patch) | |
| tree | 928ec5581c3a77d459fe13a2ef278693e517f400 /src/battle/battle_setup.c | |
| parent | e7c94a3c270a2a43a3a84e7cefe98d9044d93dd6 (diff) | |
| parent | 1416a4c4efe8b926c809664eb63dd2c3d0f86728 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/battle/battle_setup.c')
| -rw-r--r-- | src/battle/battle_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 892be1029..15555f833 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -475,7 +475,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); tState++; // go to case 1. |