From 6c5bd7571644baa5693acef24d52c4fb08ed9ce3 Mon Sep 17 00:00:00 2001 From: Nebuleon Fumika Date: Sun, 6 Jan 2013 03:45:11 -0500 Subject: Language file overhaul, part 2. Remove unused messages in all languages. It's actually reloading icons that takes so much time. --- CATSFC/system/language.msg | 651 ++------------------------------------------- source/nds/draw.c | 14 +- source/nds/draw.h | 2 +- source/nds/gui.c | 186 ++++++------- source/nds/message.h | 61 +---- 5 files changed, 129 insertions(+), 785 deletions(-) diff --git a/CATSFC/system/language.msg b/CATSFC/system/language.msg index 8f0f3b7..5e04014 100644 --- a/CATSFC/system/language.msg +++ b/CATSFC/system/language.msg @@ -2,1090 +2,483 @@ STARTCOMMENT STARTVERSION 1.0 -# 1. A charactor line should no longer than 250 ASCI chars -# 2. When a line longer that 250 chars, return the line -# and paded with "\n" -# 3. "\n" must followed with return -# 4. this is SFC version +# 1. Lines starting with a # are comments. +# 2. No line may be longer than 250 bytes. As this file is UTF-8 encoded, +# characters above U+007F take up 2 or more bytes. +# 3. If a line exceeds 250 characters, add the text "\n", without quotes, +# then a newline. You may continue the text on the next line. +# 4. See the comment line ABOVE a message for its context. For example: +# > #MSG_MAIN_MENU_SAVED_STATES +# > Saved states ENDVERSION ENDCOMMENT STARTENGLISH - #MSG_MAIN_MENU_VIDEO_AUDIO Video & audio - #MSG_MAIN_MENU_SAVED_STATES Saved states - #MSG_MAIN_MENU_CHEATS Cheats - #MSG_MAIN_MENU_TOOLS Tools - #MSG_MAIN_MENU_OPTIONS Options - #MSG_MAIN_MENU_EXIT Exit - #FMT_VIDEO_ASPECT_RATIO Aspect ratio %s - -#MSG_VIDEO_FAST_FORWARD +#FMT_VIDEO_FAST_FORWARD Fast-forward %s - #FMT_VIDEO_FRAME_SKIP_AUTOMATIC Frame skipping %s - #FMT_VIDEO_FRAME_SKIP_MANUAL Frame skipping %d - #FMT_AUDIO_SOUND Sound %s - -#MSG_SUB_MENU_05 -Back - #MSG_SAVED_STATE_CREATE Create saved state - #FMT_SAVED_STATE_LOAD Load saved state %d - -#MSG_SUB_MENU_12 -Select save slot - #MSG_SAVED_STATE_DELETE_GENERAL Delete saved states... - -#MSG_SUB_MENU_14 -Back - #FMT_CHEAT_PAGE -Cheat page %d - +Cheat code page %d #MSG_CHEAT_LOAD_FROM_FILE Load cheat file - -#MSG_SUB_MENU_22 -Cheat slot - -#MSG_SUB_MENU_23 -Load cheats - -#MSG_SUB_MENU_24 -Back - #MSG_TOOLS_SCREENSHOT_GENERAL Screenshots... - -#MSG_SUB_MENU_31 -Remap the joypad - -#MSG_SUB_MENU_32 -Keep information for %s second(s) - -#MSG_SUB_MENU_40 -Auto standby %s - #FMT_OPTIONS_LANGUAGE Language %s - #FMT_OPTIONS_CPU_FREQUENCY CPU frequency %d - -#MGS_SUB_MENU_43 +#MSG_OPTIONS_CARD_CAPACITY Card capacity - #MSG_OPTIONS_RESET Restore default settings - #MSG_OPTIONS_VERSION Version information - #MSG_SCREENSHOT_CREATE Save a screenshot - #MSG_SCREENSHOT_BROWSE Browse screenshots - -#MSG_SUB_MENU_302 -Rewinding %s - -#MSG_SUB_MENU_310 -SNES Key A %s - -#MSG_SUB_MENU_311 - B %s - -#MSG_SUB_MENU_312 - Rapid A %s - -#MSG_SUB_MENU_313 - Rapid B %s - -#MSG_SUB_MENU_314 -Awaken Menu %s - -#MSG_SUB_MENU_315 -Back NDS key - #MSG_LOAD_GAME_RECENTLY_PLAYED Recently played games - #MSG_LOAD_GAME_FROM_CARD Select a game from the card - #MSG_LOAD_GAME_MENU_TITLE Select a game - #MSG_VIDEO_ASPECT_RATIO_0 [0] Entire screen - #MSG_VIDEO_ASPECT_RATIO_1 [1] Bottom, square pixels - #MSG_VIDEO_ASPECT_RATIO_2 [2] Top, square pixels - #MSG_VIDEO_ASPECT_RATIO_3 [3] Middle, square pixels - #MSG_VIDEO_ASPECT_RATIO_4 [4] Entire screen, antialiased - #MSG_FRAMESKIP_0 Manual - #MSG_FRAMESKIP_1 Automatic - -#MSG_ON_OFF_0 +#MSG_GENERAL_OFF Off - -#MSG_ON_OFF_1 +#MSG_GENERAL_ON On - #MSG_AUDIO_ENABLED On - #MSG_AUDIO_MUTED Mute - -#MSG_SNAP_FRAME_0 -Current Frames - -#MSG_SNAP_FRAME_1 -Last Frame - -#MSG_EN_DIS_ABLE_0 -Disable - -#MSG_EN_DIS_ABLE_1 -Enable - #MSG_TOP_SCREEN_NO_GAME_LOADED No game is currently loaded - #MSG_CHEAT_ELEMENT_NOT_LOADED - -#MSG_CHEAT_MENU_0 --Unused message- - -#MSG_LOAD_STATE -Load saved state - -#MSG_LOAD_STATE_END -Load saved state - -#MSG_SAVE_STATE -Create a saved state - -#MSG_SAVE_STATE_END -OK! - -#MSG_KEY_MAP_NONE -None - -#MSG_KEY_MAP_A -A - -#MSG_KEY_MAP_B -B - -#MSG_KEY_MAP_SL -SELECT - -#MSG_KEY_MAP_ST -START - -#MSG_KEY_MAP_RT -→ - -#MSG_KEY_MAP_LF -← - -#MSG_KEY_MAP_UP -↑ - -#MSG_KEY_MAP_DW -↓ - -#MSG_HOME_MAP_R -R - -#MSG_HOME_MAP_L -L - -#MSG_HOME_MAP_X -X - -#MSG_HOME_MAP_Y -Y - -#MSG_HOME_MAP_TOUCH -Touch Screen - -#MSG_SAVESTATE_EMPTY -This slot is empty. - #MSG_SAVESTATE_FULL The current slot holds a state.\n Do you wish to overwrite it?\n [A] Overwrite [B] Cancel - #MSG_PROGRESS_SAVED_STATE_CREATING Saving state... - #MSG_PROGRESS_SAVED_STATE_CREATION_FAILED Failed!\n [A] Retry [B] Cancel - #MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED OK! - #MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT No saved state is in the selected slot - #MSG_PROGRESS_SAVED_STATE_CORRUPTED The game state file is not found or is corrupt. - #MSG_PROGRESS_SAVED_STATE_LOADING Loading... - #MSG_PROGRESS_SAVED_STATE_LOAD_FAILED Failed! - #MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED OK! - -#MSG_WARING_DIALOG -Press any key to return. - -#MSG_TIME_FORMATE -Time - #MSG_SAVED_STATE_DELETE_ALL Delete all saved states - #FMT_SAVED_STATE_DELETE_ONE Delete saved state %d - #MSG_DELETE_ALL_SAVESTATE_WARING Really delete all saved states?\n [A] Confirm [B] Cancel - #FMT_DIALOG_SAVED_STATE_DELETE_ONE Really delete saved state %d?\n [A] Confirm [B] Cancel - #MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY There's already nothing here. - #MSG_PROGRESS_SCREENSHOT_CREATING Saving a screenshot... - #MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED OK! - #MSG_PROGRESS_SCREENSHOT_CREATION_FAILED Failed! - #MSG_CHANGE_LANGUAGE Changing language... - #MSG_CHANGE_LANGUAGE_WAITING Please wait... - #MSG_NO_SLIDE No screenshots found - #MSG_PLAYING_SLIDE Playing... - #MSG_PAUSE_SLIDE Pause... - #MSG_PLAY_SLIDE1 Key UP Speed up - #MSG_PLAY_SLIDE2 Key DOWN Slow down - #MSG_PLAY_SLIDE3 Key LEFT Last image - #MSG_PLAY_SLIDE4 Key RIGHT Next image - #MSG_PLAY_SLIDE5 Key A Pause - #MSG_PLAY_SLIDE6 Key B Return to the menu - #MSG_PROGRESS_LOADING_GAME Loading... - #MSG_EMULATOR_NAME CATSFC SNES emulator - #MSG_WORD_EMULATOR_VERSION Version - #MSG_DIALOG_RESET Reset all settings to defaults? - #MSG_PROGRESS_RESETTING Please wait... -#MSG_BACK -Back - ENDENGLISH - - STARTCHINESESIM - #MSG_MAIN_MENU_VIDEO_AUDIO 图像声音 - #MSG_MAIN_MENU_SAVED_STATES 存档 - #MSG_MAIN_MENU_CHEATS 作弊器 - #MSG_MAIN_MENU_TOOLS 工具 - #MSG_MAIN_MENU_OPTIONS 综合设置 - #MSG_MAIN_MENU_EXIT 退出模拟器 - #FMT_VIDEO_ASPECT_RATIO 画面 %s - -#MSG_VIDEO_FAST_FORWARD +#FMT_VIDEO_FAST_FORWARD 游戏快进 %s - #FMT_VIDEO_FRAME_SKIP_AUTOMATIC 跳帧方式 %s - #FMT_VIDEO_FRAME_SKIP_MANUAL 跳帧级别 %d - #FMT_AUDIO_SOUND 声音开关 %s - -#MSG_SUB_MENU_05 -返回 - #MSG_SAVED_STATE_CREATE 写入存档 - #FMT_SAVED_STATE_LOAD 读取存档 %d - -#MSG_SUB_MENU_12 -存档槽选择 - #MSG_SAVED_STATE_DELETE_GENERAL 删除存档 - -#MSG_SUB_MENU_14 -返回 - #FMT_CHEAT_PAGE 作弊代码页 %d - #MSG_CHEAT_LOAD_FROM_FILE 加载作弊代码文件 - -#MSG_SUB_MENU_22 -作弊代码 - -#MSG_SUB_MENU_23 -加载作弊文件 - -#MSG_SUB_MENU_24 -返回 - #MSG_TOOLS_SCREENSHOT_GENERAL 屏幕快照 - -#MSG_SUB_MENU_31 -按键重映射 - -#MSG_SUB_MENU_32 -时间长度 %s 秒 - -#MSG_SUB_MENU_40 -自动待机 %s - #FMT_OPTIONS_LANGUAGE 语言 %s - #FMT_OPTIONS_CPU_FREQUENCY CPU主频 %d - -#MGS_SUB_MENU_43 +#MSG_OPTIONS_CARD_CAPACITY 卡容量 - #MSG_OPTIONS_RESET 缺省设置 - #MSG_OPTIONS_VERSION 版本信息 - #MSG_SCREENSHOT_CREATE 保存屏幕快照 - #MSG_SCREENSHOT_BROWSE 浏览屏幕快照 - -#MSG_SUB_MENU_302 -时之沙 %s - -#MSG_SUB_MENU_310 -SFC 按键 A %s - -#MSG_SUB_MENU_311 - B %s - -#MSG_SUB_MENU_312 - 连发 A %s - -#MSG_SUB_MENU_313 - 连发 B %s - -#MSG_SUB_MENU_314 -唤醒菜单键 %s - -#MSG_SUB_MENU_315 -返回 NDS 按键 - #MSG_LOAD_GAME_RECENTLY_PLAYED 最近玩过的游戏 - #MSG_LOAD_GAME_FROM_CARD 新游戏 - #MSG_LOAD_GAME_MENU_TITLE 装载游戏 - #MSG_VIDEO_ASPECT_RATIO_0 显示模式 0 - #MSG_VIDEO_ASPECT_RATIO_1 显示模式 1 - #MSG_VIDEO_ASPECT_RATIO_2 显示模式 2 - #MSG_VIDEO_ASPECT_RATIO_3 显示模式 3 - #MSG_VIDEO_ASPECT_RATIO_4 显示模式 4 - #MSG_FRAMESKIP_0 手动 - #MSG_FRAMESKIP_1 自动 - -#MSG_ON_OFF_0 +#MSG_GENERAL_OFF 关 - -#MSG_ON_OFF_1 +#MSG_GENERAL_ON 开 - #MSG_AUDIO_ENABLED 开 - #MSG_AUDIO_MUTED 静音 - -#MSG_SNAP_FRAME_0 -当前帧 - -#MSG_SNAP_FRAME_1 -前一帧 - -#MSG_EN_DIS_ABLE_0 -禁止 - -#MSG_EN_DIS_ABLE_1 -允许 - #MSG_TOP_SCREEN_NO_GAME_LOADED 没有加载游戏 - #MSG_CHEAT_ELEMENT_NOT_LOADED <没有加载> - -#MSG_CHEAT_MENU_LOADED --UNUSED MESSAGE- - -#MSG_LOAD_STATE -装载即时存档 - -#MSG_LOAD_STATE_END -装载即时存档完成 - -#MSG_SAVE_STATE -保存即时存档 - -#MSG_SAVE_STATE_END -保存即时存档完成 - -#MSG_KEY_MAP_NONE -无 - -#MSG_KEY_MAP_A -A - -#MSG_KEY_MAP_B -B - -#MSG_KEY_MAP_SL -SELECT - -#MSG_KEY_MAP_ST -START - -#MSG_KEY_MAP_RT -→ - -#MSG_KEY_MAP_LF -← - -#MSG_KEY_MAP_UP -↑ - -#MSG_KEY_MAP_DW -↓ - -#MSG_HOME_MAP_R -R - -#MSG_HOME_MAP_L -L - -#MSG_HOME_MAP_X -X - -#MSG_HOME_MAP_Y -Y - -#MSG_HOME_MAP_TOUCH -触摸屏 - -#MSG_SAVESTATE_EMPTY -当前存档槽没有存档文件! - -#MSG_SAVESTATE_EMPTY +#MSG_SAVESTATE_FULL 当前存档槽已有存档文件,\n 覆盖已有存档吗?\n 按 A 键覆盖\n 按 B 键取消 - - #MSG_PROGRESS_SAVED_STATE_CREATING 正在写入... - #MSG_PROGRESS_SAVED_STATE_CREATION_FAILED 写入存档失败!\n 按 A 键重试\n 按 B 键取消 - #MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED 写入存档成功! - #MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT 没有游戏截图 - #MSG_PROGRESS_SAVED_STATE_CORRUPTED 存档文件找不到或者损坏! - #MSG_PROGRESS_SAVED_STATE_LOADING 正在加载... - #MSG_PROGRESS_SAVED_STATE_LOAD_FAILED 加载存档失败 - #MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED 加载存档成功 - -#MSG_WARING_DIALOG -按任意键返回 - -#MSG_TIME_FORMATE -时间 - #MSG_SAVED_STATE_DELETE_ALL 删除当前游戏的所有存档 - #FMT_SAVED_STATE_DELETE_ONE 删除当前游戏的一个存档 %d - -#MSG_DELETE_ALL_SAVESTATE_WARING +#MSG_DIALOG_SAVED_STATE_DELETE_ALL 确定要删除所有存档吗？\n 按 A 键确定 \n 按 B 键取消 - #FMT_DIALOG_SAVED_STATE_DELETE_ONE 确定要删除存档槽 %d 的存档吗? \n 按 A 键确定 \n 按 B 键取消 - #MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY 没有存档可删除 - #MSG_PROGRESS_SCREENSHOT_CREATING 正在保存屏幕快照... - #MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED 完成! - #MSG_PROGRESS_SCREENSHOT_CREATION_FAILED 失败! - #MSG_CHANGE_LANGUAGE 正在修改... - #MSG_CHANGE_LANGUAGE_WAITING 请稍候! - #MSG_NO_SLIDE 此目录没有屏幕快照，取消放映 - #MSG_PLAYING_SLIDE 正在播放 - #MSG_PAUSE_SLIDE 已暂停 - #MSG_PLAY_SLIDE1 按键 上 加快播放 - #MSG_PLAY_SLIDE2 按键 下 减慢播放 - #MSG_PLAY_SLIDE3 按键 左 上一帧 - #MSG_PLAY_SLIDE4 按键 右 下一帧 - #MSG_PLAY_SLIDE5 按键 A 暂停 - #MSG_PLAY_SLIDE6 按键 B 返回菜单 - #MSG_PROGRESS_LOADING_GAME 正在装载游戏... - #MSG_EMULATOR_NAME SFC模拟器 - #MSG_WORD_EMULATOR_VERSION 版本 - #MSG_DIALOG_RESET 确定将 SFC模拟器恢复为出厂设置吗? - #MSG_PROGRESS_RESETTING 正在设置,请稍候... -#MSG_BACK -返回 - ENDCHINESESIM - STARTFRENCH - #MSG_MAIN_MENU_VIDEO_AUDIO Vidéo & audio - #MSG_MAIN_MENU_SAVED_STATES Sauvegardes - #MSG_MAIN_MENU_CHEATS Triche - #MSG_MAIN_MENU_TOOLS Outils - #MSG_MAIN_MENU_OPTIONS Options - #MSG_MAIN_MENU_EXIT Quitter - #FMT_VIDEO_ASPECT_RATIO Format d'image %s - -#MSG_VIDEO_FAST_FORWARD +#FMT_VIDEO_FAST_FORWARD Avance rapide %s - #FMT_VIDEO_FRAME_SKIP_AUTOMATIC Omission d'images %s - #FMT_VIDEO_FRAME_SKIP_MANUAL Images omises %d - #FMT_AUDIO_SOUND Son %s - -#MSG_SUB_MENU_05 -Retour - #MSG_SAVED_STATE_CREATE Créer une sauvegarde - #FMT_SAVED_STATE_LOAD Charger la sauvegarde %d - -#MSG_SUB_MENU_12 -Sélectionner l'emplacement - #MSG_SAVED_STATE_DELETE_GENERAL Supprimer une/des sauvegardes... - -#MSG_SUB_MENU_14 -Retour - #FMT_CHEAT_PAGE Page de codes de triche : %d - #MSG_CHEAT_LOAD_FROM_FILE Charger un fichier de triche - -#MSG_SUB_MENU_22 -Emplacement de triche - -#MSG_SUB_MENU_23 -Charger la triche - -#MSG_SUB_MENU_24 -Retour - #MSG_TOOLS_SCREENSHOT_GENERAL Captures d'écran... - -#MSG_SUB_MENU_31 -Réassigner les contrôles - -#MSG_SUB_MENU_32 -Gardes les informations pour %s seconde(s) - -#MSG_SUB_MENU_40 -Mise en veille automatique %s - #FMT_OPTIONS_LANGUAGE Langue %s - #FMT_OPTIONS_CPU_FREQUENCY Fréquence CPU %d - #MSG_OPTIONS_CARD_CAPACITY Capacité de la carte - #MSG_OPTIONS_RESET Remettre les paramètres à zéro - #MSG_OPTIONS_VERSION Version - #MSG_SCREENSHOT_CREATE Créer une capture d'écran - #MSG_SCREENSHOT_BROWSE Parcourir les captures d'écran - -#MSG_SUB_MENU_302 -Marche arrière %s - -#MSG_SUB_MENU_310 -SNES touche A %s - -#MSG_SUB_MENU_311 - B %s - -#MSG_SUB_MENU_312 - Rapid A %s - -#MSG_SUB_MENU_313 - Rapid B %s - -#MSG_SUB_MENU_314 -Afficher le menu %s - -#MSG_SUB_MENU_315 -Touche de retour NDS - #MSG_LOAD_GAME_RECENTLY_PLAYED Jeux joués récemment - #MSG_LOAD_GAME_FROM_CARD Sélectionner un jeu de la carte - #MSG_LOAD_GAME_MENU_TITLE Sélectionner un jeu - #MSG_VIDEO_ASPECT_RATIO_0 [0] Écran entier - #MSG_VIDEO_ASPECT_RATIO_1 [1] Bas, pixels carrés - #MSG_VIDEO_ASPECT_RATIO_2 [2] Haut, pixels carrés - #MSG_VIDEO_ASPECT_RATIO_3 [3] Milieu, pixels carrés - #MSG_VIDEO_ASPECT_RATIO_4 [4] Écran entier anticrénelé - #MSG_FRAMESKIP_0 Manuelle - #MSG_FRAMESKIP_1 Automatique - -#MSG_ON_OFF_0 +#MSG_GENERAL_OFF Hors fonction - -#MSG_ON_OFF_1 +#MSG_GENERAL_ON En fonction - #MSG_AUDIO_ENABLED Activé - #MSG_AUDIO_MUTED Muet - -#MSG_SNAP_FRAME_0 -Frame actuelle - -#MSG_SNAP_FRAME_1 -Dernière Frame - -#MSG_EN_DIS_ABLE_0 -Désactiver - -#MSG_EN_DIS_ABLE_1 -Activer - #MSG_TOP_SCREEN_NO_GAME_LOADED Aucun jeu n'est actuellement chargé - #MSG_CHEAT_ELEMENT_NOT_LOADED - -#MSG_CHEAT_MENU_0 --Unused message- - -#MSG_LOAD_STATE -Charger - -#MSG_LOAD_STATE_END -Chargé - -#MSG_SAVE_STATE -Sauvegarder - -#MSG_SAVE_STATE_END -Terminé! - -#MSG_KEY_MAP_NONE -Aucun - -#MSG_KEY_MAP_A -A - -#MSG_KEY_MAP_B -B - -#MSG_KEY_MAP_SL -SELECT - -#MSG_KEY_MAP_ST -START - -#MSG_KEY_MAP_RT -→ - -#MSG_KEY_MAP_LF -← - -#MSG_KEY_MAP_UP -↑ - -#MSG_KEY_MAP_DW -↓ - -#MSG_HOME_MAP_R -R - -#MSG_HOME_MAP_L -L - -#MSG_HOME_MAP_X -X - -#MSG_HOME_MAP_Y -Y - -#MSG_HOME_MAP_TOUCH -Écran tactile - -#MSG_SAVESTATE_EMPTY -Cet emplacement est vide. - #MSG_SAVESTATE_FULL Il y a une sauvegarde dans cet emplacement.\n Voulez-vous l'écraser?\n [A] Écraser [B] Annuler - #MSG_PROGRESS_SAVED_STATE_CREATING Sauvegarde en cours... - #MSG_PROGRESS_SAVED_STATE_CREATION_FAILED Échec!\n [A] Réessayer [B] Annuler - #MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED Terminé! - #MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT Aucune sauvegarde dans cet emplacement - #MSG_PROGRESS_SAVED_STATE_CORRUPTED Le fichier de sauvegarde est introuvable ou corrompu. - #MSG_PROGRESS_SAVED_STATE_LOADING Chargement en cours... - #MSG_PROGRESS_SAVED_STATE_LOAD_FAILED Échec! - #MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED Terminé! - -#MSG_WARING_DIALOG -Appuyez sur une touche pour continuer. - -#MSG_TIME_FORMATE -Date - #MSG_SAVED_STATE_DELETE_ALL Supprimer toutes les sauvegardes - #FMT_SAVED_STATE_DELETE_ONE Supprimer l'emplacement %d - #MSG_DELETE_ALL_SAVESTATE_WARING Supprimer toutes les sauvegardes?\n [A] Confirmer [B] Annuler - #FMT_DIALOG_SAVED_STATE_DELETE_ONE Supprimer l'emplacement %d?\n [A] Confirmer [B] Annuler - #MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY Cet emplacement est déjà vide. - #MSG_PROGRESS_SCREENSHOT_CREATING Capture de l'écran... - #MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED Terminé! - #MSG_PROGRESS_SCREENSHOT_CREATION_FAILED Échec! - #MSG_CHANGE_LANGUAGE Changement de la langue... - #MSG_CHANGE_LANGUAGE_WAITING Veuillez patienter... - #MSG_NO_SLIDE Aucune capture d'écran trouvée - #MSG_PLAYING_SLIDE En cours... - #MSG_PAUSE_SLIDE Pause... - #MSG_PLAY_SLIDE1 HAUT Accélérer - #MSG_PLAY_SLIDE2 BAS Ralentir - #MSG_PLAY_SLIDE3 GAUCHE Précédente - #MSG_PLAY_SLIDE4 DROITE Suivante - #MSG_PLAY_SLIDE5 A Pause - #MSG_PLAY_SLIDE6 B Retour au menu - #MSG_PROGRESS_LOADING_GAME Chargement... - #MSG_EMULATOR_NAME Émulateur SNES CATSFC - #MSG_WORD_EMULATOR_VERSION Version - #MSG_DIALOG_RESET Remettre tous les paramètres à zéro? - #MSG_PROGRESS_RESETTING Veuillez patienter... -#MSG_BACK -Retour - ENDFRENCH diff --git a/source/nds/draw.c b/source/nds/draw.c index 2a9e440..b3c5698 100644 --- a/source/nds/draw.c +++ b/source/nds/draw.c @@ -308,7 +308,7 @@ void draw_message(void* screen_addr, u16 *screen_bg, u32 sx, u32 sy, u32 ex, u32 { // drawbox(screen_addr, sx, sy, ex, ey, COLOR16(12, 12, 12)); // drawboxfill(screen_addr, sx+1, sy+1, ex-1, ey-1, color_fg); - show_icon(screen_addr, ICON_MSG, 34, 48); + show_icon(screen_addr, &ICON_MSG, 34, 48); } else { @@ -800,14 +800,14 @@ 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, 64, 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); 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); + 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); @@ -1186,18 +1186,18 @@ int icon_init(u32 language_id) } /*************************************************************/ -void show_icon(void* screen, struct gui_iconlist icon, u32 x, u32 y) +void show_icon(void* screen, struct gui_iconlist* icon, u32 x, u32 y) { u32 i, k; unsigned short *src, *dst; - src= (unsigned short*)icon.iconbuff; + src= (unsigned short*)icon->iconbuff; dst = (unsigned short*)screen + y*NDS_SCREEN_WIDTH + x; if(NULL == src) return; //The icon may initialized failure - for(i= 0; i < icon.y; i++) + for(i= 0; i < icon->y; i++) { - for(k= 0; k < icon.x; k++) + for(k= 0; k < icon->x; k++) { if(0x03E0 != *src) dst[k]= *src; src++; diff --git a/source/nds/draw.h b/source/nds/draw.h index f40aa23..143d017 100644 --- a/source/nds/draw.h +++ b/source/nds/draw.h @@ -190,7 +190,7 @@ extern void msg_set_text_color(u32 color); extern int icon_init(u32 language_id); extern int gui_change_icon(u32 language_id); extern int show_background(void *screen, char *bgname); -extern void show_icon(void* screen, struct gui_iconlist icon, u32 x, u32 y); +extern void show_icon(void* screen, struct gui_iconlist *icon, u32 x, u32 y); extern void show_Vscrollbar(char *screen, u32 x, u32 y, u32 part, u32 total); extern void show_log(void* screen_addr); diff --git a/source/nds/gui.c b/source/nds/gui.c index 4b3d814..4ebb224 100644 --- a/source/nds/gui.c +++ b/source/nds/gui.c @@ -1054,9 +1054,9 @@ s32 load_file(char **wildcards, char *result, char *default_dir_name) unsigned short color; //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_SUBBG, 0, 0); + show_icon(down_screen_addr, &ICON_TITLE, 0, 0); + show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9); //release data struct to draw scrolling string //Path @@ -1081,14 +1081,14 @@ s32 load_file(char **wildcards, char *result, char *default_dir_name) { if(k == selected_item_on_screen) { color = COLOR_ACTIVE_ITEM; - show_icon(down_screen_addr, ICON_SUBSELA, 6, 35 + k*27); + show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + k*27); } else color = COLOR_INACTIVE_ITEM; //directorys if((m+1) > num_files) { - show_icon(down_screen_addr, ICON_DIRECTORY, 17, 37 + k*27); + show_icon(down_screen_addr, &ICON_DIRECTORY, 17, 37 + k*27); pt = dir_list[m - num_files]; } //files @@ -1096,15 +1096,15 @@ s32 load_file(char **wildcards, char *result, char *default_dir_name) pt= strrchr(file_list[m], '.'); if(!strcasecmp(pt, ".smc") || !strcasecmp(pt, ".sfc")) - show_icon(down_screen_addr, ICON_SFCFILE, 17, 37 + k*27); + show_icon(down_screen_addr, &ICON_SFCFILE, 17, 37 + k*27); else if(!strcasecmp(pt, ".zip")) - show_icon(down_screen_addr, ICON_ZIPFILE, 17, 37 + k*27); + show_icon(down_screen_addr, &ICON_ZIPFILE, 17, 37 + k*27); else if(!strcasecmp(pt, ".cht")) - show_icon(down_screen_addr, ICON_CHTFILE, 17, 37 + k*27); + show_icon(down_screen_addr, &ICON_CHTFILE, 17, 37 + k*27); else if(!strcasecmp(file_list[m], "..")) - show_icon(down_screen_addr, ICON_DOTDIR, 17, 37 + k*27); + show_icon(down_screen_addr, &ICON_DOTDIR, 17, 37 + k*27); else //Not recoganized file - show_icon(down_screen_addr, ICON_UNKNOW, 17, 37 + k*27); + show_icon(down_screen_addr, &ICON_UNKNOW, 17, 37 + k*27); pt = file_list[m]; } @@ -1121,24 +1121,24 @@ s32 load_file(char **wildcards, char *result, char *default_dir_name) char *pt; m = selected_item_on_screen; - show_icon(down_screen_addr, ICON_SUBSELA, 6, 35 + m*27); + show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + m*27); n = selected_item_on_list; if((n+1) > num_files) - show_icon(down_screen_addr, ICON_DIRECTORY, 17, 37 + m*27); + show_icon(down_screen_addr, &ICON_DIRECTORY, 17, 37 + m*27); else { pt= strrchr(file_list[n], '.'); if(!strcasecmp(pt, ".smc")) - show_icon(down_screen_addr, ICON_SFCFILE, 17, 37 + m*27); + show_icon(down_screen_addr, &ICON_SFCFILE, 17, 37 + m*27); else if(!strcasecmp(pt, ".zip")) - show_icon(down_screen_addr, ICON_ZIPFILE, 17, 37 + m*27); + show_icon(down_screen_addr, &ICON_ZIPFILE, 17, 37 + m*27); else if(!strcasecmp(pt, ".cht")) - show_icon(down_screen_addr, ICON_CHTFILE, 17, 37 + m*27); + show_icon(down_screen_addr, &ICON_CHTFILE, 17, 37 + m*27); else if(!strcasecmp(file_list[m], "..")) - show_icon(down_screen_addr, ICON_DOTDIR, 17, 37 + m*27); + show_icon(down_screen_addr, &ICON_DOTDIR, 17, 37 + m*27); else //Not recoganized file - show_icon(down_screen_addr, ICON_UNKNOW, 17, 37 + m*27); + show_icon(down_screen_addr, &ICON_UNKNOW, 17, 37 + m*27); } draw_hscroll(m+1, redraw); @@ -1151,8 +1151,8 @@ s32 load_file(char **wildcards, char *result, char *default_dir_name) if(m < 20) //pause 0.5sec 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_TITLE, 0, 0); + show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9); if(path_scroll & 0x8000) //scroll left { @@ -1878,16 +1878,16 @@ u32 menu(u16 *screen) if(selected != k) { if(savestate_map[k] > 0) //full - show_icon((unsigned short*)down_screen_addr, ICON_NSTATEFULL, 28+k*21, y_pos); + show_icon((unsigned short*)down_screen_addr, &ICON_NSTATEFULL, 28+k*21, y_pos); else - show_icon((unsigned short*)down_screen_addr, ICON_NSTATEEMPTY, 28+k*21, y_pos); + show_icon((unsigned short*)down_screen_addr, &ICON_NSTATEEMPTY, 28+k*21, y_pos); } else //Highlight { if(savestate_map[k] > 0) //full - show_icon((unsigned short*)down_screen_addr, ICON_STATEFULL, 28+k*21, y_pos); + show_icon((unsigned short*)down_screen_addr, &ICON_STATEFULL, 28+k*21, y_pos); else - show_icon((unsigned short*)down_screen_addr, ICON_STATEEMPTY, 28+k*21, y_pos); + show_icon((unsigned short*)down_screen_addr, &ICON_STATEEMPTY, 28+k*21, y_pos); } } } @@ -1898,14 +1898,14 @@ u32 menu(u16 *screen) unsigned int line[3] = {0, 1, 3}; //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_SUBBG, 0, 0); + show_icon(down_screen_addr, &ICON_TITLE, 0, 0); + show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9); if(current_option_num == 0) - show_icon(down_screen_addr, ICON_BACK, 229, 10); + show_icon(down_screen_addr, &ICON_BACK, 229, 10); else - show_icon(down_screen_addr, ICON_NBACK, 229, 10); + show_icon(down_screen_addr, &ICON_NBACK, 229, 10); strcpy(line_buffer, *(display_option->display_string)); draw_string_vcenter(down_screen_addr, 0, 9, 256, COLOR_ACTIVE_ITEM, line_buffer); @@ -1916,7 +1916,7 @@ u32 menu(u16 *screen) unsigned short color; if(display_option == current_option) - show_icon(down_screen_addr, ICON_SUBSELA, 6, 35 + line[i]*27); + show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + line[i]*27); if(display_option->option_type & NUMBER_SELECTION_TYPE) { @@ -1967,14 +1967,14 @@ u32 menu(u16 *screen) unsigned int line[2] = {0, 1}; //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_SUBBG, 0, 0); + show_icon(down_screen_addr, &ICON_TITLE, 0, 0); + show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9); if(current_option_num == 0) - show_icon(down_screen_addr, ICON_BACK, 229, 6); + show_icon(down_screen_addr, &ICON_BACK, 229, 6); else - show_icon(down_screen_addr, ICON_NBACK, 229, 6); + show_icon(down_screen_addr, &ICON_NBACK, 229, 6); strcpy(line_buffer, *(display_option->display_string)); draw_string_vcenter(down_screen_addr, 0, 9, 256, COLOR_ACTIVE_ITEM, line_buffer); @@ -1985,7 +1985,7 @@ u32 menu(u16 *screen) unsigned short color; if(display_option == current_option) - show_icon(down_screen_addr, ICON_SUBSELA, 6, 35 + line[i]*27); + show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + line[i]*27); if(display_option->option_type & NUMBER_SELECTION_TYPE) { @@ -2403,23 +2403,23 @@ u32 menu(u16 *screen) current_menu -> focus_option = focus_option; //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_SUBBG, 0, 0); + show_icon(down_screen_addr, &ICON_TITLE, 0, 0); + show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9); if(current_menu -> screen_focus > 0) - show_icon(down_screen_addr, ICON_SUBSELA, 6, 35 + (current_menu -> screen_focus-1)*27); + show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + (current_menu -> screen_focus-1)*27); if(current_menu->screen_focus == 0) { draw_hscroll(0, dynamic_cheat_scroll_value); dynamic_cheat_scroll_value = 0; - show_icon(down_screen_addr, ICON_BACK, 229, 10); + show_icon(down_screen_addr, &ICON_BACK, 229, 10); } else { draw_hscroll(0, 0); - show_icon(down_screen_addr, ICON_NBACK, 229, 10); + show_icon(down_screen_addr, &ICON_NBACK, 229, 10); } k = current_menu->num_options -1; @@ -2441,16 +2441,16 @@ u32 menu(u16 *screen) if(m == (n +i)) { if(dynamic_cheat_active & 1) - show_icon((unsigned short*)down_screen_addr, ICON_STATEFULL, 230, 40 + i*27); + show_icon((unsigned short*)down_screen_addr, &ICON_STATEFULL, 230, 40 + i*27); else - show_icon((unsigned short*)down_screen_addr, ICON_NSTATEFULL, 230, 40 + i*27); + show_icon((unsigned short*)down_screen_addr, &ICON_NSTATEFULL, 230, 40 + i*27); } else { if(dynamic_cheat_active & 1) - show_icon((unsigned short*)down_screen_addr, ICON_STATEEMPTY, 230, 40 + i*27); + show_icon((unsigned short*)down_screen_addr, &ICON_STATEEMPTY, 230, 40 + i*27); else - show_icon((unsigned short*)down_screen_addr, ICON_NSTATEEMPTY, 230, 40 + i*27); + show_icon((unsigned short*)down_screen_addr, &ICON_NSTATEEMPTY, 230, 40 + i*27); } } } @@ -2778,13 +2778,13 @@ u32 menu(u16 *screen) char *frameskip_options[] = { (char*)&msg[MSG_FRAMESKIP_0], (char*)&msg[MSG_FRAMESKIP_1] }; - char *on_off_options[] = { (char*)&msg[MSG_ON_OFF_0], (char*)&msg[MSG_ON_OFF_1] }; + char *on_off_options[] = { (char*)&msg[MSG_GENERAL_OFF], (char*)&msg[MSG_GENERAL_ON] }; - char *sound_seletion[] = { (char*)&msg[MSG_AUDIO_ENABLED], (char*)&msg[MSG_AUDIO_MUTED] }; + char *sound_seletion[] = { (char*)&msg[MSG_AUDIO_MUTED], (char*)&msg[MSG_AUDIO_ENABLED] }; // char *snap_frame_options[] = { (char*)&msg[MSG_SNAP_FRAME_0], (char*)&msg[MSG_SNAP_FRAME_1] }; - char *enable_disable_options[] = { (char*)&msg[MSG_EN_DIS_ABLE_0], (char*)&msg[MSG_EN_DIS_ABLE_1] }; +// char *enable_disable_options[] = { (char*)&msg[MSG_EN_DIS_ABLE_0], (char*)&msg[MSG_EN_DIS_ABLE_1] }; /*-------------------------------------------------------- Video & Audio @@ -2796,7 +2796,7 @@ u32 menu(u16 *screen) /* 01 */ STRING_SELECTION_OPTION(NULL, NULL, &msg[FMT_VIDEO_ASPECT_RATIO], screen_ratio_options, &game_config.graphic, 5, NULL, PASSIVE_TYPE, 1), - /* 02 */ STRING_SELECTION_OPTION(game_fastforward, NULL, &msg[MSG_VIDEO_FAST_FORWARD], on_off_options, + /* 02 */ STRING_SELECTION_OPTION(game_fastforward, NULL, &msg[FMT_VIDEO_FAST_FORWARD], on_off_options, &game_fast_forward, 2, NULL, ACTION_TYPE, 2), /* 03 */ STRING_SELECTION_OPTION(game_disableAudio, NULL, &msg[FMT_AUDIO_SOUND], sound_seletion, @@ -2988,98 +2988,98 @@ u32 menu(u16 *screen) void main_menu_passive() { - show_icon(down_screen_addr, ICON_MAINBG, 0, 0); + show_icon(down_screen_addr, &ICON_MAINBG, 0, 0); current_menu -> focus_option = current_option -> line_number; //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, 22, 2); + show_icon(down_screen_addr, &ICON_MSEL, 11, 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, 22, 2); + show_icon(down_screen_addr, &ICON_MNSEL, 11, 57); } draw_string_vcenter(down_screen_addr, 13, 57, 76, 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, 102, 2); + show_icon(down_screen_addr, &ICON_MSEL, 92, 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, 102, 2); + show_icon(down_screen_addr, &ICON_MNSEL, 92, 57); } draw_string_vcenter(down_screen_addr, 95, 57, 72, 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_MSEL, 173, 57); + show_icon(down_screen_addr, &ICON_CHEAT, 182, 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_MNSEL, 173, 57); + show_icon(down_screen_addr, &ICON_NCHEAT, 182, 2); + show_icon(down_screen_addr, &ICON_MNSEL, 173, 57); } draw_string_vcenter(down_screen_addr, 176, 57, 68, 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, 22, 75); + show_icon(down_screen_addr, &ICON_MSEL, 11, 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, 22, 75); + show_icon(down_screen_addr, &ICON_MNSEL, 11, 131); } draw_string_vcenter(down_screen_addr, 14, 131, 68, 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, 102, 75); + show_icon(down_screen_addr, &ICON_MSEL, 92, 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, 102, 75); + show_icon(down_screen_addr, &ICON_MNSEL, 92, 131); } draw_string_vcenter(down_screen_addr, 95, 131, 68, 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_MSEL, 173, 131); + show_icon(down_screen_addr, &ICON_EXIT, 182, 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_MNSEL, 173, 131); + show_icon(down_screen_addr, &ICON_NEXIT, 182, 75); + show_icon(down_screen_addr, &ICON_MNSEL, 173, 131); } draw_string_vcenter(down_screen_addr, 176, 131, 68, 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_NEW, 0, 154); else - show_icon(down_screen_addr, ICON_NNEW, 0, 154); + show_icon(down_screen_addr, &ICON_NNEW, 0, 154); //Restart if(display_option++ == current_option) - show_icon(down_screen_addr, ICON_RETURN, 89, 154); + show_icon(down_screen_addr, &ICON_RETURN, 89, 154); else - show_icon(down_screen_addr, ICON_NRETURN, 89, 154); + show_icon(down_screen_addr, &ICON_NRETURN, 89, 154); //Return if(display_option++ == current_option) - show_icon(down_screen_addr, ICON_RESET, 170, 154); + show_icon(down_screen_addr, &ICON_RESET, 170, 154); else - show_icon(down_screen_addr, ICON_NRESET, 170, 154); + show_icon(down_screen_addr, &ICON_NRESET, 170, 154); } void main_menu_key() @@ -3170,16 +3170,16 @@ u32 menu(u16 *screen) unsigned short color; //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_SUBBG, 0, 0); + show_icon(down_screen_addr, &ICON_TITLE, 0, 0); + show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9); if(current_option_num == 0) - show_icon(down_screen_addr, ICON_BACK, 229, 10); + show_icon(down_screen_addr, &ICON_BACK, 229, 10); else { - show_icon(down_screen_addr, ICON_NBACK, 229, 10); - show_icon(down_screen_addr, ICON_SUBSELA, 6, 35 + (current_option_num-1)*27); + show_icon(down_screen_addr, &ICON_NBACK, 229, 10); + show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + (current_option_num-1)*27); } strcpy(line_buffer, *(display_option->display_string)); @@ -3432,9 +3432,9 @@ u32 menu(u16 *screen) u32 line_num, screen_focus, focus_option; //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_SUBBG, 0, 0); + show_icon(down_screen_addr, &ICON_TITLE, 0, 0); + show_icon(down_screen_addr, &ICON_TITLEICON, 12, 9); strcpy(line_buffer, *(display_option->display_string)); draw_string_vcenter(down_screen_addr, 0, 9, 256, COLOR_ACTIVE_ITEM, line_buffer); @@ -3477,16 +3477,16 @@ u32 menu(u16 *screen) line_num = SUBMENU_ROW_NUM; if(focus_option == 0) - show_icon(down_screen_addr, ICON_BACK, 229, 10); + show_icon(down_screen_addr, &ICON_BACK, 229, 10); else - show_icon(down_screen_addr, ICON_NBACK, 229, 10); + show_icon(down_screen_addr, &ICON_NBACK, 229, 10); for(i= 0; i < line_num; i++, display_option++) { unsigned short color; if(display_option == current_option) - show_icon(down_screen_addr, ICON_SUBSELA, 6, 35 + i*27); + show_icon(down_screen_addr, &ICON_SUBSELA, 6, 35 + i*27); if(display_option->passive_function) { @@ -3925,7 +3925,7 @@ int load_language_msg(char *filename, u32 language) while(1) { pt = fgets(string, 256, fp); - if(pt[0] == '#' || pt[0] == 0x0D || pt[0] == 0x0A) + if(pt[0] == '#' || pt[0] == '\r' || pt[0] == '\n') continue; if(pt != NULL) break; diff --git a/source/nds/message.h b/source/nds/message.h index 40b34f6..ee89acd 100644 --- a/source/nds/message.h +++ b/source/nds/message.h @@ -29,25 +29,16 @@ enum MSG MSG_MAIN_MENU_OPTIONS, MSG_MAIN_MENU_EXIT, FMT_VIDEO_ASPECT_RATIO, - MSG_VIDEO_FAST_FORWARD, + FMT_VIDEO_FAST_FORWARD, FMT_VIDEO_FRAME_SKIP_AUTOMATIC, FMT_VIDEO_FRAME_SKIP_MANUAL, FMT_AUDIO_SOUND, - MSG_SUB_MENU_05, // unused MSG_SAVED_STATE_CREATE, FMT_SAVED_STATE_LOAD, - MSG_SUB_MENU_12, // unused MSG_SAVED_STATE_DELETE_GENERAL, - MSG_SUB_MENU_14, // unused FMT_CHEAT_PAGE, MSG_CHEAT_LOAD_FROM_FILE, - MSG_SUB_MENU_22, // unused - MSG_SUB_MENU_23, // unused - MSG_SUB_MENU_24, // unused MSG_TOOLS_SCREENSHOT_GENERAL, - MSG_SUB_MENU_31, // unused - MSG_SUB_MENU_32, // unused - MSG_SUB_MENU_40, // unused FMT_OPTIONS_LANGUAGE, FMT_OPTIONS_CPU_FREQUENCY, MSG_OPTIONS_CARD_CAPACITY, @@ -55,13 +46,6 @@ enum MSG MSG_OPTIONS_VERSION, MSG_SCREENSHOT_CREATE, MSG_SCREENSHOT_BROWSE, - MSG_SUB_MENU_302, // unused - MSG_SUB_MENU_310, // unused - MSG_SUB_MENU_311, // unused - MSG_SUB_MENU_312, // unused - MSG_SUB_MENU_313, // unused - MSG_SUB_MENU_314, // unused - MSG_SUB_MENU_315, // unused MSG_LOAD_GAME_RECENTLY_PLAYED, MSG_LOAD_GAME_FROM_CARD, MSG_LOAD_GAME_MENU_TITLE, @@ -72,46 +56,18 @@ enum MSG MSG_VIDEO_ASPECT_RATIO_3, MSG_VIDEO_ASPECT_RATIO_4, - MSG_FRAMESKIP_0, // unused - MSG_FRAMESKIP_1, // unused + MSG_FRAMESKIP_0, // currently unused + MSG_FRAMESKIP_1, // currently unused - MSG_ON_OFF_0, - MSG_ON_OFF_1, + MSG_GENERAL_OFF, + MSG_GENERAL_ON, MSG_AUDIO_ENABLED, MSG_AUDIO_MUTED, - MSG_SNAP_FRAME_0, // unused - MSG_SNAP_FRAME_1, // unused - - MSG_EN_DIS_ABLE_0, // unused - MSG_EN_DIS_ABLE_1, // unused - MSG_TOP_SCREEN_NO_GAME_LOADED, MSG_CHEAT_ELEMENT_NOT_LOADED, - MSG_CHEAT_MENU_LOADED, // unused - - MSG_LOAD_STATE, // unused - MSG_LOAD_STATE_END, // unused - MSG_SAVE_STATE, // unused - MSG_SAVE_STATE_END, // unused - - MSG_KEY_MAP_NONE, // unused - MSG_KEY_MAP_A, // unused - MSG_KEY_MAP_B, // unused - MSG_KEY_MAP_SL, // unused - MSG_KEY_MAP_ST, // unused - MSG_KEY_MAP_RT, // unused - MSG_KEY_MAP_LF, // unused - MSG_KEY_MAP_UP, // unused - MSG_KEY_MAP_DW, // unused - MSG_KEY_MAP_R, // unused - MSG_KEY_MAP_L, // unused - MSG_KEY_MAP_X, // unused - MSG_KEY_MAP_Y, // unused - MSG_KEY_MAP_TOUCH, // unused - - MSG_SAVESTATE_EMPTY, // unused + MSG_SAVESTATE_FULL, MSG_PROGRESS_SAVED_STATE_CREATING, MSG_PROGRESS_SAVED_STATE_CREATION_FAILED, @@ -122,9 +78,6 @@ enum MSG MSG_PROGRESS_SAVED_STATE_LOAD_FAILED, MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED, - MSG_WARING_DIALOG, // unused - MSG_TIME_FORMATE, // unused - MSG_SAVED_STATE_DELETE_ALL, FMT_SAVED_STATE_DELETE_ONE, @@ -157,8 +110,6 @@ enum MSG MSG_DIALOG_RESET, MSG_PROGRESS_RESETTING, - MSG_BACK, // unused - MSG_END }; -- cgit v1.2.3