diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
| commit | bbe876153c2a0903a30b37734874bf63ca6d8a10 (patch) | |
| tree | 7efa03650e784e7ff6ac7d479b5315194a4081fb /src/berry.c | |
| parent | 300f2274f381b5a700b6a67847c3b9f97c67a541 (diff) | |
| parent | c2218920d57c883dc83078c2d1d7cf3af82babbb (diff) | |
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/berry.c b/src/berry.c index 323cb39cf..6e7d4592c 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1,5 +1,4 @@ #include "global.h" -#include "constants/items.h" #include "berry.h" #include "field_control_avatar.h" #include "event_object_movement.h" @@ -12,6 +11,8 @@ #include "random.h" #include "task.h" #include "text.h" +#include "constants/event_object_movement_constants.h" +#include "constants/items.h" #ifdef ENGLISH #define NAME_CHERI_BERRY _("CHERI") |