aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorNebuleon Fumika2013-03-26 19:58:17 -0400
committerNebuleon Fumika2013-03-26 19:58:17 -0400
commit805ccda32c72a403cdfb0032525a5fbb9190e1fc (patch)
treeea39de57bae60cfcf2275a24036bcf49c3d520de /source
parent2fd480b4f3cd5e0ed4cac6b484d1b8ba7512470b (diff)
downloadsnes9x2005-805ccda32c72a403cdfb0032525a5fbb9190e1fc.tar.gz
snes9x2005-805ccda32c72a403cdfb0032525a5fbb9190e1fc.tar.bz2
snes9x2005-805ccda32c72a403cdfb0032525a5fbb9190e1fc.zip
Uniformise the location of the title icon across all interfaces, default and custom.
Diffstat (limited to 'source')
-rw-r--r--source/nds/gui.c14
-rw-r--r--source/nds/gui.h3
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