diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /src/main_menu.c | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index ac26d604d..09fd06d9e 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1,14 +1,15 @@ #include "global.h" #include "main_menu.h" -#include "asm.h" #include "data2.h" #include "decompress.h" #include "event_data.h" +#include "field_effect.h" #include "menu.h" #include "mystery_event_menu.h" #include "naming_screen.h" #include "option_menu.h" #include "palette.h" +#include "pokeball.h" #include "rom4.h" #include "rtc.h" #include "save_menu_util.h" @@ -20,6 +21,7 @@ #include "task.h" #include "text.h" #include "title_screen.h" +#include "unknown_task.h" #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24)) |