diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
| commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
| tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /src/battle_setup.c | |
| parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
| parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) | |
Merge with master
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(); |