diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-17 22:03:02 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-17 22:03:02 -0500 |
| commit | de302527c3eb7fae0c09236b6d405ea64f579845 (patch) | |
| tree | b692c7e99ed61fd558f59feed5a77f768cb05744 /src/battle/battle_setup.c | |
| parent | 08a79136313ec5d82d1e62f3c9bcd2c9967a9e89 (diff) | |
| parent | 28987bb1cd0e6864257ff0434508dddcddb22e98 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into evobjmv
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 41e84a8a0..ec4a26bc5 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -474,7 +474,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. |