From b8d3542b46621299bc2056b53209fc22646bef2f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 18 Dec 2016 11:52:33 -0800 Subject: move functions from start_menu.c to menu.c --- src/menu.c | 17 +++++++++++++++++ src/start_menu.c | 15 --------------- 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/menu.c b/src/menu.c index 0b5eab831..6b35fd5dd 100644 --- a/src/menu.c +++ b/src/menu.c @@ -6,6 +6,8 @@ #include "text_window.h" #include "sound.h" #include "menu_cursor.h" +#include "map_obj_lock.h" +#include "script.h" struct Menu { @@ -41,6 +43,21 @@ EWRAM_DATA u16 gMenuMessageBoxContentTileOffset = 0; extern const struct MenuAction gUnknown_08376D74[]; +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)++; +} + void InitMenuWindow(const struct WindowConfig *winConfig) { InitMenuWindowInternal(winConfig, 1); diff --git a/src/start_menu.c b/src/start_menu.c index f02665ad1..850f610e3 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -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)++; -} -- cgit v1.2.3