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

General cleanup of the second half of contest.c

Browse Source
This commit is contained in:
Phlosioneer
2019-04-03 20:43:23 -04:00
parent 3a2ea40188
commit 3b3b2dd031
5 changed files with 246 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

461
src/contest.c
View File

File diff suppressed because it is too large Load Diff

6
src/contest_ai.c
View File

@@ -1402,7 +1402,7 @@ static void ContestAICmd_unk_63(void)
{
u8 var = sub_81563B0(gAIScriptPtr[1]);
u8 var2 = gAIScriptPtr[2];
u16 move = eContest.unk19220[var2][var];
u16 move = eContest.moveHistory[var2][var];
eContestAI.scriptResult = gContestMoves[move].effect;
gAIScriptPtr += 3;
@@ -1452,7 +1452,7 @@ static void ContestAICmd_unk_68(void)
{
u8 var = sub_81563B0(gAIScriptPtr[1]);
u8 var2 = gAIScriptPtr[2];
s8 result = eContest.unk19248[var2][var];
s8 result = eContest.excitementHistory[var2][var];
eContestAI.scriptResult = result;
gAIScriptPtr += 3;
@@ -1502,7 +1502,7 @@ static void ContestAICmd_unk_6D(void)
{
u8 var = sub_81563B0(gAIScriptPtr[1]);
u8 var2 = gAIScriptPtr[2];
u16 move = eContest.unk19220[var2][var];
u16 move = eContest.moveHistory[var2][var];
eContestAI.scriptResult = gContestEffects[gContestMoves[move].effect].effectType;
gAIScriptPtr += 3;

2
src/contest_link_80F57C4.c
View File

@@ -356,7 +356,7 @@ static void sub_80F5CE4(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
sub_80DBED4();
SaveLinkContestResults();
if (gContestFinalStandings[gContestPlayerMonIndex] == 0)
{
IncrementGameStat(GAME_STAT_WON_LINK_CONTEST);