contest fever
This commit is contained in:
parent
a5b079d833
commit
7d9640a988
@ -132,7 +132,7 @@ static void ContestEffect_UserLessEasilyStartled(void)
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant,CONTEST_STRING_STOPPED_CARING);
|
||||
}
|
||||
|
||||
// Slightly startles the POKéMON in front.
|
||||
// Slightly startles the POKéMON in front.
|
||||
static void ContestEffect_StartleFrontMon(void)
|
||||
{
|
||||
u8 idx = 0;
|
||||
@ -180,7 +180,7 @@ static void ContestEffect_StartlePrevMons(void)
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Startles the POKéMON that appealed before the user.
|
||||
// Startles the POKéMON that appealed before the user.
|
||||
static void ContestEffect_StartlePrevMon2(void)
|
||||
{
|
||||
u8 rval = Random() % 10;
|
||||
@ -197,7 +197,7 @@ static void ContestEffect_StartlePrevMon2(void)
|
||||
ContestEffect_StartleFrontMon();
|
||||
}
|
||||
|
||||
// Startles all POKéMON that appealed before the user.
|
||||
// Startles all POKéMON that appealed before the user.
|
||||
static void ContestEffect_StartlePrevMons2(void)
|
||||
{
|
||||
u8 numStartled = 0;
|
||||
@ -273,7 +273,7 @@ static void ContestEffect_ShiftJudgeAttention(void)
|
||||
}
|
||||
}
|
||||
|
||||
// Startles the POKéMON that has the JUDGE's attention.
|
||||
// Startles the POKéMON that has the JUDGE's attention.
|
||||
static void ContestEffect_StartleMonWithJudgesAttention(void)
|
||||
{
|
||||
u8 numStartled = 0;
|
||||
@ -311,7 +311,7 @@ static void ContestEffect_JamsOthersButMissOneTurn(void)
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Startles POKéMON that made a same-type appeal.
|
||||
// Startles POKéMON that made a same-type appeal.
|
||||
static void ContestEffect_StartleMonsSameTypeAppeal(void)
|
||||
{
|
||||
u16 move = eContestantStatus[eContestAppealResults.contestant].currMove;
|
||||
@ -319,42 +319,42 @@ static void ContestEffect_StartleMonsSameTypeAppeal(void)
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Badly startles POKéMON that made COOL appeals.
|
||||
// Badly startles POKéMON that made COOL appeals.
|
||||
static void ContestEffect_StartleMonsCoolAppeal(void)
|
||||
{
|
||||
JamByMoveCategory(CONTEST_CATEGORY_COOL);
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Badly startles POKéMON that made BEAUTY appeals.
|
||||
// Badly startles POKéMON that made BEAUTY appeals.
|
||||
static void ContestEffect_StartleMonsBeautyAppeal(void)
|
||||
{
|
||||
JamByMoveCategory(CONTEST_CATEGORY_BEAUTY);
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Badly startles POKéMON that made CUTE appeals.
|
||||
// Badly startles POKéMON that made CUTE appeals.
|
||||
static void ContestEffect_StartleMonsCuteAppeal(void)
|
||||
{
|
||||
JamByMoveCategory(CONTEST_CATEGORY_CUTE);
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Badly startles POKéMON that made SMART appeals.
|
||||
// Badly startles POKéMON that made SMART appeals.
|
||||
static void ContestEffect_StartleMonsSmartAppeal(void)
|
||||
{
|
||||
JamByMoveCategory(CONTEST_CATEGORY_SMART);
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Badly startles POKéMON that made TOUGH appeals.
|
||||
// Badly startles POKéMON that made TOUGH appeals.
|
||||
static void ContestEffect_StartleMonsToughAppeal(void)
|
||||
{
|
||||
JamByMoveCategory(CONTEST_CATEGORY_TOUGH);
|
||||
SetContestantEffectStringID(eContestAppealResults.contestant, CONTEST_STRING_ATTEMPT_STARTLE);
|
||||
}
|
||||
|
||||
// Makes one POKéMON after the user nervous.
|
||||
// Makes one POKéMON after the user nervous.
|
||||
static void ContestEffect_MakeFollowingMonNervous(void)
|
||||
{
|
||||
bool32 hitAny = FALSE;
|
||||
@ -386,7 +386,7 @@ static void ContestEffect_MakeFollowingMonNervous(void)
|
||||
SetContestantEffectStringID2(eContestAppealResults.contestant, CONTEST_STRING_MESSED_UP2);
|
||||
}
|
||||
|
||||
// Makes all POKéMON after the user nervous.
|
||||
// Makes all POKéMON after the user nervous.
|
||||
static void ContestEffect_MakeFollowingMonsNervous(void)
|
||||
{
|
||||
u8 numUnnerved = 0;
|
||||
@ -493,7 +493,7 @@ static void ContestEffect_WorsenConditionOfPrevMons(void)
|
||||
SetContestantEffectStringID2(eContestAppealResults.contestant, CONTEST_STRING_IGNORED);
|
||||
}
|
||||
|
||||
// Badly startles POKéMON in good condition.
|
||||
// Badly startles POKéMON in good condition.
|
||||
static void ContestEffect_BadlyStartlesMonsInGoodCondition(void)
|
||||
{
|
||||
u8 numHit = 0;
|
||||
@ -897,7 +897,7 @@ static void ContestEffect_ExciteAudienceInAnyContest(void)
|
||||
}
|
||||
}
|
||||
|
||||
// Badly startles all POKéMON that made good appeals.
|
||||
// Badly startles all POKéMON that made good appeals.
|
||||
static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user