diff options
| author | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
| commit | a6d2bfaebd16940fc0ac1be3ca29caf0888296ca (patch) | |
| tree | 7ec979bc8481b2c2d55874aef3e9004ddb715781 /constants | |
| parent | 96ebc5d46287e33df7bda74a6fb340281cdaa4c5 (diff) | |
| parent | 7d657ef56716fd01bacf4a47df50ad0ec3d03b10 (diff) | |
Merge branch 'master' into secret_base
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/misc_constants.inc | 8 | ||||
| -rw-r--r-- | constants/version.inc | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc index 438fed6b6..5f4330928 100644 --- a/constants/misc_constants.inc +++ b/constants/misc_constants.inc @@ -32,8 +32,14 @@ .equiv MALE, 0 .equiv FEMALE, 1 + .ifdef ENGLISH .equiv GAME_LANGUAGE, 2 - + .else + .ifdef GERMAN + .equiv GAME_LANGUAGE, 5 + .endif + .endif + .equiv ENEMY_TYPE1, 0 .equiv ENEMY_TYPE2, 1 .equiv PLAYER_TYPE1, 2 diff --git a/constants/version.inc b/constants/version.inc index 33d2804fc..c93e439f4 100644 --- a/constants/version.inc +++ b/constants/version.inc @@ -1,4 +1,10 @@ .ifdef SAPPHIRE + .equiv GAME_VERSION, 1 + .else + .equiv GAME_VERSION, 2 + .endif + + .ifdef SAPPHIRE .set BGM_EVIL_TEAM, BGM_AQA_0 .set BGM_GOOD_TEAM, BGM_MGM0 .else |