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

Match and link CExplosion 

Former-commit-id: e514aa9535
This commit is contained in:
Phillip Stephens 2023-02-06 21:55:32 -08:00
parent bad9a7c70d
commit 062cf9e5aa
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/Kyoto/Particles/CElementGen.s
View File

@ -8751,7 +8751,7 @@ lbl_8031F390:
/* 8031F3A0 0031C300 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l /* 8031F3A0 0031C300 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l
/* 8031F3A4 0031C304 38 80 FF FF */ li r4, -1 /* 8031F3A4 0031C304 38 80 FF FF */ li r4, -1
/* 8031F3A8 0031C308 90 1E 00 00 */ stw r0, 0(r30) /* 8031F3A8 0031C308 90 1E 00 00 */ stw r0, 0(r30)
/* 8031F3AC 0031C30C 4B D3 B9 25 */ bl "__dt__Q24rstl52list<Q24rstl10pair<Us,b>,Q24rstl17rmemory_allocator>Fv" /* 8031F3AC 0031C30C 4B D3 B9 25 */ bl "__dt__Q24rstl40list<P5CWarp,Q24rstl17rmemory_allocator>Fv"
lbl_8031F3B0: lbl_8031F3B0:
/* 8031F3B0 0031C310 7F E0 07 35 */ extsh. r0, r31 /* 8031F3B0 0031C310 7F E0 07 35 */ extsh. r0, r31
/* 8031F3B4 0031C314 40 81 00 0C */ ble lbl_8031F3C0 /* 8031F3B4 0031C314 40 81 00 0C */ ble lbl_8031F3C0

2
asm/Kyoto/Particles/CParticleElectric.s
View File

@ -3909,7 +3909,7 @@ lbl_80361EC0:
/* 80361ED0 0035EE30 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l /* 80361ED0 0035EE30 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l
/* 80361ED4 0035EE34 38 80 FF FF */ li r4, -1 /* 80361ED4 0035EE34 38 80 FF FF */ li r4, -1
/* 80361ED8 0035EE38 90 1E 00 00 */ stw r0, 0(r30) /* 80361ED8 0035EE38 90 1E 00 00 */ stw r0, 0(r30)
/* 80361EDC 0035EE3C 4B CF 8D F5 */ bl "__dt__Q24rstl52list<Q24rstl10pair<Us,b>,Q24rstl17rmemory_allocator>Fv" /* 80361EDC 0035EE3C 4B CF 8D F5 */ bl "__dt__Q24rstl40list<P5CWarp,Q24rstl17rmemory_allocator>Fv"
lbl_80361EE0: lbl_80361EE0:
/* 80361EE0 0035EE40 7F E0 07 35 */ extsh. r0, r31 /* 80361EE0 0035EE40 7F E0 07 35 */ extsh. r0, r31
/* 80361EE4 0035EE44 40 81 00 0C */ ble lbl_80361EF0 /* 80361EE4 0035EE44 40 81 00 0C */ ble lbl_80361EF0

2
asm/Kyoto/Particles/CParticleSwoosh.s
View File

@ -4884,7 +4884,7 @@ lbl_8032ED98:
/* 8032EDA8 0032BD08 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l /* 8032EDA8 0032BD08 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l
/* 8032EDAC 0032BD0C 38 80 FF FF */ li r4, -1 /* 8032EDAC 0032BD0C 38 80 FF FF */ li r4, -1
/* 8032EDB0 0032BD10 90 1E 00 00 */ stw r0, 0(r30) /* 8032EDB0 0032BD10 90 1E 00 00 */ stw r0, 0(r30)
/* 8032EDB4 0032BD14 4B D2 BF 1D */ bl "__dt__Q24rstl52list<Q24rstl10pair<Us,b>,Q24rstl17rmemory_allocator>Fv" /* 8032EDB4 0032BD14 4B D2 BF 1D */ bl "__dt__Q24rstl40list<P5CWarp,Q24rstl17rmemory_allocator>Fv"
lbl_8032EDB8: lbl_8032EDB8:
/* 8032EDB8 0032BD18 7F E0 07 35 */ extsh. r0, r31 /* 8032EDB8 0032BD18 7F E0 07 35 */ extsh. r0, r31
/* 8032EDBC 0032BD1C 40 81 00 0C */ ble lbl_8032EDC8 /* 8032EDBC 0032BD1C 40 81 00 0C */ ble lbl_8032EDC8

4
asm/MetroidPrime/CExplosion.s
View File

@ -873,8 +873,8 @@ lbl_8005AC20:
/* 8005ACC8 00057C28 38 21 00 80 */ addi r1, r1, 0x80 /* 8005ACC8 00057C28 38 21 00 80 */ addi r1, r1, 0x80
/* 8005ACCC 00057C2C 4E 80 00 20 */ blr /* 8005ACCC 00057C2C 4E 80 00 20 */ blr
.global "__dt__Q24rstl52list<Q24rstl10pair<Us,b>,Q24rstl17rmemory_allocator>Fv" .global "__dt__Q24rstl40list<P5CWarp,Q24rstl17rmemory_allocator>Fv"
"__dt__Q24rstl52list<Q24rstl10pair<Us,b>,Q24rstl17rmemory_allocator>Fv": "__dt__Q24rstl40list<P5CWarp,Q24rstl17rmemory_allocator>Fv":
/* 8005ACD0 00057C30 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8005ACD0 00057C30 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8005ACD4 00057C34 7C 08 02 A6 */ mflr r0 /* 8005ACD4 00057C34 7C 08 02 A6 */ mflr r0
/* 8005ACD8 00057C38 90 01 00 24 */ stw r0, 0x24(r1) /* 8005ACD8 00057C38 90 01 00 24 */ stw r0, 0x24(r1)

2
configure.py
View File

@ -53,7 +53,7 @@ LIBS = [
["MetroidPrime/Tweaks/CTweakParticle", True], ["MetroidPrime/Tweaks/CTweakParticle", True],
"MetroidPrime/Clamp_int", "MetroidPrime/Clamp_int",
["MetroidPrime/CArchMsgParmControllerStatus", True], ["MetroidPrime/CArchMsgParmControllerStatus", True],
["MetroidPrime/CExplosion", False], ["MetroidPrime/CExplosion", True],
["MetroidPrime/CEffect", True], ["MetroidPrime/CEffect", True],
"MetroidPrime/Cameras/CGameCamera", "MetroidPrime/Cameras/CGameCamera",
"MetroidPrime/CGameArea", "MetroidPrime/CGameArea",

3
include/MetroidPrime/CExplosion.hpp
View File

@ -33,6 +33,9 @@ public:
void Render(const CStateManager&) const override; void Render(const CStateManager&) const override;
void CalculateRenderBounds() override; void CalculateRenderBounds() override;
TUniqueId GetExplosionLightId() const { return xec_explosionLight; }
uint GetSourceId() const { return xf0_sourceId; }
public: public:
rstl::single_ptr< CParticleGen > xe8_particleGen; rstl::single_ptr< CParticleGen > xe8_particleGen;
TUniqueId xec_explosionLight; TUniqueId xec_explosionLight;

4
src/MetroidPrime/CExplosion.cpp
View File

@ -121,7 +121,7 @@ void CExplosion::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CSt
CActor::AcceptScriptMsg(msg, sender, mgr); CActor::AcceptScriptMsg(msg, sender, mgr);
if (xec_explosionLight != kInvalidUniqueId) if (xec_explosionLight != kInvalidUniqueId)
mgr.SendScriptMsgAlways(sender, xec_explosionLight, msg); mgr.SendScriptMsgAlways(xec_explosionLight, sender, msg);
} }
void CExplosion::CalculateRenderBounds() { void CExplosion::CalculateRenderBounds() {
@ -152,5 +152,3 @@ void CExplosion::Render(const CStateManager& mgr) const {
mgr.SetupFogForArea(GetCurrentAreaId()); mgr.SetupFogForArea(GetCurrentAreaId());
CElementGen::SetSubtractBlend(false); CElementGen::SetSubtractBlend(false);
} }
// bool CExplosion::CanRenderUnsorted(const CStateManager&) const { return false; }