merge easy chat with master

2018-08-11 14:14:51 +02:00
parent 85ebd76cd0 6b84feaaf2
commit 59d8d56868
7 changed files with 828 additions and 1282 deletions
--- a/include/global.h
+++ b/include/global.h
@@ -719,8 +719,8 @@ struct LilycoveLadyQuiz
    /*0x000*/ u8 id;
    /*0x001*/ u8 phase;
    /*0x002*/ u16 unk_002[9];
-    /*0x014*/ u16 unk_014;
-    /*0x016*/ u16 unk_016;
+    /*0x014*/ u16 unk_014[1];
+    /*0x016*/ u16 unk_016[1];
    /*0x018*/ u8 playerName[8];
    /*0x020*/ u16 playerTrainerId[4];
    /*0x028*/ u16 itemId;
@@ -755,7 +755,7 @@ struct LilycoveLadyContest
    /*0x00e*/ u8 language;
 };

-typedef union
+typedef union // 3b58
 {
    struct LilycoveLadyQuiz quiz;
    struct LilycoveLadyFavour favour;