From 805ccda32c72a403cdfb0032525a5fbb9190e1fc Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika
Date: Tue, 26 Mar 2013 19:58:17 -0400
Subject: Uniformise the location of the title icon across all interfaces,
 default and custom.

---
 source/nds/gui.c | 14 +++++++-------
 source/nds/gui.h |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/source/nds/gui.c b/source/nds/gui.c
index 30eded9..4648eb0 100644
--- a/source/nds/gui.c
+++ b/source/nds/gui.c
@@ -1107,7 +1107,7 @@ s32 load_file(char **wildcards, char *result, char *default_dir_name)
 			//draw background
 			show_icon(down_screen_addr, &ICON_SUBBG, 0, 0);
 			show_icon(down_screen_addr, &ICON_TITLE, 0, 0);
-			show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9);
+			show_icon(down_screen_addr, &ICON_TITLEICON, TITLE_ICON_X, TITLE_ICON_Y);
 
 			//release data struct to draw scrolling string
 			//Path
@@ -1201,7 +1201,7 @@ s32 load_file(char **wildcards, char *result, char *default_dir_name)
 			path_scroll += 1;
 		else {
 			show_icon(down_screen_addr, &ICON_TITLE, 0, 0);
-			show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9);
+			show_icon(down_screen_addr, &ICON_TITLEICON, TITLE_ICON_X, TITLE_ICON_Y);
 
 			if(path_scroll & 0x8000)	//scroll left
 			{
@@ -1948,7 +1948,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 		//draw background
 		show_icon(down_screen_addr, &ICON_SUBBG, 0, 0);
 		show_icon(down_screen_addr, &ICON_TITLE, 0, 0);
-		show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9);
+		show_icon(down_screen_addr, &ICON_TITLEICON, TITLE_ICON_X, TITLE_ICON_Y);
 
 		if(current_option_num == 0)
 			show_icon(down_screen_addr, &ICON_BACK, BACK_BUTTON_X, BACK_BUTTON_Y);
@@ -2011,7 +2011,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 		//draw background
 		show_icon(down_screen_addr, &ICON_SUBBG, 0, 0);
 		show_icon(down_screen_addr, &ICON_TITLE, 0, 0);
-		show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9);
+		show_icon(down_screen_addr, &ICON_TITLEICON, TITLE_ICON_X, TITLE_ICON_Y);
 
 		if(current_option_num == 0)
 			show_icon(down_screen_addr, &ICON_BACK, BACK_BUTTON_X, BACK_BUTTON_Y);
@@ -2445,7 +2445,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 		//draw background
 		show_icon(down_screen_addr, &ICON_SUBBG, 0, 0);
 		show_icon(down_screen_addr, &ICON_TITLE, 0, 0);
-		show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9);
+		show_icon(down_screen_addr, &ICON_TITLEICON, TITLE_ICON_X, TITLE_ICON_Y);
 
 		if(current_menu -> screen_focus > 0)
 			show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + (current_menu -> screen_focus-1)*27);
@@ -3456,7 +3456,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 		//draw background
 		show_icon(down_screen_addr, &ICON_SUBBG, 0, 0);
 		show_icon(down_screen_addr, &ICON_TITLE, 0, 0);
-		show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9);
+		show_icon(down_screen_addr, &ICON_TITLEICON, TITLE_ICON_X, TITLE_ICON_Y);
 
 		if(current_option_num == 0)
 			show_icon(down_screen_addr, &ICON_BACK, BACK_BUTTON_X, BACK_BUTTON_Y);
@@ -3690,7 +3690,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 			//draw background
 			show_icon(down_screen_addr, &ICON_SUBBG, 0, 0);
 			show_icon(down_screen_addr, &ICON_TITLE, 0, 0);
-			show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9);
+			show_icon(down_screen_addr, &ICON_TITLEICON, TITLE_ICON_X, TITLE_ICON_Y);
 
 			strcpy(line_buffer, *(display_option->display_string));
 			draw_string_vcenter(down_screen_addr, 0, 9, 256, COLOR_ACTIVE_ITEM, line_buffer);
diff --git a/source/nds/gui.h b/source/nds/gui.h
index 53e5571..9fddc47 100644
--- a/source/nds/gui.h
+++ b/source/nds/gui.h
@@ -51,6 +51,9 @@
 // Back button
 #define BACK_BUTTON_X             229
 #define BACK_BUTTON_Y             10
+// Title icon
+#define TITLE_ICON_X              12
+#define TITLE_ICON_Y              9
 
 #define MAX_GAMEPAD_MAP 16
 
-- 
cgit v1.2.3