up to ContestAICmd_unk_14

1 files changed, 44 insertions, 43 deletions

diff --git a/include/contest.h b/include/contest.h
index a1d2ec9e0..32da9703a 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -78,7 +78,8 @@ struct ContestAIInfo {
  /*0x10*/ u8 unk10;
  /*0x11*/ u8 filler11[0x3]; // padding?
  /*0x14*/ u32 flags;
- /*0x18*/ u8 filler18[0x28];
+ /*0x18*/ u16 scriptResult;
+ /*0x1A*/ u8 filler1A[0x26];
  /*0x40*/ u8 unk40;
  /*0x41*/ u8 unk41;
  /*0x42*/ u8 filler42[0x2]; // padding?
@@ -152,48 +153,48 @@ struct Contest
 
 struct ContestantStatus
 {
-    s16 appeal1;  // move appeal?
-    s16 appeal2;  // final appeal after end of turn, maybe?
-    s16 unk4;
-    u16 currMove;
-    u16 prevMove;
-    u8 moveCategory;
-    u8 unkB_0:2;
-    u8 unkB_2:2;
-    u8 moveRepeatCount:3;
-    u8 unkB_7:1;  // used a one-time move?
-    u8 unkC_0:1;
-    u8 unkC_1:2;
-    s8 unkD;
-    u8 unkE;
-    u8 unkF;
-    u8 unk10_0:1;
-    u8 unk10_1:1;
-    u8 unk10_2:1;
-    u8 unk10_3:1;
-    u8 unk10_4:2;
-    u8 unk10_6:2;
-    u8 unk11_0:2;
-    u8 unk11_2:1;
-    u8 unk11_3:1;
-    u8 unk11_4:1;
-    u8 unk11_5:1;
-    u8 unk12;
-    u8 unk13;   // status action?
-    u8 unk14;
-    u8 disappointedRepeat:1;
-    u8 unk15_1:1;
-    u8 unk15_2:1;
-    u8 unk15_3:1;
-    u8 unk15_4:1;
-    u8 unk15_5:1;
-    u8 unk15_6:1;
-    u8 unk16;
-    u8 unk17;
-    u8 unk18;
-    u8 unk19;  // turn position
-    u8 attentionLevel;  // How much the Pokemon "stood out"
-    u8 unk1B;
+ /*0x00*/ s16 appeal1;  // move appeal?
+ /*0x02*/ s16 appeal2;  // final appeal after end of turn, maybe?
+ /*0x04*/ s16 unk4;
+ /*0x06*/ u16 currMove;
+ /*0x08*/ u16 prevMove;
+ /*0x0A*/ u8 moveCategory;
+ /*0x0B*/ u8 unkB_0:2;
+          u8 unkB_2:2;
+          u8 moveRepeatCount:3;
+          u8 unkB_7:1;  // used a one-time move?
+ /*0x0C*/ u8 unkC_0:1;
+          u8 unkC_1:2;
+ /*0x0D*/ s8 unkD;
+ /*0x0E*/ u8 unkE;
+ /*0x0F*/ u8 unkF;
+ /*0x10*/ u8 unk10_0:1;
+          u8 unk10_1:1;
+          u8 unk10_2:1;
+          u8 unk10_3:1;
+          u8 unk10_4:2;
+          u8 unk10_6:2;
+ /*0x11*/ u8 unk11_0:2;
+          u8 unk11_2:1;
+          u8 unk11_3:1;
+          u8 unk11_4:1;
+          u8 unk11_5:1;
+ /*0x12*/ u8 unk12;
+ /*0x13*/ u8 unk13;   // status action?
+ /*0x14*/ u8 unk14;
+ /*0x15*/ u8 disappointedRepeat:1;
+          u8 unk15_1:1;
+          u8 unk15_2:1;
+          u8 unk15_3:1;
+          u8 unk15_4:1;
+          u8 unk15_5:1;
+          u8 unk15_6:1;
+ /*0x16*/ u8 unk16;
+ /*0x17*/ u8 unk17;
+ /*0x18*/ u8 unk18;
+ /*0x19*/ u8 unk19;  // turn position
+ /*0x1A*/ u8 attentionLevel;  // How much the Pokemon "stood out"
+ /*0x1B*/ u8 unk1B;
 };
 
 struct UnknownContestStruct3