diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-21 16:11:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-21 16:11:03 -0600 |
| commit | 0b59dbf2b8a38b384ec3cfbee15578d8e06e7ccc (patch) | |
| tree | 058b846de2b950ea7dae06fb6cec16b9ac964a9c /src/berry.c | |
| parent | 3c77ce5b5b1938665bf7ba3e2624e5df27cd871d (diff) | |
| parent | c7ca38ccf3a93c8f2880f1d0370d20aea46bd6be (diff) | |
Merge pull request #393 from DizzyEggg/text
Match one function in text.c
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); |