diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest.h | 17 | ||||
| -rw-r--r-- | include/data2.h | 2 | ||||
| -rw-r--r-- | include/graphics.h | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/include/contest.h b/include/contest.h index 0203f7dd0..414723391 100644 --- a/include/contest.h +++ b/include/contest.h @@ -21,11 +21,18 @@ struct ContestPokemon /*0x00*/ u16 species; /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x0D*/ u8 trainerName[8]; - /*0x15*/ u8 unk15; + /*0x15*/ u8 trainerGfxId; /*0x16*/ u8 unk16; /*0x17*/ u8 filler17; - /*0x18*/ u32 unk18; - /*0x1C*/ u8 filler1C[2]; + /*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; /*0x1E*/ u16 moves[4]; // moves /*0x26*/ u8 cool; // cool /*0x27*/ u8 beauty; // beauty @@ -46,9 +53,9 @@ void sub_80AB47C(void); void sub_80AE098(u8); void sub_80AE398(u8, u8); u8 sub_80AE47C(struct Pokemon *party); -u32 sub_80AE770(u8, u8); +u16 sub_80AE770(u8, u8); void sub_80AE82C(u8); -u8 sub_80AEB1C(); +u8 sub_80AEB1C(u16); void sub_80AF668(void); void sub_80B0F28(u8); int sub_80B2A7C(u8); //Don't know return type size diff --git a/include/data2.h b/include/data2.h index 53a90944d..97cb4fd7a 100644 --- a/include/data2.h +++ b/include/data2.h @@ -22,7 +22,7 @@ extern const struct SpriteFrameImage gSpriteImageTable_81E7A70[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7B70[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[]; -extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18; +extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18[]; extern const union AnimCmd *const gSpriteAnimTable_81E7C64[]; extern struct MonCoords gMonFrontPicCoords[]; extern struct MonCoords gMonBackPicCoords[]; diff --git a/include/graphics.h b/include/graphics.h index 7a2396615..35bc71c0b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -43,6 +43,9 @@ extern const u8 gUnknown_08D1A364[]; extern const u8 gUnknown_08D1A490[]; extern const u8 gUnknown_08D1A618[]; +extern const u8 gContestJudgeGfx[]; +extern const u8 gContest2Pal[]; + extern const u8 gMonFootprint_QuestionMark[]; // data/graphics/pokemon/graphics.inc |