diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-15 21:04:25 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-15 21:04:25 -0500 |
| commit | da2e0dfe5075d8e6200ecd06994175c81c847705 (patch) | |
| tree | 183a9573fcc757f77e1eb784750028d225336979 /include/global.h | |
| parent | 88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into clock
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index f3ec9ce33..0f486c235 100644 --- a/include/global.h +++ b/include/global.h @@ -48,7 +48,11 @@ enum enum LanguageId { LANGUAGE_JAPANESE = 1, LANGUAGE_ENGLISH = 2, + LANGUAGE_FRENCH = 3, + LANGUAGE_ITALIAN = 4, LANGUAGE_GERMAN = 5, + // 6 goes unused but the theory is it was meant to be Korean + LANGUAGE_SPANISH = 7, }; #define GAME_LANGUAGE (LANGUAGE_ENGLISH) @@ -284,7 +288,7 @@ struct SecretBaseRecord /*0x1B34*/ u8 partyEVs[6]; }; -#include "game_stat.h" +#include "constants/game_stat.h" #include "global.fieldmap.h" #include "global.berry.h" #include "global.tv.h" |