Merge pull request #522 from DizzyEggg/trainer_card

Trainer card

6 files changed, 72 insertions, 17 deletions

diff --git a/include/graphics.h b/include/graphics.h
index 29719d1a0..77390db90 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4846,4 +4846,18 @@ extern const u16 gUnknown_08DC64E8[];
 extern const u16 gUnknown_08DC64FC[];
 extern const u16 gUnknown_08DC6510[];
 
+// Trainer Card.
+extern const u16 gEmeraldTrainerCard0Star_Pal[];
+extern const u32 gEmeraldTrainerCard_Gfx[];
+extern const u16 gFireRedTrainerCard0Star_Pal[];
+extern const u32 gFireRedTrainerCard_Gfx[];
+extern const u32 gUnknown_08DD2AE0[];
+extern const u32 gUnknown_08DD21B0[];
+extern const u32 gUnknown_08DD2D30[];
+extern const u32 gUnknown_08DD2010[];
+extern const u32 gUnknown_08DD2B78[];
+extern const u32 gUnknown_08DD228C[];
+extern const u32 gUnknown_08DD2E5C[];
+extern const u32 gUnknown_08DD1F78[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/palette.h b/include/palette.h
index 540452f3d..f51dc4b88 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -66,5 +66,9 @@ void BeginHardwarePaletteFade(u8, u8, u8, u8, u8);
 void BlendPalettes(u32, u8, u16);
 void BlendPalettesUnfaded(u32, u8, u16);
 void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7);
+void TintPalette_GrayScale(u16 *palette, u16 count);
+void TintPalette_GrayScale2(u16 *palette, u16 count);
+void TintPalette_SepiaTone(u16 *palette, u16 count);
+void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 bTone);
 
 #endif // GUARD_PALETTE_H
diff --git a/include/pokedex.h b/include/pokedex.h
index b6d323fd3..91e9e37d4 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -41,5 +41,6 @@ u16 GetHoennPokedexCount(u8);
 u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality);
 s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
 u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
+bool16 HasAllHoennMons(void);
 
 #endif // GUARD_POKEDEX_H
diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h
index 02a35ecba..7d8d99628 100644
--- a/include/script_pokemon_util_80F87D8.h
+++ b/include/script_pokemon_util_80F87D8.h
@@ -4,5 +4,6 @@
 u16 sub_80F903C(void);
 void ReducePlayerPartyToSelectedMons(void);
 void HealPlayerParty(void);
+u8 CountPlayerContestPaintings(void);
 
 #endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
diff --git a/include/strings.h b/include/strings.h
index ff0d08195..4e9c91ff5 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2222,4 +2222,30 @@ extern const u8 gText_PreliminaryResults[];
 extern const u8 gText_Round2Results[];
 extern const u8 gText_Var1sVar2Won[];
 
+// Trainer Card
+extern const u8 gText_LinkCableBattles[];
+extern const u8 gText_LinkBattles[];
+extern const u8 gText_WaitingTrainerFinishReading[];
+extern const u8 gText_TrainerCardName[];
+extern const u8 gText_TrainerCardIDNo[];
+extern const u8 gText_TrainerCardMoney[];
+extern const u8 gText_PokedollarVar1[];
+extern const u8 gText_EmptyString6[];
+extern const u8 gText_TrainerCardPokedex[];
+extern const u8 gText_TrainerCardTime[];
+extern const u8 gText_Colon2[];
+extern const u8 gText_Var1sTrainerCard[];
+extern const u8 gText_HallOfFameDebut[];
+extern const u8 gText_WinsLosses[];
+extern const u8 gText_PokemonTrades[];
+extern const u8 gText_BerryCrush[];
+extern const u8 gText_UnionTradesAndBattles[];
+extern const u8 gText_Var1DarkGreyShadowLightGrey[];
+extern const u8 gText_PokeblocksWithFriends[];
+extern const u8 gText_WonContestsWFriends[];
+extern const u8 gText_WSlashStraightSlash[];
+extern const u8 gText_Var1DarkLightGreyBP[];
+extern const u8 gText_BattleTower[];
+extern const u8 gText_BattlePtsWon[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/trainer_card.h b/include/trainer_card.h
index 1af247d8a..1cadbd8fc 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -6,38 +6,47 @@ struct TrainerCard
     /*0x00*/ u8 gender;
     /*0x01*/ u8 stars;
     /*0x02*/ bool8 hasPokedex;
-    /*0x03*/ bool8 var_3;
-    /*0x04*/ bool8 var_4;
-    /*0x05*/ u8 var_5;
-    /*0x06*/ u16 firstHallOfFameA;
-    /*0x08*/ u16 firstHallOfFameB;
-    /*0x0A*/ u16 firstHallOfFameC;
-    /*0x0C*/ u16 pokedexSeen;
+    /*0x03*/ bool8 caughtAllHoenn;
+    /*0x04*/ bool8 hasAllPaintings;
+    /*0x06*/ u16 hofDebutHours;
+    /*0x08*/ u16 hofDebutMinutes;
+    /*0x0A*/ u16 hofDebutSeconds;
+    /*0x0C*/ u16 caughtMonsCount;
     /*0x0E*/ u16 trainerId;
     /*0x10*/ u16 playTimeHours;
     /*0x12*/ u16 playTimeMinutes;
     /*0x14*/ u16 linkBattleWins;
     /*0x16*/ u16 linkBattleLosses;
     /*0x18*/ u16 battleTowerWins;
-    /*0x1A*/ u16 battleTowerLosses;
+    /*0x1A*/ u16 battleTowerStraightWins;
     /*0x1C*/ u16 contestsWithFriends;
     /*0x1E*/ u16 pokeblocksWithFriends;
     /*0x20*/ u16 pokemonTrades;
-    /*0x22*/ u16 var_22;
     /*0x24*/ u32 money;
     /*0x28*/ u16 var_28[4];
-    /*0x30*/ u8 playerName[8];
-    /*0x38*/ u8 emeraldAddedUnknownFields[0x54-0x38];
-    /*0x54*/ u16 monSpecies[2];
-    /*0x58*/ u8 emeraldAddedUnknownFields2[0x64-0x58];
+    /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+    /*0x38*/ u8 version;
+    /*0x3A*/ u16 var_3A;
+    /*0x3C*/ u32 berryCrushPoints;
+    /*0x40*/ u32 unionRoomNum;
+    /*0x44*/ u8 filler44[0x8];
+    /*0x4C*/ u8 var_4C;
+    /*0x4D*/ u8 var_4D;
+    /*0x4E*/ u8 var_4E;
+    /*0x4F*/ u8 var_4F;
+    /*0x50*/ u8 var_50[0x4];
+    /*0x54*/ u16 monSpecies[PARTY_SIZE];
+    /*0x60*/ bool16 hasAllSymbols;
+    /*0x62*/ u16 frontierBP;
 };
 
 extern struct TrainerCard gTrainerCards[4];
 
-void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion);
-void TrainerCard_ShowLinkCard(u8 arg0, void (*callback)(void));
+u32 CountPlayerTrainerStars(void);
+u8 sub_80C4904(u8 cardId);
+void CopyTrainerCardData(struct TrainerCard *dst, u16 *src, u8 gameVersion);
+void ShowPlayerTrainerCard(void (*callback)(void));
+void ShowTrainerCardInLink(u8 arg0, void (*callback)(void));
 void TrainerCard_GenerateCardForPlayer(struct TrainerCard *);
-u8 sub_80C4904(u8);
-void sub_80C6D80(const u8 *, u8 *, u8, u8, u8);
 
 #endif // GUARD_TRAINER_CARD_H