diff --git a/src/common/Common.h b/src/common/Common.h index 21e6ba60..2f912b29 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -993,7 +993,7 @@ namespace Sapphire::Common CircularAoEPlaced = 7 }; - enum MarketCity : uint8_t + enum City : uint8_t { LimsaLominsa = 1, Gridania = 2, @@ -1001,7 +1001,7 @@ namespace Sapphire::Common Ishgard = 4, Kugane = 7, Crystarium = 10 - } + }; enum class Role : uint8_t { diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index f620b381..7c61f47b 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -24,6 +24,9 @@ namespace Sapphire::Network::ActorControl SetStatus = 0x02, CastStart = 0x03, ToggleAggro = 0x04, + /*! + * param1 = ClassJob ID + */ ClassJobChange = 0x05, DefeatMsg = 0x06, GainExpMsg = 0x07, @@ -347,6 +350,12 @@ namespace Sapphire::Network::ActorControl EmoteReq = 0x1F4, EmoteCancel = 0x1F6, PersistentEmoteCancel = 0x1F7, + /*! + * param2 = pose ID + * 0 = idle pose 0 (just standing) + * 1 = idle pose 1 + * 2-4 = idle poses 2-4 + */ PoseChange = 0x1F9, PoseReapply = 0x1FA, PoseCancel = 0x1FB, diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 8ffe9347..f524467e 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -107,8 +107,8 @@ namespace Sapphire::Network::Packets MailLetterNotification = 0x013A, // updated 5.0 MarketBoardItemListingCount = 0x013B, // updated 5.0 - MarketBoardItemListing = 0x013C, // updated 5.0 - MarketBoardItemListingHistory = 0x012A, // updated 4.5 + MarketBoardItemListing = 0x036A, // updated 5.1 + MarketBoardItemListingHistory = 0x0194, // updated 5.1 MarketBoardSearchResult = 0x0139, // updated 4.5 CharaFreeCompanyTag = 0x013B, // updated 4.5 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index fe376702..d7dd9a04 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -322,7 +322,7 @@ namespace Sapphire::Network::Packets::Server bool hq; uint8_t materiaCount; uint8_t onMannequin; - Common::MarketCity marketCity; + Common::City marketCity; uint16_t dyeId; uint16_t padding3; uint32_t padding4;