From c806992cfc5a4fac53f2c8a52b32f7a039773e41 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 15 Aug 2018 11:43:57 +0200
Subject: Port contest ai from pokeruby

---
 include/contest.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'include/contest.h')

diff --git a/include/contest.h b/include/contest.h
index b7324e26b..761b16369 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -406,7 +406,7 @@ extern struct ContestResources *gContestResources;
 #define sContest (*gContestResources->field_0)
 #define sContestantStatus (gContestResources->field_4)
 #define shared192D0 (*gContestResources->field_8)
-#define eContestAI (*gContestResources->field_C)
+#define eContestAI (gContestResources->field_C)
 #define shared19328 (*gContestResources->field_10)
 #define shared19338 (*gContestResources->field_14)
 
@@ -417,5 +417,12 @@ extern u32 gContestRngValue;
 
 bool8 IsSpeciesNotUnown(u16 species);
 void LoadContestBgAfterMoveAnim(void);
+void SetContestantEffectStringID(u8 a, u8 b);
+void SetContestantEffectStringID2(u8 a, u8 b);
+void MakeContestantNervous(u8 p);
+bool8 Contest_IsMonsTurnDisabled(u8 a);
+bool8 sub_80DE1E8(u8 a);
+void SetStartledString(u8 a, u8 b);
+s8 Contest_GetMoveExcitement(u16);
 
 #endif //GUARD_CONTEST_H
-- 
cgit v1.2.3


From 92c4fc6345faf9e5c8af4035103eea26164b68bd Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 15 Aug 2018 11:50:18 +0200
Subject: Contest AI clean-up

---
 include/contest.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'include/contest.h')

diff --git a/include/contest.h b/include/contest.h
index 761b16369..18f9ad21f 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -341,7 +341,8 @@ struct UnknownContestStruct7
     u8 contestant;
 };
 
-struct ContestAIInfo {
+struct ContestAIInfo
+{
     /*0x00*/ u8 aiState;
     /*0x02*/ u16 unk2;
     /*0x04*/ u8 unk4;
@@ -352,9 +353,9 @@ struct ContestAIInfo {
     /*0x14*/ u32 flags;
     /*0x18*/ s16 scriptResult;
     /*0x1A*/ s16 scriptArr[3];
-    /*0x20*/ u32 stack[8];
-    /*0x40*/ u8 unk40;
-    /*0x41*/ u8 unk41;
+    /*0x20*/ const u8 *stack[8];
+    /*0x40*/ u8 stackSize;
+    /*0x41*/ u8 contestantId;
 };
 
 struct UnknownContestStruct5
-- 
cgit v1.2.3