From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/menu.c') diff --git a/src/menu.c b/src/menu.c index ee9376079..a4e5d9065 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,13 +1,13 @@ #include "global.h" #include "menu.h" #include "main.h" -#include "text.h" -#include "songs.h" -#include "text_window.h" -#include "sound.h" -#include "menu_cursor.h" #include "map_obj_lock.h" +#include "menu_cursor.h" #include "script.h" +#include "songs.h" +#include "sound.h" +#include "text.h" +#include "text_window.h" struct Menu { -- cgit v1.2.3 From 9a500a622b7fb666b8b45e1280af02084fcbc12d Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 28 Jan 2017 13:08:09 -0500 Subject: define data in title_screen.c and fix build (#221) * define more data in C * correct typo in comments * define data in title_screen.c * define data in title_screen.c and fix build --- src/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/menu.c') diff --git a/src/menu.c b/src/menu.c index a4e5d9065..ba98ff057 100644 --- a/src/menu.c +++ b/src/menu.c @@ -654,7 +654,7 @@ u8 *sub_8072C44(u8 *a1, s32 a2, u8 a3, u8 a4) return AlignInt2(gMenuWindowPtr, a1, a2, a3, a4); } -u8 *sub_8072C74(u8 *a1, u8 *a2, u8 a3, u8 a4) +u8 *sub_8072C74(u8 *a1, const u8 *a2, u8 a3, u8 a4) { return AlignString(gMenuWindowPtr, a1, a2, a3, a4); } -- cgit v1.2.3