diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
commit | 49c88e63439a4ca08ca9fac7a85de51d4f56c8bd (patch) | |
tree | 69504e13ad956a1596d7f5f188279f0c25ddad55 /include/contest.h | |
parent | 431e737453feb99c18349060cad53d551ba41dcf (diff) | |
parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) |
Merge branch 'master' of github.com:pret/pokeemerald into dump_maps
Diffstat (limited to 'include/contest.h')
-rw-r--r-- | include/contest.h | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/include/contest.h b/include/contest.h index 5c473bd2c..7dcde7da2 100644 --- a/include/contest.h +++ b/include/contest.h @@ -1,7 +1,8 @@ #ifndef GUARD_CONTEST_H #define GUARD_CONTEST_H -struct ContestStruct_02039E00 { +struct ContestStruct_02039E00 +{ u16 unk_00; u8 unk_02[11]; u8 unk_0d[8]; @@ -11,8 +12,30 @@ struct ContestStruct_02039E00 { extern struct ContestStruct_02039E00 gUnknown_02039E00[4]; extern u8 gUnknown_02039F24; -extern EWRAM_DATA u16 gScriptContestCategory; -extern EWRAM_DATA u8 gUnknown_02039F2E; -extern EWRAM_DATA u8 gUnknown_02039F30; +extern u16 gScriptContestCategory; +extern u8 gUnknown_02039F2E; +extern u8 gUnknown_02039F30; + +struct ContestStruct_field_18 +{ + // unknown size + u16 field_0; +}; + +struct ContestResources +{ + void *field_0; + void *field_4; + void *field_8; + void *field_C; + void *field_10; + void *field_14; + struct ContestStruct_field_18 *field_18; +}; + +extern struct ContestResources *gContestResources; + +bool8 IsSpeciesNotUnown(u16 species); +void LoadContestBgAfterMoveAnim(void); #endif //GUARD_CONTEST_H |