diff --git a/CMakeLists.txt b/CMakeLists.txt index d75d2982..a20bc5a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +86,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 10fbe5c1..16ef3af3 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89177,7 +89177,7 @@ 0x00000071011a7cf8,sub_71011A7CF8,12,_ZNK4ksys3res27GParamListObjectSeriesArmor7getNameEv 0x00000071011a7d04,sub_71011A7D04,12,_ZNK4ksys3res24GParamListObjectLiftable7getNameEv 0x00000071011a7d10,sub_71011A7D10,12,_ZNK4ksys3res20GParamListObjectItem7getNameEv -0x00000071011a7d1c,sub_71011A7D1C,12, +0x00000071011a7d1c,sub_71011A7D1C,12,_ZNK4ksys3res21GParamListObjectRupee7getNameEv 0x00000071011a7d28,sub_71011A7D28,12, 0x00000071011a7d34,sub_71011A7D34,12, 0x00000071011a7d40,sub_71011A7D40,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h new file mode 100644 index 00000000..d566133b --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h @@ -0,0 +1,24 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectRupee : public GParamListObject { +public: + GParamListObjectRupee(); + const char* getName() const override { return "Rupee"; } + + agl::utl::Parameter mRupeeValue; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectRupee, 0x58); + +inline GParamListObjectRupee::GParamListObjectRupee() { + auto* const obj = &mObj; + + mRupeeValue.init(1, "RupeeValue", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 45feec63..44303fa9 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -25,6 +25,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h" @@ -103,6 +104,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "SeriesArmor", heap, dummy_list); add(archive.getRootList(), "Liftable", heap, dummy_list); add(archive.getRootList(), "Item", heap, dummy_list); + add(archive.getRootList(), "Rupee", heap, dummy_list); // TODO: the rest