From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/wild_encounter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/wild_encounter.c') diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 9dfcf0e5c..0746c7a90 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1,7 +1,9 @@ +#include "fieldmap.h" +#include "pokeblock.h.h" +#include "tv.h" #include "global.h" #include "wild_encounter.h" #include "abilities.h" -#include "asm.h" #include "battle_setup.h" #include "event_data.h" #include "field_player_avatar.h" @@ -2921,9 +2923,6 @@ const struct WildPokemonInfo Underwater2_WaterMonsInfo = {4, Underwater2_WaterMo extern u16 gRoute119WaterTileData[]; -extern struct WildPokemonHeader gWildMonHeaders[]; -extern struct Pokemon gEnemyParty[6]; -extern struct Pokemon gPlayerParty[6]; extern u16 gScriptResult; extern struct WildPokemon gWildFeebasRoute119Data; extern u8 Event_RepelWoreOff[]; -- cgit v1.2.3 From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:01:42 +0200 Subject: Sort includes --- src/wild_encounter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/wild_encounter.c') diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 0746c7a90..143587438 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1,19 +1,19 @@ -#include "fieldmap.h" -#include "pokeblock.h.h" -#include "tv.h" #include "global.h" #include "wild_encounter.h" #include "abilities.h" #include "battle_setup.h" #include "event_data.h" #include "field_player_avatar.h" +#include "fieldmap.h" #include "metatile_behavior.h" +#include "pokeblock.h.h" #include "rng.h" #include "roamer.h" #include "rom4.h" #include "safari_zone.h" #include "script.h" #include "species.h" +#include "tv.h" struct WildPokemon { -- cgit v1.2.3 From b4aa5dfd4053ed2de5d046f06884376641c6e8b5 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 16:50:46 +0200 Subject: Make rom match checksum --- src/wild_encounter.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/wild_encounter.c') diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 143587438..31dbd17a2 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -15,30 +15,6 @@ #include "species.h" #include "tv.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; -}; - - const struct WildPokemon PetalburgCity_WaterMons [] = { {20, 30, SPECIES_MARILL}, -- cgit v1.2.3 From 93da3ddcd3ee11ffe25b194770cec7225db868cc Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 17:43:18 +0200 Subject: Rename pokeblock.h.h --- src/wild_encounter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wild_encounter.c') diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 31dbd17a2..96f47c067 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -6,7 +6,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "metatile_behavior.h" -#include "pokeblock.h.h" +#include "pokeblock.h" #include "rng.h" #include "roamer.h" #include "rom4.h" -- cgit v1.2.3