diff --git a/CMakeLists.txt b/CMakeLists.txt index ab7a81f6..aec66806 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ add_executable(uking src/KingSystem/MessageSystem/mesTransceiver.h src/KingSystem/Resource/GeneralParamList/resGParamListObject.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index f4ab019d..e3df275b 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89188,7 +89188,7 @@ 0x00000071011a7d7c,sub_71011A7D7C,12,_ZNK4ksys3res20GParamListObjectZora7getNameEv 0x00000071011a7d88,sub_71011A7D88,12,_ZNK4ksys3res24GParamListObjectTraveler7getNameEv 0x00000071011a7d94,sub_71011A7D94,12,_ZNK4ksys3res20GParamListObjectPrey7getNameEv -0x00000071011a7da0,sub_71011A7DA0,12, +0x00000071011a7da0,sub_71011A7DA0,12,_ZNK4ksys3res34GParamListObjectAnimalFollowOffset7getNameEv 0x00000071011a7dac,sub_71011A7DAC,12, 0x00000071011a7db8,sub_71011A7DB8,12, 0x00000071011a7dc4,sub_71011A7DC4,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h new file mode 100644 index 00000000..3bc16e6d --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h @@ -0,0 +1,24 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectAnimalFollowOffset : public GParamListObject { +public: + GParamListObjectAnimalFollowOffset(); + const char* getName() const override { return "AnimalFollowOffset"; } + + agl::utl::Parameter mEatLocalOffset; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectAnimalFollowOffset, 0x60); + +inline GParamListObjectAnimalFollowOffset::GParamListObjectAnimalFollowOffset() { + auto* const obj = &mObj; + + mEatLocalOffset.init({0.0, 0.0, 0.0}, "EatLocalOffset", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 85cd446c..7b1c294e 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -3,6 +3,7 @@ #include #include "KingSystem/ActorSystem/actActorParamMgr.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h" @@ -126,6 +127,8 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Zora", heap, dummy_list); add(archive.getRootList(), "Traveler", heap, dummy_list); add(archive.getRootList(), "Prey", heap, dummy_list); + add(archive.getRootList(), "AnimalFollowOffset", heap, + dummy_list); // TODO: the rest