diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-01 03:51:24 +0100 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-30 18:51:24 -0800 |
| commit | 4258e60771aa9fdabd678930eca534423bd371b8 (patch) | |
| tree | ecca2ee7641abc0562f39b6c7dd907af2184e102 /src/wild_encounter.c | |
| parent | 831f8cd4fd94613d6b52d87df1b4903bedfaa717 (diff) | |
Declare more non-static functions in header files (#111)
* Declare more non-static functions in header files
* Use `(void)` for functions without arguments.
* Move global-included data to seperate headers
* Don't import types or global in header
* Fix fieldmap imports
* Revert in-code changes
* Add missing newlines
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 151088cd6..d021189e9 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1,11 +1,15 @@ #include "global.h" +#include "wild_encounter.h" +#include "field_player_avatar.h" +#include "safari_zone.h" +#include "battle_setup.h" #include "abilities.h" -#include "fieldmap.h" -#include "pokemon.h" #include "rng.h" #include "script.h" #include "flag.h" #include "var.h" +#include "rom4.h" +#include "vars.h" struct WildPokemon { @@ -31,20 +35,12 @@ struct WildPokemonHeader }; extern bool8 sub_805759C(u8); -extern void GetXYCoordsOneStepInFrontOfPlayer(void *, void *); extern s16 sub_810CAE4(u8, struct Pokeblock *); -extern bool32 GetSafariZoneFlag(void); -extern u8 TestPlayerAvatarFlags(u8); extern u8 MetatileBehavior_IsLandWildEncounter(u8); extern u8 sub_81344CC(void); extern u8 MetatileBehavior_IsWaterWildEncounter(u8); -extern void CheckForSafariZoneAndProceed(void); extern u8 MetatileBehavior_IsBridge(u8); -extern void PlayerGetDestCoords(u16 *x, u16 *y); extern void sub_80BEA50(u16); -extern void sav12_xor_increment(u8); -extern int MapGridGetMetatileBehaviorAt(int x, int y); -extern struct Pokeblock *SafariZoneGetActivePokeblock(void); extern u16 gRoute119WaterTileData[]; extern struct WildPokemonHeader gWildMonHeaders[]; |