From 15deb532c222c85c63823bdf15700916356a7e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 12:13:57 +0200 Subject: [PATCH] ksys/res: Implement GParamList MonsterShop --- CMakeLists.txt | 1 + data/uking_functions.csv | 2 +- .../resGParamListObjectMonsterShop.h | 26 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h diff --git a/CMakeLists.txt b/CMakeLists.txt index cf9a13c5..b2d34424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index f7fd29a3..748e6113 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89204,7 +89204,7 @@ 0x00000071011a7e3c,sub_71011A7E3C,12,_ZNK4ksys3res30GParamListObjectGiantArmorSlot7getNameEv 0x00000071011a7e48,sub_71011A7E48,12,_ZNK4ksys3res26GParamListObjectGiantArmor7getNameEv 0x00000071011a7e54,sub_71011A7E54,12,_ZNK4ksys3res24GParamListObjectGuardian7getNameEv -0x00000071011a7e60,sub_71011A7E60,12, +0x00000071011a7e60,sub_71011A7E60,12,_ZNK4ksys3res27GParamListObjectMonsterShop7getNameEv 0x00000071011a7e6c,sub_71011A7E6C,12, 0x00000071011a7e78,sub_71011A7E78,12, 0x00000071011a7e84,sub_71011A7E84,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h new file mode 100644 index 00000000..1304fd01 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h @@ -0,0 +1,26 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectMonsterShop : public GParamListObject { +public: + GParamListObjectMonsterShop(); + const char* getName() const override { return "MonsterShop"; } + + agl::utl::Parameter mBuyMamo; + agl::utl::Parameter mSellMamo; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectMonsterShop, 0x78); + +inline GParamListObjectMonsterShop::GParamListObjectMonsterShop() { + auto* const obj = &mObj; + + mBuyMamo.init(0, "BuyMamo", "", obj); + mSellMamo.init(0, "SellMamo", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index af3c90d5..df806201 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -43,6 +43,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" @@ -161,6 +162,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { dummy_list); add(archive.getRootList(), "GiantArmor", heap, dummy_list); add(archive.getRootList(), "Guardian", heap, dummy_list); + add(archive.getRootList(), "MonsterShop", heap, dummy_list); // TODO: the rest