diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d64fc28..8657cbd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 72b6e7b6..a81b3000 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89077,7 +89077,7 @@ 0x00000071011912ec,BgparamlistObjectBow::ctor,2724,_ZN4ksys3res19GParamListObjectBowC2Ev 0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596,_ZN4ksys3res28GParamListObjectWeaponOptionC2Ev 0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772,_ZN4ksys3res27GParamListObjectMasterSwordC2Ev -0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608, +0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608,_ZN4ksys3res34GParamListObjectGuardianMiniWeaponC2Ev 0x0000007101192548,BgparamlistObjectPlayer::ctor,11236, 0x000000710119512c,BgparamlistObjectCamera::ctor,884, 0x00000071011954a0,BgparamlistObjectGrab::ctor,1188, @@ -89165,7 +89165,7 @@ 0x00000071011a7c68,sub_71011A7C68,12,_ZNK4ksys3res19GParamListObjectBow7getNameEv 0x00000071011a7c74,sub_71011A7C74,12,_ZNK4ksys3res28GParamListObjectWeaponOption7getNameEv 0x00000071011a7c80,sub_71011A7C80,12,_ZNK4ksys3res27GParamListObjectMasterSword7getNameEv -0x00000071011a7c8c,sub_71011A7C8C,12, +0x00000071011a7c8c,sub_71011A7C8C,12,_ZNK4ksys3res34GParamListObjectGuardianMiniWeapon7getNameEv 0x00000071011a7c98,sub_71011A7C98,12, 0x00000071011a7ca4,sub_71011A7CA4,12, 0x00000071011a7cb0,sub_71011A7CB0,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h new file mode 100644 index 00000000..bc79f7fb --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectGuardianMiniWeapon : public GParamListObject { +public: + GParamListObjectGuardianMiniWeapon(); + const char* getName() const override { return "GuardianMiniWeapon"; } + + agl::utl::Parameter mBindMyNodeName; + agl::utl::Parameter mVisibleMatNameR; + agl::utl::Parameter mVisibleMatNameL; + agl::utl::Parameter mVisibleMatNameB; + agl::utl::Parameter mVisibleOffMatName; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectGuardianMiniWeapon, 0x100); + +inline GParamListObjectGuardianMiniWeapon::GParamListObjectGuardianMiniWeapon() { + auto* const obj = &mObj; + + mBindMyNodeName.init("", "BindMyNodeName", "", obj); + mVisibleMatNameR.init("", "VisibleMatNameR", "", obj); + mVisibleMatNameL.init("", "VisibleMatNameL", "", obj); + mVisibleMatNameB.init("", "VisibleMatNameB", "", obj); + mVisibleOffMatName.init("Mt_Arm", "VisibleOffMatName", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 4fe17721..ff028e62 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -12,6 +12,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" @@ -78,6 +79,8 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Bow", heap, dummy_list); add(archive.getRootList(), "WeaponOption", heap, dummy_list); add(archive.getRootList(), "MasterSword", heap, dummy_list); + add(archive.getRootList(), "GuardianMiniWeapon", heap, + dummy_list); // TODO: the rest