ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mistakes and use EVENT_OBJ_GFX_* macros

Browse Source
This commit is contained in:
Phlosioneer 2019-03-31 20:07:24 -04:00
parent 13c2f91b11
commit 207a54393c
4 changed files with 257 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/contest.h
View File

@ -216,7 +216,6 @@ struct ContestPokemon
/*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
/*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1]; /*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1];
/*0x15*/ u8 trainerGfxId; /*0x15*/ u8 trainerGfxId;
// Temp note: 2 bytes of padding
/*0x18*/ u32 flags; /*0x18*/ u32 flags;
/*0x1C*/ u8 whichRank:2; // 0x1 0x2 /*0x1C*/ u8 whichRank:2; // 0x1 0x2
u8 aiPool_Cool:1; // 0x4 u8 aiPool_Cool:1; // 0x4
@ -224,7 +223,6 @@ struct ContestPokemon
u8 aiPool_Cute:1; // 0x10 u8 aiPool_Cute:1; // 0x10
u8 aiPool_Smart:1; // 0x20 u8 aiPool_Smart:1; // 0x20
u8 aiPool_Tough:1; // 0x40 u8 aiPool_Tough:1; // 0x40
// Temp note: 1 byte of padding
/*0x1E*/ u16 moves[4]; // moves /*0x1E*/ u16 moves[4]; // moves
/*0x26*/ u8 cool; // cool /*0x26*/ u8 cool; // cool
/*0x27*/ u8 beauty; // beauty /*0x27*/ u8 beauty; // beauty

384
src/data/contest_opponents.h
View File

File diff suppressed because it is too large Load Diff