diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/field_poison.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/field_poison.c')
| -rw-r--r-- | src/field_poison.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/field_poison.c b/src/field_poison.c index a5a76e00a..fd7aeb7e4 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -1,10 +1,10 @@ #include "global.h" #include "battle.h" -#include "battle_frontier_2.h" #include "event_data.h" #include "field_message_box.h" #include "field_poison.h" #include "fldeff_80F9BCC.h" +#include "frontier_util.h" #include "party_menu.h" #include "pokenav.h" #include "rom_818CFC8.h" @@ -14,6 +14,8 @@ #include "task.h" #include "constants/species.h" +extern bool8 InBattlePike(void); + static bool32 IsMonValidSpecies(struct Pokemon *pokemon) { u16 species = GetMonData(pokemon, MON_DATA_SPECIES2); |