diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-20 20:41:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 20:41:33 -0400 |
| commit | 4ba573ed1eba7c37160ce6107d95447f42902385 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/berry.c | |
| parent | 13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff) | |
| parent | b22e5219ba01c70da9a03397430bff10d0b99060 (diff) | |
Merge branch 'master' into patch-1
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" |