diff options
author | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
commit | 73cce797533c5985406b7b5696834b0976039c4f (patch) | |
tree | bcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /include/contest.h | |
parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'include/contest.h')
-rw-r--r-- | include/contest.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/contest.h b/include/contest.h index 502d44b90..8790d7371 100644 --- a/include/contest.h +++ b/include/contest.h @@ -226,6 +226,11 @@ extern u8 gUnknown_02039F24; extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; extern u8 gUnknown_02039F30; +extern u8 gContestFinalStandings[4]; +extern u8 gContestPlayerMonIndex; +extern s16 gUnknown_02039F08[4]; +extern s16 gContestMonConditions[4]; +extern u8 gIsLinkContest; struct Shared18000 { @@ -427,5 +432,6 @@ bool8 Contest_IsMonsTurnDisabled(u8 a); bool8 sub_80DE1E8(u8 a); void SetStartledString(u8 a, u8 b); s8 Contest_GetMoveExcitement(u16); +void sub_80DEDA8(u8); #endif //GUARD_CONTEST_H |