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

Split CIntElement, CModVectorElement, CParticleDataFactory 

Former-commit-id: ad450211a5
This commit is contained in:
Luke Street 2022-10-09 00:11:17 -04:00
parent edd4b5d0f7
commit 68d30b954d
10 changed files with 11380 additions and 11350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

2354
asm/Kyoto/Particles/CIntElement.s Normal file
View File

File diff suppressed because it is too large Load Diff

2327
asm/Kyoto/Particles/CModVectorElement.s Normal file
View File

File diff suppressed because it is too large Load Diff

6642
asm/Kyoto/Particles/CParticleDataFactory.s Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -3904,9 +3904,9 @@ lbl_80361EA4:
lbl_80361EC0:
/* 80361EC0 0035EE20 28 1E 00 00 */ cmplwi r30, 0
/* 80361EC4 0035EE24 41 82 00 1C */ beq lbl_80361EE0
/* 80361EC8 0035EE28 3C 80 80 3F */ lis r4, lbl_803EDD08@ha
/* 80361EC8 0035EE28 3C 80 80 3F */ lis r4, __vt__12CParticleGen@ha
/* 80361ECC 0035EE2C 38 7E 00 04 */ addi r3, r30, 4
/* 80361ED0 0035EE30 38 04 DD 08 */ addi r0, r4, lbl_803EDD08@l
/* 80361ED0 0035EE30 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l
/* 80361ED4 0035EE34 38 80 FF FF */ li r4, -1
/* 80361ED8 0035EE38 90 1E 00 00 */ stw r0, 0(r30)
/* 80361EDC 0035EE3C 4B CF 8D F5 */ bl __dt__12CParticleGenFv
@ -4109,9 +4109,9 @@ lbl_8036214C:
"__ct__17CParticleElectricF30TToken<20CElectricDescription>":
/* 80362170 0035F0D0 94 21 FF 30 */ stwu r1, -0xd0(r1)
/* 80362174 0035F0D4 7C 08 02 A6 */ mflr r0
/* 80362178 0035F0D8 3C A0 80 3F */ lis r5, lbl_803EDD08@ha
/* 80362178 0035F0D8 3C A0 80 3F */ lis r5, __vt__12CParticleGen@ha
/* 8036217C 0035F0DC 90 01 00 D4 */ stw r0, 0xd4(r1)
/* 80362180 0035F0E0 38 05 DD 08 */ addi r0, r5, lbl_803EDD08@l
/* 80362180 0035F0E0 38 05 DD 08 */ addi r0, r5, __vt__12CParticleGen@l
/* 80362184 0035F0E4 38 A0 00 00 */ li r5, 0
/* 80362188 0035F0E8 BE E1 00 AC */ stmw r23, 0xac(r1)
/* 8036218C 0035F0EC 7C 7F 1B 78 */ mr r31, r3
@ -5279,4 +5279,3 @@ lbl_803D83F8:
# ROM: 0x3D53F8
.asciz "??(??)"
.balign 4

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

@ -1,5 +1,42 @@
.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"
.global AddModifier__12CParticleGenFP5CWarp
@ -58,4 +95,3 @@ lbl_803D7920:
# ROM: 0x3D4920
.asciz "??(??)"
.balign 4

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

@ -4872,9 +4872,9 @@ lbl_8032ED7C:
lbl_8032ED98:
/* 8032ED98 0032BCF8 28 1E 00 00 */ cmplwi r30, 0
/* 8032ED9C 0032BCFC 41 82 00 1C */ beq lbl_8032EDB8
/* 8032EDA0 0032BD00 3C 80 80 3F */ lis r4, lbl_803EDD08@ha
/* 8032EDA0 0032BD00 3C 80 80 3F */ lis r4, __vt__12CParticleGen@ha
/* 8032EDA4 0032BD04 38 7E 00 04 */ addi r3, r30, 4
/* 8032EDA8 0032BD08 38 04 DD 08 */ addi r0, r4, lbl_803EDD08@l
/* 8032EDA8 0032BD08 38 04 DD 08 */ addi r0, r4, __vt__12CParticleGen@l
/* 8032EDAC 0032BD0C 38 80 FF FF */ li r4, -1
/* 8032EDB0 0032BD10 90 1E 00 00 */ stw r0, 0(r30)
/* 8032EDB4 0032BD14 4B D2 BF 1D */ bl __dt__12CParticleGenFv
@ -4896,9 +4896,9 @@ lbl_8032EDC8:
"__ct__15CParticleSwooshF28TToken<18CSwooshDescription>i":
/* 8032EDE4 0032BD44 94 21 FF 00 */ stwu r1, -0x100(r1)
/* 8032EDE8 0032BD48 7C 08 02 A6 */ mflr r0
/* 8032EDEC 0032BD4C 3C C0 80 3F */ lis r6, lbl_803EDD08@ha
/* 8032EDEC 0032BD4C 3C C0 80 3F */ lis r6, __vt__12CParticleGen@ha
/* 8032EDF0 0032BD50 90 01 01 04 */ stw r0, 0x104(r1)
/* 8032EDF4 0032BD54 38 06 DD 08 */ addi r0, r6, lbl_803EDD08@l
/* 8032EDF4 0032BD54 38 06 DD 08 */ addi r0, r6, __vt__12CParticleGen@l
/* 8032EDF8 0032BD58 38 C0 00 00 */ li r6, 0
/* 8032EDFC 0032BD5C BF 61 00 EC */ stmw r27, 0xec(r1)
/* 8032EE00 0032BD60 7C 7F 1B 78 */ mr r31, r3
@ -5885,4 +5885,3 @@ lbl_803D7968:
# ROM: 0x3D4968
.asciz "??(??)"
.balign 4

4
asm/MetroidPrime/Enemies/CPuddleSpore.s
View File

@ -2764,10 +2764,10 @@ lbl_80148EC0:
sub_80148ec8:
/* 80148EC8 00145E28 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80148ECC 00145E2C 7C 08 02 A6 */ mflr r0
/* 80148ED0 00145E30 3C A0 80 3F */ lis r5, lbl_803EDD08@ha
/* 80148ED0 00145E30 3C A0 80 3F */ lis r5, __vt__12CParticleGen@ha
/* 80148ED4 00145E34 38 84 00 04 */ addi r4, r4, 4
/* 80148ED8 00145E38 90 01 00 14 */ stw r0, 0x14(r1)
/* 80148EDC 00145E3C 38 05 DD 08 */ addi r0, r5, lbl_803EDD08@l
/* 80148EDC 00145E3C 38 05 DD 08 */ addi r0, r5, __vt__12CParticleGen@l
/* 80148EE0 00145E40 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80148EE4 00145E44 7C 7F 1B 78 */ mr r31, r3
/* 80148EE8 00145E48 90 03 00 00 */ stw r0, 0(r3)

3
configure.py
View File

@ -728,6 +728,9 @@ LIBS = [
"Kyoto/PVS/CPVSVisSet",
"Kyoto/Particles/CColorElement",
"Kyoto/Particles/CElementGen",
"Kyoto/Particles/CIntElement",
"Kyoto/Particles/CModVectorElement",
"Kyoto/Particles/CParticleDataFactory",
"Kyoto/Particles/CParticleGen",
"Kyoto/Particles/CParticleGlobals",
"Kyoto/Particles/CParticleSwoosh",

3
obj_files.mk
View File

@ -535,6 +535,9 @@ KYOTO_1 :=\
$(BUILD_DIR)/asm/Kyoto/PVS/CPVSVisSet.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CColorElement.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CElementGen.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CIntElement.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CModVectorElement.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CParticleDataFactory.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CParticleGen.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CParticleGlobals.o\
$(BUILD_DIR)/asm/Kyoto/Particles/CParticleSwoosh.o\