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/start_menu.c | |
| parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 80080cd43..e05f3a999 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,10 +1,11 @@ #include "global.h" #include "start_menu.h" -#include "asm.h" #include "event_data.h" #include "field_map_obj_helpers.h" #include "field_player_avatar.h" #include "field_weather.h" +#include "fieldmap.h" +#include "item_menu.h" #include "load_save.h" #include "main.h" #include "map_obj_lock.h" @@ -12,6 +13,8 @@ #include "option_menu.h" #include "palette.h" #include "pokedex.h" +#include "pokemon_menu.h" +#include "pokenav.h" #include "rom4.h" #include "safari_zone.h" #include "save.h" @@ -25,6 +28,7 @@ #include "strings2.h" #include "task.h" #include "trainer_card.h" +#include "unknown_task.h" //Menu actions enum { @@ -49,7 +53,6 @@ extern u16 gSaveFileStatus; extern u16 gScriptResult; extern u8 (*gCallback_03004AE8)(void); extern u8 gUnknown_03004860; -extern u8 gNumSafariBalls; EWRAM_DATA static u8 sStartMenuCursorPos = 0; EWRAM_DATA static u8 sNumStartMenuActions = 0; |