diff options
| author | Nebuleon Fumika | 2013-02-08 17:47:20 -0500 |
|---|---|---|
| committer | Nebuleon Fumika | 2013-02-08 17:47:20 -0500 |
| commit | ef12da18df54de9ac3b5db0a7d5bfe2a09a3e872 (patch) | |
| tree | 1a4e1b1b48666a1b8e5b353b85f5c7c3f86e0d1c /source | |
| parent | 9ef4103ea59d3048f4a692c038a75dc933ff28ac (diff) | |
| parent | 267da6d5e11a285b5172983de540f6f9219c21db (diff) | |
| download | snes9x2005-ef12da18df54de9ac3b5db0a7d5bfe2a09a3e872.tar.gz snes9x2005-ef12da18df54de9ac3b5db0a7d5bfe2a09a3e872.tar.bz2 snes9x2005-ef12da18df54de9ac3b5db0a7d5bfe2a09a3e872.zip | |
Merge branch 'master' into 8bitsound
Diffstat (limited to 'source')
| -rw-r--r-- | source/nds/gui.c | 14 | ||||
| -rw-r--r-- | source/nds/message.h | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/source/nds/gui.c b/source/nds/gui.c index 4299db2..6d67ba1 100644 --- a/source/nds/gui.c +++ b/source/nds/gui.c @@ -50,15 +50,17 @@ char argv[2][MAX_PATH]; // If adding a language, make sure you update the size of the array in // message.h too. -char *lang[4] = +char *lang[6] = { "English", // 0 "简体中文", // 1 "Français", // 2 "Deutsch", // 3 + "Nederlands", // 4 + "Español", // 5 }; -char *language_options[] = { (char *) &lang[0], (char *) &lang[1], (char *) &lang[2], (char *) &lang[3] }; +char *language_options[] = { (char *) &lang[0], (char *) &lang[1], (char *) &lang[2], (char *) &lang[3], (char *) &lang[4], (char *) &lang[5] }; /****************************************************************************** * Macro definition @@ -4111,6 +4113,14 @@ int load_language_msg(char *filename, u32 language) strcpy(start, "STARTGERMAN"); strcpy(end, "ENDGERMAN"); break; + case DUTCH: + strcpy(start, "STARTDUTCH"); + strcpy(end, "ENDDUTCH"); + break; + case SPANISH: + strcpy(start, "STARTSPANISH"); + strcpy(end, "ENDSPANISH"); + break; } u32 cmplen = strlen(start); diff --git a/source/nds/message.h b/source/nds/message.h index 538bc3b..bab9292 100644 --- a/source/nds/message.h +++ b/source/nds/message.h @@ -146,10 +146,12 @@ enum LANGUAGE { ENGLISH, CHINESE_SIMPLIFIED, FRENCH, - GERMAN + GERMAN, + DUTCH, + SPANISH }; -extern char* lang[4]; // Allocated in gui.c, needs to match the languages ^ +extern char* lang[6]; // Allocated in gui.c, needs to match the languages ^ char *msg[MSG_END+1]; char msg_data[32 * 1024]; |