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

Link CEffect

This commit is contained in:
Luke Street 2022-10-18 21:47:26 -04:00
parent 45baefd608
commit a1b52467ea
6 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
asm/MetroidPrime/CEffect.s
View File

@ -47,42 +47,6 @@ lbl_805A6E78:
.section .text, "ax" .section .text, "ax"
.global __dt__12CParticleGenFv
__dt__12CParticleGenFv:
/* 8005ACD0 00057C30 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8005ACD4 00057C34 7C 08 02 A6 */ mflr r0
/* 8005ACD8 00057C38 90 01 00 24 */ stw r0, 0x24(r1)
/* 8005ACDC 00057C3C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8005ACE0 00057C40 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8005ACE4 00057C44 7C 9E 23 78 */ mr r30, r4
/* 8005ACE8 00057C48 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8005ACEC 00057C4C 7C 7D 1B 79 */ or. r29, r3, r3
/* 8005ACF0 00057C50 41 82 00 38 */ beq lbl_8005AD28
/* 8005ACF4 00057C54 83 FD 00 04 */ lwz r31, 4(r29)
/* 8005ACF8 00057C58 48 00 00 14 */ b lbl_8005AD0C
lbl_8005ACFC:
/* 8005ACFC 00057C5C 7F E3 FB 79 */ or. r3, r31, r31
/* 8005AD00 00057C60 83 FF 00 04 */ lwz r31, 4(r31)
/* 8005AD04 00057C64 41 82 00 08 */ beq lbl_8005AD0C
/* 8005AD08 00057C68 48 2B AC 29 */ bl Free__7CMemoryFPCv
lbl_8005AD0C:
/* 8005AD0C 00057C6C 80 1D 00 08 */ lwz r0, 8(r29)
/* 8005AD10 00057C70 7C 1F 00 40 */ cmplw r31, r0
/* 8005AD14 00057C74 40 82 FF E8 */ bne lbl_8005ACFC
/* 8005AD18 00057C78 7F C0 07 35 */ extsh. r0, r30
/* 8005AD1C 00057C7C 40 81 00 0C */ ble lbl_8005AD28
/* 8005AD20 00057C80 7F A3 EB 78 */ mr r3, r29
/* 8005AD24 00057C84 48 2B AC 0D */ bl Free__7CMemoryFPCv
lbl_8005AD28:
/* 8005AD28 00057C88 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8005AD2C 00057C8C 7F A3 EB 78 */ mr r3, r29
/* 8005AD30 00057C90 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8005AD34 00057C94 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 8005AD38 00057C98 83 A1 00 14 */ lwz r29, 0x14(r1)
/* 8005AD3C 00057C9C 7C 08 03 A6 */ mtlr r0
/* 8005AD40 00057CA0 38 21 00 20 */ addi r1, r1, 0x20
/* 8005AD44 00057CA4 4E 80 00 20 */ blr
.global AddToRenderer__7CEffectCFRC14CFrustumPlanesRC13CStateManager .global AddToRenderer__7CEffectCFRC14CFrustumPlanesRC13CStateManager
AddToRenderer__7CEffectCFRC14CFrustumPlanesRC13CStateManager: AddToRenderer__7CEffectCFRC14CFrustumPlanesRC13CStateManager:
/* 8005AD48 00057CA8 4E 80 00 20 */ blr /* 8005AD48 00057CA8 4E 80 00 20 */ blr

36
asm/MetroidPrime/CExplosion.s
View File

@ -873,6 +873,42 @@ 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__12CParticleGenFv
__dt__12CParticleGenFv:
/* 8005ACD0 00057C30 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8005ACD4 00057C34 7C 08 02 A6 */ mflr r0
/* 8005ACD8 00057C38 90 01 00 24 */ stw r0, 0x24(r1)
/* 8005ACDC 00057C3C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8005ACE0 00057C40 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8005ACE4 00057C44 7C 9E 23 78 */ mr r30, r4
/* 8005ACE8 00057C48 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8005ACEC 00057C4C 7C 7D 1B 79 */ or. r29, r3, r3
/* 8005ACF0 00057C50 41 82 00 38 */ beq lbl_8005AD28
/* 8005ACF4 00057C54 83 FD 00 04 */ lwz r31, 4(r29)
/* 8005ACF8 00057C58 48 00 00 14 */ b lbl_8005AD0C
lbl_8005ACFC:
/* 8005ACFC 00057C5C 7F E3 FB 79 */ or. r3, r31, r31
/* 8005AD00 00057C60 83 FF 00 04 */ lwz r31, 4(r31)
/* 8005AD04 00057C64 41 82 00 08 */ beq lbl_8005AD0C
/* 8005AD08 00057C68 48 2B AC 29 */ bl Free__7CMemoryFPCv
lbl_8005AD0C:
/* 8005AD0C 00057C6C 80 1D 00 08 */ lwz r0, 8(r29)
/* 8005AD10 00057C70 7C 1F 00 40 */ cmplw r31, r0
/* 8005AD14 00057C74 40 82 FF E8 */ bne lbl_8005ACFC
/* 8005AD18 00057C78 7F C0 07 35 */ extsh. r0, r30
/* 8005AD1C 00057C7C 40 81 00 0C */ ble lbl_8005AD28
/* 8005AD20 00057C80 7F A3 EB 78 */ mr r3, r29
/* 8005AD24 00057C84 48 2B AC 0D */ bl Free__7CMemoryFPCv
lbl_8005AD28:
/* 8005AD28 00057C88 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8005AD2C 00057C8C 7F A3 EB 78 */ mr r3, r29
/* 8005AD30 00057C90 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8005AD34 00057C94 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 8005AD38 00057C98 83 A1 00 14 */ lwz r29, 0x14(r1)
/* 8005AD3C 00057C9C 7C 08 03 A6 */ mtlr r0
/* 8005AD40 00057CA0 38 21 00 20 */ addi r1, r1, 0x20
/* 8005AD44 00057CA4 4E 80 00 20 */ blr
.section .rodata .section .rodata
.balign 8 .balign 8
.global lbl_803CCF78 .global lbl_803CCF78

2
configure.py
View File

@ -75,7 +75,7 @@ LIBS = [
"MetroidPrime/Clamp_int", "MetroidPrime/Clamp_int",
["MetroidPrime/CArchMsgParmControllerStatus", True], ["MetroidPrime/CArchMsgParmControllerStatus", True],
"MetroidPrime/CExplosion", "MetroidPrime/CExplosion",
"MetroidPrime/CEffect", ["MetroidPrime/CEffect", True],
"MetroidPrime/Cameras/CGameCamera", "MetroidPrime/Cameras/CGameCamera",
"MetroidPrime/CGameArea", "MetroidPrime/CGameArea",
"MetroidPrime/HUD/CSamusHud", "MetroidPrime/HUD/CSamusHud",

6
include/MetroidPrime/CEffect.hpp
View File

@ -11,11 +11,11 @@ public:
const CTransform4f& xf); const CTransform4f& xf);
// CEntity // CEntity
~CEffect() {} ~CEffect() override {}
// CActor // CActor
virtual void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
virtual void Render(const CStateManager&) const; void Render(const CStateManager&) const override;
}; };
CHECK_SIZEOF(CEffect, 0xe8) CHECK_SIZEOF(CEffect, 0xe8)

2
obj_files.mk
View File

@ -42,7 +42,7 @@ METROIDPRIME :=\
$(BUILD_DIR)/asm/MetroidPrime/Clamp_int.o\ $(BUILD_DIR)/asm/MetroidPrime/Clamp_int.o\
$(BUILD_DIR)/src/MetroidPrime/CArchMsgParmControllerStatus.o\ $(BUILD_DIR)/src/MetroidPrime/CArchMsgParmControllerStatus.o\
$(BUILD_DIR)/asm/MetroidPrime/CExplosion.o\ $(BUILD_DIR)/asm/MetroidPrime/CExplosion.o\
$(BUILD_DIR)/asm/MetroidPrime/CEffect.o\ $(BUILD_DIR)/src/MetroidPrime/CEffect.o\
$(BUILD_DIR)/asm/MetroidPrime/Cameras/CGameCamera.o\ $(BUILD_DIR)/asm/MetroidPrime/Cameras/CGameCamera.o\
$(BUILD_DIR)/asm/MetroidPrime/CGameArea.o\ $(BUILD_DIR)/asm/MetroidPrime/CGameArea.o\
$(BUILD_DIR)/asm/MetroidPrime/HUD/CSamusHud.o\ $(BUILD_DIR)/asm/MetroidPrime/HUD/CSamusHud.o\

6
src/MetroidPrime/CEffect.cpp
View File

@ -3,10 +3,10 @@
#include "MetroidPrime/CActorParameters.hpp" #include "MetroidPrime/CActorParameters.hpp"
CEffect::CEffect(TUniqueId uid, const CEntityInfo& info, bool active, const rstl::string& name, CEffect::CEffect(TUniqueId uid, const CEntityInfo& info, bool active, const rstl::string& name,
const CTransform4f& xf) const CTransform4f& xf)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic), : CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(kMT_NoStepLogic),
CActorParameters::None(), kInvalidUniqueId) {} CActorParameters::None(), kInvalidUniqueId) {}
void CEffect::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const {}
void CEffect::Render(const CStateManager&) const {} void CEffect::Render(const CStateManager&) const {}
void CEffect::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const {}