Merge remote-tracking branch 'upstream/master' into nakamura

1 files changed, 5 insertions, 8 deletions

diff --git a/src/contest_ai.c b/src/contest_ai.c
index 1e249083b..e570dbafb 100644
--- a/src/contest_ai.c
+++ b/src/contest_ai.c
@@ -2,12 +2,9 @@
 #include "contest.h"
 #include "random.h"
 #include "contest_ai.h"
+#include "contest_effect.h"
 #include "ewram.h"
 
-extern u8 AreMovesContestCombo(u16, u16);
-extern bool8 sub_80B214C(u8);
-extern bool8 Contest_IsMonsTurnDisabled(u8);
-
 extern u16 gSpecialVar_ContestCategory;
 
 extern u8 *gAIScriptPtr;
@@ -383,7 +380,7 @@ static u8 sub_8128A7C(u8 var)
     int i;
 
     for(i = 0; i < 4; i++)
-        if(shared192D0.unk0[i] == var)
+        if(shared192D0.turnOrder[i] == var)
             break;
 
     return i;
@@ -497,7 +494,7 @@ static void ContestAICmd_unk_0A(void)
 
 static void ContestAICmd_get_user_order(void)
 {
-    eContestAI->scriptResult = shared192D0.unk0[eContestAI->unk41];
+    eContestAI->scriptResult = shared192D0.turnOrder[eContestAI->unk41];
     gAIScriptPtr += 1;
 }
 
@@ -543,7 +540,7 @@ static void ContestAICmd_unk_0F(void)
 
 static void ContestAICmd_get_user_condition_maybe(void)
 {
-    eContestAI->scriptResult = sContestantStatus[eContestAI->unk41].unkD / 10;
+    eContestAI->scriptResult = sContestantStatus[eContestAI->unk41].condition / 10;
     gAIScriptPtr += 1;
 }
 
@@ -1150,7 +1147,7 @@ static void ContestAICmd_get_condition(void)
 {
     int var = sub_8128A7C(gAIScriptPtr[1]);
 
-    eContestAI->scriptResult = sContestantStatus[var].unkD / 10;
+    eContestAI->scriptResult = sContestantStatus[var].condition / 10;
     gAIScriptPtr += 2;
 }