dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

More cleanup, document contestant sorting

Browse Source
This commit is contained in:
Phlosioneer
2019-04-02 20:00:05 -04:00
parent c3200c0beb
commit 99e8e8e53f
6 changed files with 232 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/contest_effect.c
View File

@@ -517,7 +517,7 @@ static void ContestEffect_BadlyStartlesMonsInGoodCondition(void)
// The appeal works great if performed first.
static void ContestEffect_BetterIfFirst(void)
{
if (gUnknown_02039F26[eContestResources8.contestant] == 0)
if (gContestantTurnOrder[eContestResources8.contestant] == 0)
{
u16 move = eContestantStatus[eContestResources8.contestant].currMove;
eContestantStatus[eContestResources8.contestant].appeal2 += 2 * gContestEffects[gContestMoves[move].effect].appeal;
@@ -528,7 +528,7 @@ static void ContestEffect_BetterIfFirst(void)
// The appeal works great if performed last.
static void ContestEffect_BetterIfLast(void)
{
if (gUnknown_02039F26[eContestResources8.contestant] == 3)
if (gContestantTurnOrder[eContestResources8.contestant] == 3)
{
u16 move = eContestantStatus[eContestResources8.contestant].currMove;
eContestantStatus[eContestResources8.contestant].appeal2 += 2 * gContestEffects[gContestMoves[move].effect].appeal;