sub_818DF00

1 files changed, 39 insertions, 27 deletions

diff --git a/include/global.h b/include/global.h
index 8c2122b39..42fe0cfbb 100644
--- a/include/global.h
+++ b/include/global.h
@@ -667,39 +667,51 @@ enum {
     LILYCOVE_LADY_CONTEST
 };
 
-typedef union // TODO
+struct LilycoveLadyQuiz
 {
-    struct
-    {
-        /*0x000*/ u8 id;
-        /*0x001*/ u8 language;
-    } quiz;
+    /*0x000*/ u8 id;
+    /*0x001*/ u8 language;
+    /*0x002*/ u16 unk_002[9];
+    /*0x014*/ u16 unk_014;
+    /*0x016*/ u8 filler_016[2];
+    /*0x018*/ u8 unk_018;
+    /*0x019*/ u8 filler_019[15];
+    /*0x028*/ u16 unk_028;
+    /*0x02a*/ u8 filler_02a;
+    /*0x02b*/ u8 unk_02b;
+};
 
-    struct
-    {
-        /*0x000*/ u8 id;
-        /*0x001*/ u8 unk_001;
-        /*0x002*/ u8 unk_002;
-        /*0x003*/ u8 unk_003;
-        /*0x004*/ u8 unk_004[8];
-        /*0x00c*/ u8 unk_00c;
-        /*0x00d*/ u8 filler_00d;
-        /*0x00e*/ u16 itemId;
-        /*0x010*/ u16 unk_010;
-        /*0x012*/ u8 language;
-    } favour;
+struct LilycoveLadyFavour
+{
+    /*0x000*/ u8 id;
+    /*0x001*/ u8 unk_001;
+    /*0x002*/ u8 unk_002;
+    /*0x003*/ u8 unk_003;
+    /*0x004*/ u8 unk_004[8];
+    /*0x00c*/ u8 unk_00c;
+    /*0x00d*/ u8 filler_00d;
+    /*0x00e*/ u16 itemId;
+    /*0x010*/ u16 unk_010;
+    /*0x012*/ u8 language;
+};
 
-    struct
-    {
-        /*0x000*/ u8 id;
-        /*0x001*/ u8 filler_001[12];
-        /*0x00d*/ u8 category; // maybe?
-    } contest;
+struct LilycoveLadyContest
+{
+    /*0x000*/ u8 id;
+    /*0x001*/ u8 filler_001[12];
+    /*0x00d*/ u8 category; // maybe?
+};
+
+typedef union // TODO
+{
+    struct LilycoveLadyQuiz quiz;
+    struct LilycoveLadyFavour favour;
+    struct LilycoveLadyContest contest;
 
     struct
     {
         /*0x000*/ u8 id;
-        /*0x001*/ u8 filler_001[535];
+        /*0x001*/ u8 filler_001[0x207];
     } common;
 } LilycoveLady;
 
@@ -786,7 +798,7 @@ struct SaveBlock1
     /*0x3728*/ struct RamScript ramScript;
     /*0x3B14*/ struct RecordMixingGift recordMixingGift;
     /*0x3B24*/ u8 seen2[52];
-    /*0x3B58*/ LilycoveLady lilycoveLady; // TODO: convert to a union
+    /*0x3B58*/ LilycoveLady lilycoveLady;
     /*0x3D70*/ u8 babyPhrase[24]; // TODO: convert to a struct
     // sizeof: 0x3D88
 };