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.
---
CATSFC/system/gui/savo.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/scheato.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/sexito.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/smaini.bmp | Bin 0 -> 6590 bytes
CATSFC/system/gui/smaybgo.bmp | Bin 98360 -> 98358 bytes
CATSFC/system/gui/smsgfr.bmp | Bin 43124 -> 43122 bytes
CATSFC/system/gui/snavo.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/sncheato.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/snewo.bmp | Bin 6896 -> 0 bytes
CATSFC/system/gui/snexito.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/snmaini.bmp | Bin 0 -> 6590 bytes
CATSFC/system/gui/snnewo.bmp | Bin 6896 -> 0 bytes
CATSFC/system/gui/snother.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/snreseto.bmp | Bin 6592 -> 0 bytes
CATSFC/system/gui/snreteno.bmp | Bin 6288 -> 0 bytes
CATSFC/system/gui/snsaveo.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/sntoolo.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/sother.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/sreseto.bmp | Bin 6592 -> 0 bytes
CATSFC/system/gui/sreteno.bmp | Bin 6288 -> 0 bytes
CATSFC/system/gui/ssaveo.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/gui/stoolo.bmp | Bin 5464 -> 5462 bytes
CATSFC/system/language.msg | 18 ++
copyright | 38 ++-
source/images/applications-system.svg | 247 ++++++++++++++++++
source/images/key.svg | 111 ++++++++
source/images/manage.svg | 391 ++++++++++++++++++++++++++++
source/images/media-flash.svg | 477 ++++++++++++++++++++++++++++++++++
source/images/slide-audio.svg | 158 +++++++++++
source/images/smsgfr.svg | 16 ++
source/images/system-log-out.svg | 457 ++++++++++++++++++++++++++++++++
source/nds/draw.c | 42 ++-
source/nds/draw.h | 42 ++-
source/nds/gui.c | 67 ++---
source/nds/message.h | 3 +
35 files changed, 1988 insertions(+), 79 deletions(-)
create mode 100644 CATSFC/system/gui/smaini.bmp
delete mode 100644 CATSFC/system/gui/snewo.bmp
create mode 100644 CATSFC/system/gui/snmaini.bmp
delete mode 100644 CATSFC/system/gui/snnewo.bmp
delete mode 100644 CATSFC/system/gui/snreseto.bmp
delete mode 100644 CATSFC/system/gui/snreteno.bmp
delete mode 100644 CATSFC/system/gui/sreseto.bmp
delete mode 100644 CATSFC/system/gui/sreteno.bmp
create mode 100644 source/images/applications-system.svg
create mode 100644 source/images/key.svg
create mode 100644 source/images/manage.svg
create mode 100644 source/images/media-flash.svg
create mode 100644 source/images/slide-audio.svg
create mode 100644 source/images/smsgfr.svg
create mode 100644 source/images/system-log-out.svg
diff --git a/CATSFC/system/gui/savo.bmp b/CATSFC/system/gui/savo.bmp
index 2e78f9c..3263cf9 100644
Binary files a/CATSFC/system/gui/savo.bmp and b/CATSFC/system/gui/savo.bmp differ
diff --git a/CATSFC/system/gui/scheato.bmp b/CATSFC/system/gui/scheato.bmp
index 724da7a..272d438 100644
Binary files a/CATSFC/system/gui/scheato.bmp and b/CATSFC/system/gui/scheato.bmp differ
diff --git a/CATSFC/system/gui/sexito.bmp b/CATSFC/system/gui/sexito.bmp
index b84427e..b004d51 100644
Binary files a/CATSFC/system/gui/sexito.bmp and b/CATSFC/system/gui/sexito.bmp differ
diff --git a/CATSFC/system/gui/smaini.bmp b/CATSFC/system/gui/smaini.bmp
new file mode 100644
index 0000000..fffdd18
Binary files /dev/null and b/CATSFC/system/gui/smaini.bmp differ
diff --git a/CATSFC/system/gui/smaybgo.bmp b/CATSFC/system/gui/smaybgo.bmp
index f14231e..138439b 100644
Binary files a/CATSFC/system/gui/smaybgo.bmp and b/CATSFC/system/gui/smaybgo.bmp differ
diff --git a/CATSFC/system/gui/smsgfr.bmp b/CATSFC/system/gui/smsgfr.bmp
index 0b58674..e4a3646 100644
Binary files a/CATSFC/system/gui/smsgfr.bmp and b/CATSFC/system/gui/smsgfr.bmp differ
diff --git a/CATSFC/system/gui/snavo.bmp b/CATSFC/system/gui/snavo.bmp
index 3b4148f..4886c1e 100644
Binary files a/CATSFC/system/gui/snavo.bmp and b/CATSFC/system/gui/snavo.bmp differ
diff --git a/CATSFC/system/gui/sncheato.bmp b/CATSFC/system/gui/sncheato.bmp
index 5c1ac56..e171f46 100644
Binary files a/CATSFC/system/gui/sncheato.bmp and b/CATSFC/system/gui/sncheato.bmp differ
diff --git a/CATSFC/system/gui/snewo.bmp b/CATSFC/system/gui/snewo.bmp
deleted file mode 100644
index 39de451..0000000
Binary files a/CATSFC/system/gui/snewo.bmp and /dev/null differ
diff --git a/CATSFC/system/gui/snexito.bmp b/CATSFC/system/gui/snexito.bmp
index afdadd9..530fa43 100644
Binary files a/CATSFC/system/gui/snexito.bmp and b/CATSFC/system/gui/snexito.bmp differ
diff --git a/CATSFC/system/gui/snmaini.bmp b/CATSFC/system/gui/snmaini.bmp
new file mode 100644
index 0000000..35ab559
Binary files /dev/null and b/CATSFC/system/gui/snmaini.bmp differ
diff --git a/CATSFC/system/gui/snnewo.bmp b/CATSFC/system/gui/snnewo.bmp
deleted file mode 100644
index f13c988..0000000
Binary files a/CATSFC/system/gui/snnewo.bmp and /dev/null differ
diff --git a/CATSFC/system/gui/snother.bmp b/CATSFC/system/gui/snother.bmp
index b6f68e9..72bde2c 100644
Binary files a/CATSFC/system/gui/snother.bmp and b/CATSFC/system/gui/snother.bmp differ
diff --git a/CATSFC/system/gui/snreseto.bmp b/CATSFC/system/gui/snreseto.bmp
deleted file mode 100644
index 312e2cf..0000000
Binary files a/CATSFC/system/gui/snreseto.bmp and /dev/null differ
diff --git a/CATSFC/system/gui/snreteno.bmp b/CATSFC/system/gui/snreteno.bmp
deleted file mode 100644
index 11b00f7..0000000
Binary files a/CATSFC/system/gui/snreteno.bmp and /dev/null differ
diff --git a/CATSFC/system/gui/snsaveo.bmp b/CATSFC/system/gui/snsaveo.bmp
index 49764c2..c298db0 100644
Binary files a/CATSFC/system/gui/snsaveo.bmp and b/CATSFC/system/gui/snsaveo.bmp differ
diff --git a/CATSFC/system/gui/sntoolo.bmp b/CATSFC/system/gui/sntoolo.bmp
index e6caf8f..10ac2b1 100644
Binary files a/CATSFC/system/gui/sntoolo.bmp and b/CATSFC/system/gui/sntoolo.bmp differ
diff --git a/CATSFC/system/gui/sother.bmp b/CATSFC/system/gui/sother.bmp
index 57027f2..23017a1 100644
Binary files a/CATSFC/system/gui/sother.bmp and b/CATSFC/system/gui/sother.bmp differ
diff --git a/CATSFC/system/gui/sreseto.bmp b/CATSFC/system/gui/sreseto.bmp
deleted file mode 100644
index f9c9ed0..0000000
Binary files a/CATSFC/system/gui/sreseto.bmp and /dev/null differ
diff --git a/CATSFC/system/gui/sreteno.bmp b/CATSFC/system/gui/sreteno.bmp
deleted file mode 100644
index 96bfb59..0000000
Binary files a/CATSFC/system/gui/sreteno.bmp and /dev/null differ
diff --git a/CATSFC/system/gui/ssaveo.bmp b/CATSFC/system/gui/ssaveo.bmp
index c5c2c70..45cc612 100644
Binary files a/CATSFC/system/gui/ssaveo.bmp and b/CATSFC/system/gui/ssaveo.bmp differ
diff --git a/CATSFC/system/gui/stoolo.bmp b/CATSFC/system/gui/stoolo.bmp
index c99efc3..7600d16 100644
Binary files a/CATSFC/system/gui/stoolo.bmp and b/CATSFC/system/gui/stoolo.bmp differ
diff --git a/CATSFC/system/language.msg b/CATSFC/system/language.msg
index ef1ba03..a755e34 100644
--- a/CATSFC/system/language.msg
+++ b/CATSFC/system/language.msg
@@ -15,6 +15,12 @@ ENDVERSION
ENDCOMMENT
STARTENGLISH
+#MSG_MAIN_MENU_NEW_GAME
+New game
+#MSG_MAIN_MENU_RETURN_TO_GAME
+Return to game
+#MSG_MAIN_MENU_RESET_GAME
+Reset game
#MSG_MAIN_MENU_VIDEO_AUDIO
Video & audio
#MSG_MAIN_MENU_SAVED_STATES
@@ -188,6 +194,12 @@ Please wait...
ENDENGLISH
STARTCHINESESIM
+#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
@@ -361,6 +373,12 @@ SFC模拟器
ENDCHINESESIM
STARTFRENCH
+#MSG_MAIN_MENU_NEW_GAME
+Nouveau jeu
+#MSG_MAIN_MENU_RETURN_TO_GAME
+Retour au jeu
+#MSG_MAIN_MENU_RESET_GAME
+Redémarrer jeu
#MSG_MAIN_MENU_VIDEO_AUDIO
Vidéo & audio
#MSG_MAIN_MENU_SAVED_STATES
diff --git a/copyright b/copyright
index cc04bd8..9663005 100644
--- a/copyright
+++ b/copyright
@@ -50,4 +50,40 @@ Attribution-Noncommercial-No Derivative Works 3.0 License.
See it here: http://deleket.deviantart.com/art/Gaming-Icons-Pack-42723812
The full text of the license is found here:
-http://creativecommons.org/licenses/by-nc-nd/3.0/
\ No newline at end of file
+http://creativecommons.org/licenses/by-nc-nd/3.0/
+
+----
+
+sbutto.svg, smaini.svg, smnsel.svg, smsel.svg, smsgfr.svg, snmaini.svg,
+ stitle.svg, subsela.svg:
+
+Created by GBAtemp user Nebuleon.
+
+Some rights reserved. This work is licensed under a Creative Commons
+Attribution-ShareAlike 3.0 license.
+
+The full text of the license is found here:
+http://creativecommons.org/licenses/by-sa/3.0/
+
+----
+
+applications-system.svg, media-flash.svg, system-log-out.svg:
+
+Created by artists for the Tango Icon Project.
+
+This work is in the public domain.
+
+----
+
+key.svg, manage.svg, slide-audio.svg:
+
+Part of the RRZE Icon Set, (c) 2010 Regional Computing Centre of Erlangen
+(RRZE).
+
+Get it here: http://rrze-icon-set.berlios.de/download.html
+
+Some rights reserved. This work is licensed under a Creative Commons
+Attribution-ShareAlike 3.0 license.
+
+The full text of the license is found here:
+http://creativecommons.org/licenses/by-sa/3.0/
\ No newline at end of file
diff --git a/source/images/applications-system.svg b/source/images/applications-system.svg
new file mode 100644
index 0000000..9d76774
--- /dev/null
+++ b/source/images/applications-system.svg
@@ -0,0 +1,247 @@
+
+
+
diff --git a/source/images/key.svg b/source/images/key.svg
new file mode 100644
index 0000000..0fc1678
--- /dev/null
+++ b/source/images/key.svg
@@ -0,0 +1,111 @@
+
+
+
diff --git a/source/images/manage.svg b/source/images/manage.svg
new file mode 100644
index 0000000..063dd65
--- /dev/null
+++ b/source/images/manage.svg
@@ -0,0 +1,391 @@
+
+
+
diff --git a/source/images/media-flash.svg b/source/images/media-flash.svg
new file mode 100644
index 0000000..13f910f
--- /dev/null
+++ b/source/images/media-flash.svg
@@ -0,0 +1,477 @@
+
+
+
diff --git a/source/images/slide-audio.svg b/source/images/slide-audio.svg
new file mode 100644
index 0000000..5a9be13
--- /dev/null
+++ b/source/images/slide-audio.svg
@@ -0,0 +1,158 @@
+
+
+
diff --git a/source/images/smsgfr.svg b/source/images/smsgfr.svg
new file mode 100644
index 0000000..5f1156f
--- /dev/null
+++ b/source/images/smsgfr.svg
@@ -0,0 +1,16 @@
+
diff --git a/source/images/system-log-out.svg b/source/images/system-log-out.svg
new file mode 100644
index 0000000..adb9521
--- /dev/null
+++ b/source/images/system-log-out.svg
@@ -0,0 +1,457 @@
+
+
+
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