diff --git a/Cafe.Matcha/Constant/MatchaOpcode.cs b/Cafe.Matcha/Constant/MatchaOpcode.cs
index a961484..f0910e0 100644
--- a/Cafe.Matcha/Constant/MatchaOpcode.cs
+++ b/Cafe.Matcha/Constant/MatchaOpcode.cs
@@ -32,47 +32,47 @@ internal static class OpcodeStorage
     {
         public static Dictionary<ushort, MatchaOpcode> Global = new Dictionary<ushort, MatchaOpcode>
         {
-            { 0x0187, MatchaOpcode.ActorControl },
-            { 0x0141, MatchaOpcode.ActorControlSelf },
+            { 0x03c7, MatchaOpcode.ActorControl },
+            { 0x022f, MatchaOpcode.ActorControlSelf },
             { 0xf002, MatchaOpcode.CEDirector },
-            { 0x021f, MatchaOpcode.CompanyAirshipStatus },
-            { 0x017d, MatchaOpcode.CompanySubmersibleStatus },
-            { 0x0181, MatchaOpcode.ContentFinderNotifyPop },
+            { 0x0164, MatchaOpcode.CompanyAirshipStatus },
+            { 0x0363, MatchaOpcode.CompanySubmersibleStatus },
+            { 0x01e5, MatchaOpcode.ContentFinderNotifyPop },
             { 0xf006, MatchaOpcode.DirectorStart },
-            { 0x020e, MatchaOpcode.EventPlay },
-            { 0x028a, MatchaOpcode.Examine },
+            { 0x026f, MatchaOpcode.EventPlay },
+            { 0x006a, MatchaOpcode.Examine },
             { 0xf009, MatchaOpcode.FateInfo },
-            { 0x03dd, MatchaOpcode.InitZone },
-            { 0x008f, MatchaOpcode.InventoryTransaction },
-            { 0x0305, MatchaOpcode.ItemInfo },
-            { 0x00fc, MatchaOpcode.MarketBoardItemListing },
-            { 0x01d7, MatchaOpcode.MarketBoardItemListingCount },
-            { 0x022b, MatchaOpcode.MarketBoardItemListingHistory },
-            { 0x0300, MatchaOpcode.NpcSpawn },
-            { 0x0121, MatchaOpcode.PlayerSetup },
-            { 0x0338, MatchaOpcode.PlayerSpawn },
+            { 0x0173, MatchaOpcode.InitZone },
+            { 0x0197, MatchaOpcode.InventoryTransaction },
+            { 0x02d0, MatchaOpcode.ItemInfo },
+            { 0x03a3, MatchaOpcode.MarketBoardItemListing },
+            { 0x0233, MatchaOpcode.MarketBoardItemListingCount },
+            { 0x02bf, MatchaOpcode.MarketBoardItemListingHistory },
+            { 0x0359, MatchaOpcode.NpcSpawn },
+            { 0x02a7, MatchaOpcode.PlayerSetup },
+            { 0x0165, MatchaOpcode.PlayerSpawn },
         };
         public static Dictionary<ushort, MatchaOpcode> China = new Dictionary<ushort, MatchaOpcode>
         {
-            { 0x019b, MatchaOpcode.ActorControl },
-            { 0x033f, MatchaOpcode.ActorControlSelf },
-            { 0x00af, MatchaOpcode.CEDirector },
-            { 0x0398, MatchaOpcode.CompanyAirshipStatus },
-            { 0x0377, MatchaOpcode.CompanySubmersibleStatus },
-            { 0x02c7, MatchaOpcode.ContentFinderNotifyPop },
-            { 0x01b0, MatchaOpcode.DirectorStart },
-            { 0x0230, MatchaOpcode.EventPlay },
-            { 0x0233, MatchaOpcode.Examine },
-            { 0x01b9, MatchaOpcode.FateInfo },
-            { 0x00e1, MatchaOpcode.InitZone },
-            { 0x02b9, MatchaOpcode.InventoryTransaction },
-            { 0x037f, MatchaOpcode.ItemInfo },
-            { 0x0079, MatchaOpcode.MarketBoardItemListing },
-            { 0x032e, MatchaOpcode.MarketBoardItemListingCount },
-            { 0x012c, MatchaOpcode.MarketBoardItemListingHistory },
-            { 0x0261, MatchaOpcode.NpcSpawn },
-            { 0x01f3, MatchaOpcode.PlayerSetup },
-            { 0x0301, MatchaOpcode.PlayerSpawn },
+            { 0x0108, MatchaOpcode.ActorControl },
+            { 0x0295, MatchaOpcode.ActorControlSelf },
+            { 0x0363, MatchaOpcode.CEDirector },
+            { 0x0370, MatchaOpcode.CompanyAirshipStatus },
+            { 0x0069, MatchaOpcode.CompanySubmersibleStatus },
+            { 0x0326, MatchaOpcode.ContentFinderNotifyPop },
+            { 0x029c, MatchaOpcode.DirectorStart },
+            { 0x0353, MatchaOpcode.EventPlay },
+            { 0x03ab, MatchaOpcode.Examine },
+            { 0x01df, MatchaOpcode.FateInfo },
+            { 0x0315, MatchaOpcode.InitZone },
+            { 0x0286, MatchaOpcode.InventoryTransaction },
+            { 0x0327, MatchaOpcode.ItemInfo },
+            { 0x0081, MatchaOpcode.MarketBoardItemListing },
+            { 0x020f, MatchaOpcode.MarketBoardItemListingCount },
+            { 0x014d, MatchaOpcode.MarketBoardItemListingHistory },
+            { 0x0276, MatchaOpcode.NpcSpawn },
+            { 0x00b6, MatchaOpcode.PlayerSetup },
+            { 0x0265, MatchaOpcode.PlayerSpawn },
         };
     }
 }