diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
| commit | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /src/field_poison.c | |
| parent | 054a015c950ca9869ce28245a2f13c3f72cddb37 (diff) | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
Merge remote-tracking branch 'pret/master' into script_menu
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 6a519d90c..e2fd994fc 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -6,7 +6,7 @@ #include "field_message_box.h" #include "strings.h" #include "rom_818CFC8.h" -#include "battle_frontier_2.h" +#include "frontier_util.h" #include "pokenav.h" #include "event_data.h" #include "script.h" @@ -14,6 +14,8 @@ #include "fldeff_80F9BCC.h" #include "field_poison.h" +extern bool8 InBattlePike(void); + static bool32 sub_80F9568(struct Pokemon *pokemon) { u16 species = GetMonData(pokemon, MON_DATA_SPECIES2); |