summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-12-18 11:52:33 -0800
committerYamaArashi <shadow962@live.com>2016-12-18 11:52:33 -0800
commitb8d3542b46621299bc2056b53209fc22646bef2f (patch)
treeede8509d469aef1eed087fc6124b969e68e0ce0d /src
parentbfe868c4fbd3e9bd216be3d05b9f4a573cf66c42 (diff)
move functions from start_menu.c to menu.c
Diffstat (limited to 'src')
-rw-r--r--src/menu.c17
-rw-r--r--src/start_menu.c15
2 files changed, 17 insertions, 15 deletions
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)++;
-}