aboutsummaryrefslogtreecommitdiff
path: root/source/nds
diff options
context:
space:
mode:
Diffstat (limited to 'source/nds')
-rw-r--r--source/nds/draw.c8
-rw-r--r--source/nds/gui.c10
-rw-r--r--source/nds/message.h3
3 files changed, 12 insertions, 9 deletions
diff --git a/source/nds/draw.c b/source/nds/draw.c
index b3c5698..d739dc9 100644
--- a/source/nds/draw.c
+++ b/source/nds/draw.c
@@ -113,7 +113,7 @@ struct gui_iconlist gui_icon_list[]= {
/* 37 */ {"nbacko", 19, 13, NULL},
/* 38 */ {"chtfile", 16, 15, NULL},
/* 39 */ {"smsgfr", 193, 111, NULL},
- /* 40 */ {"sbutto", 61, 16, NULL}
+ /* 40 */ {"sbutto", 76, 16, NULL}
};
@@ -800,16 +800,16 @@ u32 draw_yesno_dialog(enum SCREEN_ID screen, u32 sy, char *yes, char *no)
i= SCREEN_WIDTH/2 - box_width - 2;
// drawbox(screen_address, i, sy-1, i+box_width-1, sy+FONTS_HEIGHT, COLOR16(8, 8, 8));
// drawboxfill(screen_address, i+1, sy, i+box_width-2, sy+FONTS_HEIGHT-1, COLOR16(15, 15, 15));
- show_icon((unsigned short*)screen_addr, &ICON_BUTTON, 64, 128);
+ show_icon((unsigned short*)screen_addr, &ICON_BUTTON, 49, 128);
// draw_string_vcenter(screen_address, i+1, sy+1, box_width, COLOR_WHITE, yes);
- draw_string_vcenter((unsigned short*)screen_addr, 66, 130, 58, COLOR_WHITE, yes);
+ draw_string_vcenter((unsigned short*)screen_addr, 51, 130, 73, COLOR_WHITE, yes);
i= SCREEN_WIDTH/2 + 3;
// drawbox(screen_address, i, sy-1, i+box_width-1, sy+FONTS_HEIGHT, COLOR16(8, 8, 8));
// drawboxfill(screen_address, i+1, sy, i+box_width-2, sy+FONTS_HEIGHT-1, COLOR16(15, 15, 15));
show_icon((unsigned short*)screen_addr, &ICON_BUTTON, 136, 128);
// draw_string_vcenter(screen_address, i+1, sy+1, box_width, COLOR_WHITE, no);
- draw_string_vcenter((unsigned short*)screen_addr, 138, 130, 58, COLOR_WHITE, no);
+ draw_string_vcenter((unsigned short*)screen_addr, 138, 130, 73, COLOR_WHITE, no);
ds2_flipScreen(screen, 2);
diff --git a/source/nds/gui.c b/source/nds/gui.c
index 00c8633..d545edf 100644
--- a/source/nds/gui.c
+++ b/source/nds/gui.c
@@ -1239,7 +1239,7 @@ u32 play_screen_snapshot(void)
//construct filelist_info struct
manage_filelist_info(&filelist_info, -1);
- if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)"))
+ if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B]))
return 1;
else
return 0;
@@ -2031,7 +2031,7 @@ u32 menu(u16 *screen)
{
draw_message(down_screen_addr, NULL, 28, 31, 227, 165, 0);
draw_string_vcenter(down_screen_addr, 36, 74, 190, COLOR_MSSG, msg[MSG_SAVESTATE_FULL]);
- if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)") == 0)
+ if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B]) == 0)
return;
clear_savestate_slot(0);
@@ -2165,7 +2165,7 @@ u32 menu(u16 *screen)
if(flag)
{
- if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)"))
+ if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B]))
{
wait_Allkey_release(0);
for(i= 0; i < SAVE_STATE_SLOT_NUM; i++)
@@ -2196,7 +2196,7 @@ u32 menu(u16 *screen)
sprintf(line_buffer, msg[FMT_DIALOG_SAVED_STATE_DELETE_ONE], delette_savestate_num);
draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, line_buffer);
- if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)")) {
+ if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B])) {
wait_Allkey_release(0);
clear_savestate_slot(delette_savestate_num);
}
@@ -2650,7 +2650,7 @@ u32 menu(u16 *screen)
draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
draw_string_vcenter(down_screen_addr, 36, 70, 190, COLOR_MSSG, msg[MSG_DIALOG_RESET]);
- if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes", "No"))
+ if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B]))
{
wait_Allkey_release(0);
draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
diff --git a/source/nds/message.h b/source/nds/message.h
index 09332bc..ded5925 100644
--- a/source/nds/message.h
+++ b/source/nds/message.h
@@ -71,6 +71,9 @@ enum MSG
MSG_GENERAL_OFF,
MSG_GENERAL_ON,
+ MSG_GENERAL_CONFIRM_WITH_A,
+ MSG_GENERAL_CANCEL_WITH_B,
+
MSG_AUDIO_ENABLED,
MSG_AUDIO_MUTED,