Merge branch 'master' into doc-sixisland

include/constants/facility_trainer_classes.h

@@ -133,10 +133,10 @@
 #define FACILITY_CLASS_CRUSH_KIN 0x81
 #define FACILITY_CLASS_SIS_AND_BRO_2 0x82
 #define FACILITY_CLASS_PKMN_PROF 0x83
-#define FACILITY_CLASS_PLAYER 0x84
-#define FACILITY_CLASS_PLAYER_2 0x85
-#define FACILITY_CLASS_PLAYER_3 0x86
-#define FACILITY_CLASS_PLAYER_4 0x87
+#define FACILITY_CLASS_BRENDAN 0x84
+#define FACILITY_CLASS_MAY 0x85
+#define FACILITY_CLASS_RED 0x86
+#define FACILITY_CLASS_LEAF 0x87
 #define FACILITY_CLASS_TEAM_ROCKET_2 0x88
 #define FACILITY_CLASS_PSYCHIC_4 0x89
 #define FACILITY_CLASS_CRUSH_GIRL 0x8A

include/constants/flags.h

@@ -670,7 +670,7 @@
 #define FLAG_SILPH_11F_DOOR                              0x28D
 #define FLAG_0x28E                                       0x28E
 #define FLAG_0x28F                                       0x28F
-#define FLAG_MET_STICKER_LADY                            0x290
+#define FLAG_MET_STICKER_MAN                             0x290
 #define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN               0x291
 #define FLAG_GOT_VS_SEEKER                               0x292
 #define FLAG_GOT_TM19_FROM_ERIKA                         0x293
@@ -1327,6 +1327,7 @@
 #define FLAG_0x808 (SYS_FLAGS + 0x8)
 
 #define PERMA_SYS_FLAGS_START 0x820
+
 #define FLAG_BADGE01_GET (SYS_FLAGS + 0x20)
 #define FLAG_BADGE02_GET (SYS_FLAGS + 0x21)
 #define FLAG_BADGE03_GET (SYS_FLAGS + 0x22)
@@ -1335,6 +1336,8 @@
 #define FLAG_BADGE06_GET (SYS_FLAGS + 0x25)
 #define FLAG_BADGE07_GET (SYS_FLAGS + 0x26)
 #define FLAG_BADGE08_GET (SYS_FLAGS + 0x27)
+#define NUM_BADGES       (1 + FLAG_BADGE08_GET - FLAG_BADGE01_GET)
+
 #define FLAG_SYS_POKEMON_GET (SYS_FLAGS + 0x28)
 #define FLAG_SYS_POKEDEX_GET (SYS_FLAGS + 0x29)
 #define FLAG_0x82A (SYS_FLAGS + 0x2A)

include/constants/metatile_labels.h

@@ -190,6 +190,10 @@
 #define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Mowed 0x311
 #define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Mowed 0x312
 
+// gTileset_SeviiIslands45
+#define METATILE_SeviiIslands45_RocketWarehouseDoor_Locked    0x30B
+#define METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked  0x2AF
+
 // gTileset_SeviiIslands67
 #define METATILE_SeviiIslands67_DottedHoleDoor_Closed    0x357
 #define METATILE_SeviiIslands67_DottedHoleDoor_Open      0x358

include/constants/trainer_card.h

@@ -0,0 +1,17 @@
+#ifndef GUARD_CONSTANTS_TRAINER_CARD_H
+#define GUARD_CONSTANTS_TRAINER_CARD_H
+
+#define TRAINER_CARD_PROFILE_LENGTH  4
+#define TRAINER_CARD_STICKER_TYPES   3
+
+#define CARD_TYPE_FRLG     0
+#define CARD_TYPE_RSE      1
+
+#define MON_ICON_TINT_NORMAL  0
+#define MON_ICON_TINT_BLACK   1
+#define MON_ICON_TINT_PINK    2
+#define MON_ICON_TINT_SEPIA   3
+
+#define NUM_LINK_TRAINER_CARD_CLASSES 8
+
+#endif // GUARD_CONSTANTS_TRAINER_CARD_H