diff options
Diffstat (limited to 'src/start_menu.c')
-rw-r--r-- | src/start_menu.c | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 06eb28909..850f610e3 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,10 +1,19 @@ #include "global.h" #include "start_menu.h" #include "asm.h" +#include "field_player_avatar.h" +#include "flag.h" +#include "load_save.h" #include "main.h" +#include "map_obj_lock.h" #include "menu.h" +#include "option_menu.h" #include "palette.h" #include "pokedex.h" +#include "rom4.h" +#include "safari_zone.h" +#include "save.h" +#include "save_menu_util.h" #include "script.h" #include "songs.h" #include "sound.h" @@ -12,15 +21,7 @@ #include "string_util.h" #include "task.h" #include "trainer_card.h" -#include "flag.h" -#include "rom4.h" -#include "safari_zone.h" -#include "field_player_avatar.h" #include "weather.h" -#include "save.h" -#include "option_menu.h" -#include "map_obj_lock.h" -#include "save_menu_util.h" //Menu actions enum { @@ -76,7 +77,6 @@ static void BuildStartMenuActions_Link(void); static void DisplaySafariBallsWindow(void); static bool32 PrintStartMenuItemsMultistep(s16 *a, u32 b); static bool32 InitStartMenuMultistep(s16 *a, s16 *b); -static void sub_8071230(void); static void Task_StartMenu(u8 taskId); static u8 StartMenu_InputProcessCallback(void); static u8 SaveCallback1(void); @@ -811,14 +811,14 @@ static void Task_8071B64(u8 taskId) (*step)++; break; case 1: - sub_8047A1C(); + SetSecretBase2Field_9_AndHideBG(); sub_8125E2C(); (*step)++; break; case 2: if(!sub_8125E6C()) break; - sub_8047A34(); + ClearSecretBase2Field_9_2(); (*step)++; break; case 3: @@ -832,18 +832,3 @@ static void Task_8071B64(u8 taskId) } } } - -void sub_8071C20(void) -{ - PlaySE(SE_SELECT); - MenuZeroFillScreen(); - sub_8064E2C(); - ScriptContext2_Disable(); - sub_8072DEC(); -} - -void AppendToList(u8 *list, u8 *pindex, u32 value) -{ - list[*pindex] = value; - (*pindex)++; -} |