From b4aa5dfd4053ed2de5d046f06884376641c6e8b5 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 16:50:46 +0200
Subject: Make rom match checksum

---
 include/fieldmap.h       |  8 ++++----
 include/pokemon.h        | 12 ++++++++++++
 include/wild_encounter.h | 23 +++++++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/fieldmap.h b/include/fieldmap.h
index 5ef292640..0f39b90ea 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -16,11 +16,11 @@ void fillSouthConnection(struct MapHeader *, struct MapHeader *, s32);
 void fillNorthConnection(struct MapHeader *, struct MapHeader *, s32);
 void fillWestConnection(struct MapHeader *, struct MapHeader *, s32);
 void fillEastConnection(struct MapHeader *, struct MapHeader *, s32);
-u16 MapGridGetZCoordAt(int s, int y);
-u16 MapGridIsImpassableAt(int, int);
-u16 MapGridGetMetatileIdAt(int, int);
+u8 MapGridGetZCoordAt(int s, int y);
+u8 MapGridIsImpassableAt(int, int);
+u32 MapGridGetMetatileIdAt(int, int);
 u32 MapGridGetMetatileBehaviorAt(int x, int y); // return: (u8|u16|int) args: (int|s16|s32)
-u16 MapGridGetMetatileLayerTypeAt(int, int);
+u8 MapGridGetMetatileLayerTypeAt(int, int);
 void MapGridSetMetatileIdAt(int, int, u16);
 u32 GetBehaviorByMetatileId(u16 metatile);
 void save_serialize_map(void);
diff --git a/include/pokemon.h b/include/pokemon.h
index 3d97e2f3d..2983d58bd 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -383,6 +383,18 @@ struct PokemonStorage
     u8 unkArray[14];
 };
 
+struct Evolution
+{
+    u16 method;
+    u16 param;
+    u16 targetSpecies;
+};
+
+struct EvolutionData
+{
+    struct Evolution evolutions[5];
+};
+
 extern const u8 *const gItemEffectTable[];
 extern u8 gTrainerClassToPicIndex[];
 extern u8 gTrainerClassToNameIndex[];
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 268ff137f..a4485b08d 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -1,6 +1,29 @@
 #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);
-- 
cgit v1.2.3