From e70c1c37cda07c9d172fce36842ea72cc79725ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 4 Nov 2020 00:42:50 +0100 Subject: [PATCH] ksys/gdt: Start adding GameDataMgr --- data/uking_functions.csv | 40 ++++---- expected/_ZN4ksys3gdt7ManagerC1Ev.bin | Bin 0 -> 576 bytes src/KingSystem/GameData/gdtManager.cpp | 123 +++++++++++++++++++++++ src/KingSystem/GameData/gdtManager.h | 133 +++++++++++++++++++++++-- 4 files changed, 268 insertions(+), 28 deletions(-) create mode 100644 expected/_ZN4ksys3gdt7ManagerC1Ev.bin diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 2ef40f93..f8645e15 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -74235,20 +74235,20 @@ 0x0000007100dce7e8,sub_7100DCE7E8,48, 0x0000007100dce818,sub_7100DCE818,92, 0x0000007100dce874,sub_7100DCE874,32, -0x0000007100dce894,sub_7100DCE894,100, -0x0000007100dce8f8,sub_7100DCE8F8,108, -0x0000007100dce964,GameDataMgr::createInstance,136, -0x0000007100dce9ec,GameDataMgr::ctor,572, -0x0000007100dcec28,gdm::ResArray::ctor,276, -0x0000007100dced3c,GameDataMgr::dtor,504, -0x0000007100dcef34,sub_7100DCEF34,72, -0x0000007100dcef7c,sub_7100DCEF7C,132, -0x0000007100dcf000,sub_7100DCF000,132, -0x0000007100dcf084,nullsub_3855,4, -0x0000007100dcf088,Res2Array::dtor,280, -0x0000007100dcf1a0,GameDataMgr::dtorDelete,36, -0x0000007100dcf1c4,GameDataMgr::init,1264, -0x0000007100dcf6b4,sub_7100DCF6B4,704, +0x0000007100dce894,sub_7100DCE894,100,_ZN4ksys3gdt7Manager18SingletonDisposer_D2Ev +0x0000007100dce8f8,sub_7100DCE8F8,108,_ZN4ksys3gdt7Manager18SingletonDisposer_D0Ev +0x0000007100dce964,GameDataMgr::createInstance,136,_ZN4ksys3gdt7Manager14createInstanceEPN4sead4HeapE +0x0000007100dce9ec,GameDataMgr::ctor,572,_ZN4ksys3gdt7ManagerC1Ev? +0x0000007100dcec28,gdm::ResArray::ctor,276,_ZN4sead9SafeArrayIN4ksys3res6HandleELi32EEC2Ev +0x0000007100dced3c,GameDataMgr::dtor,504,_ZN4ksys3gdt7ManagerD1Ev +0x0000007100dcef34,sub_7100DCEF34,72,_ZN4ksys3gdt7Manager14MethodTreeNodeD2Ev +0x0000007100dcef7c,sub_7100DCEF7C,132,_ZN4sead13DelegateEventIPN4ksys3gdt7Manager10ResetEventEED2Ev +0x0000007100dcf000,sub_7100DCF000,132,_ZN4sead13DelegateEventIPN4ksys3gdt7Manager11ReinitEventEED2Ev +0x0000007100dcf084,nullsub_3855,4,_ZN4ksys3gdt7Manager15TriggerParamRefD2Ev +0x0000007100dcf088,Res2Array::dtor,280,_ZN4sead9SafeArrayIN4ksys3res6HandleELi32EED2Ev +0x0000007100dcf1a0,GameDataMgr::dtorDelete,36,_ZN4ksys3gdt7ManagerD0Ev +0x0000007100dcf1c4,GameDataMgr::init,1264,_ZN4ksys3gdt7Manager4initEPN4sead4HeapEPNS2_9FrameworkE? +0x0000007100dcf6b4,sub_7100DCF6B4,704,_ZN4ksys3gdt7Manager15IncrementLoggerC2Ev 0x0000007100dcf974,EntryFactoryBgdata::dtor,68, 0x0000007100dcf9b8,GameDataMgr::loadGameDataFromArc,1692, 0x0000007100dd0054,GameDataMgr::loadShopGameDataInfo,600, @@ -74320,13 +74320,13 @@ 0x0000007100dd7880,GameDataMgr::doSyncDataVec2fArray,528, 0x0000007100dd7a90,GameDataMgr::doSyncDataVec3fArray,528, 0x0000007100dd7ca0,GameDataMgr::doSyncDataVec4fArray,528, -0x0000007100dd7eb0,GameDataMgr::getName,12, -0x0000007100dd7ebc,sub_7100DD7EBC,12, -0x0000007100dd7ec8,j__ZdlPv_893,4, +0x0000007100dd7eb0,GameDataMgr::getName,12,_ZNK4ksys3gdt7Manager7getNameEv +0x0000007100dd7ebc,sub_7100DD7EBC,12,_ZThn8_NK4ksys3gdt7Manager7getNameEv +0x0000007100dd7ec8,j__ZdlPv_893,4,_ZN4ksys3gdt7Manager15TriggerParamRefD0Ev 0x0000007100dd7ecc,j__ZdlPv_894,4, -0x0000007100dd7ed0,sub_7100DD7ED0,148, -0x0000007100dd7f64,sub_7100DD7F64,148, -0x0000007100dd7ff8,sub_7100DD7FF8,84, +0x0000007100dd7ed0,sub_7100DD7ED0,148,_ZN4sead13DelegateEventIPN4ksys3gdt7Manager11ReinitEventEED0Ev +0x0000007100dd7f64,sub_7100DD7F64,148,_ZN4sead13DelegateEventIPN4ksys3gdt7Manager10ResetEventEED0Ev +0x0000007100dd7ff8,sub_7100DD7FF8,84,_ZN4ksys3gdt7Manager14MethodTreeNodeD0Ev 0x0000007100dd804c,EntryFactoryBgdata::m1,76, 0x0000007100dd8098,EntryFactoryBgdata::rtti1,132, 0x0000007100dd811c,EntryFactoryBgdata::rtti2,92, diff --git a/expected/_ZN4ksys3gdt7ManagerC1Ev.bin b/expected/_ZN4ksys3gdt7ManagerC1Ev.bin new file mode 100644 index 0000000000000000000000000000000000000000..6d62ed287f451ff2b95fbb49387a67fa3564e170 GIT binary patch literal 576 zcmXX^F=!M~5dHr)`?JC&V33F@3>+58A$Q5<5I2RFJ1z-aqg}9x>lWef6&7+A&|to3 zXCX`w4^v(t{wpMf%@!dcHX1Af!hwQfwhAH&Q34|*m-%}shCjpm@6DTGjutlcznfei zucY+xQwAUU*oJedjDIcG_5%)Tm1}jM0v%Z-8-*CQFP+M$o{816YCF=i>Vp-4(Q=smX7t<>s{h>m_Rrds%In>}lG|E|T zAK3F-q*~Sl))#4SPv&r&v3CxeL5I&^+|S&7;xS(A98hjFEJ0n{4xeNORA zpx-KhTtD-7d$#A{rJy~IxN>?Rs@Biu^2)eNy9?Lnu==HfRq{%`JU?>{#yIn8#8Eo} c&+Be;i|$}+mC>D)>0V0uXyN^vZR<|w6dhUezW@LL literal 0 HcmV?d00001 diff --git a/src/KingSystem/GameData/gdtManager.cpp b/src/KingSystem/GameData/gdtManager.cpp index b483bef5..6d753940 100644 --- a/src/KingSystem/GameData/gdtManager.cpp +++ b/src/KingSystem/GameData/gdtManager.cpp @@ -1,7 +1,130 @@ #include "KingSystem/GameData/gdtManager.h" +#include +#include +#include +#include