diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-19 23:04:33 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-19 23:04:33 +0100 |
| commit | 576d1b3474e9ebec6a16d3ca68378d0f92fb4026 (patch) | |
| tree | 7e8703ba4a5ab4af71dd6b0fe9b1e382c25193bb /include | |
| parent | f06c0749bcebc10fe146ca038a6a8597952a0f21 (diff) | |
Document and match somne trainer card
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokedex.h | 1 | ||||
| -rw-r--r-- | include/script_pokemon_util_80F87D8.h | 1 | ||||
| -rw-r--r-- | include/trainer_card.h | 17 |
3 files changed, 10 insertions, 9 deletions
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/trainer_card.h b/include/trainer_card.h index a3d9160e0..df516510e 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -6,27 +6,27 @@ struct TrainerCard /*0x00*/ u8 gender; /*0x01*/ u8 stars; /*0x02*/ bool8 hasPokedex; - /*0x03*/ bool8 var_3; - /*0x04*/ bool8 var_4; + /*0x03*/ bool8 caughtAllHoenn; + /*0x04*/ bool8 hasAllPaintings; /*0x05*/ u8 var_5; - /*0x06*/ u16 firstHallOfFameA; - /*0x08*/ u16 firstHallOfFameB; - /*0x0A*/ u16 firstHallOfFameC; - /*0x0C*/ u16 pokedexCaught; + /*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 battleTowerLosses; // wrong name /*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]; + /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x38*/ u8 var_38; /*0x39*/ u8 var_39; /*0x3A*/ u16 var_3A; @@ -43,7 +43,6 @@ struct TrainerCard /*0x62*/ u16 var_62; }; - extern struct TrainerCard gTrainerCards[4]; void sub_80C3120(struct TrainerCard *arg0, u16 *src, u8 gameVersion); |