From 4b4349ac8afb7dce6c0ca8a64a268f897a295469 Mon Sep 17 00:00:00 2001 From: Nebuleon Fumika Date: Fri, 18 Jan 2013 21:36:59 -0500 Subject: GUI picture overhaul. * Glass buttons. These new buttons are in the SVG format in source/images if you wish to make derived skins. * Icons from the Tango Icon Library and the RRZE Icon Set. These new icons are in the SVG format in source/images if you wish to make derived skins. * Main menu: More readable text on unselected options. * Main menu: Make "New game", "Return to game" and "Reset game" localised in English, French and Simplified Chinese. These three options also all use the same button image now; snewo, snnewo, sreseto, snreseto, sreteno and snreteno are gone and replaced by smaini and snmaini. * copyright: Update. * Align main menu icons and text better. --- source/nds/draw.c | 42 +++++++++++++++----------------- source/nds/draw.h | 42 +++++++++++++++----------------- source/nds/gui.c | 67 +++++++++++++++++++++++++++------------------------- source/nds/message.h | 3 +++ 4 files changed, 76 insertions(+), 78 deletions(-) (limited to 'source/nds') diff --git a/source/nds/draw.c b/source/nds/draw.c index 612cdcb..6799836 100644 --- a/source/nds/draw.c +++ b/source/nds/draw.c @@ -91,29 +91,25 @@ struct gui_iconlist gui_icon_list[]= { /* 18 */ {"snexito", 52, 52, NULL}, /* 19 */ {"sunnof", 16, 16, NULL}, - /* 20 */ {"snewo", 89, 38, NULL}, - /* 21 */ {"snnewo", 89, 38, NULL}, - /* 22 */ {"sreseto", 86, 38, NULL}, - /* 23 */ {"snreseto", 86, 38, NULL}, - /* 24 */ {"sreteno", 81, 38, NULL}, - /* 25 */ {"snreteno", 81, 38, NULL}, - /* 26 */ {"smaybgo", 256, 192, NULL}, - - /* 27 */ {"sticon", 29, 13, NULL}, - /* 28 */ {"ssubbg", 256, 192, NULL}, - - /* 29 */ {"subsela", 245, 22, NULL}, - /* 30 */ {"subselb", 245, 22, NULL}, - /* 31 */ {"sfullo", 12, 12, NULL}, - /* 32 */ {"snfullo", 12, 12, NULL}, - /* 33 */ {"semptyo", 12, 12, NULL}, - /* 34 */ {"snemptyo", 12, 12, NULL}, - /* 35 */ {"fdoto", 16, 16, NULL}, - /* 36 */ {"backo", 19, 13, NULL}, - /* 37 */ {"nbacko", 19, 13, NULL}, - /* 38 */ {"chtfile", 16, 15, NULL}, - /* 39 */ {"smsgfr", 193, 111, NULL}, - /* 40 */ {"sbutto", 76, 16, NULL} + /* 20 */ {"smaini", 85, 38, NULL}, + /* 21 */ {"snmaini", 85, 38, NULL}, + /* 22 */ {"smaybgo", 256, 192, NULL}, + + /* 23 */ {"sticon", 29, 13, NULL}, + /* 24 */ {"ssubbg", 256, 192, NULL}, + + /* 25 */ {"subsela", 245, 22, NULL}, + /* 26 */ {"subselb", 245, 22, NULL}, + /* 27 */ {"sfullo", 12, 12, NULL}, + /* 28 */ {"snfullo", 12, 12, NULL}, + /* 29 */ {"semptyo", 12, 12, NULL}, + /* 30 */ {"snemptyo", 12, 12, NULL}, + /* 31 */ {"fdoto", 16, 16, NULL}, + /* 32 */ {"backo", 19, 13, NULL}, + /* 33 */ {"nbacko", 19, 13, NULL}, + /* 34 */ {"chtfile", 16, 15, NULL}, + /* 35 */ {"smsgfr", 193, 111, NULL}, + /* 36 */ {"sbutto", 76, 16, NULL} }; diff --git a/source/nds/draw.h b/source/nds/draw.h index 143d017..deca0e9 100644 --- a/source/nds/draw.h +++ b/source/nds/draw.h @@ -128,29 +128,25 @@ extern struct gui_iconlist gui_icon_list[]; #define ICON_NEXIT gui_icon_list[18] #define ICON_UNKNOW gui_icon_list[19] -#define ICON_NEW gui_icon_list[20] -#define ICON_NNEW gui_icon_list[21] -#define ICON_RESET gui_icon_list[22] -#define ICON_NRESET gui_icon_list[23] -#define ICON_RETURN gui_icon_list[24] -#define ICON_NRETURN gui_icon_list[25] -#define ICON_MAINBG gui_icon_list[26] - -#define ICON_TITLEICON gui_icon_list[27] -#define ICON_SUBBG gui_icon_list[28] - -#define ICON_SUBSELA gui_icon_list[29] -#define ICON_SUBSELB gui_icon_list[30] -#define ICON_STATEFULL gui_icon_list[31] -#define ICON_NSTATEFULL gui_icon_list[32] -#define ICON_STATEEMPTY gui_icon_list[33] -#define ICON_NSTATEEMPTY gui_icon_list[34] -#define ICON_DOTDIR gui_icon_list[35] -#define ICON_BACK gui_icon_list[36] -#define ICON_NBACK gui_icon_list[37] -#define ICON_CHTFILE gui_icon_list[38] -#define ICON_MSG gui_icon_list[39] -#define ICON_BUTTON gui_icon_list[40] +#define ICON_MAINITEM gui_icon_list[20] +#define ICON_NMAINITEM gui_icon_list[21] +#define ICON_MAINBG gui_icon_list[22] + +#define ICON_TITLEICON gui_icon_list[23] +#define ICON_SUBBG gui_icon_list[24] + +#define ICON_SUBSELA gui_icon_list[25] +#define ICON_SUBSELB gui_icon_list[26] +#define ICON_STATEFULL gui_icon_list[27] +#define ICON_NSTATEFULL gui_icon_list[28] +#define ICON_STATEEMPTY gui_icon_list[29] +#define ICON_NSTATEEMPTY gui_icon_list[30] +#define ICON_DOTDIR gui_icon_list[31] +#define ICON_BACK gui_icon_list[32] +#define ICON_NBACK gui_icon_list[33] +#define ICON_CHTFILE gui_icon_list[34] +#define ICON_MSG gui_icon_list[35] +#define ICON_BUTTON gui_icon_list[46] /****************************************************************************** * diff --git a/source/nds/gui.c b/source/nds/gui.c index 85b087a..0a0a82a 100644 --- a/source/nds/gui.c +++ b/source/nds/gui.c @@ -2990,92 +2990,95 @@ u32 menu(u16 *screen) //Audio/Video strcpy(line_buffer, *(display_option->display_string)); if(display_option++ == current_option) { - show_icon(down_screen_addr, &ICON_AVO, 22, 2); - show_icon(down_screen_addr, &ICON_MSEL, 11, 57); + show_icon(down_screen_addr, &ICON_AVO, 19, 2); + show_icon(down_screen_addr, &ICON_MSEL, 5, 57); } else { - show_icon(down_screen_addr, &ICON_NAVO, 22, 2); - show_icon(down_screen_addr, &ICON_MNSEL, 11, 57); + show_icon(down_screen_addr, &ICON_NAVO, 19, 2); + show_icon(down_screen_addr, &ICON_MNSEL, 5, 57); } - draw_string_vcenter(down_screen_addr, 13, 57, 76, COLOR_WHITE, line_buffer); + draw_string_vcenter(down_screen_addr, 7, 57, 75, COLOR_WHITE, line_buffer); //Save strcpy(line_buffer, *(display_option->display_string)); if(display_option++ == current_option) { - show_icon(down_screen_addr, &ICON_SAVO, 102, 2); - show_icon(down_screen_addr, &ICON_MSEL, 92, 57); + show_icon(down_screen_addr, &ICON_SAVO, 103, 2); + show_icon(down_screen_addr, &ICON_MSEL, 89, 57); } else { - show_icon(down_screen_addr, &ICON_NSAVO, 102, 2); - show_icon(down_screen_addr, &ICON_MNSEL, 92, 57); + show_icon(down_screen_addr, &ICON_NSAVO, 103, 2); + show_icon(down_screen_addr, &ICON_MNSEL, 89, 57); } - draw_string_vcenter(down_screen_addr, 95, 57, 72, COLOR_WHITE, line_buffer); + draw_string_vcenter(down_screen_addr, 91, 57, 75, COLOR_WHITE, line_buffer); //Cheat strcpy(line_buffer, *(display_option->display_string)); if(display_option++ == current_option) { - show_icon(down_screen_addr, &ICON_CHEAT, 182, 2); + show_icon(down_screen_addr, &ICON_CHEAT, 187, 2); show_icon(down_screen_addr, &ICON_MSEL, 173, 57); } else { - show_icon(down_screen_addr, &ICON_NCHEAT, 182, 2); + show_icon(down_screen_addr, &ICON_NCHEAT, 187, 2); show_icon(down_screen_addr, &ICON_MNSEL, 173, 57); } - draw_string_vcenter(down_screen_addr, 176, 57, 68, COLOR_WHITE, line_buffer); + draw_string_vcenter(down_screen_addr, 175, 57, 75, COLOR_WHITE, line_buffer); //Tools strcpy(line_buffer, *(display_option->display_string)); if(display_option++ == current_option) { - show_icon(down_screen_addr, &ICON_TOOL, 22, 75); - show_icon(down_screen_addr, &ICON_MSEL, 11, 131); + show_icon(down_screen_addr, &ICON_TOOL, 19, 75); + show_icon(down_screen_addr, &ICON_MSEL, 5, 131); } else { - show_icon(down_screen_addr, &ICON_NTOOL, 22, 75); - show_icon(down_screen_addr, &ICON_MNSEL, 11, 131); + show_icon(down_screen_addr, &ICON_NTOOL, 19, 75); + show_icon(down_screen_addr, &ICON_MNSEL, 5, 131); } - draw_string_vcenter(down_screen_addr, 14, 131, 68, COLOR_WHITE, line_buffer); + draw_string_vcenter(down_screen_addr, 7, 131, 75, COLOR_WHITE, line_buffer); //Other strcpy(line_buffer, *(display_option->display_string)); if(display_option++ == current_option) { - show_icon(down_screen_addr, &ICON_OTHER, 102, 75); - show_icon(down_screen_addr, &ICON_MSEL, 92, 131); + show_icon(down_screen_addr, &ICON_OTHER, 103, 75); + show_icon(down_screen_addr, &ICON_MSEL, 89, 131); } else { - show_icon(down_screen_addr, &ICON_NOTHER, 102, 75); - show_icon(down_screen_addr, &ICON_MNSEL, 92, 131); + show_icon(down_screen_addr, &ICON_NOTHER, 103, 75); + show_icon(down_screen_addr, &ICON_MNSEL, 89, 131); } - draw_string_vcenter(down_screen_addr, 95, 131, 68, COLOR_WHITE, line_buffer); + draw_string_vcenter(down_screen_addr, 91, 131, 75, COLOR_WHITE, line_buffer); //Exit strcpy(line_buffer, *(display_option->display_string)); if(display_option++ == current_option) { - show_icon(down_screen_addr, &ICON_EXIT, 182, 75); + show_icon(down_screen_addr, &ICON_EXIT, 187, 75); show_icon(down_screen_addr, &ICON_MSEL, 173, 131); } else { - show_icon(down_screen_addr, &ICON_NEXIT, 182, 75); + show_icon(down_screen_addr, &ICON_NEXIT, 187, 75); show_icon(down_screen_addr, &ICON_MNSEL, 173, 131); } - draw_string_vcenter(down_screen_addr, 176, 131, 68, COLOR_WHITE, line_buffer); + draw_string_vcenter(down_screen_addr, 175, 131, 75, COLOR_WHITE, line_buffer); //New if(display_option++ == current_option) - show_icon(down_screen_addr, &ICON_NEW, 0, 154); + show_icon(down_screen_addr, &ICON_MAINITEM, 0, 154); else - show_icon(down_screen_addr, &ICON_NNEW, 0, 154); + show_icon(down_screen_addr, &ICON_NMAINITEM, 0, 154); + draw_string_vcenter(down_screen_addr, 0, 165, 85, COLOR_WHITE, msg[MSG_MAIN_MENU_NEW_GAME]); //Restart if(display_option++ == current_option) - show_icon(down_screen_addr, &ICON_RETURN, 89, 154); + show_icon(down_screen_addr, &ICON_MAINITEM, 85, 154); else - show_icon(down_screen_addr, &ICON_NRETURN, 89, 154); + show_icon(down_screen_addr, &ICON_NMAINITEM, 85, 154); + draw_string_vcenter(down_screen_addr, 85, 165, 85, COLOR_WHITE, msg[MSG_MAIN_MENU_RETURN_TO_GAME]); //Return if(display_option++ == current_option) - show_icon(down_screen_addr, &ICON_RESET, 170, 154); + show_icon(down_screen_addr, &ICON_MAINITEM, 170, 154); else - show_icon(down_screen_addr, &ICON_NRESET, 170, 154); + show_icon(down_screen_addr, &ICON_NMAINITEM, 170, 154); + draw_string_vcenter(down_screen_addr, 170, 165, 85, COLOR_WHITE, msg[MSG_MAIN_MENU_RESET_GAME]); } void main_menu_key() diff --git a/source/nds/message.h b/source/nds/message.h index 882a23d..4809272 100644 --- a/source/nds/message.h +++ b/source/nds/message.h @@ -22,6 +22,9 @@ enum MSG { + MSG_MAIN_MENU_NEW_GAME, + MSG_MAIN_MENU_RETURN_TO_GAME, + MSG_MAIN_MENU_RESET_GAME, MSG_MAIN_MENU_VIDEO_AUDIO, MSG_MAIN_MENU_SAVED_STATES, MSG_MAIN_MENU_CHEATS, -- cgit v1.2.3