diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
| commit | 73cce797533c5985406b7b5696834b0976039c4f (patch) | |
| tree | bcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /src/berry.c | |
| parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry.c b/src/berry.c index 7cd28d69f..9f08165b8 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1,10 +1,13 @@ #include "global.h" #include "berry.h" #include "event_data.h" +#include "field_control_avatar.h" #include "fieldmap.h" #include "item.h" +#include "item_menu.h" #include "main.h" #include "random.h" +#include "string_util.h" #include "text.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" @@ -12,11 +15,8 @@ extern u8 EventObjectGetBerryTreeId(u8 eventObjectId); extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); extern void CB2_ChooseBerry(void); -extern const u8* GetEventObjectScriptPointerPlayerFacing(void); extern bool8 IsBerryTreeSparkling(u8, u8, u8); -extern u16 gSpecialVar_ItemId; - extern const u8 BerryTreeScript[]; static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); |