From e10e8dcac7022b1572dd8d92db06f1917c0c3141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 23 Mar 2022 00:56:51 +0100 Subject: [PATCH] data: Update function list --- data/uking_functions.csv | 10 +++++----- .../Physics/StaticCompound/physStaticCompound.cpp | 2 +- .../physStaticCompoundRigidBodyGroup.cpp | 4 ++-- .../Physics/StaticCompound/physStaticCompoundUtil.h | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 7317042d..8712183f 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -84222,7 +84222,7 @@ Address,Quality,Size,Name 0x0000007100fcac9c,U,000112, 0x0000007100fcad0c,U,000328, 0x0000007100fcae54,O,000028,_ZN4ksys4phys14StaticCompound17getFieldBodyGroupEi -0x0000007100fcae70,O,000084,_ZNK4ksys4phys14StaticCompound17hasFieldBodyGroupEPNS0_9BodyGroupE +0x0000007100fcae70,O,000084,_ZNK4ksys4phys14StaticCompound17hasFieldBodyGroupEPNS0_28StaticCompoundRigidBodyGroupE 0x0000007100fcaec4,O,000008,_ZNK4ksys4phys14StaticCompound27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100fcaecc,O,000092,_ZNK4ksys4phys14StaticCompound18getRuntimeTypeInfoEv 0x0000007100fcaf28,O,000008,_ZNK4ksys4phys14StaticCompound10needsParseEv @@ -84254,9 +84254,9 @@ Address,Quality,Size,Name 0x0000007100fcbbe4,U,000176, 0x0000007100fcbc94,U,000324, 0x0000007100fcbdd8,U,000104, -0x0000007100fcbe40,O,000168,_ZN4ksys4phys9BodyGroupC1Ev -0x0000007100fcbee8,O,000288,_ZN4ksys4phys9BodyGroupD1Ev -0x0000007100fcc008,O,001492,_ZN4ksys4phys9BodyGroup4initERK16hkpPhysicsSystemPN4sead8Matrix34IfEEPNS0_14StaticCompoundEPNS5_4HeapE +0x0000007100fcbe40,O,000168,_ZN4ksys4phys28StaticCompoundRigidBodyGroupC1Ev +0x0000007100fcbee8,O,000288,_ZN4ksys4phys28StaticCompoundRigidBodyGroupD1Ev +0x0000007100fcc008,O,001492,_ZN4ksys4phys28StaticCompoundRigidBodyGroup4initERK16hkpPhysicsSystemPN4sead8Matrix34IfEEPNS0_14StaticCompoundEPNS5_4HeapE 0x0000007100fcc5dc,U,000120,BodyGroup::x 0x0000007100fcc654,U,000120,BodyGroup::x_0 0x0000007100fcc6cc,U,000248,BodyGroup::x_1 @@ -84269,7 +84269,7 @@ Address,Quality,Size,Name 0x0000007100fccc7c,U,000312,BodyGroup::x_8 0x0000007100fccdb4,U,000944,BodyGroup::x_9 0x0000007100fcd164,U,000244,BodyGroup::x_10 -0x0000007100fcd258,O,000288,_ZN4ksys4phys9BodyGroup12modifyMatrixERKN4sead8Matrix34IfEEi +0x0000007100fcd258,O,000288,_ZN4ksys4phys28StaticCompoundRigidBodyGroup12modifyMatrixERKN4sead8Matrix34IfEEi 0x0000007100fcd378,U,000028,BodyGroup::x_12 0x0000007100fcd394,U,000144,BodyGroup::x_16 0x0000007100fcd424,U,000164,BodyGroup::x_13 diff --git a/src/KingSystem/Physics/StaticCompound/physStaticCompound.cpp b/src/KingSystem/Physics/StaticCompound/physStaticCompound.cpp index 1bf1ae18..b18e0201 100644 --- a/src/KingSystem/Physics/StaticCompound/physStaticCompound.cpp +++ b/src/KingSystem/Physics/StaticCompound/physStaticCompound.cpp @@ -2,8 +2,8 @@ #include #include #include -#include "KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.h" #include "KingSystem/Physics/StaticCompound/physStaticCompoundInfo.h" +#include "KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.h" #include "KingSystem/Utils/Debug.h" #include "KingSystem/Utils/HeapUtil.h" diff --git a/src/KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.cpp b/src/KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.cpp index 756ebaae..830ecb19 100644 --- a/src/KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.cpp +++ b/src/KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.cpp @@ -29,8 +29,8 @@ StaticCompoundRigidBodyGroup::~StaticCompoundRigidBodyGroup() { mRigidBodies.freeBuffer(); } -void StaticCompoundRigidBodyGroup::init(const hkpPhysicsSystem& system, sead::Matrix34f* mtx, StaticCompound* sc, - sead::Heap* heap) { +void StaticCompoundRigidBodyGroup::init(const hkpPhysicsSystem& system, sead::Matrix34f* mtx, + StaticCompound* sc, sead::Heap* heap) { mStaticCompound = sc; mMtxPtr = mtx; diff --git a/src/KingSystem/Physics/StaticCompound/physStaticCompoundUtil.h b/src/KingSystem/Physics/StaticCompound/physStaticCompoundUtil.h index 70aa5243..976a6889 100644 --- a/src/KingSystem/Physics/StaticCompound/physStaticCompoundUtil.h +++ b/src/KingSystem/Physics/StaticCompound/physStaticCompoundUtil.h @@ -24,8 +24,9 @@ bool getMaterialMaskFromCollidable(RigidBodyCollisionMasks* p_masks, u32* p_coll const hkpShape& shape, const u32* shape_key); // 0x0000007100fd09d0 -void getBodyGroupAndObjectFromSCShape(StaticCompoundRigidBodyGroup** p_body_group, map::Object** p_object, - const hkpShape& shape, const u32* shape_key); +void getBodyGroupAndObjectFromSCShape(StaticCompoundRigidBodyGroup** p_body_group, + map::Object** p_object, const hkpShape& shape, + const u32* shape_key); // 0x0000007100fd0a1c u32 getCollisionFilterInfoFromCollidable(RigidBodyCollisionMasks* p_masks,