Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

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);