7 files changed, 43 insertions, 17 deletions
diff --git a/include/constants/facility_trainer_classes.h b/include/constants/facility_trainer_classes.h
index 10500ff35..fe94608dd 100644
--- a/include/constants/facility_trainer_classes.h
+++ b/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
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7555f3c6b..11b09512f 100644
--- a/include/constants/flags.h
+++ b/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)
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 01140a160..75804bfd9 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -190,4 +190,8 @@
 #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
+
 #endif // GUARD_METATILE_LABELS_H
diff --git a/include/constants/trainer_card.h b/include/constants/trainer_card.h
new file mode 100644
index 000000000..67901eb27
--- /dev/null
+++ b/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
diff --git a/include/graphics.h b/include/graphics.h
index dcc4c44a7..1405cdcf1 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4845,10 +4845,10 @@ extern const u32 gBuyMenuFrame_Pal[];
 extern const u16 gUnknown_8D2FBB4[];
 
 // trainer card
-extern const u16 gFireRedTrainerCard_Pal[];
-extern const u32 gFireRedTrainerCard_Gfx[];
-extern const u16 gEmeraldTrainerCard_Pal[];
-extern const u32 gEmeraldTrainerCard_Gfx[];
+extern const u16 gKantoTrainerCard_Pal[];
+extern const u32 gKantoTrainerCard_Gfx[];
+extern const u16 gHoennTrainerCard_Pal[];
+extern const u32 gHoennTrainerCard_Gfx[];
 
 // battle_interface
 extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[];
diff --git a/include/trainer_card.h b/include/trainer_card.h
index 2bf20b045..09b9a253a 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_TRAINER_CARD_H
 #define GUARD_TRAINER_CARD_H
 
+#include "constants/trainer_card.h"
+
 struct TrainerCardRSE
 {
     /*0x00*/ u8 gender;
@@ -23,7 +25,7 @@ struct TrainerCardRSE
     /*0x1E*/ u16 pokeblocksWithFriends;
     /*0x20*/ u16 pokemonTrades;
     /*0x24*/ u32 money;
-    /*0x28*/ u16 var_28[4];
+    /*0x28*/ u16 easyChatProfile[TRAINER_CARD_PROFILE_LENGTH];
     /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
 };
 
@@ -31,16 +33,16 @@ struct TrainerCard
 {
     /*0x00*/ struct TrainerCardRSE rse;
     /*0x38*/ u8 version;
-    /*0x3A*/ u16 var_3A;
+    /*0x3A*/ bool16 hasAllFrontierSymbols;
     /*0x3C*/ u32 berryCrushPoints;
     /*0x40*/ u32 unionRoomNum;
     /*0x44*/ u32 berriesPicked;
-	/*0x48*/ u32 jumpsInRow;
-    /*0x4C*/ bool8 var_4C;
+    /*0x48*/ u32 jumpsInRow;
+    /*0x4C*/ bool8 shouldDrawStickers;
     /*0x4D*/ bool8 hasAllMons;
-    /*0x4E*/ u8 var_4E;
-    /*0x4F*/ u8 var_4F;
-    /*0x50*/ u8 var_50[4];
+    /*0x4E*/ u8 monIconTint;
+    /*0x4F*/ u8 facilityClass;
+    /*0x50*/ u8 stickers[TRAINER_CARD_STICKER_TYPES];
     /*0x54*/ u16 monSpecies[PARTY_SIZE];
 };
 
diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h
index 436a791e9..23f6e2cab 100644
--- a/include/trainer_pokemon_sprites.h
+++ b/include/trainer_pokemon_sprites.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-u16 sub_810C330(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
+u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
 bool16 ResetAllPicSprites(void);
 u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);