diff --git a/CMakeLists.txt b/CMakeLists.txt index 660e8d77..81db1873 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,6 +120,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 5a9cbe5a..0efd4768 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89110,7 +89110,7 @@ 0x00000071011a1c80,BgparamlistObjectSwarm::ctor,388,_ZN4ksys3res21GParamListObjectSwarmC2Ev 0x00000071011a1e04,BgparamlistObjectGelEnemy::ctor,1352,_ZN4ksys3res24GParamListObjectGelEnemyC2Ev 0x00000071011a234c,BgparamlistObjectWizzrobe::ctor,832,_ZN4ksys3res24GParamListObjectWizzrobeC2Ev -0x00000071011a268c,BgparamlistObjectStalEnemy::ctor,328, +0x00000071011a268c,BgparamlistObjectStalEnemy::ctor,328,_ZN4ksys3res25GParamListObjectStalEnemyC2Ev 0x00000071011a27d4,BgparamlistObjectGuardianMini::ctor,672, 0x00000071011a2a74,BgparamlistObjectClothReaction::ctor,1460, 0x00000071011a3028,BgparamlistObjectGlobal::ctor,6116, @@ -89209,7 +89209,7 @@ 0x00000071011a7e78,sub_71011A7E78,12,_ZNK4ksys3res24GParamListObjectGelEnemy7getNameEv 0x00000071011a7e84,sub_71011A7E84,12,_ZNK4ksys3res20GParamListObjectNest7getNameEv 0x00000071011a7e90,sub_71011A7E90,12,_ZNK4ksys3res24GParamListObjectWizzrobe7getNameEv -0x00000071011a7e9c,sub_71011A7E9C,12, +0x00000071011a7e9c,sub_71011A7E9C,12,_ZNK4ksys3res25GParamListObjectStalEnemy7getNameEv 0x00000071011a7ea8,sub_71011A7EA8,12, 0x00000071011a7eb4,sub_71011A7EB4,12, 0x00000071011a7ec0,sub_71011A7EC0,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h new file mode 100644 index 00000000..cee124f0 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h @@ -0,0 +1,25 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectStalEnemy : public GParamListObject { +public: + GParamListObjectStalEnemy() { + auto* const obj = &mObj; + + mHeadActorName.init("", "HeadActorName", "", obj); + mLeftArmActorName.init("", "LeftArmActorName", "", obj); + } + + const char* getName() const override { return "StalEnemy"; } + + agl::utl::Parameter mHeadActorName; + agl::utl::Parameter mLeftArmActorName; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectStalEnemy, 0x88); + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 5c68d0f5..34e8adc9 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -59,6 +59,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h" @@ -171,6 +172,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "GelEnemy", heap, dummy_list); add(archive.getRootList(), "Nest", heap, dummy_list); add(archive.getRootList(), "Wizzrobe", heap, dummy_list); + add(archive.getRootList(), "StalEnemy", heap, dummy_list); // TODO: the rest