From 5583679013f4f292f9a70d10446825f5e322f0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 12:19:25 +0200 Subject: [PATCH] ksys/res: Implement GParamList Nest --- CMakeLists.txt | 1 + data/uking_functions.csv | 2 +- .../resGParamListObjectNest.h | 24 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h diff --git a/CMakeLists.txt b/CMakeLists.txt index de5d9621..4c23dd9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 0715952d..b092b0f1 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89207,7 +89207,7 @@ 0x00000071011a7e60,sub_71011A7E60,12,_ZNK4ksys3res27GParamListObjectMonsterShop7getNameEv 0x00000071011a7e6c,sub_71011A7E6C,12,_ZNK4ksys3res21GParamListObjectSwarm7getNameEv 0x00000071011a7e78,sub_71011A7E78,12,_ZNK4ksys3res24GParamListObjectGelEnemy7getNameEv -0x00000071011a7e84,sub_71011A7E84,12, +0x00000071011a7e84,sub_71011A7E84,12,_ZNK4ksys3res20GParamListObjectNest7getNameEv 0x00000071011a7e90,sub_71011A7E90,12, 0x00000071011a7e9c,sub_71011A7E9C,12, 0x00000071011a7ea8,sub_71011A7EA8,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h new file mode 100644 index 00000000..c04d826d --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h @@ -0,0 +1,24 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectNest : public GParamListObject { +public: + GParamListObjectNest(); + const char* getName() const override { return "Nest"; } + + agl::utl::Parameter mCreateActor; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectNest, 0x60); + +inline GParamListObjectNest::GParamListObjectNest() { + auto* const obj = &mObj; + + mCreateActor.init("", "CreateActor", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 83b3f669..25398c13 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -45,6 +45,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" @@ -167,6 +168,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "MonsterShop", heap, dummy_list); add(archive.getRootList(), "Swarm", heap, dummy_list); add(archive.getRootList(), "GelEnemy", heap, dummy_list); + add(archive.getRootList(), "Nest", heap, dummy_list); // TODO: the rest