fix merge conflicts

1 files changed, 25 insertions, 0 deletions

diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 33b7df7b9..a4485b08d 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -1,6 +1,31 @@
 #ifndef GUARD_WILD_ENCOUNTER_H
 #define GUARD_WILD_ENCOUNTER_H
 
+struct WildPokemon
+{
+    u8 minLevel;
+    u8 maxLevel;
+    u16 species;
+};
+
+struct WildPokemonInfo
+{
+    u8 encounterRate;
+    const struct WildPokemon *wildPokemon;
+};
+
+struct WildPokemonHeader
+{
+    u8 mapGroup;
+    u8 mapNum;
+    struct WildPokemonInfo *landMonsInfo;
+    struct WildPokemonInfo *waterMonsInfo;
+    struct WildPokemonInfo *rockSmashMonsInfo;
+    struct WildPokemonInfo *fishingMonsInfo;
+};
+
+extern struct WildPokemonHeader gWildMonHeaders[];
+
 void DisableWildEncounters(bool8 disabled);
 bool8 StandardWildEncounter(u16 a, u16 b);
 void RockSmashWildEncounter(void);