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/mori_debug_menu.c | |
parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/mori_debug_menu.c')
-rw-r--r-- | src/mori_debug_menu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index 18c65b7e6..ba79261c0 100644 --- a/src/mori_debug_menu.c +++ b/src/mori_debug_menu.c @@ -1,10 +1,12 @@ #include "global.h" #include "mori_debug_menu.h" -#include "asm.h" #include "data2.h" +#include "daycare.h" +#include "learn_move.h" #include "link.h" #include "main.h" #include "menu.h" +#include "pokeblock.h" #include "start_menu.h" #include "string_util.h" |