From 0cddd149362086f605edb41a87d87ffe6394f457 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sat, 21 Jan 2023 02:56:22 +0100
Subject: [PATCH 1/3] [3.3] Fix Emote exd struct

---
 deps/datReader/Exd/Structs.h | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h
index 6d620b0f..7936609c 100644
--- a/deps/datReader/Exd/Structs.h
+++ b/deps/datReader/Exd/Structs.h
@@ -618,21 +618,20 @@ namespace Excel
   {
     EmoteTextStruct Text;
     uint32_t Unknown;
-    int32_t TimelineID;
-    int32_t TimelineID_Begin;
-    int32_t TimelineID_End;
-    int32_t TimelineID_GroundSitting;
-    int32_t TimelineID_ChairSitting;
-    int32_t TimelineID_Mounting;
-    int32_t TimelineID_Lying;
-    int32_t TimelineID_Adjust;
     int32_t TextCommand;
+    uint16_t TimelineID;
+    uint16_t TimelineID_Begin;
+    uint16_t TimelineID_End;
+    uint16_t TimelineID_GroundSitting;
+    uint16_t TimelineID_ChairSitting;
+    uint16_t TimelineID_Mounting;
+    uint16_t TimelineID_Lying;
+    uint16_t Unknown1A;
     uint16_t Icon;
     uint16_t Log;
     uint16_t LogSelf;
     uint8_t Category;
     uint8_t Mode;
-    uint8_t UI_Priority;
     uint8_t Reward;
     uint8_t IsLoopEmote : 1;
     uint8_t IsPoseEmote : 1;
@@ -642,7 +641,6 @@ namespace Excel
     uint8_t IsFacial : 1;
     uint8_t IsRotate : 1;
     uint8_t IsEndEmoteMode : 1;
-    int8_t padding0[1];
   };
 
   /* 195171 */

From 4ef05823e15ac90ee46979fac07add1dbad60b44 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sat, 21 Jan 2023 19:00:16 +0100
Subject: [PATCH 2/3] [3.3] Fix CustomTalk exd struct

(cherry picked from commit c243cf165fd36e0e0bca9b0f05f55e4c47766148)
---
 deps/datReader/Exd/Structs.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h
index 7936609c..b668386d 100644
--- a/deps/datReader/Exd/Structs.h
+++ b/deps/datReader/Exd/Structs.h
@@ -3453,6 +3453,7 @@ namespace Excel
   struct CustomTalkTextStruct
   {
     Excel::StringOffset Name;
+    Excel::StringOffset NpcUnk;
   };
 
   /* 362364 */
@@ -3461,6 +3462,7 @@ namespace Excel
     CustomTalkDefineStruct Define[30];
     CustomTalkTextStruct Text;
     Excel::StringOffset Script;
+    uint32_t UnknownFC;
     uint32_t MapIcon;
     uint8_t padding0 : 1;
     uint8_t ListenHousing : 1;
@@ -3470,7 +3472,7 @@ namespace Excel
     uint8_t ConditionCallback : 1;
     uint8_t AcceptCallback : 1;
     uint8_t ClientEvent : 1;
-    int8_t padding1[3];
+    uint8_t Unknown105: 1;
   };
 
   /* 362365 */

From 198e1316b849e2a88d26b8e53bf5aef03eb0e382 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Sat, 21 Jan 2023 18:59:58 +0100
Subject: [PATCH 3/3] [3.3] Fix Mount exd struct

(cherry picked from commit c0cd9347b17e05d9d241b2544e36ec8708d6475e)
---
 deps/datReader/Exd/Structs.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h
index b668386d..369aa9ce 100644
--- a/deps/datReader/Exd/Structs.h
+++ b/deps/datReader/Exd/Structs.h
@@ -1131,9 +1131,6 @@ namespace Excel
   struct Mount
   {
     MountTextStruct Text;
-    Excel::StringOffset CallSE;
-    Excel::StringOffset CallFalseSE;
-    Excel::StringOffset ExitSE;
     float Slowdown;
     float MoveAccel_Run;
     float MoveAccel_Walk;
@@ -1159,7 +1156,7 @@ namespace Excel
     uint8_t RadiusRate;
     uint8_t unknown3[3];
     int8_t MountOrder;
-    uint8_t unknown4 : 4;
+    uint8_t unknown4 : 5;
   };
 
   /* 201019 */