diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-11 18:20:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 18:20:58 -0500 |
| commit | f12824e3b1643f86599e2c03c96b752a87a73746 (patch) | |
| tree | ea95b65775cf7caf2089ea21f47a07c8571413bd /include/trainer_card.h | |
| parent | 7526b2ccf1ab02a975ee477341f8accbf3f108c5 (diff) | |
| parent | b43c48202ba3b3a1cd31c8abf1a726bf8980f043 (diff) | |
Merge pull request #180 from ghoulslash/trainer-card
Trainer card
Diffstat (limited to 'include/trainer_card.h')
| -rw-r--r-- | include/trainer_card.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/trainer_card.h b/include/trainer_card.h index b38754988..06844dc2e 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -24,23 +24,26 @@ struct TrainerCard /*0x20*/ u16 pokemonTrades; /*0x24*/ u32 money; /*0x28*/ u16 var_28[4]; - /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH]; /*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; + /*0x44*/ u32 berriesPicked; + /*0x48*/ u32 jumpsInRow; + /*0x4C*/ bool8 var_4C; + /*0x4D*/ bool8 hasAllMons; /*0x4E*/ u8 var_4E; /*0x4F*/ u8 var_4F; - /*0x50*/ u8 var_50[0x4]; + /*0x50*/ u8 var_50[4]; /*0x54*/ u16 monSpecies[PARTY_SIZE]; }; extern struct TrainerCard gTrainerCards[4]; -void InitTrainerCard(MainCallback callback); -void InitLinkPartnerTrainerCard(u8 whoseCard, MainCallback callback); +void ShowPlayerTrainerCard(void (*callback)(void)); +void ShowTrainerCardInLink(u8 whoseCard, MainCallback callback); +u8 GetTrainerCardStars(u8 cardId); +void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *trainerCard); #endif //GUARD_TRAINER_CARD_H |