diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/contest.h | 27 | ||||
| -rw-r--r-- | include/contest.h | 22 |
2 files changed, 11 insertions, 38 deletions
diff --git a/include/constants/contest.h b/include/constants/contest.h index a10354169..5ec4c4f69 100644 --- a/include/constants/contest.h +++ b/include/constants/contest.h @@ -52,33 +52,6 @@ #define CONTEST_AI_CHECK_ORDER (1 << 4) #define CONTEST_AI_CHECK_GOOD_MOVE (1 << 5) #define CONTEST_AI_ERRATIC (1 << 6) -#define CONTEST_AI_DUMMY_1 (1 << 7) -#define CONTEST_AI_DUMMY_2 (1 << 8) -#define CONTEST_AI_DUMMY_3 (1 << 9) -#define CONTEST_AI_DUMMY_4 (1 << 10) -#define CONTEST_AI_DUMMY_5 (1 << 11) -#define CONTEST_AI_DUMMY_6 (1 << 12) -#define CONTEST_AI_DUMMY_7 (1 << 13) -#define CONTEST_AI_DUMMY_8 (1 << 14) -#define CONTEST_AI_DUMMY_9 (1 << 15) -#define CONTEST_AI_DUMMY_10 (1 << 16) -#define CONTEST_AI_DUMMY_11 (1 << 17) -#define CONTEST_AI_DUMMY_12 (1 << 18) -#define CONTEST_AI_DUMMY_13 (1 << 19) -#define CONTEST_AI_DUMMY_14 (1 << 20) -#define CONTEST_AI_DUMMY_15 (1 << 21) -#define CONTEST_AI_DUMMY_16 (1 << 22) -#define CONTEST_AI_DUMMY_17 (1 << 23) -#define CONTEST_AI_DUMMY_18 (1 << 24) -#define CONTEST_AI_DUMMY_19 (1 << 25) -#define CONTEST_AI_DUMMY_20 (1 << 26) -#define CONTEST_AI_DUMMY_21 (1 << 27) -#define CONTEST_AI_DUMMY_22 (1 << 28) -#define CONTEST_AI_DUMMY_23 (1 << 29) -#define CONTEST_AI_DUMMY_24 (1 << 30) -#define CONTEST_AI_DUMMY_25 (1 << 31) -#define CONTEST_AI_ALL (CONTEST_AI_CHECK_BAD_MOVE | CONTEST_AI_CHECK_COMBO | CONTEST_AI_CHECK_BORING | CONTEST_AI_CHECK_EXCITEMENT | CONTEST_AI_CHECK_ORDER | CONTEST_AI_CHECK_GOOD_MOVE | CONTEST_AI_ERRATIC) -#define CONTEST_AI_DUMMIES_1 (CONTEST_AI_DUMMY_1 | CONTEST_AI_DUMMY_2 | CONTEST_AI_DUMMY_3 | CONTEST_AI_DUMMY_4 | CONTEST_AI_DUMMY_5) #define CONTEST_EFFECT_HIGHLY_APPEALING 0 #define CONTEST_EFFECT_USER_MORE_EASILY_STARTLED 1 diff --git a/include/contest.h b/include/contest.h index 834aba402..e4cda6e25 100644 --- a/include/contest.h +++ b/include/contest.h @@ -127,11 +127,11 @@ struct Contest { u8 playerMoveChoice; u8 appealNumber; - u8 unused2[CONTESTANT_COUNT]; - bool16 unk1920A_0:1; // Task active flags? - bool16 unk1920A_1:1; - bool16 unk1920A_2:1; - bool16 unk1920A_3:1; + u8 unk[CONTESTANT_COUNT]; // never read + bool16 unused1:1; + bool16 unused2:1; + bool16 unused3:1; + bool16 unused4:1; bool16 waitForJudgeSpeechBubble:1; bool16 isShowingApplauseMeter:1; bool16 applauseMeterIsMoving:1; @@ -140,10 +140,10 @@ struct Contest bool16 sliderHeartsAnimating:1; // When the slider heart is appearing/disappearing bool16 waitForLink:1; u8 mainTaskId; - u8 unk1920D[4]; + u8 filler1[4]; u8 judgeAttentionTaskId; u8 blendTaskId; - u8 filler19213; + u8 filler2; u8 turnNumber; u8 currentContestant; u8 judgeSpeechBubbleSpriteId; @@ -159,8 +159,8 @@ struct Contest struct ContestantStatus { - s16 appeal1; // move appeal? - s16 appeal2; // final appeal after end of turn, maybe? + s16 baseAppeal; + s16 appeal; s16 pointTotal; u16 currMove; u16 prevMove; @@ -264,8 +264,8 @@ struct ContestTV s16 move; u8 winnerFlags; u8 loserFlags; - u8 madeAppeal:1; - u8 madeExcitingAppeal:1; + bool8 madeAppeal:1; + bool8 madeExcitingAppeal:1; }; struct ContestUnused |