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

Clean up contest_opponents.inc

Browse Source
This commit is contained in:
Phlosioneer 2019-03-09 01:38:38 -05:00
parent 5b4b0a245b
commit 153499ed6f
3 changed files with 414 additions and 585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

973
data/contest_opponents.inc
View File

File diff suppressed because it is too large Load Diff

18
include/contest.h
View File

@ -208,15 +208,17 @@ struct ContestPokemon
{ {
/*0x00*/ u16 species; /*0x00*/ u16 species;
/*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
/*0x0D*/ u8 trainerName[8]; /*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; /*0x1C*/ u8 whichRank:2; // 0x1 0x2
u8 aiPool_Cool:1; u8 aiPool_Cool:1; // 0x4
u8 aiPool_Beauty:1; u8 aiPool_Beauty:1; // 0x8
u8 aiPool_Cute:1; u8 aiPool_Cute:1; // 0x10
u8 aiPool_Smart:1; u8 aiPool_Smart:1; // 0x20
u8 aiPool_Tough:1; 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
@ -227,7 +229,7 @@ struct ContestPokemon
/*0x2C*/ u8 unk2C[12]; /*0x2C*/ u8 unk2C[12];
/*0x38*/ u32 personality; // personality /*0x38*/ u32 personality; // personality
/*0x3C*/ u32 otId; // otId /*0x3C*/ u32 otId; // otId
}; // wow };
struct Shared18000 struct Shared18000
{ {

8
src/data/contest_opponents.h
View File

@ -77,4 +77,10 @@ const struct ContestWinner gUnknown_08587FA4[] =
.trainerName = _("OMAR"), .trainerName = _("OMAR"),
.contestRank = CONTEST_RANK_MASTER .contestRank = CONTEST_RANK_MASTER
} }
}; };
/*
const struct ContestPokemon gContestOpponents[] =
{
};*/
extern const struct ContestPokemon gContestOpponents[96];