summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/graphics.h14
-rw-r--r--include/palette.h4
-rw-r--r--include/strings.h26
-rw-r--r--include/trainer_card.h26
4 files changed, 56 insertions, 14 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/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 df516510e..a5b217413 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -8,7 +8,6 @@ struct TrainerCard
/*0x02*/ bool8 hasPokedex;
/*0x03*/ bool8 caughtAllHoenn;
/*0x04*/ bool8 hasAllPaintings;
- /*0x05*/ u8 var_5;
/*0x06*/ u16 hofDebutHours;
/*0x08*/ u16 hofDebutMinutes;
/*0x0A*/ u16 hofDebutSeconds;
@@ -19,36 +18,35 @@ struct TrainerCard
/*0x14*/ u16 linkBattleWins;
/*0x16*/ u16 linkBattleLosses;
/*0x18*/ u16 battleTowerWins;
- /*0x1A*/ u16 battleTowerLosses; // wrong name
+ /*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[PLAYER_NAME_LENGTH + 1];
- /*0x38*/ u8 var_38;
- /*0x39*/ u8 var_39;
+ /*0x38*/ u8 version;
/*0x3A*/ u16 var_3A;
- /*0x3C*/ u32 var_3C;
- /*0x40*/ u32 var_40;
+ /*0x3C*/ u32 berruCrushPoints;
+ /*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[6];
- /*0x60*/ u16 var_60;
- /*0x62*/ u16 var_62;
+ /*0x54*/ u16 monSpecies[PARTY_SIZE];
+ /*0x60*/ bool16 hasAllSymbols;
+ /*0x62*/ u16 frontierBP;
};
extern struct TrainerCard gTrainerCards[4];
-void sub_80C3120(struct TrainerCard *arg0, u16 *src, 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