diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /include/constants/region_map_sections.h | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'include/constants/region_map_sections.h')
| -rw-r--r-- | include/constants/region_map_sections.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 8ff75dfa9..12c894367 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -220,4 +220,6 @@ #define MAPSEC_IN_GAME_TRADE 0xFE #define MAPSEC_FATEFUL_ENCOUNTER 0xFF +#define MAPSEC_SUBTRACT_KANTO (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC) + #endif //GUARD_REGIONMAPSEC_H |