diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
tree | fa83e9a7105769c66e3a66b3c6871984293db329 /src/matsuda_debug_menu.c | |
parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'src/matsuda_debug_menu.c')
-rw-r--r-- | src/matsuda_debug_menu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c index 018e36567..3665cabd8 100644 --- a/src/matsuda_debug_menu.c +++ b/src/matsuda_debug_menu.c @@ -1,7 +1,8 @@ #include "global.h" #include "matsuda_debug_menu.h" -#include "asm.h" #include "contest.h" +#include "contest_link_80C2020.h" +#include "contest_link_80C857C.h" #include "data2.h" #include "link.h" #include "main.h" @@ -13,6 +14,7 @@ #include "string_util.h" #include "task.h" #include "text.h" +#include "unknown_task.h" extern u8 gUnknown_0203856C; extern u8 gUnknown_0203857D[][64]; @@ -27,8 +29,6 @@ extern u8 gContestPlayerMonIndex; extern u16 gScriptContestCategory; extern u16 gScriptContestRank; -extern struct Window gMenuWindow; - extern u16 gUnknown_030042A4; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042C0; @@ -84,8 +84,6 @@ static void sub_80AA10C(void); static void sub_80AA5BC(u8); static void sub_80AA614(u8, u8); static void sub_80AAD08(struct Sprite *, s8); -extern void sub_80AB47C(void); -extern int sub_80B2A7C(u8); //Don't know return type size u8 unref_sub_80A9B28(void) { |