Merge remote-tracking branch 'upstream/master'

karashiiro · Jul 18, 2023 · d4f9715 · d4f9715
2 parents 47e650d + 9691e92
commit d4f9715
Show file tree

Hide file tree

Showing 9 changed files with 441 additions and 441 deletions.
diff --git a/FFXIVConstants/CN.cs b/FFXIVConstants/CN.cs
@@ -5,11 +5,11 @@ namespace FFXIVConstants
 {
     public static class CN
     {
-        public const string Version = "6.31";
+        public const string Version = "6.35";
 
         public static Dictionary<string, object> Constants = new Dictionary<string, object>
         {
-            { "InventoryOperationBaseValue", 0x0232 },
+            { "InventoryOperationBaseValue", 0x02a1 },
         };
     }
 }
diff --git a/FFXIVConstants/KR.cs b/FFXIVConstants/KR.cs
@@ -6,7 +6,7 @@ static class KR
     {
         public static Dictionary<string, object> Constants = new Dictionary<string, object>
         {
-            { "InventoryOperationBaseValue", 0x0254 },
+            { "InventoryOperationBaseValue", 0x0289 },
         };
     }
 }
diff --git a/FFXIVOpcodes/Ipcs_cn.cs b/FFXIVOpcodes/Ipcs_cn.cs
@@ -14,91 +14,91 @@ public enum ClientLobbyIpcType : ushort
 
     public enum ServerZoneIpcType : ushort
     {
-        ActorCast = 0x0097,
-        ActorControl = 0x0342,
-        ActorControlSelf = 0x03D5,
-        ActorControlTarget = 0x0359,
-        ActorGauge = 0x02C2,
-        ActorMove = 0x02D9,
-        ActorSetPos = 0x00EC,
-        AirshipExplorationResult = 0x0344,
-        AirshipStatus = 0x0171,
-        AirshipStatusList = 0x0326,
-        AirshipTimers = 0x02A7,
-        AoeEffect16 = 0x032E,
-        AoeEffect24 = 0x01E2,
-        AoeEffect32 = 0x00EB,
-        AoeEffect8 = 0x0147,
-        BossStatusEffectList = 0x0094,
-        CEDirector = 0x03CE,
-        CFNotify = 0x00EF,
-        CFPreferredRole = 0x01C8,
-        ContainerInfo = 0x02DF,
-        CurrencyCrystalInfo = 0x03A7,
-        DesynthResult = 0x0319,
-        Effect = 0x0227,
-        EffectResult = 0x017C,
-        EnvironmentControl = 0x021B,
-        EventFinish = 0x03B8,
-        EventPlay = 0x00AE,
-        EventPlay4 = 0x03BD,
-        EventStart = 0x03CB,
-        Examine = 0x014E,
-        ExamineSearchInfo = 0x026F,
-        FateInfo = 0x01AC,
-        FreeCompanyDialog = 0x035C,
-        FreeCompanyInfo = 0x00FF,
-        HousingWardInfo = 0x01E9,
-        InitZone = 0x00BC,
-        InventoryActionAck = 0x01CB,
-        InventoryTransaction = 0x0087,
-        InventoryTransactionFinish = 0x01D5,
-        IslandWorkshopSupplyDemand = 0x03DA,
-        ItemInfo = 0x0265,
-        ItemMarketBoardInfo = 0x0321,
-        Logout = 0x00E6,
-        MarketBoardItemListing = 0x0345,
-        MarketBoardItemListingCount = 0x0069,
-        MarketBoardItemListingHistory = 0x01FD,
-        MarketBoardPurchase = 0x0237,
-        MarketBoardSearchResult = 0x0376,
-        MiniCactpotInit = 0x01E3,
-        NpcSpawn = 0x01CA,
-        NpcSpawn2 = 0x0276,
-        ObjectSpawn = 0x01D9,
-        PlaceFieldMarker = 0x0346,
-        PlaceFieldMarkerPreset = 0x0243,
-        PlayerSetup = 0x0322,
-        PlayerSpawn = 0x0391,
-        PlayerStats = 0x02F7,
-        Playtime = 0x02ED,
-        PrepareZoning = 0x0331,
-        ResultDialog = 0x033E,
-        RetainerInformation = 0x0135,
-        RSV = 0x028B,
-        StatusEffectList = 0x01BF,
-        StatusEffectList2 = 0x0356,
-        StatusEffectList3 = 0x0294,
-        SubmarineExplorationResult = 0x01AB,
-        SubmarineProgressionStatus = 0x00AA,
-        SubmarineStatusList = 0x014C,
-        SubmarineTimers = 0x0146,
-        SystemLogMessage = 0x01F3,
-        UpdateClassInfo = 0x037E,
-        UpdateHpMpTp = 0x016F,
-        UpdateInventorySlot = 0x03E2,
-        UpdateSearchInfo = 0x020E,
+        ActorCast = 0x0184,
+        ActorControl = 0x02A5,
+        ActorControlSelf = 0x01A3,
+        ActorControlTarget = 0x02D0,
+        ActorGauge = 0x00C9,
+        ActorMove = 0x038E,
+        ActorSetPos = 0x024E,
+        AirshipExplorationResult = 0x032E,
+        AirshipStatus = 0x03C8,
+        AirshipStatusList = 0x02E3,
+        AirshipTimers = 0x00E1,
+        AoeEffect16 = 0x0252,
+        AoeEffect24 = 0x0271,
+        AoeEffect32 = 0x018C,
+        AoeEffect8 = 0x0215,
+        BossStatusEffectList = 0x00B1,
+        CEDirector = 0x03E6,
+        CFNotify = 0x00CA,
+        CFPreferredRole = 0x0303,
+        ContainerInfo = 0x010C,
+        CurrencyCrystalInfo = 0x0209,
+        DesynthResult = 0x0396,
+        Effect = 0x00CD,
+        EffectResult = 0x0378,
+        EnvironmentControl = 0x030E,
+        EventFinish = 0x02B1,
+        EventPlay = 0x03CE,
+        EventPlay4 = 0x00BC,
+        EventStart = 0x00DE,
+        Examine = 0x0255,
+        ExamineSearchInfo = 0x0353,
+        FateInfo = 0x02CF,
+        FreeCompanyDialog = 0x0137,
+        FreeCompanyInfo = 0x011F,
+        HousingWardInfo = 0x029F,
+        InitZone = 0x01E3,
+        InventoryActionAck = 0x008B,
+        InventoryTransaction = 0x01FC,
+        InventoryTransactionFinish = 0x033B,
+        IslandWorkshopSupplyDemand = 0x0310,
+        ItemInfo = 0x036B,
+        ItemMarketBoardInfo = 0x0078,
+        Logout = 0x033D,
+        MarketBoardItemListing = 0x03B0,
+        MarketBoardItemListingCount = 0x00EF,
+        MarketBoardItemListingHistory = 0x03AC,
+        MarketBoardPurchase = 0x034A,
+        MarketBoardSearchResult = 0x025A,
+        MiniCactpotInit = 0x0251,
+        NpcSpawn = 0x0366,
+        NpcSpawn2 = 0x013E,
+        ObjectSpawn = 0x0153,
+        PlaceFieldMarker = 0x00DA,
+        PlaceFieldMarkerPreset = 0x0136,
+        PlayerSetup = 0x03A8,
+        PlayerSpawn = 0x00C8,
+        PlayerStats = 0x017D,
+        Playtime = 0x033E,
+        PrepareZoning = 0x0146,
+        ResultDialog = 0x0328,
+        RetainerInformation = 0x01EC,
+        RSV = 0x030F,
+        StatusEffectList = 0x0149,
+        StatusEffectList2 = 0x03B1,
+        StatusEffectList3 = 0x03C2,
+        SubmarineExplorationResult = 0x0158,
+        SubmarineProgressionStatus = 0x039D,
+        SubmarineStatusList = 0x0365,
+        SubmarineTimers = 0x01E6,
+        SystemLogMessage = 0x0183,
+        UpdateClassInfo = 0x028C,
+        UpdateHpMpTp = 0x0247,
+        UpdateInventorySlot = 0x01C1,
+        UpdateSearchInfo = 0x007B,
     };
 
     public enum ClientZoneIpcType : ushort
     {
-        ChatHandler = 0x0373,
-        ClientTrigger = 0x0269,
-        InventoryModifyHandler = 0x022B,
-        MarketBoardPurchaseHandler = 0x022C,
-        SetSearchInfoHandler = 0x023C,
-        UpdatePositionHandler = 0x0085,
-        UpdatePositionInstance = 0x0288,
+        ChatHandler = 0x0326,
+        ClientTrigger = 0x0325,
+        InventoryModifyHandler = 0x029A,
+        MarketBoardPurchaseHandler = 0x017A,
+        SetSearchInfoHandler = 0x019D,
+        UpdatePositionHandler = 0x0315,
+        UpdatePositionInstance = 0x0320,
     };
 
     public enum ServerChatIpcType : ushort

diff --git a/FFXIVOpcodes/Ipcs_kr.cs b/FFXIVOpcodes/Ipcs_kr.cs
@@ -35,96 +35,96 @@ enum ClientLobbyIpcType : ushort
     */
     enum ServerZoneIpcType : ushort
     {
-        ActorCast = 0x01E2, // 6.25
-        ActorControl = 0x0303, // 6.25
-        ActorControlSelf = 0x00F4, // 6.25
-        ActorControlTarget = 0x022B, // 6.25
-        ActorGauge = 0x030C, // 6.25
-        ActorMove = 0x0367, // 6.25
-        ActorSetPos = 0x03CC, // 6.25
-        AirshipExplorationResult = 0x01C6, // 6.25
-        AirshipStatus = 0x0333, // 6.25
-        AirshipStatusList = 0x01E6, // 6.25
-        AirshipTimers = 0x0381, // 6.25
-        AoeEffect16 = 0x0069, // 6.25
-        AoeEffect24 = 0x03B1, // 6.25
-        AoeEffect32 = 0x01CA, // 6.25
-        AoeEffect8 = 0x00F6, // 6.25
-        CEDirector = 0x0365, // 6.25
-        CFNotify = 0x0229, // 6.25
-        CFPreferredRole = 0x0261, // 6.25
-        ContainerInfo = 0x0341, // 6.25
-        CurrencyCrystalInfo = 0x02A5, // 6.25
-        DesynthResult = 0x013A, // 6.25
-        Effect = 0x0070, // 6.25
-        EffectResult = 0x0123, // 6.25
-        EffectResultBasic = 0x006E, // 6.25
-        EventFinish = 0x020F, // 6.25
-        EventPlay = 0x0092, // 6.25
-        EventPlay32 = 0x0384, // 6.25
-        EventPlay4 = 0x01B1, // 6.25
-        EventStart = 0x01BB, // 6.25
-        Examine = 0x02AE, // 6.25
-        ExamineFreeCompanyInfo = 0x00A7, // 6.25
-        ExamineSearchInfo = 0x007F, // 6.25
-        FreeCompanyDialog = 0x021A, // 6.25
-        FreeCompanyInfo = 0x017F, // 6.25
-        HousingWardInfo = 0x0199, // 6.25
-        InitZone = 0x028E, // 6.25
-        InventoryActionAck = 0x0388, // 6.25
-        InventoryTransaction = 0x0218, // 6.25
-        InventoryTransactionFinish = 0x0249, // 6.25
-        IslandWorkshopSupplyDemand = 0x03C9, // 6.25
-        ItemInfo = 0x0191, // 6.25
-        ItemMarketBoardInfo = 0x00C8, // 6.25
-        Logout = 0x0370, // 6.25
-        MapEffect = 0x02E8, // 6.25
-        MarketBoardItemListing = 0x0227, // 6.25
-        MarketBoardItemListingCount = 0x01E4, // 6.25
-        MarketBoardItemListingHistory = 0x0266, // 6.25
-        MarketBoardPurchase = 0x027B, // 6.25
-        MarketBoardSearchResult = 0x0338, // 6.25
-        MiniCactpotInit = 0x027A, // 6.25
-        NpcSpawn = 0x0120, // 6.25
-        ObjectSpawn = 0x019C, // 6.25
-        PlaceFieldMarker = 0x0312, // 6.25
-        PlaceFieldMarkerPreset = 0x010E, // 6.25
-        PlayerSetup = 0x0164, // 6.25
-        PlayerSpawn = 0x0395, // 6.25
-        PlayerStats = 0x02C0, // 6.25
-        Playtime = 0x00A4, // 6.25
-        PrepareZoning = 0x02B3, // 6.25
-        ResultDialog = 0x00CF, // 6.25
-        RetainerInformation = 0x03BA, // 6.25
-        SocialList = 0x02E7, // 6.25
-        StatusEffectList = 0x033E, // 6.25
-        StatusEffectList2 = 0x03DD, // 6.25
-        StatusEffectList3 = 0x0122, // 6.25
-        SubmarineExplorationResult = 0x03B4, // 6.25
-        SubmarineProgressionStatus = 0x02F8, // 6.25
-        SubmarineStatusList = 0x0159, // 6.25
-        SubmarineTimers = 0x00FC, // 6.25
-        SystemLogMessage = 0x0201, // 6.25
-        UpdateClassInfo = 0x02B8, // 6.25
-        UpdateHpMpTp = 0x008C, // 6.25
-        UpdateInventorySlot = 0x0113, // 6.25
-        UpdateSearchInfo = 0x007B, // 6.25
-        WeatherChange = 0x01B9, // 6.25
+        ActorCast = 0x0231, // 6.3
+        ActorControl = 0x02BE, // 6.3
+        ActorControlSelf = 0x02ED, // 6.3
+        ActorControlTarget = 0x0210, // 6.3
+        ActorGauge = 0x0335, // 6.3
+        ActorMove = 0x0365, // 6.3
+        ActorSetPos = 0x030C, // 6.3
+        AirshipExplorationResult = 0x0103, // 6.3
+        AirshipStatus = 0x03B7, // 6.3
+        AirshipStatusList = 0x0068, // 6.3
+        AirshipTimers = 0x032D, // 6.3
+        AoeEffect16 = 0x01C6, // 6.3
+        AoeEffect24 = 0x0091, // 6.3
+        AoeEffect32 = 0x039D, // 6.3
+        AoeEffect8 = 0x0371, // 6.3
+        CEDirector = 0x0309, // 6.3
+        CFNotify = 0x006F, // 6.3
+        CFPreferredRole = 0x01E9, // 6.3
+        ContainerInfo = 0x02C5, // 6.3
+        CurrencyCrystalInfo = 0x036D,
+        DesynthResult = 0x03A8, // 6.3
+        Effect = 0x00E8, // 6.3
+        EffectResult = 0x01EC, // 6.3
+        EffectResultBasic = 0x0222, // 6.3
+        EventFinish = 0x02F6, // 6.3
+        EventPlay = 0x0277, // 6.3
+        EventPlay32 = 0x0392, // 6.3
+        EventPlay4 = 0x025B, // 6.3
+        EventStart = 0x008B, // 6.3
+        Examine = 0x01C3, // 6.3
+        ExamineFreeCompanyInfo = 0x0133, // 6.3
+        ExamineSearchInfo = 0x0226, // 6.3
+        FreeCompanyDialog = 0x02B1, // 6.3
+        FreeCompanyInfo = 0x01A4, // 6.3
+        HousingWardInfo = 0x01FB, // 6.3
+        InitZone = 0x01DF, // 6.3
+        InventoryActionAck = 0x033D, // 6.3
+        InventoryTransaction = 0x0393, // 6.3
+        InventoryTransactionFinish = 0x02E5, // 6.3
+        IslandWorkshopSupplyDemand = 0x00B0, // 6.3
+        ItemInfo = 0x0123, // 6.3
+        ItemMarketBoardInfo = 0x00EA, // 6.3
+        Logout = 0x038D, // 6.3
+        MapEffect = 0x0275, // 6.3
+        MarketBoardItemListing = 0x022A, // 6.3
+        MarketBoardItemListingCount = 0x0117, // 6.3
+        MarketBoardItemListingHistory = 0x0134, // 6.3
+        MarketBoardPurchase = 0x0105, // 6.3
+        MarketBoardSearchResult = 0x020B, // 6.3
+        MiniCactpotInit = 0x01EB, // 6.3
+        NpcSpawn = 0x022B, // 6.3
+        ObjectSpawn = 0x02CB, // 6.3
+        PlaceFieldMarker = 0x0223, // 6.3
+        PlaceFieldMarkerPreset = 0x01A2, // 6.3
+        PlayerSetup = 0x026E, // 6.3
+        PlayerSpawn = 0x031E, // 6.3
+        PlayerStats = 0x0341, // 6.3
+        Playtime = 0x031F, // 6.3
+        PrepareZoning = 0x034F, // 6.3
+        ResultDialog = 0x00C6, // 6.3
+        RetainerInformation = 0x010F, // 6.3
+        SocialList = 0x009A, // 6.3
+        StatusEffectList = 0x0067, // 6.3
+        StatusEffectList2 = 0x3B0, // 6.3
+        StatusEffectList3 = 0xDA, // 6.3
+        SubmarineExplorationResult = 0x0191, // 6.3
+        SubmarineProgressionStatus = 0x017E, // 6.3
+        SubmarineStatusList = 0x0122, // 6.3
+        SubmarineTimers = 0x019C, // 6.3
+        SystemLogMessage = 0x03E0, // 6.3
+        UpdateClassInfo = 0x03B6, // 6.3
+        UpdateHpMpTp = 0x0166, // 6.3
+        UpdateInventorySlot = 0x039C, // 6.3
+        UpdateSearchInfo = 0x03BE, // 6.3
+        WeatherChange = 0x0358, // 6.3
     };
 
     /**
     * Client IPC Zone Type Codes.
     */
     enum ClientZoneIpcType : ushort
     {
-        ChatHandler = 0x0203, // 6.25
-        ClientTrigger = 0x016A, // 6.25
-        InventoryModifyHandler = 0x024D, // 6.25 (Base offset: 0x0254)
-        LogoutHandler = 0x02FF, // 6.25
-        MarketBoardPurchaseHandler = 0x03E5, // 6.25
-        SetSearchInfoHandler = 0x0256, // 6.25
-        UpdatePositionHandler = 0x01E8, // 6.25
-        UpdatePositionInstance = 0x0139, // 6.25
+        ChatHandler = 0x0125, // 6.3
+        ClientTrigger = 0x0390, // 6.3
+        InventoryModifyHandler = 0x0282, // 6.3 (Base offset: 0x0289)
+        LogoutHandler = 0x0273, // 6.3
+        MarketBoardPurchaseHandler = 0x0258, // 6.3
+        SetSearchInfoHandler = 0x0307, // 6.3
+        UpdatePositionHandler = 0x0074, // 6.3
+        UpdatePositionInstance = 0x0248, // 6.3
     };
 
     ////////////////////////////////////////////////////////////////////////////////

diff --git a/FFXIVOpcodes/Program.cs b/FFXIVOpcodes/Program.cs
@@ -19,7 +19,7 @@ public static void Main()
             var regions = new List<RegionSet>{
                 new RegionSet { Region = "Global", Version = "6.05"},
                 new RegionSet { Region = "CN", Version = FFXIVConstants.CN.Version }, // <3
-                new RegionSet { Region = "KR", Version = "6.25" },
+                new RegionSet { Region = "KR", Version = "6.3" },
             };
 
             Type[][] enums = {

diff --git a/constants.json b/constants.json
@@ -3,9 +3,9 @@
     "InventoryOperationBaseValue": 327
   },
   "CN": {
-    "InventoryOperationBaseValue": 562
+    "InventoryOperationBaseValue": 673
   },
   "KR": {
-    "InventoryOperationBaseValue": 596
+    "InventoryOperationBaseValue": 649
   }
 }