diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/berry.c | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/berry.c b/src/berry.c index 257248e5c..d6fbb955e 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1,8 +1,10 @@ #include "global.h" #include "berry.h" -#include "asm.h" #include "field_control_avatar.h" +#include "field_map_obj.h" +#include "fieldmap.h" #include "item.h" +#include "item_menu.h" #include "items.h" #include "main.h" #include "rng.h" |