diff options
| author | JaceCearK1 <JaceCearK1@users.noreply.github.com> | 2017-07-01 21:04:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 21:04:18 +0200 |
| commit | 0dd804a99e5455a0eac8ff6ed87d9de16c7380b7 (patch) | |
| tree | 7b3567978b63ee6548a7b945e075ea8ba37bef51 /include/trainer_card.h | |
| parent | f1344efd2aff92292f58f7323bd9297a38fe9b02 (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge pull request #1 from pret/master
Update fork to match main fork.
Diffstat (limited to 'include/trainer_card.h')
| -rw-r--r-- | include/trainer_card.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/include/trainer_card.h b/include/trainer_card.h index 7269c0b20..bd0c808dd 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -2,30 +2,30 @@ #define GUARD_TRAINER_CARD_H 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; - /*0x0E*/ u16 trainerId; - /*0x10*/ u16 playTimeHours; - /*0x12*/ u16 playTimeMinutes; - /*0x14*/ u16 linkBattleWins; - /*0x16*/ u16 linkBattleLosses; - /*0x18*/ u16 battleTowerWins; - /*0x1A*/ u16 battleTowerLosses; - /*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]; + /*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; + /*0x0E*/ u16 trainerId; + /*0x10*/ u16 playTimeHours; + /*0x12*/ u16 playTimeMinutes; + /*0x14*/ u16 linkBattleWins; + /*0x16*/ u16 linkBattleLosses; + /*0x18*/ u16 battleTowerWins; + /*0x1A*/ u16 battleTowerLosses; + /*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]; }; void sub_8093110(void (*)(void)); |