diff --git a/CMakeLists.txt b/CMakeLists.txt index e4a3383f..2e75b0a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 3a673b57..bbc679f0 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89116,7 +89116,7 @@ 0x00000071011a3028,BgparamlistObjectGlobal::ctor,6116,_ZN4ksys3res22GParamListObjectGlobalC2Ev 0x00000071011a480c,BgparamlistObjectAutoGen::ctor,404,_ZN4ksys3res23GParamListObjectAutoGenC2Ev 0x00000071011a49a0,BgparamlistObjectChemicalType::ctor,336,_ZN4ksys3res28GParamListObjectChemicalTypeC2Ev -0x00000071011a4af0,BgparamlistObjectGolem::ctor,676, +0x00000071011a4af0,BgparamlistObjectGolem::ctor,676,_ZN4ksys3res21GParamListObjectGolemC2Ev 0x00000071011a4d94,BgparamlistObjectHorseTargetedInfo::ctor,356, 0x00000071011a4ef8,BgparamlistObjectWolfLink::ctor,4548, 0x00000071011a60bc,BgparamlistObjectEvent::ctor,852, @@ -89216,7 +89216,7 @@ 0x00000071011a7ecc,sub_71011A7ECC,12,_ZNK4ksys3res20GParamListObjectBeam7getNameEv 0x00000071011a7ed8,sub_71011A7ED8,12,_ZNK4ksys3res23GParamListObjectAutoGen7getNameEv 0x00000071011a7ee4,sub_71011A7EE4,12,_ZNK4ksys3res28GParamListObjectChemicalType7getNameEv -0x00000071011a7ef0,sub_71011A7EF0,12, +0x00000071011a7ef0,sub_71011A7EF0,12,_ZNK4ksys3res21GParamListObjectGolem7getNameEv 0x00000071011a7efc,sub_71011A7EFC,12, 0x00000071011a7f08,sub_71011A7F08,12, 0x00000071011a7f14,sub_71011A7F14,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h new file mode 100644 index 00000000..79486cb1 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectGolem : public GParamListObject { +public: + GParamListObjectGolem(); + const char* getName() const override { return "Golem"; } + + agl::utl::Parameter mUpperArmRActor; + agl::utl::Parameter mLowerArmRActor; + agl::utl::Parameter mUpperArmLActor; + agl::utl::Parameter mLowerArmLActor; + agl::utl::Parameter mDefaultWeakPointActor; + agl::utl::Parameter mIsDefaultChemicalOn; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectGolem, 0x120); + +inline GParamListObjectGolem::GParamListObjectGolem() { + auto* const obj = &mObj; + + mUpperArmRActor.init("", "UpperArmRActor", "", obj); + mLowerArmRActor.init("", "LowerArmRActor", "", obj); + mUpperArmLActor.init("", "UpperArmLActor", "", obj); + mLowerArmLActor.init("", "LowerArmLActor", "", obj); + mDefaultWeakPointActor.init("", "DefaultWeakPointActor", "", obj); + mIsDefaultChemicalOn.init(false, "IsDefaultChemicalOn", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 8d3eb431..afa15194 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -35,6 +35,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h" @@ -185,6 +186,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Beam", heap, dummy_list); add(archive.getRootList(), "AutoGen", heap, dummy_list); add(archive.getRootList(), "ChemicalType", heap, dummy_list); + add(archive.getRootList(), "Golem", heap, dummy_list); // TODO: the rest