diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 11:42:59 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 11:42:59 +0100 |
| commit | f4ab21ee67eb3d254e086c95467ac08b08a6014c (patch) | |
| tree | b54ca1eb6800b5c07b94c134e401f2e4ef00dc79 /include/global.h | |
| parent | 435167674968749684710d7ad5c4f628c6b4ae86 (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into decompile_use_pokeblock
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 fdcebc924..f52919c9d 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" |