diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /constants/map_constants.inc | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge with master, fix conflicts
Diffstat (limited to 'constants/map_constants.inc')
| -rw-r--r-- | constants/map_constants.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/constants/map_constants.inc b/constants/map_constants.inc index eabfe6e69..a061d2501 100644 --- a/constants/map_constants.inc +++ b/constants/map_constants.inc @@ -1,3 +1,4 @@ +@ TODO: these need to match the names in include/constants/maps.h .set cur_map_group, -1 new_map_group |