diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-13 12:55:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 12:55:06 -0500 |
| commit | 32fbf67d479c15351c718851412d84b4925acfdf (patch) | |
| tree | e15fd2a025a49d29d9ff770ccbb8639aa3ffcc2c /include/trainer_card.h | |
| parent | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (diff) | |
| parent | 0c1d33da4f6db7b90913586a39ed60ea2b13f39e (diff) | |
Merge branch 'master' into shop
Diffstat (limited to 'include/trainer_card.h')
| -rw-r--r-- | include/trainer_card.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/trainer_card.h b/include/trainer_card.h index af603444f..d80a5fa52 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -27,13 +27,16 @@ struct TrainerCard /*0x24*/ u32 money; /*0x28*/ u16 var_28[4]; /*0x30*/ u8 playerName[8]; - /*0x38*/ u8 emeraldAddedUnknownFields[0x64-0x38]; + /*0x38*/ u8 emeraldAddedUnknownFields[0x54-0x38]; + /*0x54*/ u16 monSpecies[2]; + /*0x58*/ u8 emeraldAddedUnknownFields2[0x64-0x58]; }; extern struct TrainerCard gTrainerCards[4]; void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion); -void sub_80C4E74(u8 arg0, void (*callback)(void)); -void sub_80C30A4(u16 *arg0); +void TrainerCard_ShowLinkCard(u8 arg0, void (*callback)(void)); +void TrainerCard_GenerateCardForPlayer(struct TrainerCard *); +u8 sub_80C4904(u8); #endif // GUARD_TRAINER_CARD_H |