diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a759c6a..ab3b8962 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ add_executable(uking src/KingSystem/MessageSystem/mesTransceiver.h src/KingSystem/Resource/GeneralParamList/resGParamListObject.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index aff7304a..650d5c2a 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89222,7 +89222,7 @@ 0x00000071011a7f14,sub_71011A7F14,12,_ZNK4ksys3res21GParamListObjectEvent7getNameEv 0x00000071011a7f20,sub_71011A7F20,12,_ZNK4ksys3res23GParamListObjectGolemIK7getNameEv 0x00000071011a7f2c,sub_71011A7F2C,12,_ZNK4ksys3res27GParamListObjectPictureBook7getNameEv -0x00000071011a7f38,sub_71011A7F38,12, +0x00000071011a7f38,sub_71011A7F38,12,_ZNK4ksys3res23GParamListObjectAirWall7getNameEv 0x00000071011a7f44,sub_71011A7F44,12, 0x00000071011a80c4,sub_71011A80C4,140,_ZNK4sead15RuntimeTypeInfo6DeriveIN4ksys3res10GParamListEE9isDerivedEPKNS0_9InterfaceE 0x00000071011a8150,sub_71011A8150,108,_ZN4ksys3res9AIProgramD1Ev diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h new file mode 100644 index 00000000..82b675d9 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h @@ -0,0 +1,24 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectAirWall : public GParamListObject { +public: + GParamListObjectAirWall(); + const char* getName() const override { return "AirWall"; } + + agl::utl::Parameter mLayer; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectAirWall, 0x60); + +inline GParamListObjectAirWall::GParamListObjectAirWall() { + auto* const obj = &mObj; + + mLayer.init("AirWall", "Layer", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 7853f1c5..44d0b6ef 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -3,6 +3,7 @@ #include #include "KingSystem/ActorSystem/actActorParamMgr.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h" @@ -198,6 +199,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Event", heap, dummy_list); add(archive.getRootList(), "GolemIK", heap, dummy_list); add(archive.getRootList(), "PictureBook", heap, dummy_list); + add(archive.getRootList(), "AirWall", heap, dummy_list); // TODO: the rest