From 806b54b027f67959b93f3cc9f18388e3bfd50d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 11:52:59 +0200 Subject: [PATCH] ksys/res: Implement GParamList Insect --- CMakeLists.txt | 1 + data/uking_functions.csv | 2 +- .../resGParamListObjectInsect.h | 24 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 11a6a93a..4f673572 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 59befde7..448498e5 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89193,7 +89193,7 @@ 0x00000071011a7db8,sub_71011A7DB8,12,_ZNK4ksys3res25GParamListObjectBindActor7getNameEv 0x00000071011a7dc4,sub_71011A7DC4,12,_ZNK4ksys3res25GParamListObjectEatTarget7getNameEv 0x00000071011a7dd0,sub_71011A7DD0,12,_ZNK4ksys3res26GParamListObjectAnimalUnit7getNameEv -0x00000071011a7ddc,sub_71011A7DDC,12, +0x00000071011a7ddc,sub_71011A7DDC,12,_ZNK4ksys3res22GParamListObjectInsect7getNameEv 0x00000071011a7de8,sub_71011A7DE8,12, 0x00000071011a7df4,sub_71011A7DF4,12, 0x00000071011a7e00,sub_71011A7E00,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h new file mode 100644 index 00000000..b7f78cac --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h @@ -0,0 +1,24 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectInsect : public GParamListObject { +public: + GParamListObjectInsect(); + const char* getName() const override { return "Insect"; } + + agl::utl::Parameter mFireResistanceLevel; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectInsect, 0x58); + +inline GParamListObjectInsect::GParamListObjectInsect() { + auto* const obj = &mObj; + + mFireResistanceLevel.init(0, "FireResistanceLevel", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 9de521ef..98b9a41e 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -28,6 +28,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h" @@ -138,6 +139,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "BindActor", heap, dummy_list); add(archive.getRootList(), "EatTarget", heap, dummy_list); add(archive.getRootList(), "AnimalUnit", heap, dummy_list); + add(archive.getRootList(), "Insect", heap, dummy_list); // TODO: the rest