diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:07:24 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:07:24 -0400 |
| commit | 207a54393c533e073e54365a8069753536fefa3c (patch) | |
| tree | 2532ccc2fd26729e9f3f6e6405171a534f2ea231 /include/contest.h | |
| parent | 13c2f91b11a9ae773fd22b045f37b85c6e1ed984 (diff) | |
Fix mistakes and use EVENT_OBJ_GFX_* macros
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/contest.h b/include/contest.h index 5c299bee5..a0b1a6b34 100644 --- a/include/contest.h +++ b/include/contest.h @@ -216,7 +216,6 @@ struct ContestPokemon /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1]; /*0x15*/ u8 trainerGfxId; - // Temp note: 2 bytes of padding /*0x18*/ u32 flags; /*0x1C*/ u8 whichRank:2; // 0x1 0x2 u8 aiPool_Cool:1; // 0x4 @@ -224,7 +223,6 @@ struct ContestPokemon u8 aiPool_Cute:1; // 0x10 u8 aiPool_Smart:1; // 0x20 u8 aiPool_Tough:1; // 0x40 - // Temp note: 1 byte of padding /*0x1E*/ u16 moves[4]; // moves /*0x26*/ u8 cool; // cool /*0x27*/ u8 beauty; // beauty |