ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add condition mod constants

Browse Source
This commit is contained in:
GriffinR 2020-08-18 11:38:50 -04:00
parent 19cf1b9770
commit fa29ff98a3
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/contest.h
View File

@ -77,6 +77,13 @@ enum {
CONTEST_FILTER_ONLY_POSTGAME CONTEST_FILTER_ONLY_POSTGAME
}; };
// Constants for changing in-contest Condition (the stars that appear during appeals)
enum {
CONDITION_NO_CHANGE,
CONDITION_GAIN,
CONDITION_LOSE,
};
struct ContestPokemon struct ContestPokemon
{ {
u16 species; u16 species;

16
src/contest.c
View File

@ -1935,7 +1935,7 @@ static void Task_DoAppeals(u8 taskId)
gTasks[taskId].tState = APPEALSTATE_TRY_JUDGE_STAR; gTasks[taskId].tState = APPEALSTATE_TRY_JUDGE_STAR;
return; return;
case APPEALSTATE_TRY_JUDGE_STAR: case APPEALSTATE_TRY_JUDGE_STAR:
if (eContestantStatus[contestant].conditionMod == 1) if (eContestantStatus[contestant].conditionMod == CONDITION_GAIN)
DoJudgeSpeechBubble(JUDGE_SYMBOL_STAR); DoJudgeSpeechBubble(JUDGE_SYMBOL_STAR);
gTasks[taskId].tState = APPEALSTATE_WAIT_JUDGE_STAR; gTasks[taskId].tState = APPEALSTATE_WAIT_JUDGE_STAR;
return; return;
@ -3270,26 +3270,26 @@ static bool8 UpdateConditionStars(u8 contestantIdx, bool8 resetMod)
u8 contestantOffset; u8 contestantOffset;
s32 numStars; s32 numStars;
if (eContestantStatus[contestantIdx].conditionMod == 0) if (eContestantStatus[contestantIdx].conditionMod == CONDITION_NO_CHANGE)
return FALSE; return FALSE;
contestantOffset = gContestantTurnOrder[contestantIdx] * 5 + 2; contestantOffset = gContestantTurnOrder[contestantIdx] * 5 + 2;
numStars = eContestantStatus[contestantIdx].condition / 10; 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); ContestBG_FillBoxWithTile(0, GetStarTileOffset(), 19, contestantOffset, 1, numStars, 17);
if (resetMod) if (resetMod)
{ {
PlaySE(SE_EXPMAX); 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); ContestBG_FillBoxWithTile(0, 0, 19, contestantOffset + numStars, 1, 3 - numStars, 17);
if (resetMod) if (resetMod)
{ {
PlaySE(SE_FU_ZAKU2); PlaySE(SE_FU_ZAKU2);
eContestantStatus[contestantIdx].conditionMod = 0; eContestantStatus[contestantIdx].conditionMod = CONDITION_NO_CHANGE;
} }
} }
return TRUE; return TRUE;
@ -3510,7 +3510,7 @@ static void ResetContestantStatuses(void)
eContestantStatus[i].nervous = FALSE; eContestantStatus[i].nervous = FALSE;
eContestantStatus[i].effectStringId = CONTEST_STRING_NONE; eContestantStatus[i].effectStringId = CONTEST_STRING_NONE;
eContestantStatus[i].effectStringId2 = 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].repeatedPrevMove = eContestantStatus[i].repeatedMove;
eContestantStatus[i].repeatedMove = FALSE; eContestantStatus[i].repeatedMove = FALSE;
eContestantStatus[i].turnOrderModAction = 0; eContestantStatus[i].turnOrderModAction = 0;
@ -4464,7 +4464,7 @@ static void CalculateAppealMoveImpact(u8 contestant)
gContestEffectFuncs[effect](); gContestEffectFuncs[effect]();
if (eContestantStatus[contestant].conditionMod == 1) if (eContestantStatus[contestant].conditionMod == CONDITION_GAIN)
eContestantStatus[contestant].appeal += eContestantStatus[contestant].condition - 10; eContestantStatus[contestant].appeal += eContestantStatus[contestant].condition - 10;
else if (eContestantStatus[contestant].appealTripleCondition) else if (eContestantStatus[contestant].appealTripleCondition)
eContestantStatus[contestant].appeal += eContestantStatus[contestant].condition * 3; eContestantStatus[contestant].appeal += eContestantStatus[contestant].condition * 3;

4
src/contest_effect.c
View File

@ -478,7 +478,7 @@ static void ContestEffect_WorsenConditionOfPrevMons(void)
CanUnnerveContestant(i)) CanUnnerveContestant(i))
{ {
eContestantStatus[i].condition = 0; eContestantStatus[i].condition = 0;
eContestantStatus[i].conditionMod = 2; eContestantStatus[i].conditionMod = CONDITION_LOSE;
SetContestantEffectStringID(i, CONTEST_STRING_REGAINED_FORM); SetContestantEffectStringID(i, CONTEST_STRING_REGAINED_FORM);
numHit++; numHit++;
} }
@ -724,7 +724,7 @@ static void ContestEffect_ImproveConditionPreventNervousness(void)
if (eContestantStatus[eContestAppealResults.contestant].condition < 30) if (eContestantStatus[eContestAppealResults.contestant].condition < 30)
{ {
eContestantStatus[eContestAppealResults.contestant].condition += 10; eContestantStatus[eContestAppealResults.contestant].condition += 10;
eContestantStatus[eContestAppealResults.contestant].conditionMod = 1; eContestantStatus[eContestAppealResults.contestant].conditionMod = CONDITION_GAIN;
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_CONDITION_ROSE); SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_CONDITION_ROSE);
} }
else else