Merge master into sync-script

2020-01-12 15:39:21 -05:00
parent aa84a1d3a1 15ff7eb2f8
commit f276383293
84 changed files with 16393 additions and 35195 deletions
@@ -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
@@ -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