From ce74d72c31a3ebda26adc6ae888700213f64b113 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 14:19:09 -0600 Subject: label and clean up some things in contest.c --- include/contest.h | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'include/contest.h') diff --git a/include/contest.h b/include/contest.h index 55f39d002..e2b16ff1d 100644 --- a/include/contest.h +++ b/include/contest.h @@ -3,11 +3,23 @@ enum { - CONTEST_CATEGORY_COOL, - CONTEST_CATEGORY_BEAUTY, - CONTEST_CATEGORY_CUTE, - CONTEST_CATEGORY_SMART, - CONTEST_CATEGORY_TOUGH, + CONTEST_CATEGORY_COOL, + CONTEST_CATEGORY_BEAUTY, + CONTEST_CATEGORY_CUTE, + CONTEST_CATEGORY_SMART, + CONTEST_CATEGORY_TOUGH, +}; + +enum +{ + CONTEST_EFFECT_HIGHLY_APPEALING, + CONTEST_EFFECT_USER_MORE_STARTLED, + CONTEST_EFFECT_APPEAL_ONLY_ONCE, + CONTEST_EFFECT_REPEATABLE, + CONTEST_EFFECT_AVOID_STARTLE_ONCE, + CONTEST_EFFECT_AVOID_STARTLE, + CONTEST_EFFECT_AVOID_STARTLE_LITTLE, + //... }; struct ContestMove @@ -62,8 +74,8 @@ extern const u8 *const gContestEffectStrings[]; void ResetLinkContestBoolean(void); void sub_80AB2AC(void); -void sub_80AB47C(void); -void sub_80AE098(u8); +void CB2_StartContest(void); +void CreatePlayerContestMon(u8); void sub_80AE398(u8, u8); u8 sub_80AE47C(struct Pokemon *party); u16 sub_80AE770(u8, u8); @@ -73,6 +85,6 @@ void sub_80AF668(void); void sub_80B0F28(u8); bool8 sub_80B2A7C(u8); u8 sub_80B2C4C(u8, u8); -void sub_80B2D1C(void); +void Contest_ResetWinners(void); #endif // GUARD_CONTEST_H -- cgit v1.2.3