diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-17 20:10:21 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-17 20:10:21 -0400 |
| commit | 8027698fd30d410f2262906a25c0f00170abd58f (patch) | |
| tree | 4b36f90f33d3d93a329956c5c88cba0d48157fb0 /constants | |
| parent | 61d54c967acbbfdc0aaeb3f96d5f7d4aa94c6dcf (diff) | |
| parent | d01a28c82fd25b8a92cbb1d508279e34690e3d26 (diff) | |
resolve tv.c conflict
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 |