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/berry.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/berry.c')
| -rw-r--r-- | src/berry.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/berry.c b/src/berry.c index e00015477..2d7b50e2b 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1,19 +1,17 @@ #include "global.h" +#include "item.h" +#include "main.h" #include "text.h" +#include "rng.h" #define FIRST_BERRY 0x85 // ITEM_CHERI_BERRY #define LAST_BERRY 0xaf // ITEM_ENIGMA_BERRY extern u8 GetStageByBerryTreeId(u8); extern u16 GetStageDurationByBerryType(u8); -extern void SetMainCallback2(void*); extern void sub_80A68CC(); -extern u16 Random(void); extern u8 sub_8060234(u8, u8, u8); -extern u8 AddBagItem(u16, u8); extern void sub_8060288(u8, u8, u8); -extern u8 IsBagPocketNonEmpty(u8); -extern void GetCameraCoords(s16*, s16*); extern u8 FieldObjectGetBerryTreeId(u8); extern u8 *GetFieldObjectScriptPointerForComparison(); |