diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-02-11 13:01:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 13:01:17 -0800 |
| commit | 9bf6448707a36bf7d530bf932347c1adb508192e (patch) | |
| tree | 81a0cd76e018625f166d67a3b6af08f5eb423cf2 /include/contest.h | |
| parent | b281e6f6b685045960a5deba2244d13a1963a9b6 (diff) | |
| parent | f70f8a62842670eb5979ef18487a2ab25bca7922 (diff) | |
Merge pull request #557 from PikalaxALT/fix_nonmatching
Fix nonmatching functions throughout the repo
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/include/contest.h b/include/contest.h index b0bdd7f61..557b9e5c4 100644 --- a/include/contest.h +++ b/include/contest.h @@ -43,17 +43,13 @@ struct ContestPokemon /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x0D*/ u8 trainerName[8]; /*0x15*/ u8 trainerGfxId; - /*0x16*/ u8 unk16; - /*0x17*/ u8 filler17; /*0x18*/ u32 flags; - /*0x1C*/ u8 unk1C_0:2; - u8 unk1C_2:1; - u8 unk1C_3:1; - u8 unk1C_4:1; - u8 unk1C_5:1; - u8 unk1C_6:1; - u8 unk1C_7:1; - u8 filler1D; + /*0x1C*/ u8 whichRank:2; + u8 aiPool_Cool:1; + u8 aiPool_Beauty:1; + u8 aiPool_Cute:1; + u8 aiPool_Smart:1; + u8 aiPool_Tough:1; /*0x1E*/ u16 moves[4]; // moves /*0x26*/ u8 cool; // cool /*0x27*/ u8 beauty; // beauty @@ -61,8 +57,7 @@ struct ContestPokemon /*0x29*/ u8 smart; // smart /*0x2A*/ u8 tough; // tough /*0x2B*/ u8 sheen; // sheen - /*0x2C*/ u8 unk2C; - /*0x2D*/ u8 unk2D[11]; + /*0x2C*/ u8 unk2C[12]; /*0x38*/ u32 personality; // personality /*0x3C*/ u32 otId; // otId }; // wow |