From 671ae90becbb175c4a725c8dc232c44e78eadbe9 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Wed, 7 Aug 2019 21:42:38 -0700
Subject: [PATCH] further corrections and documentation

---
 .../Network/PacketDef/Chat/ServerChatDef.h    | 30 +++++++++++++++++++
 src/common/Network/PacketDef/Ipcs.h           |  3 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 16 ----------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h
index ce614f7c..a91004b7 100644
--- a/src/common/Network/PacketDef/Chat/ServerChatDef.h
+++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h
@@ -29,6 +29,36 @@ struct FFXIVIpcTellErrNotFound : FFXIVIpcBasePacket< TellErrNotFound >
   char receipientName[32];
 };
 
+struct FFXIVIpcFreeCompanyEvent : FFXIVIpcBasePacket< FreeCompanyEvent >
+{
+  uint16_t unknown;
+  uint16_t unknown1;
+  uint16_t unknown2;
+  uint16_t unknown3;
+  uint16_t unknown4;
+  char padding[6];
+  uint8_t eventID;
+  /*
+  * 0x0F Login
+  * 0x10 Logout
+  */
+  uint8_t padding1;
+  char padding2[6];
+  uint16_t unknown5;
+  char parameter[46];
+  /**
+  * eventID  | parameter usage
+  * 0x0F       FC name
+  * 0x10       FC name
+  */
+  char parameter1[32];
+  /**
+  * eventID  | parameter1 usage
+  * 0x0F       Character name
+  * 0x10       Character name
+  */
+};
+
 } /* Sapphire::Common::Network::Packets::Server */
 
 
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index a21519ce..b30f73ae 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -101,7 +101,6 @@ namespace Sapphire::Network::Packets
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
-    FreeCompanyEvent = 0x012C, // added 5.0
     // 12D - 137 - constant gap between 4.5x -> 5.0
     ReqMoogleMailList = 0x0138, // updated 5.0
     ReqMoogleMailLetter = 0x0139, // updated 5.0
@@ -374,6 +373,8 @@ namespace Sapphire::Network::Packets
   {
     Tell = 0x0064, // updated for sb
     TellErrNotFound = 0x0066,
+
+    FreeCompanyEvent = 0x012C, // added 5.0
   };
 
   /**
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 62208497..6649feb8 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -247,22 +247,6 @@ namespace Sapphire::Network::Packets::Server
     } entry[8];
   };
 
-  struct FFXIVIpcFreeCompanyEvent : FFXIVIpcBasePacket< FreeCompanyEvent >
-  {
-    uint16_t unknown;
-    uint16_t unknown1;
-    uint16_t unknown2;
-    uint16_t unknown3;
-    uint16_t unknown4;
-    char padding[6];
-    uint8_t eventID; // 0x0F Login, 0x10 Logout
-    uint8_t padding1;
-    char padding2[6];
-    uint16_t unknown5;
-    char fcName[46];
-    char characterName[32];
-  };
-
   /**
   * Structural representation of the packet sent by the server
   * to send a list of mail the player has