Continue new contest documentation

1 files changed, 9 insertions, 127 deletions

diff --git a/include/contest.h b/include/contest.h
index b6818f996..1cad71705 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -17,124 +17,6 @@ enum
 
 enum
 {
-    CONTEST_EFFECT_HIGHLY_APPEALING,
-    CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-    CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
-    CONTEST_EFFECT_REPETITION_NOT_BORING,
-    CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-    CONTEST_EFFECT_AVOID_STARTLE,
-    CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY,
-    CONTEST_EFFECT_USER_LESS_EASILY_STARTLED,
-    CONTEST_EFFECT_STARTLE_FRONT_MON,
-    CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS,
-    CONTEST_EFFECT_STARTLE_PREV_MON,
-    CONTEST_EFFECT_STARTLE_PREV_MONS,
-    CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-    CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-    CONTEST_EFFECT_STARTLE_PREV_MON_2,
-    CONTEST_EFFECT_STARTLE_PREV_MONS_2,
-    CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
-    CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-    CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-    CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-    CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL,
-    CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL,
-    CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL,
-    CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL,
-    CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL,
-    CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS,
-    CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-    CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-    CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION,
-    CONTEST_EFFECT_BETTER_IF_FIRST,
-    CONTEST_EFFECT_BETTER_IF_LAST,
-    CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
-    CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
-    CONTEST_EFFECT_BETTER_WHEN_LATER,
-    CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
-    CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-    CONTEST_EFFECT_BETTER_IF_DIFF_TYPE,
-    CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-    CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-    CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION,
-    CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
-    CONTEST_EFFECT_NEXT_APPEAL_LATER,
-    CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER,
-    CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-    CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
-    CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-    CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
-    CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-};
-
-enum
-{
-    COMBO_STARTER_RAIN_DANCE = 1,
-    COMBO_STARTER_RAGE,
-    COMBO_STARTER_FOCUS_ENERGY,
-    COMBO_STARTER_HYPNOSIS,
-    COMBO_STARTER_ENDURE,
-    COMBO_STARTER_HORN_ATTACK,
-    COMBO_STARTER_SWORDS_DANCE,
-    COMBO_STARTER_STOCKPILE,
-    COMBO_STARTER_SUNNY_DAY,
-    COMBO_STARTER_REST,
-    COMBO_STARTER_VICE_GRIP,
-    COMBO_STARTER_DEFENSE_CURL,
-    COMBO_STARTER_CHARGE,
-    COMBO_STARTER_ROCK_THROW,
-    COMBO_STARTER_YAWN,
-    COMBO_STARTER_SCARY_FACE,
-    COMBO_STARTER_POWDER_SNOW,
-    COMBO_STARTER_LOCK_ON,
-    COMBO_STARTER_SOFT_BOILED,
-    COMBO_STARTER_MEAN_LOOK,
-    COMBO_STARTER_SCRATCH,
-    COMBO_STARTER_GROWTH,
-    COMBO_STARTER_HAIL,
-    COMBO_STARTER_SANDSTORM,
-    COMBO_STARTER_BELLY_DRUM,
-    COMBO_STARTER_MIND_READER,
-    COMBO_STARTER_DRAGON_BREATH,
-    COMBO_STARTER_DRAGON_RAGE,
-    COMBO_STARTER_DRAGON_DANCE,
-    COMBO_STARTER_SURF,
-    COMBO_STARTER_DIVE,
-    COMBO_STARTER_STRING_SHOT,
-    COMBO_STARTER_LEER,
-    COMBO_STARTER_TAUNT,
-    COMBO_STARTER_CHARM,
-    COMBO_STARTER_HARDEN,
-    COMBO_STARTER_SING,
-    COMBO_STARTER_EARTHQUAKE,
-    COMBO_STARTER_DOUBLE_TEAM,
-    COMBO_STARTER_CURSE,
-    COMBO_STARTER_SWEET_SCENT,
-    COMBO_STARTER_SLUDGE,
-    COMBO_STARTER_SLUDGE_BOMB,
-    COMBO_STARTER_THUNDER_PUNCH,
-    COMBO_STARTER_FIRE_PUNCH,
-    COMBO_STARTER_ICE_PUNCH,
-    COMBO_STARTER_PECK,
-    COMBO_STARTER_METAL_SOUND,
-    COMBO_STARTER_MUD_SPORT,
-    COMBO_STARTER_WATER_SPORT,
-    COMBO_STARTER_BONE_CLUB,
-    COMBO_STARTER_BONEMERANG,
-    COMBO_STARTER_BONE_RUSH,
-    COMBO_STARTER_SAND_ATTACK,
-    COMBO_STARTER_MUD_SLAP,
-    COMBO_STARTER_FAKE_OUT,
-    COMBO_STARTER_PSYCHIC,
-    COMBO_STARTER_KINESIS,
-    COMBO_STARTER_CONFUSION,
-    COMBO_STARTER_POUND,
-    COMBO_STARTER_SMOG,
-    COMBO_STARTER_CALM_MIND
-};
-
-enum
-{
     CONTEST_STRING_MORE_CONSCIOUS,
     CONTEST_STRING_NO_APPEAL,
     CONTEST_STRING_SETTLE_DOWN,
@@ -255,7 +137,7 @@ struct ContestStruct_field_18
 struct Contest
 {
     u8 playerMoveChoice;
-    u8 turnNumber;
+    u8 appealNumber;
     u8 unused2[CONTESTANT_COUNT];
     bool16 unk1920A_0:1;  // Task active flags?
     bool16 unk1920A_1:1;
@@ -273,14 +155,14 @@ struct Contest
     u8 unk19211;
     u8 unk19212;
     u8 filler19213;
-    u8 unk19214;
-    u8 unk19215;
+    u8 turnNumber;
+    u8 currentContestant;
     u8 unk19216;    // sprite ID
     s8 applauseLevel;
     u8 prevTurnOrder[CONTESTANT_COUNT];
     u32 unk1921C;   // saved RNG value?
-    u16 moveHistory[CONTEST_TURN_COUNT][CONTESTANT_COUNT];
-    u8 excitementHistory[CONTEST_TURN_COUNT][CONTESTANT_COUNT];
+    u16 moveHistory[CONTEST_NUM_APPEALS][CONTESTANT_COUNT];
+    u8 excitementHistory[CONTEST_NUM_APPEALS][CONTESTANT_COUNT];
     u8 applauseMeterSpriteId;
     u8 contestSetupState;
     u8 unk1925E;
@@ -431,9 +313,9 @@ struct ContestResources
 #define eUnknownHeap1A004 (*(struct Shared1A004 *)(gHeap + 0x1a004))
 
 extern struct ContestPokemon gContestMons[CONTESTANT_COUNT];
-extern s16 gContestMonConditions[CONTESTANT_COUNT];
+extern s16 gContestMonRound1Points[CONTESTANT_COUNT];
 extern s16 gContestMonTotalPoints[CONTESTANT_COUNT];
-extern s16 gUnknown_02039F10[CONTESTANT_COUNT];
+extern s16 gContestMonAppealPointTotals[CONTESTANT_COUNT];
 extern s16 gContestMonRound2Points[CONTESTANT_COUNT];
 extern u8 gContestFinalStandings[CONTESTANT_COUNT];
 extern u8 gContestMonPartyIndex;
@@ -457,8 +339,8 @@ void ResetLinkContestBoolean(void);
 void LoadContestBgAfterMoveAnim(void);
 void CB2_StartContest(void);
 void CreateContestMonFromParty(u8 partyIndex);
-void sub_80DAB8C(u8 contestType, u8 rank);
-void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame);
+void SetContestants(u8 contestType, u8 rank);
+void SetLinkAIContestants(u8 contestType, u8 rank, bool32 isPostgame);
 u8 GetContestEntryEligibility(struct Pokemon *pkmn);
 void sub_80DB09C(u8 contestCategory);
 bool8 IsSpeciesNotUnown(u16 species);