diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-18 11:38:50 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-18 11:38:50 -0400 |
| commit | fa29ff98a342f4f434b96d4e04f47e25ca865512 (patch) | |
| tree | 68c0c83a39ce0554ba54dace82c5aa1a6827edfc /src/contest.c | |
| parent | 19cf1b9770d8ec98aec3100a1aa1b9399a8c54bf (diff) | |
Add condition mod constants
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/contest.c b/src/contest.c index de0001831..a015c5bab 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1935,7 +1935,7 @@ static void Task_DoAppeals(u8 taskId) gTasks[taskId].tState = APPEALSTATE_TRY_JUDGE_STAR; return; case APPEALSTATE_TRY_JUDGE_STAR: - if (eContestantStatus[contestant].conditionMod == 1) + if (eContestantStatus[contestant].conditionMod == CONDITION_GAIN) DoJudgeSpeechBubble(JUDGE_SYMBOL_STAR); gTasks[taskId].tState = APPEALSTATE_WAIT_JUDGE_STAR; return; @@ -3270,26 +3270,26 @@ static bool8 UpdateConditionStars(u8 contestantIdx, bool8 resetMod) u8 contestantOffset; s32 numStars; - if (eContestantStatus[contestantIdx].conditionMod == 0) + if (eContestantStatus[contestantIdx].conditionMod == CONDITION_NO_CHANGE) return FALSE; contestantOffset = gContestantTurnOrder[contestantIdx] * 5 + 2; numStars = eContestantStatus[contestantIdx].condition / 10; - if (eContestantStatus[contestantIdx].conditionMod == 1) + if (eContestantStatus[contestantIdx].conditionMod == CONDITION_GAIN) { ContestBG_FillBoxWithTile(0, GetStarTileOffset(), 19, contestantOffset, 1, numStars, 17); if (resetMod) { PlaySE(SE_EXPMAX); - eContestantStatus[contestantIdx].conditionMod = 0; + eContestantStatus[contestantIdx].conditionMod = CONDITION_NO_CHANGE; } } - else + else // CONDITION_LOSE { ContestBG_FillBoxWithTile(0, 0, 19, contestantOffset + numStars, 1, 3 - numStars, 17); if (resetMod) { PlaySE(SE_FU_ZAKU2); - eContestantStatus[contestantIdx].conditionMod = 0; + eContestantStatus[contestantIdx].conditionMod = CONDITION_NO_CHANGE; } } return TRUE; @@ -3510,7 +3510,7 @@ static void ResetContestantStatuses(void) eContestantStatus[i].nervous = FALSE; eContestantStatus[i].effectStringId = CONTEST_STRING_NONE; eContestantStatus[i].effectStringId2 = CONTEST_STRING_NONE; - eContestantStatus[i].conditionMod = 0; + eContestantStatus[i].conditionMod = CONDITION_NO_CHANGE; eContestantStatus[i].repeatedPrevMove = eContestantStatus[i].repeatedMove; eContestantStatus[i].repeatedMove = FALSE; eContestantStatus[i].turnOrderModAction = 0; @@ -4464,7 +4464,7 @@ static void CalculateAppealMoveImpact(u8 contestant) gContestEffectFuncs[effect](); - if (eContestantStatus[contestant].conditionMod == 1) + if (eContestantStatus[contestant].conditionMod == CONDITION_GAIN) eContestantStatus[contestant].appeal += eContestantStatus[contestant].condition - 10; else if (eContestantStatus[contestant].appealTripleCondition) eContestantStatus[contestant].appeal += eContestantStatus[contestant].condition * 3; |