diff --git a/data/uking_functions.csv b/data/uking_functions.csv index a3aea111..75adf6ac 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -241,7 +241,7 @@ 0x0000007100004194,DamageMgrBow::m52,8, 0x000000710000419c,DamageMgrBow::m53,8, 0x00000071000041a4,nullsub_40,4, -0x00000071000041a8,_ZN4sead19FixedSafeStringBaseIcLi64EED0Ev,8, +0x00000071000041a8,x,8, 0x00000071000041b0,sub_71000041B0,372, 0x0000007100004324,_ZNK4sead15RuntimeTypeInfo6DeriveINS_13ControlDeviceEE9isDerivedEPKNS0_9InterfaceE,140, 0x00000071000043b0,sub_71000043B0,140, @@ -395,10 +395,10 @@ 0x000000710000a9dc,sub_710000A9DC,40, 0x000000710000aa04,sub_710000AA04,8, 0x000000710000aa0c,_ZThn8_N3agl6detail20GPUMemBlockMgrHeapExD0Ev,40, -0x000000710000aa34,j__ZdlPv_1,4, -0x000000710000aa38,sead::SafeStringX::assign,240, -0x000000710000ab28,j__ZdlPv_2,4, -0x000000710000ab2c,_ZN4sead15FixedSafeStringILi64EEaSERKNS_14SafeStringBaseIcEE,240, +0x000000710000aa34,j__ZdlPv_1,4,_ZN4sead15FixedSafeStringILi64EED0Ev +0x000000710000aa38,sead::SafeStringX::assign,240,_ZN4sead15FixedSafeStringILi64EEaSERKNS_14SafeStringBaseIcEE +0x000000710000ab28,j__ZdlPv_2,4,_ZN4sead19FixedSafeStringBaseIcLi64EED0Ev +0x000000710000ab2c,_ZN4sead19FixedSafeStringBaseIcLi64EEaSERKNS_14SafeStringBaseIcEE,240,_ZN4sead19FixedSafeStringBaseIcLi64EEaSERKNS_14SafeStringBaseIcEE 0x000000710000ac1c,j__ZdlPv_3,4, 0x000000710000ac20,sub_710000AC20,140, 0x000000710000acac,sub_710000ACAC,372, @@ -437,7 +437,7 @@ 0x000000710000ded8,sub_710000DED8,1412, 0x000000710000e45c,Dragon::m78,164, 0x000000710000e500,sub_710000E500,756, -0x000000710000e7f4,_ZN4sead15FixedSafeStringILi128EEaSERKNS_14SafeStringBaseIcEE,240,_ZN4sead15FixedSafeStringILi16EEaSERKNS_14SafeStringBaseIcEE +0x000000710000e7f4,xxx,240,_ZN4sead15FixedSafeStringILi16EEaSERKNS_14SafeStringBaseIcEE 0x000000710000e8e4,sub_710000E8E4,420, 0x000000710000ea88,sub_710000EA88,456, 0x000000710000ec50,sub_710000EC50,84, @@ -490,8 +490,8 @@ 0x0000007100011f30,sub_7100011F30,200, 0x0000007100011ff8,sub_7100011FF8,192, 0x00000071000120b8,sub_71000120B8,200, -0x0000007100012180,j__ZdlPv_4,4, -0x0000007100012184,_ZN4sead15FixedSafeStringILi20EEaSERKNS_14SafeStringBaseIcEE_0,240, +0x0000007100012180,j__ZdlPv_4,4,_ZN4sead15FixedSafeStringILi32EED0Ev +0x0000007100012184,_ZN4sead15FixedSafeStringILi32EEaSERKNS_14SafeStringBaseIcEE,240,_ZN4sead15FixedSafeStringILi32EEaSERKNS_14SafeStringBaseIcEE 0x0000007100012274,sub_7100012274,20, 0x0000007100012288,j__ZdlPv_5,4, 0x000000710001228c,sub_710001228C,8, @@ -504,8 +504,8 @@ 0x000000710001260c,j__ZdlPv_6,4,_ZN4sead15FixedSafeStringILi16EED0Ev 0x0000007100012610,_ZNK4sead14SafeStringBaseIcE9findIndexERKS1_,468,_ZNK4sead14SafeStringBaseIcE9findIndexERKS1_ 0x00000071000127e4,_ZN4sead18Matrix34CalcCommonIfE7inverseERNS_9BaseMtx34IfEERKS3_,336, -0x0000007100012934,j__ZdlPv_7,4, -0x0000007100012938,xxxx,240, +0x0000007100012934,j__ZdlPv_7,4,_ZN4sead21FormatFixedSafeStringILi128EED0Ev +0x0000007100012938,_ZN4sead15FixedSafeStringILi128EEaSERKNS_14SafeStringBaseIcEE,240,_ZN4sead15FixedSafeStringILi128EEaSERKNS_14SafeStringBaseIcEE 0x0000007100012a28,sub_7100012A28,600, 0x0000007100012c80,Enemy::construct,68, 0x0000007100012cc4,sub_7100012CC4,44, @@ -619,7 +619,7 @@ 0x000000710001b1b8,nullsub_53,4, 0x000000710001b1bc,_ZNK4sead15RuntimeTypeInfo6DeriveINS_6CameraEE9isDerivedEPKNS0_9InterfaceE,140, 0x000000710001b248,j__ZdlPv_11,4, -0x000000710001b24c,_ZN4sead19FixedSafeStringBaseIcLi64EEaSERKNS_14SafeStringBaseIcEE,240, +0x000000710001b24c,x,240, 0x000000710001b33c,sub_710001B33C,88, 0x000000710001b394,sub_710001B394,96, 0x000000710001b3f4,sub_710001B3F4,40, @@ -2393,10 +2393,10 @@ 0x000000710007fd84,_ZN4sead10FileHandleD0Ev,64,_ZN4sead10FileHandleD0Ev 0x000000710007fdc4,sub_710007FDC4,140, 0x000000710007fe50,sub_710007FE50,372, -0x000000710007ffc4,j__ZdlPv_29,4, -0x000000710007ffc8,_ZN4sead19FixedSafeStringBaseIcLi128EEaSERKNS_14SafeStringBaseIcEE,240, -0x00000071000800b8,j__ZdlPv_30,4, -0x00000071000800bc,_ZN4sead15FixedSafeStringILi256EEaSERKNS_14SafeStringBaseIcEE,240, +0x000000710007ffc4,j__ZdlPv_29,4,_ZN4sead15FixedSafeStringILi256EED0Ev +0x000000710007ffc8,_ZN4sead15FixedSafeStringIcLi256EEaSERKNS_14SafeStringBaseIcEE,240,_ZN4sead15FixedSafeStringILi256EEaSERKNS_14SafeStringBaseIcEE +0x00000071000800b8,j__ZdlPv_30,4,_ZN4sead19FixedSafeStringBaseIcLi256EED0Ev +0x00000071000800bc,_ZN4sead19FixedSafeStringBaseIcLi256EEaSERKNS_14SafeStringBaseIcEE,240,_ZN4sead19FixedSafeStringBaseIcLi256EEaSERKNS_14SafeStringBaseIcEE 0x00000071000801ac,_ZN4sead18HeapSafeStringBaseIcED0Ev,60, 0x00000071000801e8,j__ZdlPv_31,4, 0x00000071000801ec,_ZN4sead15FixedSafeStringILi32EEaSERKNS_14SafeStringBaseIcEE,240, @@ -6792,8 +6792,8 @@ 0x000000710011ffbc,_ZNK5uking6action28EventPlayUiOneTimeAnimAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE,288,_ZNK5uking6action28EventPlayUiOneTimeAnimAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001200dc,_ZNK5uking6action28EventPlayUiOneTimeAnimAction18getRuntimeTypeInfoEv,92,_ZNK5uking6action28EventPlayUiOneTimeAnimAction18getRuntimeTypeInfoEv 0x0000007100120138,j__ZdlPv_46,4, -0x000000710012013c,j__ZdlPv_47,4, -0x0000007100120140,_ZN4sead19FixedSafeStringBaseIcLi155EEaSERKNS_14SafeStringBaseIcEE,240, +0x000000710012013c,j__ZdlPv_47,4,_ZN4sead19FixedSafeStringBaseIcLi32EED0Ev +0x0000007100120140,_ZN4sead19FixedSafeStringBaseIcLi32EEaSERKNS_14SafeStringBaseIcEE,240,_ZN4sead19FixedSafeStringBaseIcLi32EEaSERKNS_14SafeStringBaseIcEE 0x0000007100120230,AI_Action_EventPlayUiOPTextAction::ctor,56, 0x0000007100120268,_ZN5uking6action23EventPlayUiOPTextActionD1Ev,20,_ZN5uking6action23EventPlayUiOPTextActionD1Ev 0x000000710012027c,_ZN5uking6action23EventPlayUiOPTextActionD0Ev,52,_ZN5uking6action23EventPlayUiOPTextActionD0Ev @@ -28503,7 +28503,7 @@ 0x0000007100480840,j__ZdlPv_112,4, 0x0000007100480844,_ZN4sead15FixedSafeStringILi512EEaSERKNS_14SafeStringBaseIcEE,240, 0x0000007100480934,j__ZdlPv_113,4, -0x0000007100480938,_ZN4sead19FixedSafeStringBaseIcLi256EEaSERKNS_14SafeStringBaseIcEE,240, +0x0000007100480938,x,240, 0x0000007100480a28,AI_AI_LeaveFromTarget::ctor,52,_ZN5uking2ai15LeaveFromTargetC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100480a5c,_ZN5uking2ai15LeaveFromTargetD1Ev,4,_ZN5uking2ai15LeaveFromTargetD1Ev 0x0000007100480a60,_ZN5uking2ai15LeaveFromTargetD0Ev,36,_ZN5uking2ai15LeaveFromTargetD0Ev @@ -76059,37 +76059,37 @@ 0x0000007100dd2ba8,GameDataMgr::increaseInt,232,_ZN4ksys3gdt7Manager12incrementS32EiRKN4sead14SafeStringBaseIcEE 0x0000007100dd2c90,GameDataMgr::__auto1,72,_ZN4ksys3gdt7Manager13wasFlagCopiedERKN4sead14SafeStringBaseIcEE 0x0000007100dd2cd8,GameDataMgr::__auto6,72,_ZN4ksys3gdt7Manager16wasFlagNotCopiedERKN4sead14SafeStringBaseIcEE -0x0000007100dd2d20,GameDataMgr::copyParamToParam1,28, -0x0000007100dd2d3c,GameDataMgr::getBoolIdxForMapUnitObject,272, -0x0000007100dd2e4c,GameDataMgr::allocParam1,180, -0x0000007100dd2f00,getShopInfoByHash,140, +0x0000007100dd2d20,GameDataMgr::copyParamToParam1,28,_ZN4ksys3gdt7Manager17copyParamToParam1Ev +0x0000007100dd2d3c,GameDataMgr::getBoolIdxForMapUnitObject,272,_ZN4ksys3gdt7Manager20getRevivalFlagHandleERKN4sead14SafeStringBaseIcEERKNS_3map9MubinIterE +0x0000007100dd2e4c,GameDataMgr::allocParam1,180,_ZN4ksys3gdt7Manager11allocParam1Ev +0x0000007100dd2f00,getShopInfoByHash,140,_ZN4ksys3gdt7Manager15getShopInfoIterEjPN2al9ByamlIterERKS3_PKj 0x0000007100dd2f8c,GameDataMgr::resetBoolFlagForRadarMgr,208, -0x0000007100dd305c,allocRetryBuffer,176, -0x0000007100dd310c,GameDataMgr::destroyTriggerParamC08IfNeeded,52, -0x0000007100dd3140,GameDataMgr::syncData,368, -0x0000007100dd32b0,GameDataMgr::syncStart,1084, -0x0000007100dd36ec,GameDataMgr::syncDataX,8392, -0x0000007100dd57b4,sub_7100DD57B4,8, -0x0000007100dd57bc,GameDataMgr::syncStartOnLoadEnd,136, -0x0000007100dd5844,sub_7100DD5844,752, -0x0000007100dd5b34,GameDataMgr::doSyncDataBool,368, -0x0000007100dd5ca4,GameDataMgr::doSyncDataS32,368, -0x0000007100dd5e14,GameDataMgr::doSyncDataF32,368, -0x0000007100dd5f84,GameDataMgr::doSyncDataString,616, -0x0000007100dd61ec,GameDataMgr::doSyncDataString64,616, -0x0000007100dd6454,GameDataMgr::doSyncDataString256,616, -0x0000007100dd66bc,GameDataMgr::doSyncDataVec2f,568, -0x0000007100dd68f4,GameDataMgr::doSyncDataVec3f,568, -0x0000007100dd6b2c,GameDataMgr::doSyncDataVec4f,568, -0x0000007100dd6d64,GameDataMgr::doSyncDataBoolArray,388, -0x0000007100dd6ee8,GameDataMgr::doSyncDataS32Array,352, -0x0000007100dd7048,GameDataMgr::doSyncDataF32Array,352, -0x0000007100dd71a8,GameDataMgr::doSyncDataStringArray,584, -0x0000007100dd73f0,GameDataMgr::doSyncDataString64Array,584, -0x0000007100dd7638,GameDataMgr::doSyncDataString256Array,584, -0x0000007100dd7880,GameDataMgr::doSyncDataVec2fArray,528, -0x0000007100dd7a90,GameDataMgr::doSyncDataVec3fArray,528, -0x0000007100dd7ca0,GameDataMgr::doSyncDataVec4fArray,528, +0x0000007100dd305c,allocRetryBuffer,176,_ZN4ksys3gdt7Manager16allocRetryBufferEPN4sead4HeapE +0x0000007100dd310c,GameDataMgr::destroyTriggerParamC08IfNeeded,52,_ZN4ksys3gdt7Manager18destroyRetryBufferEv +0x0000007100dd3140,GameDataMgr::syncData,368,_ZN4ksys3gdt7Manager8syncDataEPKc +0x0000007100dd32b0,GameDataMgr::syncStart,1084,_ZN4ksys3gdt7Manager9syncStartEv +0x0000007100dd36ec,GameDataMgr::syncDataX,8392,_ZN4ksys3gdt7Manager10syncUpdateEPKc! +0x0000007100dd57b4,sub_7100DD57B4,8,_ZThn8_N4ksys3gdt7Manager8syncDataEPKc +0x0000007100dd57bc,GameDataMgr::syncStartOnLoadEnd,136,_ZN4ksys3gdt7Manager18startSyncOnLoadEndEv +0x0000007100dd5844,sub_7100DD5844,752,_ZN4ksys3gdt7Manager11parseFloatsERKN4sead14SafeStringBaseIcEEPfj +0x0000007100dd5b34,GameDataMgr::doSyncDataBool,368,_ZN4ksys3gdt7Manager11doSyncArrayIbEEvRKN4sead8PtrArrayINS0_8FlagBaseEEEPhPKc +0x0000007100dd5ca4,GameDataMgr::doSyncDataS32,368,_ZN4ksys3gdt7Manager11doSyncArrayIiEEvRKN4sead8PtrArrayINS0_8FlagBaseEEEPhPKc +0x0000007100dd5e14,GameDataMgr::doSyncDataF32,368,_ZN4ksys3gdt7Manager11doSyncArrayIfEEvRKN4sead8PtrArrayINS0_8FlagBaseEEEPhPKc +0x0000007100dd5f84,GameDataMgr::doSyncDataString,616,_ZN4ksys3gdt7Manager14doSyncArrayStrILi32EEEvRKN4sead8PtrArrayINS0_8FlagBaseEEEPhPKcj +0x0000007100dd61ec,GameDataMgr::doSyncDataString64,616,_ZN4ksys3gdt7Manager14doSyncArrayStrILi64EEEvRKN4sead8PtrArrayINS0_8FlagBaseEEEPhPKcj +0x0000007100dd6454,GameDataMgr::doSyncDataString256,616,_ZN4ksys3gdt7Manager14doSyncArrayStrILi256EEEvRKN4sead8PtrArrayINS0_8FlagBaseEEEPhPKcj +0x0000007100dd66bc,GameDataMgr::doSyncDataVec2f,568,_ZN4ksys3gdt7Manager14doSyncArrayVecIN4sead7Vector2IfEEEEvRKNS3_8PtrArrayINS0_8FlagBaseEEEPhPKcj +0x0000007100dd68f4,GameDataMgr::doSyncDataVec3f,568,_ZN4ksys3gdt7Manager14doSyncArrayVecIN4sead7Vector3IfEEEEvRKNS3_8PtrArrayINS0_8FlagBaseEEEPhPKcj +0x0000007100dd6b2c,GameDataMgr::doSyncDataVec4f,568,_ZN4ksys3gdt7Manager14doSyncArrayVecIN4sead7Vector4IfEEEEvRKNS3_8PtrArrayINS0_8FlagBaseEEEPhPKcj +0x0000007100dd6d64,GameDataMgr::doSyncDataBoolArray,388,_ZN4ksys3gdt7Manager11doSyncArrayIbEEvRKN4sead8PtrArrayINS4_INS0_8FlagBaseEEEEEPhPKc +0x0000007100dd6ee8,GameDataMgr::doSyncDataS32Array,352,_ZN4ksys3gdt7Manager11doSyncArrayIiEEvRKN4sead8PtrArrayINS4_INS0_8FlagBaseEEEEEPhPKc +0x0000007100dd7048,GameDataMgr::doSyncDataF32Array,352,_ZN4ksys3gdt7Manager11doSyncArrayIfEEvRKN4sead8PtrArrayINS4_INS0_8FlagBaseEEEEEPhPKc +0x0000007100dd71a8,GameDataMgr::doSyncDataStringArray,584,_ZN4ksys3gdt7Manager14doSyncArrayStrILi32EEEvRKN4sead8PtrArrayINS4_INS0_8FlagBaseEEEEEPhPKcj +0x0000007100dd73f0,GameDataMgr::doSyncDataString64Array,584,_ZN4ksys3gdt7Manager14doSyncArrayStrILi64EEEvRKN4sead8PtrArrayINS4_INS0_8FlagBaseEEEEEPhPKcj +0x0000007100dd7638,GameDataMgr::doSyncDataString256Array,584,_ZN4ksys3gdt7Manager14doSyncArrayStrILi256EEEvRKN4sead8PtrArrayINS4_INS0_8FlagBaseEEEEEPhPKcj +0x0000007100dd7880,GameDataMgr::doSyncDataVec2fArray,528,_ZN4ksys3gdt7Manager14doSyncArrayVecIN4sead7Vector2IfEEEEvRKNS3_8PtrArrayINS6_INS0_8FlagBaseEEEEEPhPKcj +0x0000007100dd7a90,GameDataMgr::doSyncDataVec3fArray,528,_ZN4ksys3gdt7Manager14doSyncArrayVecIN4sead7Vector3IfEEEEvRKNS3_8PtrArrayINS6_INS0_8FlagBaseEEEEEPhPKcj +0x0000007100dd7ca0,GameDataMgr::doSyncDataVec4fArray,528,_ZN4ksys3gdt7Manager14doSyncArrayVecIN4sead7Vector4IfEEEEvRKNS3_8PtrArrayINS6_INS0_8FlagBaseEEEEEPhPKcj 0x0000007100dd7eb0,GameDataMgr::getName,12,_ZNK4ksys3gdt7Manager7getNameEv 0x0000007100dd7ebc,sub_7100DD7EBC,12,_ZThn8_NK4ksys3gdt7Manager7getNameEv 0x0000007100dd7ec8,j__ZdlPv_893,4,_ZN4ksys3gdt15TriggerParamRefD0Ev @@ -79185,7 +79185,7 @@ 0x0000007100e8de68,sub_7100E8DE68,40, 0x0000007100e8de90,sub_7100E8DE90,40, 0x0000007100e8deb8,MapConst::m1,64, -0x0000007100e8def8,_ZN4sead15FixedSafeStringILi64EED0Ev,68, +0x0000007100e8def8,x,68, 0x0000007100e8df3c,sub_7100E8DF3C,68, 0x0000007100e8df80,MapConst::m18,8, 0x0000007100e8df88,nullsub_4002,4, diff --git a/lib/sead b/lib/sead index dfbcf903..9ac7ac68 160000 --- a/lib/sead +++ b/lib/sead @@ -1 +1 @@ -Subproject commit dfbcf903b8543c5f85fe166eaf8d4bc92c9c93ba +Subproject commit 9ac7ac68fb0cd1adbb62fb2bfb52d56db3c5cc90 diff --git a/src/KingSystem/GameData/gdtManager.cpp b/src/KingSystem/GameData/gdtManager.cpp index d46b0745..7597cc49 100644 --- a/src/KingSystem/GameData/gdtManager.cpp +++ b/src/KingSystem/GameData/gdtManager.cpp @@ -1,18 +1,24 @@ #include "KingSystem/GameData/gdtManager.h" #include +#include #include #include #include +#include #include #include