From 3b3b2dd031868f116e09b7bbff7e8b8b6ceb7a9a Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 3 Apr 2019 20:43:23 -0400 Subject: General cleanup of the second half of contest.c --- include/contest.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include/contest.h') diff --git a/include/contest.h b/include/contest.h index 2f986f217..1fba54885 100644 --- a/include/contest.h +++ b/include/contest.h @@ -5,6 +5,7 @@ #define CONTESTANT_COUNT 4 #define APPLAUSE_METER_SIZE 5 +#define CONTEST_TURN_COUNT 5 #define CONTEST_DEBUG_MODE_OFF 0 // Prints the totalPoints value for each contestant. @@ -298,9 +299,9 @@ struct Contest /*0x13*/ s8 applauseLevel; /*0x19218*/ u8 prevTurnOrder[CONTESTANT_COUNT]; /*0x1921C*/ u32 unk1921C; // saved RNG value? - u16 unk19220[5][4]; // move history? - u8 unk19248[5][4]; // excitement history - u8 applauseMeterSpriteId; // sprite ID + u16 moveHistory[CONTEST_TURN_COUNT][CONTESTANT_COUNT]; + u8 excitementHistory[CONTEST_TURN_COUNT][CONTESTANT_COUNT]; + u8 applauseMeterSpriteId; /*0x1925D*/ u8 contestSetupState; /*0x1925E*/ u8 unk1925E; }; @@ -483,7 +484,7 @@ u8 sub_80DAE0C(struct Pokemon *pkmn); void sub_80DB09C(u8 contestCategory); bool8 IsSpeciesNotUnown(u16 species); bool8 Contest_IsMonsTurnDisabled(u8 a); -void sub_80DBED4(void); +void SaveLinkContestResults(void); void SortContestants(bool8 a); void SetContestantEffectStringID(u8 a, u8 b); void SetContestantEffectStringID2(u8 a, u8 b); -- cgit v1.2.3