diff options
| author | Nebuleon Fumika | 2013-02-08 05:50:22 -0500 |
|---|---|---|
| committer | Nebuleon Fumika | 2013-02-08 05:50:22 -0500 |
| commit | 927d456306672110870eb3386742c1c1ef8eb4f6 (patch) | |
| tree | 509da9ac1727570b02572068aefb9cdf102ad75b /source/nds/message.h | |
| parent | 433749b6ef1e2b070755c3bb7fc0d81b5ecaa7b1 (diff) | |
| parent | d4fcf2697c9a45594e3ee0b8bf82e480ddd0b69b (diff) | |
| download | snes9x2005-927d456306672110870eb3386742c1c1ef8eb4f6.tar.gz snes9x2005-927d456306672110870eb3386742c1c1ef8eb4f6.tar.bz2 snes9x2005-927d456306672110870eb3386742c1c1ef8eb4f6.zip | |
Merge branch 'master' into 8bitsound
Conflicts:
source/nds/entry.cpp
Diffstat (limited to 'source/nds/message.h')
| -rw-r--r-- | source/nds/message.h | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/source/nds/message.h b/source/nds/message.h index 0aff8d9..538bc3b 100644 --- a/source/nds/message.h +++ b/source/nds/message.h @@ -31,6 +31,9 @@ enum MSG MSG_MAIN_MENU_TOOLS, MSG_MAIN_MENU_OPTIONS, MSG_MAIN_MENU_EXIT, + FMT_VIDEO_AUDIO_FLUIDITY_PREFERENCE, + MSG_VIDEO_AUDIO_FLUIDITY_PREFER_VIDEO, + MSG_VIDEO_AUDIO_FLUIDITY_PREFER_AUDIO, FMT_VIDEO_ASPECT_RATIO, FMT_VIDEO_FAST_FORWARD, FMT_VIDEO_FRAME_SKIPPING, @@ -41,21 +44,27 @@ enum MSG FMT_CHEAT_PAGE, MSG_CHEAT_LOAD_FROM_FILE, MSG_TOOLS_SCREENSHOT_GENERAL, - MSG_TOOLS_GLOBAL_HOTKEY_GENERAL, // currently unused - MSG_TOOLS_GAME_HOTKEY_GENERAL, // currently unused + MSG_TOOLS_GLOBAL_HOTKEY_GENERAL, + MSG_TOOLS_GAME_HOTKEY_GENERAL, FMT_OPTIONS_LANGUAGE, FMT_OPTIONS_CPU_FREQUENCY, - MSG_OPTIONS_CARD_CAPACITY, + MSG_OPTIONS_CPU_FREQUENCY_0, + MSG_OPTIONS_CPU_FREQUENCY_1, + MSG_OPTIONS_CPU_FREQUENCY_2, + MSG_OPTIONS_CPU_FREQUENCY_3, + MSG_OPTIONS_CPU_FREQUENCY_4, + MSG_OPTIONS_CPU_FREQUENCY_5, + MSG_OPTIONS_CARD_CAPACITY /* unused if !defined(ENABLE_FREE_SPACE) */, MSG_OPTIONS_RESET, MSG_OPTIONS_VERSION, MSG_SCREENSHOT_CREATE, MSG_SCREENSHOT_BROWSE, - MSG_HOTKEY_MAIN_MENU, // currently unused - MSG_HOTKEY_TEMPORARY_FAST_FORWARD, // currently unused - MSG_HOTKEY_SOUND_TOGGLE, // currently unused - MSG_PROGRESS_HOTKEY_WAITING_FOR_KEYS, // currently unused - MSG_HOTKEY_DELETE_WITH_A, // currently unused - MSG_HOTKEY_CANCEL_WITH_B, // currently unused + MSG_HOTKEY_MAIN_MENU, + MSG_HOTKEY_TEMPORARY_FAST_FORWARD, + MSG_HOTKEY_SOUND_TOGGLE, + MSG_PROGRESS_HOTKEY_WAITING_FOR_KEYS, + MSG_HOTKEY_DELETE_WITH_A, + MSG_HOTKEY_CANCEL_WITH_B, MSG_LOAD_GAME_RECENTLY_PLAYED, MSG_LOAD_GAME_FROM_CARD, MSG_LOAD_GAME_MENU_TITLE, @@ -112,9 +121,6 @@ enum MSG 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, @@ -139,13 +145,14 @@ enum MSG enum LANGUAGE { ENGLISH, CHINESE_SIMPLIFIED, - FRENCH + FRENCH, + GERMAN }; -extern char* lang[3]; // Allocated in gui.c, needs to match the languages ^ +extern char* lang[4]; // Allocated in gui.c, needs to match the languages ^ char *msg[MSG_END+1]; -char msg_data[16 * 1024]; +char msg_data[32 * 1024]; #endif //__MESSAGE_H__ |