diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 15:39:21 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 16:03:06 -0500 |
| commit | f2763832931127fc24e7cb9f9cdd85e3cf706a5c (patch) | |
| tree | d23050509231d1d9c6d1694b2755c93fdaf26a4e /include/constants | |
| parent | aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (diff) | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
Merge master into sync-script
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/region_map.h | 6 | ||||
| -rw-r--r-- | include/constants/trade.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/constants/region_map.h b/include/constants/region_map.h index 0957a72ee..bd087bd60 100644 --- a/include/constants/region_map.h +++ b/include/constants/region_map.h @@ -89,6 +89,9 @@ #define MAPSEC_SKY_PILLAR 0x55 #define MAPSEC_SECRET_BASE 0x56 #define MAPSEC_DYNAMIC 0x57 + +#define MAPSECS_KANTO 0x58 + #define MAPSEC_PALLET_TOWN 0x58 #define MAPSEC_VIRIDIAN_CITY 0x59 #define MAPSEC_PEWTER_CITY 0x5A @@ -144,6 +147,9 @@ #define MAPSEC_POKEMON_TOWER 0x8C #define MAPSEC_CERULEAN_CAVE 0x8D #define MAPSEC_POWER_PLANT 0x8E + +#define MAPSECS_SEVII_123 0x8F + #define MAPSEC_ONE_ISLAND 0x8F #define MAPSEC_TWO_ISLAND 0x90 #define MAPSEC_THREE_ISLAND 0x91 diff --git a/include/constants/trade.h b/include/constants/trade.h index b1371caab..b22cd26d2 100644 --- a/include/constants/trade.h +++ b/include/constants/trade.h @@ -1,4 +1,4 @@ - #ifndef GUARD_CONSTANTS_TRADE_H +#ifndef GUARD_CONSTANTS_TRADE_H #define GUARD_CONSTANTS_TRADE_H // TODO: document trade.c and trade_scene.c with corresponding macros @@ -115,4 +115,4 @@ #define CANT_REGISTER_MON 1 #define CANT_REGISTER_EGG 2 -#endif //GUARD_CONSTANTS_TRADE_H +#endif // GUARD_CONSTANTS_TRADE_H |