From e9dbd61debcb728b23e3b79fec1d604f870e3f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 13:53:06 +0200 Subject: [PATCH] ksys/res: Implement GParamList Event --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +- .../resGParamListObjectEvent.h | 38 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 + 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 2aac7d87..16dd5305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index acced5c1..1b3b9038 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89119,7 +89119,7 @@ 0x00000071011a4af0,BgparamlistObjectGolem::ctor,676,_ZN4ksys3res21GParamListObjectGolemC2Ev 0x00000071011a4d94,BgparamlistObjectHorseTargetedInfo::ctor,356,_ZN4ksys3res33GParamListObjectHorseTargetedInfoC2Ev 0x00000071011a4ef8,BgparamlistObjectWolfLink::ctor,4548,_ZN4ksys3res24GParamListObjectWolfLinkC2Ev -0x00000071011a60bc,BgparamlistObjectEvent::ctor,852, +0x00000071011a60bc,BgparamlistObjectEvent::ctor,852,_ZN4ksys3res21GParamListObjectEventC2Ev 0x00000071011a6410,BgparamlistObjectGolemIK::ctor,1792, 0x00000071011a6b10,BgparamlistObjectPictureBook::ctor,344, 0x00000071011a6c68,BgparamlistObjectMotorcycle::ctor,2736, @@ -89219,7 +89219,7 @@ 0x00000071011a7ef0,sub_71011A7EF0,12,_ZNK4ksys3res21GParamListObjectGolem7getNameEv 0x00000071011a7efc,sub_71011A7EFC,12,_ZNK4ksys3res33GParamListObjectHorseTargetedInfo7getNameEv 0x00000071011a7f08,sub_71011A7F08,12,_ZNK4ksys3res24GParamListObjectWolfLink7getNameEv -0x00000071011a7f14,sub_71011A7F14,12, +0x00000071011a7f14,sub_71011A7F14,12,_ZNK4ksys3res21GParamListObjectEvent7getNameEv 0x00000071011a7f20,sub_71011A7F20,12, 0x00000071011a7f2c,sub_71011A7F2C,12, 0x00000071011a7f38,sub_71011A7F38,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h new file mode 100644 index 00000000..ec8ffdb8 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h @@ -0,0 +1,38 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectEvent : public GParamListObject { +public: + GParamListObjectEvent(); + const char* getName() const override { return "Event"; } + + agl::utl::Parameter mVisibleOffActor1; + agl::utl::Parameter mVisibleOffActor2; + agl::utl::Parameter mVisibleOffActor3; + agl::utl::Parameter mVisibleOffActor4; + agl::utl::Parameter mVisibleOffActor5; + agl::utl::Parameter mVisibleOffActor6; + agl::utl::Parameter mVisibleOffActor7; + agl::utl::Parameter mVisibleOffActor8; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectEvent, 0x178); + +inline GParamListObjectEvent::GParamListObjectEvent() { + auto* const obj = &mObj; + + mVisibleOffActor1.init("", "VisibleOffActor1", "", obj); + mVisibleOffActor2.init("", "VisibleOffActor2", "", obj); + mVisibleOffActor3.init("", "VisibleOffActor3", "", obj); + mVisibleOffActor4.init("", "VisibleOffActor4", "", obj); + mVisibleOffActor5.init("", "VisibleOffActor5", "", obj); + mVisibleOffActor6.init("", "VisibleOffActor6", "", obj); + mVisibleOffActor7.init("", "VisibleOffActor7", "", obj); + mVisibleOffActor8.init("", "VisibleOffActor8", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 449c1dd1..f751e3a5 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -28,6 +28,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h" @@ -192,6 +193,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "HorseTargetedInfo", heap, dummy_list); add(archive.getRootList(), "WolfLink", heap, dummy_list); + add(archive.getRootList(), "Event", heap, dummy_list); // TODO: the rest