Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

contest effect review changes

This commit is contained in:
DizzyEggg 2018-08-16 22:55:36 +02:00
parent 0bfe894566
commit 5dd1afd383
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/contest_effect.c
View File

@ -440,10 +440,17 @@ static void ContestEffect_MakeFollowingMonsNervous(void)
MakeContestantNervous(contestantIds[i]); MakeContestantNervous(contestantIds[i]);
SetContestantEffectStringID(contestantIds[i], CONTEST_STRING_NERVOUS); SetContestantEffectStringID(contestantIds[i], CONTEST_STRING_NERVOUS);
numUnnerved++; numUnnerved++;
} else }
else
{
contestantUnnerved = TRUE; contestantUnnerved = TRUE;
} else }
}
else
{
contestantUnnerved = TRUE; contestantUnnerved = TRUE;
}
if (contestantUnnerved) if (contestantUnnerved)
{ {
contestantUnnerved = FALSE; contestantUnnerved = FALSE;
@ -542,8 +549,11 @@ static void ContestEffect_AppealAsGoodAsPrevOnes(void)
} }
if (appealSum < 0) if (appealSum < 0)
appealSum = 0; appealSum = 0;
if (shared192D0.turnOrder[shared192D0.contestant] == 0 || appealSum == 0) if (shared192D0.turnOrder[shared192D0.contestant] == 0 || appealSum == 0)
{
SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_APPEAL_NOT_WELL); SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_APPEAL_NOT_WELL);
}
else else
{ {
sContestantStatus[shared192D0.contestant].appeal2 += appealSum / 2; sContestantStatus[shared192D0.contestant].appeal2 += appealSum / 2;
@ -567,7 +577,9 @@ static void ContestEffect_AppealAsGoodAsPrevOne(void)
} }
} }
if (shared192D0.turnOrder[shared192D0.contestant] == 0 || appeal <= 0) if (shared192D0.turnOrder[shared192D0.contestant] == 0 || appeal <= 0)
{
SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_APPEAL_NOT_WELL2); SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_APPEAL_NOT_WELL2);
}
else else
{ {
sContestantStatus[shared192D0.contestant].appeal2 += appeal; sContestantStatus[shared192D0.contestant].appeal2 += appeal;
@ -716,7 +728,9 @@ static void ContestEffect_ImproveConditionPreventNervousness(void)
SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_CONDITION_ROSE); SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_CONDITION_ROSE);
} }
else else
{
SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_NO_CONDITION_IMPROVE); SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_NO_CONDITION_IMPROVE);
}
} }
// The appeal works well if the user’s condition is good. // The appeal works well if the user’s condition is good.
@ -988,8 +1002,10 @@ static bool8 CanUnnerveContestant(u8 i)
{ {
return TRUE; return TRUE;
} }
else
return FALSE; {
return FALSE;
}
} }
static bool8 WasAtLeastOneOpponentJammed(void) static bool8 WasAtLeastOneOpponentJammed(void)

5
src/data/contest_moves.h
View File

@ -1,6 +1,3 @@
#ifndef POKEEMERALD_CONTEST_MOVES_H
#define POKEEMERALD_CONTEST_MOVES_H
const struct ContestMove gContestMoves[MOVES_COUNT] = const struct ContestMove gContestMoves[MOVES_COUNT] =
{ {
[MOVE_NONE] = {0}, [MOVE_NONE] = {0},
@ -3009,5 +3006,3 @@ void (*const gContestEffectFuncs[])(void) =
ContestEffect_BetterWhenAudienceExcited, ContestEffect_BetterWhenAudienceExcited,
ContestEffect_DontExciteAudience, ContestEffect_DontExciteAudience,
}; };
#endif // POKEEMERALD_CONTEST_MOVES_H