diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
| commit | 5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch) | |
| tree | bf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /src/berry.c | |
| parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
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" |