diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-13 20:51:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-13 20:51:05 +0100 |
| commit | 4b420643dc33d93ec38ebaa3f4068c1766491c06 (patch) | |
| tree | 0b2cf61da41be02a78758147159250e242cca4a3 /include/constants | |
| parent | edddd847c585b729fbec96194e5e2d891149f27e (diff) | |
| parent | e13895e58ab38c8adbde1e572068692e8ee5ee35 (diff) | |
Merge branch 'master' into trainer_hill
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/region_map_sections.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 12c894367..bba76939c 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -216,10 +216,10 @@ #define MAPSEC_TRAINER_HILL 0xD4 #define MAPSEC_NONE 0xD5 -#define MAPSEC_SPECIAL_EGG 0xFD -#define MAPSEC_IN_GAME_TRADE 0xFE -#define MAPSEC_FATEFUL_ENCOUNTER 0xFF +#define METLOC_SPECIAL_EGG 0xFD +#define METLOC_IN_GAME_TRADE 0xFE +#define METLOC_FATEFUL_ENCOUNTER 0xFF -#define MAPSEC_SUBTRACT_KANTO (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC) +#define KANTO_MAPSEC_COUNT (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC) #endif //GUARD_REGIONMAPSEC_H |