Merge pull request #165 from Supamiu/master

PlayerSpawn and NpcSpawn fix
karashiiro · Oct 3, 2023 · 50d4293 · 50d4293
2 parents 51ba6ed + 30942eb
commit 50d4293
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 82 deletions.
diff --git a/FFXIVOpcodes/Ipcs.cs b/FFXIVOpcodes/Ipcs.cs
@@ -52,7 +52,7 @@ enum ServerZoneIpcType : ushort
         CurrencyCrystalInfo = 0x02AD, // updated 6.5
         InitZone = 0x038F, // updated 6.5
         WeatherChange = 0x03DA, // updated 6.5
-        PlayerSpawn = 0x0379, // updated 6.5
+        PlayerSpawn = 0x03E2, // updated 6.5
         ActorSetPos = 0x0280, // updated 6.5
         PrepareZoning = 0x01F3, // updated 6.5
         ContainerInfo = 0x01B5, // updated 6.5
@@ -76,7 +76,7 @@ enum ServerZoneIpcType : ushort
         InventoryTransactionFinish = 0x029A, // updated 6.5
         ResultDialog = 0x01C3, // updated 6.5
         RetainerInformation = 0x03D5, // updated 6.5
-        NpcSpawn = 0x03E2, // updated 6.5
+        NpcSpawn = 0x0379, // updated 6.5
         ItemMarketBoardInfo = 0x033A, // updated 6.5
         ObjectSpawn = 0x02C2, // updated 6.5
         EffectResultBasic = 0x01AF, // updated 6.5

diff --git a/opcodes.json b/opcodes.json
@@ -5,8 +5,8 @@
     "lists": {
       "ServerZoneIpcType": [
         {
-          "name": "ActorMove",
-          "opcode": 371
+          "name": "ActorGauge",
+          "opcode": 793
         },
         {
           "name": "AirshipStatusList",
@@ -29,41 +29,45 @@
           "opcode": 406
         },
         {
-          "name": "ActorGauge",
-          "opcode": 793
+          "name": "AirshipTimers",
+          "opcode": 524
         },
         {
           "name": "ActorControl",
           "opcode": 579
         },
         {
-          "name": "AirshipTimers",
-          "opcode": 524
+          "name": "ActorSetPos",
+          "opcode": 640
         },
         {
-          "name": "AirshipExplorationResult",
-          "opcode": 237
+          "name": "ActorMove",
+          "opcode": 371
         },
         {
-          "name": "ActorSetPos",
-          "opcode": 640
+          "name": "AirshipExplorationResult",
+          "opcode": 237
         },
         {
-          "name": "ContainerInfo",
-          "opcode": 437
+          "name": "CurrencyCrystalInfo",
+          "opcode": 685
         },
         {
           "name": "CFNotify",
           "opcode": 268
         },
         {
-          "name": "CurrencyCrystalInfo",
-          "opcode": 685
+          "name": "ContainerInfo",
+          "opcode": 437
         },
         {
           "name": "DesynthResult",
           "opcode": 429
         },
+        {
+          "name": "EventPlay",
+          "opcode": 878
+        },
         {
           "name": "EventPlay8",
           "opcode": 861
@@ -77,20 +81,24 @@
           "opcode": 956
         },
         {
-          "name": "EventPlay32",
-          "opcode": 679
+          "name": "EventFinish",
+          "opcode": 721
         },
         {
-          "name": "Effect",
-          "opcode": 546
+          "name": "EventPlay255",
+          "opcode": 773
         },
         {
-          "name": "EffectResultBasic",
-          "opcode": 431
+          "name": "EventPlay4",
+          "opcode": 339
         },
         {
-          "name": "EventPlay128",
-          "opcode": 662
+          "name": "EventPlay32",
+          "opcode": 679
+        },
+        {
+          "name": "EffectResult",
+          "opcode": 407
         },
         {
           "name": "EventStart",
@@ -100,33 +108,25 @@
           "name": "EventPlay64",
           "opcode": 373
         },
-        {
-          "name": "EventPlay",
-          "opcode": 878
-        },
-        {
-          "name": "EventPlay255",
-          "opcode": 773
-        },
         {
           "name": "ExamineSearchInfo",
           "opcode": 278
         },
         {
-          "name": "EnvironmentControl",
-          "opcode": 340
+          "name": "EventPlay128",
+          "opcode": 662
         },
         {
-          "name": "EventPlay4",
-          "opcode": 339
+          "name": "EnvironmentControl",
+          "opcode": 340
         },
         {
-          "name": "EffectResult",
-          "opcode": 407
+          "name": "EffectResultBasic",
+          "opcode": 431
         },
         {
-          "name": "EventFinish",
-          "opcode": 721
+          "name": "Effect",
+          "opcode": 546
         },
         {
           "name": "FreeCompanyInfo",
@@ -136,6 +136,14 @@
           "name": "FreeCompanyDialog",
           "opcode": 913
         },
+        {
+          "name": "InventoryTransactionFinish",
+          "opcode": 666
+        },
+        {
+          "name": "InitZone",
+          "opcode": 911
+        },
         {
           "name": "InventoryActionAck",
           "opcode": 844
@@ -144,53 +152,45 @@
           "name": "ItemMarketBoardInfo",
           "opcode": 826
         },
-        {
-          "name": "ItemInfo",
-          "opcode": 347
-        },
         {
           "name": "InventoryTransaction",
           "opcode": 285
         },
         {
-          "name": "InventoryTransactionFinish",
-          "opcode": 666
+          "name": "ItemInfo",
+          "opcode": 347
         },
         {
           "name": "IslandWorkshopSupplyDemand",
           "opcode": 681
         },
-        {
-          "name": "InitZone",
-          "opcode": 911
-        },
         {
           "name": "Logout",
           "opcode": 944
         },
         {
-          "name": "MarketBoardSearchResult",
-          "opcode": 361
+          "name": "MarketBoardItemListingHistory",
+          "opcode": 927
         },
         {
-          "name": "MarketBoardItemListingCount",
-          "opcode": 360
+          "name": "MarketBoardItemListing",
+          "opcode": 563
         },
         {
-          "name": "MarketBoardPurchase",
-          "opcode": 307
+          "name": "MarketBoardItemListingCount",
+          "opcode": 360
         },
         {
-          "name": "MarketBoardItemListingHistory",
-          "opcode": 927
+          "name": "MarketBoardSearchResult",
+          "opcode": 361
         },
         {
-          "name": "MarketBoardItemListing",
-          "opcode": 563
+          "name": "MarketBoardPurchase",
+          "opcode": 307
         },
         {
           "name": "NpcSpawn",
-          "opcode": 994
+          "opcode": 889
         },
         {
           "name": "ObjectSpawn",
@@ -201,28 +201,28 @@
           "opcode": 888
         },
         {
-          "name": "PlaceFieldMarkerPreset",
-          "opcode": 445
+          "name": "PlayerStats",
+          "opcode": 828
+        },
+        {
+          "name": "PlayerSetup",
+          "opcode": 109
         },
         {
           "name": "PrepareZoning",
           "opcode": 499
         },
         {
-          "name": "PlayerSpawn",
-          "opcode": 889
+          "name": "PlaceFieldMarkerPreset",
+          "opcode": 445
         },
         {
           "name": "PlaceFieldMarker",
           "opcode": 530
         },
         {
-          "name": "PlayerSetup",
-          "opcode": 109
-        },
-        {
-          "name": "PlayerStats",
-          "opcode": 828
+          "name": "PlayerSpawn",
+          "opcode": 994
         },
         {
           "name": "ResultDialog",
@@ -233,8 +233,8 @@
           "opcode": 981
         },
         {
-          "name": "SubmarineTimers",
-          "opcode": 852
+          "name": "StatusEffectList",
+          "opcode": 567
         },
         {
           "name": "StatusEffectList3",
@@ -244,10 +244,6 @@
           "name": "SubmarineExplorationResult",
           "opcode": 814
         },
-        {
-          "name": "StatusEffectList",
-          "opcode": 567
-        },
         {
           "name": "SubmarineStatusList",
           "opcode": 912
@@ -260,6 +256,10 @@
           "name": "SystemLogMessage",
           "opcode": 137
         },
+        {
+          "name": "SubmarineTimers",
+          "opcode": 852
+        },
         {
           "name": "StatusEffectList2",
           "opcode": 618
@@ -268,6 +268,10 @@
           "name": "UpdateInventorySlot",
           "opcode": 873
         },
+        {
+          "name": "UpdateHpMpTp",
+          "opcode": 559
+        },
         {
           "name": "UpdateSearchInfo",
           "opcode": 578
@@ -276,10 +280,6 @@
           "name": "UpdateClassInfo",
           "opcode": 250
         },
-        {
-          "name": "UpdateHpMpTp",
-          "opcode": 559
-        },
         {
           "name": "WeatherChange",
           "opcode": 986