diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 83076136..a64c458e 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -12454,7 +12454,7 @@ reserve__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>Fi = .text:0x8 reserve__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fi = .text:0x802D7EAC; // type:function size:0x10C scope:global reserve__Q24rstl77vector,Q24rstl17rmemory_allocator>Fi = .text:0x802D7FB8; // type:function size:0x100 scope:global FAnimCharacterSet__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer = .text:0x802D80B8; // type:function size:0x64 scope:global -fn_802D811C = .text:0x802D811C; // type:function size:0xA4 +__ct<17CAnimCharacterSet>__16CFactoryFnReturnFP17CAnimCharacterSet = .text:0x802D811C; // type:function size:0xA4 fn_802D81C0 = .text:0x802D81C0; // type:function size:0x90 fn_802D8250 = .text:0x802D8250; // type:function size:0x64 fn_802D82B4 = .text:0x802D82B4; // type:function size:0x58 @@ -12463,9 +12463,9 @@ fn_802D8398 = .text:0x802D8398; // type:function size:0x50 fn_802D83E8 = .text:0x802D83E8; // type:function size:0x24 __dt__13CAnimationSetFv = .text:0x802D840C; // type:function size:0x58 scope:global fn_802D8464 = .text:0x802D8464; // type:function size:0x110 -fn_802D8574 = .text:0x802D8574; // type:function size:0x2C -fn_802D85A0 = .text:0x802D85A0; // type:function size:0x9C -fn_802D863C = .text:0x802D863C; // type:function size:0x64 +GetIObjObjectFor__27TToken<17CAnimCharacterSet>FRCQ24rstl29auto_ptr<17CAnimCharacterSet> = .text:0x802D8574; // type:function size:0x2C +GetNewDerivedObject__45TObjOwnerDerivedFromIObj<17CAnimCharacterSet>FRCQ24rstl29auto_ptr<17CAnimCharacterSet> = .text:0x802D85A0; // type:function size:0x9C +__dt__Q24rstl29auto_ptr<17CAnimCharacterSet>Fv = .text:0x802D863C; // type:function size:0x64 __ct__17CAnimCharacterSetFR12CInputStream = .text:0x802D86A0; // type:function size:0x5C scope:global __dt__15CAnimTreeLoopInFv = .text:0x802D86FC; // type:function size:0x114 scope:global fn_802D8810 = .text:0x802D8810; // type:function size:0x1DC @@ -18132,7 +18132,7 @@ jumptable_803DAC04 = .data:0x803DAC04; // type:object size:0x24 scope:local __vt__15CCameraCollider = .data:0x803DAC28; // type:object size:0x10 scope:global lbl_803DAC38 = .data:0x803DAC38; // type:object size:0x6C lbl_803DACA4 = .data:0x803DACA4; // type:object size:0xC -lbl_803DACB0 = .data:0x803DACB0; // type:object size:0x10 +__vt__43TObjOwnerDerivedFromIObj<15CGenDescription> = .data:0x803DACB0; // type:object size:0x10 lbl_803DACC0 = .data:0x803DACC0; // type:object size:0x70 __vt__10CTweakBall = .data:0x803DAD30; // type:object size:0xC scope:global jumptable_803DAD40 = .data:0x803DAD40; // type:object size:0x94 scope:local @@ -18668,7 +18668,7 @@ lbl_803ECA90 = .data:0x803ECA90; // type:object size:0x40 __vt__16CCollidableAABox = .data:0x803ECAD0; // type:object size:0x28 scope:global __vt__17CCollidableSphere = .data:0x803ECAF8; // type:object size:0x28 scope:global jumptable_803ECB20 = .data:0x803ECB20; // type:object size:0xAC scope:local -lbl_803ECBD0 = .data:0x803ECBD0; // type:object size:0x10 +__vt__45TObjOwnerDerivedFromIObj<17CAnimCharacterSet> = .data:0x803ECBD0; // type:object size:0x10 lbl_803ECBE0 = .data:0x803ECBE0; // type:object size:0x78 lbl_803ECC58 = .data:0x803ECC58; // type:object size:0x78 lbl_803ECCD0 = .data:0x803ECCD0; // type:object size:0x20 diff --git a/configure.py b/configure.py index bcc071c5..9b0da49f 100755 --- a/configure.py +++ b/configure.py @@ -1079,7 +1079,7 @@ config.libs = [ Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Animation/CHalfTransition.cpp"), Object(NonMatching, "Kyoto/Particles/CElectricDescription.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Particles/CSwooshDescription.cpp"), - Object(NonMatching, "Kyoto/Particles/CGenDescription.cpp"), + Object(MatchingFor("GM8E01_00"), "Kyoto/Particles/CGenDescription.cpp"), Object(NonMatching, "Kyoto/CPakFile.cpp"), Object(NonMatching, "Kyoto/Animation/CPoseAsTransformsVariableSize.cpp"), Object(NonMatching, "Kyoto/Input/CRumbleVoice.cpp"), diff --git a/include/Kyoto/Particles/CParticleDataFactory.hpp b/include/Kyoto/Particles/CParticleDataFactory.hpp index a3208308..c851f23f 100644 --- a/include/Kyoto/Particles/CParticleDataFactory.hpp +++ b/include/Kyoto/Particles/CParticleDataFactory.hpp @@ -10,8 +10,8 @@ class CInputStream; class CParticleDataFactory { public: static CGenDescription* GetGeneratorDesc(CInputStream& in, CSimplePool* pool, uint offset); - static CGenDescription* CreateGeneratorDescription(CInputStream&, rstl::vector< uint >& assets, uint offset, - CSimplePool* pool); + static CGenDescription* CreateGeneratorDescription(CInputStream&, rstl::vector< uint >& assets, + uint offset, CSimplePool* pool); static CUVElement* GetTextureElement(CInputStream& in, CSimplePool* resPool); static CColorElement* GetColorElement(CInputStream& in); static CModVectorElement* GetModVectorElement(CInputStream& in); diff --git a/include/Kyoto/Particles/CSpawnSystemKeyframeData.hpp b/include/Kyoto/Particles/CSpawnSystemKeyframeData.hpp index d55d011d..c8e32907 100644 --- a/include/Kyoto/Particles/CSpawnSystemKeyframeData.hpp +++ b/include/Kyoto/Particles/CSpawnSystemKeyframeData.hpp @@ -12,7 +12,7 @@ public: CSpawnSystemKeyframeInfo(CInputStream& in); }; CSpawnSystemKeyframeData(CInputStream& in); - ~CSpawnSystemKeyframeData(); + ~CSpawnSystemKeyframeData() {} private: int mUnknown1; diff --git a/src/Kyoto/Particles/CParticleDataFactory.cpp b/src/Kyoto/Particles/CParticleDataFactory.cpp index 98538b0d..28be5bf2 100644 --- a/src/Kyoto/Particles/CParticleDataFactory.cpp +++ b/src/Kyoto/Particles/CParticleDataFactory.cpp @@ -7,9 +7,9 @@ #include "Kyoto/Particles/CIntElement.hpp" #include "Kyoto/Particles/CModVectorElement.hpp" #include "Kyoto/Particles/CRealElement.hpp" +#include "Kyoto/Particles/CSpawnSystemKeyframeData.hpp" #include "Kyoto/Particles/IElement.hpp" #include "Kyoto/Streams/CInputStream.hpp" - #define SBIG(v) v CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in,