From e1e3f71d5044e5a19a04cc203ea723a158a4a94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 19 Sep 2020 22:35:16 +0200 Subject: [PATCH] ksys/res: Implement GParamList EnemyShown --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +-- .../resGParamListObjectEnemyShown.h | 30 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d30020a7..781f56a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.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 12b87eb7..6cdb9e1c 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89063,7 +89063,7 @@ 0x000000710118c4f4,BgparamlistObjectEnemyLevel::ctor,936,_ZN4ksys3res26GParamListObjectEnemyLevelC2Ev 0x000000710118c89c,BgparamlistObjectEnemyRace::ctor,2780,_ZN4ksys3res25GParamListObjectEnemyRaceC2Ev 0x000000710118d378,BgparamlistObjectAttackInterval::ctor,564,_ZN4ksys3res30GParamListObjectAttackIntervalC2Ev -0x000000710118d5ac,BgparamlistObjectEnemyShown::ctor,404, +0x000000710118d5ac,BgparamlistObjectEnemyShown::ctor,404,_ZN4ksys3res26GParamListObjectEnemyShownC2Ev 0x000000710118d740,BgparamlistObjectBindBone::ctor,392, 0x000000710118d8c8,BgparamlistObjectAttack::ctor,900, 0x000000710118dc4c,BgparamlistObjectWeaponCommon::ctor,3288, @@ -89151,7 +89151,7 @@ 0x00000071011a7bc0,sub_71011A7BC0,12,_ZNK4ksys3res26GParamListObjectEnemyLevel7getNameEv 0x00000071011a7bcc,sub_71011A7BCC,12,_ZNK4ksys3res25GParamListObjectEnemyRace7getNameEv 0x00000071011a7bd8,sub_71011A7BD8,12,_ZNK4ksys3res30GParamListObjectAttackInterval7getNameEv -0x00000071011a7be4,sub_71011A7BE4,12, +0x00000071011a7be4,sub_71011A7BE4,12,_ZNK4ksys3res26GParamListObjectEnemyShown7getNameEv 0x00000071011a7bf0,sub_71011A7BF0,12, 0x00000071011a7bfc,sub_71011A7BFC,12, 0x00000071011a7c08,sub_71011A7C08,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h new file mode 100644 index 00000000..24d44522 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h @@ -0,0 +1,30 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectEnemyShown : public GParamListObject { +public: + GParamListObjectEnemyShown(); + const char* getName() const override { return "EnemyShown"; } + + agl::utl::Parameter mIsHappy; + agl::utl::Parameter mIsCasebyCase; + agl::utl::Parameter mIsSit; + agl::utl::Parameter mIsNoise; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectEnemyShown, 0xb8); + +inline GParamListObjectEnemyShown::GParamListObjectEnemyShown() { + auto* const obj = &mObj; + + mIsHappy.init(false, "IsHappy", "", obj); + mIsCasebyCase.init(false, "IsCasebyCase", "", obj); + mIsSit.init(false, "IsSit", "", obj); + mIsNoise.init(false, "IsNoise", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index be1f14d2..5dc27993 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -7,6 +7,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListTraits.h" @@ -50,6 +51,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "EnemyRace", heap, dummy_list); add(archive.getRootList(), "AttackInterval", heap, dummy_list); + add(archive.getRootList(), "EnemyShown", heap, dummy_list); // TODO: the rest