PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match and link CParticleGen

This commit is contained in:
Phillip Stephens 2023-02-04 01:18:12 -08:00
parent e55ce9dcda
commit 25f0b7229b
6 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
asm/Kyoto/Particles/CParticleDataFactory.s
View File

@ -26,6 +26,43 @@ lbl_803D7918:
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4
.section .data
.balign 8
.global __vt__12CParticleGen
__vt__12CParticleGen:
# ROM: 0x3EAD08
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte SetGeneratorRate__12CParticleGenFf
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte GetGeneratorRate__12CParticleGenCFv
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte AddModifier__12CParticleGenFP5CWarp
.4byte 0
.section .text .section .text
.global CreateTexture__Fi .global CreateTexture__Fi

37
asm/Kyoto/Particles/CParticleGen.s
View File

@ -1,42 +1,5 @@
.include "macros.inc" .include "macros.inc"
.section .data
.balign 8
.global __vt__12CParticleGen
__vt__12CParticleGen:
# ROM: 0x3EAD08
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte SetGeneratorRate__12CParticleGenFf
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte GetGeneratorRate__12CParticleGenCFv
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte AddModifier__12CParticleGenFP5CWarp
.4byte 0
.section .text, "ax" .section .text, "ax"
.global AddModifier__12CParticleGenFP5CWarp .global AddModifier__12CParticleGenFP5CWarp

2
configure.py
View File

@ -585,7 +585,7 @@ LIBS = [
["Kyoto/Particles/CIntElement", True], ["Kyoto/Particles/CIntElement", True],
["Kyoto/Particles/CModVectorElement", False], ["Kyoto/Particles/CModVectorElement", False],
["Kyoto/Particles/CParticleDataFactory", False], ["Kyoto/Particles/CParticleDataFactory", False],
"Kyoto/Particles/CParticleGen", ["Kyoto/Particles/CParticleGen", True],
["Kyoto/Particles/CParticleGlobals", True], ["Kyoto/Particles/CParticleGlobals", True],
"Kyoto/Particles/CParticleSwoosh", "Kyoto/Particles/CParticleSwoosh",
"Kyoto/Particles/CParticleSwooshDataFactory", "Kyoto/Particles/CParticleSwooshDataFactory",

2
include/Kyoto/Particles/CParticleGen.hpp
View File

@ -46,7 +46,7 @@ public:
virtual uint Get4CharId() const = 0; virtual uint Get4CharId() const = 0;
private: private:
rstl::list< rstl::pair<ushort, bool> > x4_modifiersList; rstl::list< CWarp* > x4_modifiersList;
}; };
#endif // _CPARTICLEGEN #endif // _CPARTICLEGEN

4
include/rstl/list.hpp
View File

@ -69,7 +69,9 @@ private:
}; };
node* create_node(node* prev, node* next, const T& val) { node* create_node(node* prev, node* next, const T& val) {
node* n = new node(prev, next); node* n;
x0_allocator.allocate(n, 1);
new(n) node(prev, next);
construct(n->get_value(), val); construct(n->get_value(), val);
return n; return n;
} }

5
src/Kyoto/Particles/CParticleGen.cpp Normal file
View File

@ -0,0 +1,5 @@
#include "Kyoto/Particles/CParticleGen.hpp"
void CParticleGen::AddModifier(CWarp* warp) {
x4_modifiersList.push_back(warp);
}