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/safari_zone.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/safari_zone.c')
| -rw-r--r-- | src/safari_zone.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c index 600ba95d2..deb8817ec 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -1,8 +1,11 @@ #include "global.h" +#include "safari_zone.h" +#include "field_player_avatar.h" #include "flag.h" #include "main.h" #include "script.h" #include "string_util.h" +#include "rom4.h" struct PokeblockFeeder { @@ -15,16 +18,11 @@ struct PokeblockFeeder #define NUM_POKEBLOCK_FEEDERS 10 -void ClearAllPokeblockFeeders(void); -void DecrementFeederStepCounters(void); +static void ClearAllPokeblockFeeders(void); +static void DecrementFeederStepCounters(void); extern void c2_exit_to_overworld_2_switch(void); extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void); extern void sub_8080E44(void); -extern void CB2_LoadMap(void); -extern void sav12_xor_increment(u8); -extern void warp_in(void); -extern void GetXYCoordsOneStepInFrontOfPlayer(void *, void *); -extern void PlayerGetDestCoords(u16 *, u16 *); extern u8 gUnknown_02024D26; |