diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-30 23:37:27 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-30 23:37:27 -0500 |
| commit | 51ade392bf16ae4c87a18f8965b8e650fe983d03 (patch) | |
| tree | abca9b93197138cc4e375c0b7ed4412d52007c0c /src/battle/battle_setup.c | |
| parent | f5b348f8d0b2587145c1d17e2b35fb2c49a3fb93 (diff) | |
| parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
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. |