diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-02-18 17:38:30 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-02-18 17:38:30 -0600 |
| commit | 27da62f8310ea6612654a91293ad003d2c48167b (patch) | |
| tree | 0ffa36c4a29ba24d7527594cd55711b1efb87213 /src/field/berry.c | |
| parent | 5388d28bf33b38bb8dbb825564491feaa89c1787 (diff) | |
| parent | adac76c8370b86176a52d8ecb2e349e2be13f8ba (diff) | |
Merge branch 'master' into decompile_debug
Diffstat (limited to 'src/field/berry.c')
| -rw-r--r-- | src/field/berry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field/berry.c b/src/field/berry.c index a0ec9836a..9313c458b 100644 --- a/src/field/berry.c +++ b/src/field/berry.c @@ -1,7 +1,7 @@ #include "global.h" #include "berry.h" #include "field_control_avatar.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "fieldmap.h" #include "item.h" #include "item_menu.h" |