primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Match & link CIntElement

Browse Source 
Former-commit-id: a110979970
This commit is contained in:
Luke Street
2022-10-09 12:35:06 -04:00
parent ac84b38d5d
commit f64e9c953a
36 changed files with 2011 additions and 1349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/Kyoto/CFrameDelayedKiller.s
+4 -5
View File
@@ -19,8 +19,8 @@ lbl_805A96B0:
.section .text, "ax"
.global sub_8036ca64
sub_8036ca64:
.global __dl__8IElementFPvUl
__dl__8IElementFPvUl:
/* 8036CA64 003699C4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8036CA68 003699C8 7C 08 02 A6 */ mflr r0
/* 8036CA6C 003699CC 90 01 00 14 */ stw r0, 0x14(r1)
@@ -30,8 +30,8 @@ sub_8036ca64:
/* 8036CA7C 003699DC 38 21 00 10 */ addi r1, r1, 0x10
/* 8036CA80 003699E0 4E 80 00 20 */ blr
.global __nw__FUlPCcPCc_0
__nw__FUlPCcPCc_0:
.global __nw__8IElementFUl
__nw__8IElementFUl:
/* 8036CA84 003699E4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8036CA88 003699E8 7C 08 02 A6 */ mflr r0
/* 8036CA8C 003699EC 90 01 00 14 */ stw r0, 0x14(r1)
@@ -415,4 +415,3 @@ lbl_803D8568:
# ROM: 0x3D5568
.asciz "??(??)"
.balign 4
asm/Kyoto/Particles/CColorElement.s
+71 -72
View File
@@ -164,19 +164,19 @@ __dt__16CCEParticleColor:
/* 803163E4 00313344 38 03 DA 00 */ addi r0, r3, lbl_803EDA00@l
/* 803163E8 00313348 90 1F 00 00 */ stw r0, 0(r31)
/* 803163EC 0031334C 41 82 00 20 */ beq lbl_8031640C
/* 803163F0 00313350 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 803163F4 00313354 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 803163F0 00313350 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 803163F4 00313354 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 803163F8 00313358 90 1F 00 00 */ stw r0, 0(r31)
/* 803163FC 0031335C 41 82 00 10 */ beq lbl_8031640C
/* 80316400 00313360 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80316404 00313364 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80316400 00313360 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80316404 00313364 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80316408 00313368 90 1F 00 00 */ stw r0, 0(r31)
lbl_8031640C:
/* 8031640C 0031336C 7C 80 07 35 */ extsh. r0, r4
/* 80316410 00313370 40 81 00 10 */ ble lbl_80316420
/* 80316414 00313374 7F E3 FB 78 */ mr r3, r31
/* 80316418 00313378 38 80 00 04 */ li r4, 4
/* 8031641C 0031337C 48 05 66 49 */ bl sub_8036ca64
/* 8031641C 0031337C 48 05 66 49 */ bl __dl__8IElementFPvUl
lbl_80316420:
/* 80316420 00313380 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80316424 00313384 7F E3 FB 78 */ mr r3, r31
@@ -204,7 +204,7 @@ GetValue__18CCEKeyframeEmitterCFiR6CColor:
/* 80316464 003133C4 2C 00 00 00 */ cmpwi r0, 0
/* 80316468 003133C8 40 82 00 A0 */ bne lbl_80316508
/* 8031646C 003133CC 88 03 00 0C */ lbz r0, 0xc(r3)
/* 80316470 003133D0 80 ED A8 D8 */ lwz r7, lbl_805A9498@sda21(r13)
/* 80316470 003133D0 80 ED A8 D8 */ lwz r7, mEmitterTime__16CParticleGlobals@sda21(r13)
/* 80316474 003133D4 28 00 00 00 */ cmplwi r0, 0
/* 80316478 003133D8 90 E1 00 10 */ stw r7, 0x10(r1)
/* 8031647C 003133DC 41 82 00 50 */ beq lbl_803164CC
@@ -247,7 +247,7 @@ lbl_80316500:
/* 80316500 00313460 38 60 00 00 */ li r3, 0
/* 80316504 00313464 48 00 00 54 */ b lbl_80316558
lbl_80316508:
/* 80316508 00313468 80 8D A8 E0 */ lwz r4, lbl_805A94A0@sda21(r13)
/* 80316508 00313468 80 8D A8 E0 */ lwz r4, mParticleLifetimePercentage__16CParticleGlobals@sda21(r13)
/* 8031650C 0031346C 2C 04 00 64 */ cmpwi r4, 0x64
/* 80316510 00313470 40 82 00 18 */ bne lbl_80316528
/* 80316514 00313474 80 63 00 24 */ lwz r3, 0x24(r3)
@@ -259,7 +259,7 @@ lbl_80316528:
/* 80316528 00313488 38 04 00 01 */ addi r0, r4, 1
/* 8031652C 0031348C 80 C3 00 24 */ lwz r6, 0x24(r3)
/* 80316530 00313490 54 03 10 3A */ slwi r3, r0, 2
/* 80316534 00313494 C0 2D A8 E8 */ lfs f1, lbl_805A94A8@sda21(r13)
/* 80316534 00313494 C0 2D A8 E8 */ lfs f1, mParticleLifetimePercentageRemainder__16CParticleGlobals@sda21(r13)
/* 80316538 00313498 54 80 10 3A */ slwi r0, r4, 2
/* 8031653C 0031349C 7C A6 1A 14 */ add r5, r6, r3
/* 80316540 003134A0 38 61 00 08 */ addi r3, r1, 8
@@ -312,19 +312,19 @@ lbl_803165CC:
lbl_803165E0:
/* 803165E0 00313540 28 1E 00 00 */ cmplwi r30, 0
/* 803165E4 00313544 41 82 00 20 */ beq lbl_80316604
/* 803165E8 00313548 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 803165EC 0031354C 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 803165E8 00313548 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 803165EC 0031354C 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 803165F0 00313550 90 1E 00 00 */ stw r0, 0(r30)
/* 803165F4 00313554 41 82 00 10 */ beq lbl_80316604
/* 803165F8 00313558 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 803165FC 0031355C 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 803165F8 00313558 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 803165FC 0031355C 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80316600 00313560 90 1E 00 00 */ stw r0, 0(r30)
lbl_80316604:
/* 80316604 00313564 7F E0 07 35 */ extsh. r0, r31
/* 80316608 00313568 40 81 00 10 */ ble lbl_80316618
/* 8031660C 0031356C 7F C3 F3 78 */ mr r3, r30
/* 80316610 00313570 38 80 00 28 */ li r4, 0x28
/* 80316614 00313574 48 05 64 51 */ bl sub_8036ca64
/* 80316614 00313574 48 05 64 51 */ bl __dl__8IElementFPvUl
lbl_80316618:
/* 80316618 00313578 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8031661C 0031357C 7F C3 F3 78 */ mr r3, r30
@@ -338,20 +338,20 @@ lbl_80316618:
__ct__18CCEKeyframeEmitterFR12CInputStream:
/* 80316634 00313594 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80316638 00313598 7C 08 02 A6 */ mflr r0
/* 8031663C 0031359C 3C A0 80 3F */ lis r5, lbl_803EC5B4@ha
/* 8031663C 0031359C 3C A0 80 3F */ lis r5, __vt__13CColorElement@ha
/* 80316640 003135A0 90 01 00 24 */ stw r0, 0x24(r1)
/* 80316644 003135A4 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80316648 003135A8 7C 9F 23 78 */ mr r31, r4
/* 8031664C 003135AC 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80316650 003135B0 7C 7E 1B 78 */ mr r30, r3
/* 80316654 003135B4 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80316654 003135B4 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80316658 003135B8 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8031665C 003135BC 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 8031665C 003135BC 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80316660 003135C0 3C 60 80 3F */ lis r3, lbl_803EDA10@ha
/* 80316664 003135C4 7F C6 F3 78 */ mr r6, r30
/* 80316668 003135C8 93 81 00 10 */ stw r28, 0x10(r1)
/* 8031666C 003135CC 90 1E 00 00 */ stw r0, 0(r30)
/* 80316670 003135D0 38 05 C5 B4 */ addi r0, r5, lbl_803EC5B4@l
/* 80316670 003135D0 38 05 C5 B4 */ addi r0, r5, __vt__13CColorElement@l
/* 80316674 003135D4 90 1E 00 00 */ stw r0, 0(r30)
/* 80316678 003135D8 38 03 DA 10 */ addi r0, r3, lbl_803EDA10@l
/* 8031667C 003135DC 7F E3 FB 78 */ mr r3, r31
@@ -557,19 +557,19 @@ lbl_80316930:
lbl_80316950:
/* 80316950 003138B0 28 1E 00 00 */ cmplwi r30, 0
/* 80316954 003138B4 41 82 00 20 */ beq lbl_80316974
/* 80316958 003138B8 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 8031695C 003138BC 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 80316958 003138B8 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 8031695C 003138BC 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 80316960 003138C0 90 1E 00 00 */ stw r0, 0(r30)
/* 80316964 003138C4 41 82 00 10 */ beq lbl_80316974
/* 80316968 003138C8 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 8031696C 003138CC 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80316968 003138C8 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 8031696C 003138CC 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80316970 003138D0 90 1E 00 00 */ stw r0, 0(r30)
lbl_80316974:
/* 80316974 003138D4 7F E0 07 35 */ extsh. r0, r31
/* 80316978 003138D8 40 81 00 10 */ ble lbl_80316988
/* 8031697C 003138DC 7F C3 F3 78 */ mr r3, r30
/* 80316980 003138E0 38 80 00 14 */ li r4, 0x14
/* 80316984 003138E4 48 05 60 E1 */ bl sub_8036ca64
/* 80316984 003138E4 48 05 60 E1 */ bl __dl__8IElementFPvUl
lbl_80316988:
/* 80316988 003138E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8031698C 003138EC 7F C3 F3 78 */ mr r3, r30
@@ -581,12 +581,12 @@ lbl_80316988:
.global __ct__8CCEPulseFP11CIntElementP11CIntElementP13CColorElementP13CColorElement
__ct__8CCEPulseFP11CIntElementP11CIntElementP13CColorElementP13CColorElement:
/* 803169A4 00313904 3D 40 80 3F */ lis r10, lbl_803EC5A8@ha
/* 803169A8 00313908 3D 20 80 3F */ lis r9, lbl_803EC5B4@ha
/* 803169AC 0031390C 38 0A C5 A8 */ addi r0, r10, lbl_803EC5A8@l
/* 803169A4 00313904 3D 40 80 3F */ lis r10, __vt__8IElement@ha
/* 803169A8 00313908 3D 20 80 3F */ lis r9, __vt__13CColorElement@ha
/* 803169AC 0031390C 38 0A C5 A8 */ addi r0, r10, __vt__8IElement@l
/* 803169B0 00313910 3D 00 80 3F */ lis r8, lbl_803EDA20@ha
/* 803169B4 00313914 90 03 00 00 */ stw r0, 0(r3)
/* 803169B8 00313918 39 29 C5 B4 */ addi r9, r9, lbl_803EC5B4@l
/* 803169B8 00313918 39 29 C5 B4 */ addi r9, r9, __vt__13CColorElement@l
/* 803169BC 0031391C 38 08 DA 20 */ addi r0, r8, lbl_803EDA20@l
/* 803169C0 00313920 91 23 00 00 */ stw r9, 0(r3)
/* 803169C4 00313924 90 03 00 00 */ stw r0, 0(r3)
@@ -683,19 +683,19 @@ lbl_80316AE8:
lbl_80316B08:
/* 80316B08 00313A68 28 1E 00 00 */ cmplwi r30, 0
/* 80316B0C 00313A6C 41 82 00 20 */ beq lbl_80316B2C
/* 80316B10 00313A70 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 80316B14 00313A74 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 80316B10 00313A70 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 80316B14 00313A74 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 80316B18 00313A78 90 1E 00 00 */ stw r0, 0(r30)
/* 80316B1C 00313A7C 41 82 00 10 */ beq lbl_80316B2C
/* 80316B20 00313A80 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80316B24 00313A84 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80316B20 00313A80 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80316B24 00313A84 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80316B28 00313A88 90 1E 00 00 */ stw r0, 0(r30)
lbl_80316B2C:
/* 80316B2C 00313A8C 7F E0 07 35 */ extsh. r0, r31
/* 80316B30 00313A90 40 81 00 10 */ ble lbl_80316B40
/* 80316B34 00313A94 7F C3 F3 78 */ mr r3, r30
/* 80316B38 00313A98 38 80 00 10 */ li r4, 0x10
/* 80316B3C 00313A9C 48 05 5F 29 */ bl sub_8036ca64
/* 80316B3C 00313A9C 48 05 5F 29 */ bl __dl__8IElementFPvUl
lbl_80316B40:
/* 80316B40 00313AA0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80316B44 00313AA4 7F C3 F3 78 */ mr r3, r30
@@ -707,12 +707,12 @@ lbl_80316B40:
.global __ct__12CCETimeChainFP13CColorElementP13CColorElementP11CIntElement
__ct__12CCETimeChainFP13CColorElementP13CColorElementP11CIntElement:
/* 80316B5C 00313ABC 3D 20 80 3F */ lis r9, lbl_803EC5A8@ha
/* 80316B60 00313AC0 3D 00 80 3F */ lis r8, lbl_803EC5B4@ha
/* 80316B64 00313AC4 38 09 C5 A8 */ addi r0, r9, lbl_803EC5A8@l
/* 80316B5C 00313ABC 3D 20 80 3F */ lis r9, __vt__8IElement@ha
/* 80316B60 00313AC0 3D 00 80 3F */ lis r8, __vt__13CColorElement@ha
/* 80316B64 00313AC4 38 09 C5 A8 */ addi r0, r9, __vt__8IElement@l
/* 80316B68 00313AC8 3C E0 80 3F */ lis r7, lbl_803EDA30@ha
/* 80316B6C 00313ACC 90 03 00 00 */ stw r0, 0(r3)
/* 80316B70 00313AD0 39 08 C5 B4 */ addi r8, r8, lbl_803EC5B4@l
/* 80316B70 00313AD0 39 08 C5 B4 */ addi r8, r8, __vt__13CColorElement@l
/* 80316B74 00313AD4 38 07 DA 30 */ addi r0, r7, lbl_803EDA30@l
/* 80316B78 00313AD8 91 03 00 00 */ stw r8, 0(r3)
/* 80316B7C 00313ADC 90 03 00 00 */ stw r0, 0(r3)
@@ -893,19 +893,19 @@ lbl_80316DEC:
lbl_80316E0C:
/* 80316E0C 00313D6C 28 1E 00 00 */ cmplwi r30, 0
/* 80316E10 00313D70 41 82 00 20 */ beq lbl_80316E30
/* 80316E14 00313D74 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 80316E18 00313D78 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 80316E14 00313D74 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 80316E18 00313D78 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 80316E1C 00313D7C 90 1E 00 00 */ stw r0, 0(r30)
/* 80316E20 00313D80 41 82 00 10 */ beq lbl_80316E30
/* 80316E24 00313D84 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80316E28 00313D88 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80316E24 00313D84 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80316E28 00313D88 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80316E2C 00313D8C 90 1E 00 00 */ stw r0, 0(r30)
lbl_80316E30:
/* 80316E30 00313D90 7F E0 07 35 */ extsh. r0, r31
/* 80316E34 00313D94 40 81 00 10 */ ble lbl_80316E44
/* 80316E38 00313D98 7F C3 F3 78 */ mr r3, r30
/* 80316E3C 00313D9C 38 80 00 14 */ li r4, 0x14
/* 80316E40 00313DA0 48 05 5C 25 */ bl sub_8036ca64
/* 80316E40 00313DA0 48 05 5C 25 */ bl __dl__8IElementFPvUl
lbl_80316E44:
/* 80316E44 00313DA4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80316E48 00313DA8 7F C3 F3 78 */ mr r3, r30
@@ -917,12 +917,12 @@ lbl_80316E44:
.global __ct__10CCEFadeEndFP13CColorElementP13CColorElementP12CRealElementP12CRealElement
__ct__10CCEFadeEndFP13CColorElementP13CColorElementP12CRealElementP12CRealElement:
/* 80316E60 00313DC0 3D 40 80 3F */ lis r10, lbl_803EC5A8@ha
/* 80316E64 00313DC4 3D 20 80 3F */ lis r9, lbl_803EC5B4@ha
/* 80316E68 00313DC8 38 0A C5 A8 */ addi r0, r10, lbl_803EC5A8@l
/* 80316E60 00313DC0 3D 40 80 3F */ lis r10, __vt__8IElement@ha
/* 80316E64 00313DC4 3D 20 80 3F */ lis r9, __vt__13CColorElement@ha
/* 80316E68 00313DC8 38 0A C5 A8 */ addi r0, r10, __vt__8IElement@l
/* 80316E6C 00313DCC 3D 00 80 3F */ lis r8, lbl_803EDA40@ha
/* 80316E70 00313DD0 90 03 00 00 */ stw r0, 0(r3)
/* 80316E74 00313DD4 39 29 C5 B4 */ addi r9, r9, lbl_803EC5B4@l
/* 80316E74 00313DD4 39 29 C5 B4 */ addi r9, r9, __vt__13CColorElement@l
/* 80316E78 00313DD8 38 08 DA 40 */ addi r0, r8, lbl_803EDA40@l
/* 80316E7C 00313DDC 91 23 00 00 */ stw r9, 0(r3)
/* 80316E80 00313DE0 90 03 00 00 */ stw r0, 0(r3)
@@ -1086,19 +1086,19 @@ lbl_803170B0:
lbl_803170D0:
/* 803170D0 00314030 28 1E 00 00 */ cmplwi r30, 0
/* 803170D4 00314034 41 82 00 20 */ beq lbl_803170F4
/* 803170D8 00314038 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 803170DC 0031403C 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 803170D8 00314038 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 803170DC 0031403C 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 803170E0 00314040 90 1E 00 00 */ stw r0, 0(r30)
/* 803170E4 00314044 41 82 00 10 */ beq lbl_803170F4
/* 803170E8 00314048 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 803170EC 0031404C 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 803170E8 00314048 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 803170EC 0031404C 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 803170F0 00314050 90 1E 00 00 */ stw r0, 0(r30)
lbl_803170F4:
/* 803170F4 00314054 7F E0 07 35 */ extsh. r0, r31
/* 803170F8 00314058 40 81 00 10 */ ble lbl_80317108
/* 803170FC 0031405C 7F C3 F3 78 */ mr r3, r30
/* 80317100 00314060 38 80 00 10 */ li r4, 0x10
/* 80317104 00314064 48 05 59 61 */ bl sub_8036ca64
/* 80317104 00314064 48 05 59 61 */ bl __dl__8IElementFPvUl
lbl_80317108:
/* 80317108 00314068 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8031710C 0031406C 7F C3 F3 78 */ mr r3, r30
@@ -1110,12 +1110,12 @@ lbl_80317108:
.global __ct__7CCEFadeFP13CColorElementP13CColorElementP12CRealElement
__ct__7CCEFadeFP13CColorElementP13CColorElementP12CRealElement:
/* 80317124 00314084 3D 20 80 3F */ lis r9, lbl_803EC5A8@ha
/* 80317128 00314088 3D 00 80 3F */ lis r8, lbl_803EC5B4@ha
/* 8031712C 0031408C 38 09 C5 A8 */ addi r0, r9, lbl_803EC5A8@l
/* 80317124 00314084 3D 20 80 3F */ lis r9, __vt__8IElement@ha
/* 80317128 00314088 3D 00 80 3F */ lis r8, __vt__13CColorElement@ha
/* 8031712C 0031408C 38 09 C5 A8 */ addi r0, r9, __vt__8IElement@l
/* 80317130 00314090 3C E0 80 3F */ lis r7, lbl_803EDA50@ha
/* 80317134 00314094 90 03 00 00 */ stw r0, 0(r3)
/* 80317138 00314098 39 08 C5 B4 */ addi r8, r8, lbl_803EC5B4@l
/* 80317138 00314098 39 08 C5 B4 */ addi r8, r8, __vt__13CColorElement@l
/* 8031713C 0031409C 38 07 DA 50 */ addi r0, r7, lbl_803EDA50@l
/* 80317140 003140A0 91 03 00 00 */ stw r8, 0(r3)
/* 80317144 003140A4 90 03 00 00 */ stw r0, 0(r3)
@@ -1143,19 +1143,19 @@ __dt__15CCEFastConstantFv:
/* 80317184 003140E4 38 03 DA 60 */ addi r0, r3, lbl_803EDA60@l
/* 80317188 003140E8 90 1F 00 00 */ stw r0, 0(r31)
/* 8031718C 003140EC 41 82 00 20 */ beq lbl_803171AC
/* 80317190 003140F0 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 80317194 003140F4 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 80317190 003140F0 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 80317194 003140F4 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 80317198 003140F8 90 1F 00 00 */ stw r0, 0(r31)
/* 8031719C 003140FC 41 82 00 10 */ beq lbl_803171AC
/* 803171A0 00314100 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 803171A4 00314104 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 803171A0 00314100 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 803171A4 00314104 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 803171A8 00314108 90 1F 00 00 */ stw r0, 0(r31)
lbl_803171AC:
/* 803171AC 0031410C 7C 80 07 35 */ extsh. r0, r4
/* 803171B0 00314110 40 81 00 10 */ ble lbl_803171C0
/* 803171B4 00314114 7F E3 FB 78 */ mr r3, r31
/* 803171B8 00314118 38 80 00 08 */ li r4, 8
/* 803171BC 0031411C 48 05 58 A9 */ bl sub_8036ca64
/* 803171BC 0031411C 48 05 58 A9 */ bl __dl__8IElementFPvUl
lbl_803171C0:
/* 803171C0 00314120 80 01 00 14 */ lwz r0, 0x14(r1)
/* 803171C4 00314124 7F E3 FB 78 */ mr r3, r31
@@ -1177,11 +1177,11 @@ __ct__15CCEFastConstantFffff:
/* 803171F8 00314158 F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0
/* 803171FC 0031415C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80317200 00314160 7C 7F 1B 78 */ mr r31, r3
/* 80317204 00314164 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80317208 00314168 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 8031720C 0031416C 3C 80 80 3F */ lis r4, lbl_803EC5B4@ha
/* 80317204 00314164 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80317208 00314168 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 8031720C 0031416C 3C 80 80 3F */ lis r4, __vt__13CColorElement@ha
/* 80317210 00314170 90 1F 00 00 */ stw r0, 0(r31)
/* 80317214 00314174 38 04 C5 B4 */ addi r0, r4, lbl_803EC5B4@l
/* 80317214 00314174 38 04 C5 B4 */ addi r0, r4, __vt__13CColorElement@l
/* 80317218 00314178 3C 60 80 3F */ lis r3, lbl_803EDA60@ha
/* 8031721C 0031417C 38 C0 00 FF */ li r6, 0xff
/* 80317220 00314180 90 1F 00 00 */ stw r0, 0(r31)
@@ -1361,19 +1361,19 @@ lbl_80317494:
lbl_803174B4:
/* 803174B4 00314414 28 1E 00 00 */ cmplwi r30, 0
/* 803174B8 00314418 41 82 00 20 */ beq lbl_803174D8
/* 803174BC 0031441C 3C 60 80 3F */ lis r3, lbl_803EC5B4@ha
/* 803174C0 00314420 38 03 C5 B4 */ addi r0, r3, lbl_803EC5B4@l
/* 803174BC 0031441C 3C 60 80 3F */ lis r3, __vt__13CColorElement@ha
/* 803174C0 00314420 38 03 C5 B4 */ addi r0, r3, __vt__13CColorElement@l
/* 803174C4 00314424 90 1E 00 00 */ stw r0, 0(r30)
/* 803174C8 00314428 41 82 00 10 */ beq lbl_803174D8
/* 803174CC 0031442C 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 803174D0 00314430 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 803174CC 0031442C 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 803174D0 00314430 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 803174D4 00314434 90 1E 00 00 */ stw r0, 0(r30)
lbl_803174D8:
/* 803174D8 00314438 7F E0 07 35 */ extsh. r0, r31
/* 803174DC 0031443C 40 81 00 10 */ ble lbl_803174EC
/* 803174E0 00314440 7F C3 F3 78 */ mr r3, r30
/* 803174E4 00314444 38 80 00 14 */ li r4, 0x14
/* 803174E8 00314448 48 05 55 7D */ bl sub_8036ca64
/* 803174E8 00314448 48 05 55 7D */ bl __dl__8IElementFPvUl
lbl_803174EC:
/* 803174EC 0031444C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 803174F0 00314450 7F C3 F3 78 */ mr r3, r30
@@ -1385,12 +1385,12 @@ lbl_803174EC:
.global __ct__11CCEConstantFP12CRealElementP12CRealElementP12CRealElementP12CRealElement
__ct__11CCEConstantFP12CRealElementP12CRealElementP12CRealElementP12CRealElement:
/* 80317508 00314468 3D 40 80 3F */ lis r10, lbl_803EC5A8@ha
/* 8031750C 0031446C 3D 20 80 3F */ lis r9, lbl_803EC5B4@ha
/* 80317510 00314470 38 0A C5 A8 */ addi r0, r10, lbl_803EC5A8@l
/* 80317508 00314468 3D 40 80 3F */ lis r10, __vt__8IElement@ha
/* 8031750C 0031446C 3D 20 80 3F */ lis r9, __vt__13CColorElement@ha
/* 80317510 00314470 38 0A C5 A8 */ addi r0, r10, __vt__8IElement@l
/* 80317514 00314474 3D 00 80 3F */ lis r8, lbl_803EDA70@ha
/* 80317518 00314478 90 03 00 00 */ stw r0, 0(r3)
/* 8031751C 0031447C 39 29 C5 B4 */ addi r9, r9, lbl_803EC5B4@l
/* 8031751C 0031447C 39 29 C5 B4 */ addi r9, r9, __vt__13CColorElement@l
/* 80317520 00314480 38 08 DA 70 */ addi r0, r8, lbl_803EDA70@l
/* 80317524 00314484 91 23 00 00 */ stw r9, 0(r3)
/* 80317528 00314488 90 03 00 00 */ stw r0, 0(r3)
@@ -1492,4 +1492,3 @@ lbl_803D7840:
# ROM: 0x3D4840
.asciz "??(??)"
.balign 4
asm/Kyoto/Particles/CElementGen.s
+63 -63
View File
@@ -77,28 +77,28 @@ lbl_805A88D0:
.section .bss
.balign 8
.lcomm lbl_804BFE28, 0x20, 4
.lcomm lbl_804BFE48, 0x20, 4
.lcomm lbl_804BFE68, 0x4C, 4
.lcomm lbl_804BFEB4, 0x4C, 4
.lcomm mStaticParticleList, 0x20, 4
.lcomm mStaticFreeList, 0x20, 4
.lcomm "ModulatePreviousTEVWithRasColor$6239", 0x4C, 4
.lcomm "ModulatePreviousTEVWithRasColor$6760", 0x4C, 4
.section .sbss, "wa"
.balign 8
# TODO this probably isn't split properly
.global lbl_805A9470
lbl_805A9470:
.global mParticleAliveCount__11CElementGen
mParticleAliveCount__11CElementGen:
.skip 0x4
.global lbl_805A9474
lbl_805A9474:
.global mParticleSystemAliveCount__11CElementGen
mParticleSystemAliveCount__11CElementGen:
.skip 0x4
.global lbl_805A9478
lbl_805A9478:
.global sMoveRedToAlphaBuffer__11CElementGen
sMoveRedToAlphaBuffer__11CElementGen:
.skip 0x1
.global lbl_805A9479
lbl_805A9479:
.global sSubtractBlend__11CElementGen
sSubtractBlend__11CElementGen:
.skip 0x1
.global lbl_805A947A
lbl_805A947A:
.global sStaticListInitialized
sStaticListInitialized:
.skip 0x1
.global lbl_805A947B
lbl_805A947B:
@@ -392,8 +392,8 @@ SystemHasLight__11CElementGenCFv:
/* 8031797C 003148DC 54 03 0F FE */ srwi r3, r0, 0x1f
/* 80317980 003148E0 4E 80 00 20 */ blr
.global GetEmitterTime__11CElementGenFv
GetEmitterTime__11CElementGenFv:
.global GetEmitterTime__11CElementGenCFv
GetEmitterTime__11CElementGenCFv:
/* 80317984 003148E4 80 63 00 74 */ lwz r3, 0x74(r3)
/* 80317988 003148E8 4E 80 00 20 */ blr
@@ -822,7 +822,7 @@ lbl_80317F48:
/* 80317F74 00314ED4 88 64 00 31 */ lbz r3, 0x31(r4)
/* 80317F78 00314ED8 54 60 DF FF */ rlwinm. r0, r3, 0x1b, 0x1f, 0x1f
/* 80317F7C 00314EDC 41 82 02 A8 */ beq lbl_80318224
/* 80317F80 00314EE0 88 0D A8 B8 */ lbz r0, lbl_805A9478@sda21(r13)
/* 80317F80 00314EE0 88 0D A8 B8 */ lbz r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 80317F84 00314EE4 3A 80 00 00 */ li r20, 0
/* 80317F88 00314EE8 28 00 00 00 */ cmplwi r0, 0
/* 80317F8C 00314EEC 41 82 00 1C */ beq lbl_80317FA8
@@ -1441,7 +1441,7 @@ lbl_80318848:
/* 803188C8 00315828 4B FF 2B 49 */ bl StreamEnd__9CGraphicsFv
/* 803188CC 0031582C 48 00 01 80 */ b lbl_80318A4C
lbl_803188D0:
/* 803188D0 00315830 88 0D A8 B9 */ lbz r0, lbl_805A9479@sda21(r13)
/* 803188D0 00315830 88 0D A8 B9 */ lbz r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 803188D4 00315834 83 84 00 50 */ lwz r28, 0x50(r4)
/* 803188D8 00315838 28 00 00 00 */ cmplwi r0, 0
/* 803188DC 0031583C 41 82 00 6C */ beq lbl_80318948
@@ -1784,9 +1784,9 @@ lbl_80318CBC:
/* 80318DEC 00315D4C 38 80 00 0F */ li r4, 0xf
/* 80318DF0 00315D50 4B FF 03 35 */ bl __ct__Q213CTevCombiners8ColorVarFQ213CTevCombiners9EColorSrc
/* 80318DF4 00315D54 80 A1 00 28 */ lwz r5, 0x28(r1)
/* 80318DF8 00315D58 3C 60 80 4C */ lis r3, lbl_804BFEB4@ha
/* 80318DF8 00315D58 3C 60 80 4C */ lis r3, "ModulatePreviousTEVWithRasColor$6760"@ha
/* 80318DFC 00315D5C 81 21 00 24 */ lwz r9, 0x24(r1)
/* 80318E00 00315D60 38 63 FE B4 */ addi r3, r3, lbl_804BFEB4@l
/* 80318E00 00315D60 38 63 FE B4 */ addi r3, r3, "ModulatePreviousTEVWithRasColor$6760"@l
/* 80318E04 00315D64 81 01 00 20 */ lwz r8, 0x20(r1)
/* 80318E08 00315D68 38 81 00 78 */ addi r4, r1, 0x78
/* 80318E0C 00315D6C 80 01 00 1C */ lwz r0, 0x1c(r1)
@@ -1801,9 +1801,9 @@ lbl_80318CBC:
/* 80318E30 00315D90 38 00 00 01 */ li r0, 1
/* 80318E34 00315D94 98 0D A8 C5 */ stb r0, lbl_805A9485@sda21(r13)
lbl_80318E38:
/* 80318E38 00315D98 3C 80 80 4C */ lis r4, lbl_804BFEB4@ha
/* 80318E38 00315D98 3C 80 80 4C */ lis r4, "ModulatePreviousTEVWithRasColor$6760"@ha
/* 80318E3C 00315D9C 38 60 00 01 */ li r3, 1
/* 80318E40 00315DA0 38 84 FE B4 */ addi r4, r4, lbl_804BFEB4@l
/* 80318E40 00315DA0 38 84 FE B4 */ addi r4, r4, "ModulatePreviousTEVWithRasColor$6760"@l
/* 80318E44 00315DA4 4B FF 14 75 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80318E48 00315DA8 48 00 00 10 */ b lbl_80318E58
lbl_80318E4C:
@@ -2928,7 +2928,7 @@ sub_80319e3c:
/* 80319F20 00316E80 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 80319F24 00316E84 38 60 00 01 */ li r3, 1
/* 80319F28 00316E88 4B FF 03 91 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80319F2C 00316E8C 8B AD A8 B8 */ lbz r29, lbl_805A9478@sda21(r13)
/* 80319F2C 00316E8C 8B AD A8 B8 */ lbz r29, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 80319F30 00316E90 7F D0 F3 78 */ mr r16, r30
/* 80319F34 00316E94 3A 20 00 00 */ li r17, 0
/* 80319F38 00316E98 48 00 00 4C */ b lbl_80319F84
@@ -3158,7 +3158,7 @@ lbl_8031A27C:
/* 8031A28C 003171EC 57 93 13 BA */ rlwinm r19, r28, 2, 0xe, 0x1d
/* 8031A290 003171F0 7E BE 98 2E */ lwzx r21, r30, r19
/* 8031A294 003171F4 7E A3 AB 78 */ mr r3, r21
/* 8031A298 003171F8 4B FF D6 ED */ bl GetEmitterTime__11CElementGenFv
/* 8031A298 003171F8 4B FF D6 ED */ bl GetEmitterTime__11CElementGenCFv
/* 8031A29C 003171FC 7C 9E 98 2E */ lwzx r4, r30, r19
/* 8031A2A0 00317200 57 A0 06 3F */ clrlwi. r0, r29, 0x18
/* 8031A2A4 00317204 7C 77 1B 78 */ mr r23, r3
@@ -3619,9 +3619,9 @@ lbl_8031A858:
/* 8031A988 003178E8 38 80 00 0F */ li r4, 0xf
/* 8031A98C 003178EC 4B FE E7 99 */ bl __ct__Q213CTevCombiners8ColorVarFQ213CTevCombiners9EColorSrc
/* 8031A990 003178F0 80 BF 00 30 */ lwz r5, 0x30(r31)
/* 8031A994 003178F4 3C 60 80 4C */ lis r3, lbl_804BFE68@ha
/* 8031A994 003178F4 3C 60 80 4C */ lis r3, "ModulatePreviousTEVWithRasColor$6239"@ha
/* 8031A998 003178F8 81 3F 00 2C */ lwz r9, 0x2c(r31)
/* 8031A99C 003178FC 38 63 FE 68 */ addi r3, r3, lbl_804BFE68@l
/* 8031A99C 003178FC 38 63 FE 68 */ addi r3, r3, "ModulatePreviousTEVWithRasColor$6239"@l
/* 8031A9A0 00317900 81 1F 00 28 */ lwz r8, 0x28(r31)
/* 8031A9A4 00317904 38 9F 01 0C */ addi r4, r31, 0x10c
/* 8031A9A8 00317908 80 1F 00 24 */ lwz r0, 0x24(r31)
@@ -3636,9 +3636,9 @@ lbl_8031A858:
/* 8031A9CC 0031792C 38 00 00 01 */ li r0, 1
/* 8031A9D0 00317930 98 0D A8 BB */ stb r0, lbl_805A947B@sda21(r13)
lbl_8031A9D4:
/* 8031A9D4 00317934 3C 80 80 4C */ lis r4, lbl_804BFE68@ha
/* 8031A9D4 00317934 3C 80 80 4C */ lis r4, "ModulatePreviousTEVWithRasColor$6239"@ha
/* 8031A9D8 00317938 38 60 00 01 */ li r3, 1
/* 8031A9DC 0031793C 38 84 FE 68 */ addi r4, r4, lbl_804BFE68@l
/* 8031A9DC 0031793C 38 84 FE 68 */ addi r4, r4, "ModulatePreviousTEVWithRasColor$6239"@l
/* 8031A9E0 00317940 4B FE F8 D9 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 8031A9E4 00317944 48 00 00 10 */ b lbl_8031A9F4
lbl_8031A9E8:
@@ -3716,8 +3716,8 @@ lbl_8031AAF0:
/* 8031AAF4 00317A54 4B FE E3 5D */ bl SetNumChans__3CGXFUc
/* 8031AAF8 00317A58 3B 60 00 01 */ li r27, 1
lbl_8031AAFC:
/* 8031AAFC 00317A5C 88 0D A8 B9 */ lbz r0, lbl_805A9479@sda21(r13)
/* 8031AB00 00317A60 8B 4D A8 B8 */ lbz r26, lbl_805A9478@sda21(r13)
/* 8031AAFC 00317A5C 88 0D A8 B9 */ lbz r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 8031AB00 00317A60 8B 4D A8 B8 */ lbz r26, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 8031AB04 00317A64 28 00 00 00 */ cmplwi r0, 0
/* 8031AB08 00317A68 41 82 00 98 */ beq lbl_8031ABA0
/* 8031AB0C 00317A6C 88 1E 02 6C */ lbz r0, 0x26c(r30)
@@ -5511,14 +5511,14 @@ lbl_8031C5A4:
/* 8031C5B0 00319510 7C 03 02 14 */ add r0, r3, r0
/* 8031C5B4 00319514 7C 1C 00 40 */ cmplw r28, r0
/* 8031C5B8 00319518 40 82 FF D4 */ bne lbl_8031C58C
/* 8031C5BC 0031951C 80 6D A8 F4 */ lwz r3, lbl_805A94B4@sda21(r13)
/* 8031C5BC 0031951C 80 6D A8 F4 */ lwz r3, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
/* 8031C5C0 00319520 3C 80 50 41 */ lis r4, 0x50415254@ha
/* 8031C5C4 00319524 38 84 52 54 */ addi r4, r4, 0x50415254@l
/* 8031C5C8 00319528 38 01 00 08 */ addi r0, r1, 8
/* 8031C5CC 0031952C 90 81 00 08 */ stw r4, 8(r1)
/* 8031C5D0 00319530 93 A1 00 0C */ stw r29, 0xc(r1)
/* 8031C5D4 00319534 90 61 00 10 */ stw r3, 0x10(r1)
/* 8031C5D8 00319538 90 0D A8 F4 */ stw r0, lbl_805A94B4@sda21(r13)
/* 8031C5D8 00319538 90 0D A8 F4 */ stw r0, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
/* 8031C5DC 0031953C 80 1D 00 34 */ lwz r0, 0x34(r29)
/* 8031C5E0 00319540 2C 00 00 00 */ cmpwi r0, 0
/* 8031C5E4 00319544 40 81 00 48 */ ble lbl_8031C62C
@@ -5555,7 +5555,7 @@ lbl_8031C62C:
/* 8031C650 003195B0 D0 1D 02 D0 */ stfs f0, 0x2d0(r29)
/* 8031C654 003195B4 41 82 00 0C */ beq lbl_8031C660
/* 8031C658 003195B8 80 01 00 10 */ lwz r0, 0x10(r1)
/* 8031C65C 003195BC 90 0D A8 F4 */ stw r0, lbl_805A94B4@sda21(r13)
/* 8031C65C 003195BC 90 0D A8 F4 */ stw r0, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
lbl_8031C660:
/* 8031C660 003195C0 80 01 00 34 */ lwz r0, 0x34(r1)
/* 8031C664 003195C4 83 E1 00 2C */ lwz r31, 0x2c(r1)
@@ -5622,10 +5622,10 @@ DestroyParticles__11CElementGenFv:
/* 8031C72C 0031968C 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 8031C730 00319690 7C 7F 1B 78 */ mr r31, r3
/* 8031C734 00319694 93 C1 00 28 */ stw r30, 0x28(r1)
/* 8031C738 00319698 80 0D A8 B0 */ lwz r0, lbl_805A9470@sda21(r13)
/* 8031C738 00319698 80 0D A8 B0 */ lwz r0, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031C73C 0031969C 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8031C740 003196A0 7C 03 00 50 */ subf r0, r3, r0
/* 8031C744 003196A4 90 0D A8 B0 */ stw r0, lbl_805A9470@sda21(r13)
/* 8031C744 003196A4 90 0D A8 B0 */ stw r0, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031C748 003196A8 80 1F 00 34 */ lwz r0, 0x34(r31)
/* 8031C74C 003196AC 80 7F 00 3C */ lwz r3, 0x3c(r31)
/* 8031C750 003196B0 1C 00 00 38 */ mulli r0, r0, 0x38
@@ -5747,11 +5747,11 @@ ForceParticleCreation__11CElementGenFi:
/* 8031C8DC 0031983C 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8031C8E0 00319840 7C 7E 1B 78 */ mr r30, r3
/* 8031C8E4 00319844 38 66 52 54 */ addi r3, r6, 0x50415254@l
/* 8031C8E8 00319848 80 AD A8 F4 */ lwz r5, lbl_805A94B4@sda21(r13)
/* 8031C8E8 00319848 80 AD A8 F4 */ lwz r5, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
/* 8031C8EC 0031984C 93 C1 00 0C */ stw r30, 0xc(r1)
/* 8031C8F0 00319850 90 61 00 08 */ stw r3, 8(r1)
/* 8031C8F4 00319854 90 A1 00 10 */ stw r5, 0x10(r1)
/* 8031C8F8 00319858 90 0D A8 F4 */ stw r0, lbl_805A94B4@sda21(r13)
/* 8031C8F8 00319858 90 0D A8 F4 */ stw r0, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
/* 8031C8FC 0031985C 80 7E 00 74 */ lwz r3, 0x74(r30)
/* 8031C900 00319860 48 00 DE 49 */ bl SetEmitterTime__16CParticleGlobalsFi
/* 8031C904 00319864 7F C3 F3 78 */ mr r3, r30
@@ -5760,7 +5760,7 @@ ForceParticleCreation__11CElementGenFi:
/* 8031C910 00319870 34 01 00 08 */ addic. r0, r1, 8
/* 8031C914 00319874 41 82 00 0C */ beq lbl_8031C920
/* 8031C918 00319878 80 01 00 10 */ lwz r0, 0x10(r1)
/* 8031C91C 0031987C 90 0D A8 F4 */ stw r0, lbl_805A94B4@sda21(r13)
/* 8031C91C 0031987C 90 0D A8 F4 */ stw r0, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
lbl_8031C920:
/* 8031C920 00319880 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8031C924 00319884 83 E1 00 1C */ lwz r31, 0x1c(r1)
@@ -6735,7 +6735,7 @@ CreateNewParticles__11CElementGenFi:
/* 8031D6F0 0031A650 BF 41 01 28 */ stmw r26, 0x128(r1)
/* 8031D6F4 0031A654 7C 7A 1B 78 */ mr r26, r3
/* 8031D6F8 0031A658 7C 9B 23 78 */ mr r27, r4
/* 8031D6FC 0031A65C 88 0D A8 BA */ lbz r0, lbl_805A947A@sda21(r13)
/* 8031D6FC 0031A65C 88 0D A8 BA */ lbz r0, sStaticListInitialized@sda21(r13)
/* 8031D700 0031A660 28 00 00 00 */ cmplwi r0, 0
/* 8031D704 0031A664 40 82 00 08 */ bne lbl_8031D70C
/* 8031D708 0031A668 48 00 1A 61 */ bl Initialize__11CElementGenFv
@@ -6750,7 +6750,7 @@ lbl_8031D70C:
/* 8031D728 0031A688 40 81 00 08 */ ble lbl_8031D730
/* 8031D72C 0031A68C 7F A3 20 50 */ subf r29, r3, r4
lbl_8031D730:
/* 8031D730 0031A690 80 6D A8 B0 */ lwz r3, lbl_805A9470@sda21(r13)
/* 8031D730 0031A690 80 6D A8 B0 */ lwz r3, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031D734 0031A694 7C 1D 1A 14 */ add r0, r29, r3
/* 8031D738 0031A698 2C 00 0A 00 */ cmpwi r0, 0xa00
/* 8031D73C 0031A69C 40 81 00 08 */ ble lbl_8031D744
@@ -6784,8 +6784,8 @@ lbl_8031D7A0:
/* 8031D7A0 0031A700 80 83 00 00 */ lwz r4, 0(r3)
/* 8031D7A4 0031A704 38 7A 00 60 */ addi r3, r26, 0x60
/* 8031D7A8 0031A708 48 00 2E 75 */ bl "reserve__Q24rstl69vector<Q211CElementGen17CParticleListItem,Q24rstl17rmemory_allocator>Fi"
/* 8031D7AC 0031A70C 3C 60 80 4C */ lis r3, lbl_804BFE48@ha
/* 8031D7B0 0031A710 3B E3 FE 48 */ addi r31, r3, lbl_804BFE48@l
/* 8031D7AC 0031A70C 3C 60 80 4C */ lis r3, mStaticFreeList@ha
/* 8031D7B0 0031A710 3B E3 FE 48 */ addi r31, r3, mStaticFreeList@l
/* 8031D7B4 0031A714 48 00 00 CC */ b lbl_8031D880
lbl_8031D7B8:
/* 8031D7B8 0031A718 80 1A 00 64 */ lwz r0, 0x64(r26)
@@ -6878,10 +6878,10 @@ lbl_8031D8A8:
/* 8031D8FC 0031A85C 98 A1 01 22 */ stb r5, 0x122(r1)
/* 8031D900 0031A860 98 A1 01 23 */ stb r5, 0x123(r1)
/* 8031D904 0031A864 48 00 03 81 */ bl sub_8031dc84
/* 8031D908 0031A868 80 6D A8 B0 */ lwz r3, lbl_805A9470@sda21(r13)
/* 8031D908 0031A868 80 6D A8 B0 */ lwz r3, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031D90C 0031A86C 80 9A 00 34 */ lwz r4, 0x34(r26)
/* 8031D910 0031A870 38 03 00 01 */ addi r0, r3, 1
/* 8031D914 0031A874 90 0D A8 B0 */ stw r0, lbl_805A9470@sda21(r13)
/* 8031D914 0031A874 90 0D A8 B0 */ stw r0, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031D918 0031A878 3B 64 FF FF */ addi r27, r4, -1
/* 8031D91C 0031A87C 80 7A 02 5C */ lwz r3, 0x25c(r26)
/* 8031D920 0031A880 38 03 00 01 */ addi r0, r3, 1
@@ -7205,10 +7205,10 @@ lbl_8031DDA8:
/* 8031DDAC 0031AD0C 80 1D 00 74 */ lwz r0, 0x74(r29)
/* 8031DDB0 0031AD10 7C 03 00 00 */ cmpw r3, r0
/* 8031DDB4 0031AD14 40 80 01 84 */ bge lbl_8031DF38
/* 8031DDB8 0031AD18 80 6D A8 B0 */ lwz r3, lbl_805A9470@sda21(r13)
/* 8031DDB8 0031AD18 80 6D A8 B0 */ lwz r3, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031DDBC 0031AD1C 38 1F 00 38 */ addi r0, r31, 0x38
/* 8031DDC0 0031AD20 38 63 FF FF */ addi r3, r3, -1
/* 8031DDC4 0031AD24 90 6D A8 B0 */ stw r3, lbl_805A9470@sda21(r13)
/* 8031DDC4 0031AD24 90 6D A8 B0 */ stw r3, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031DDC8 0031AD28 80 9D 00 34 */ lwz r4, 0x34(r29)
/* 8031DDCC 0031AD2C 80 BD 00 3C */ lwz r5, 0x3c(r29)
/* 8031DDD0 0031AD30 1C 64 00 38 */ mulli r3, r4, 0x38
@@ -8104,11 +8104,11 @@ Update__11CElementGenFd:
/* 8031EAAC 0031BA0C 93 E1 00 24 */ stw r31, 0x24(r1)
/* 8031EAB0 0031BA10 7C 7F 1B 78 */ mr r31, r3
/* 8031EAB4 0031BA14 38 65 52 54 */ addi r3, r5, 0x50415254@l
/* 8031EAB8 0031BA18 80 8D A8 F4 */ lwz r4, lbl_805A94B4@sda21(r13)
/* 8031EAB8 0031BA18 80 8D A8 F4 */ lwz r4, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
/* 8031EABC 0031BA1C 93 E1 00 10 */ stw r31, 0x10(r1)
/* 8031EAC0 0031BA20 90 61 00 0C */ stw r3, 0xc(r1)
/* 8031EAC4 0031BA24 90 81 00 14 */ stw r4, 0x14(r1)
/* 8031EAC8 0031BA28 90 0D A8 F4 */ stw r0, lbl_805A94B4@sda21(r13)
/* 8031EAC8 0031BA28 90 0D A8 F4 */ stw r0, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
/* 8031EACC 0031BA2C 80 7F 00 28 */ lwz r3, 0x28(r31)
/* 8031EAD0 0031BA30 80 03 00 04 */ lwz r0, 4(r3)
/* 8031EAD4 0031BA34 28 00 00 00 */ cmplwi r0, 0
@@ -8149,7 +8149,7 @@ lbl_8031EB50:
/* 8031EB5C 0031BABC 34 01 00 0C */ addic. r0, r1, 0xc
/* 8031EB60 0031BAC0 41 82 00 0C */ beq lbl_8031EB6C
/* 8031EB64 0031BAC4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8031EB68 0031BAC8 90 0D A8 F4 */ stw r0, lbl_805A94B4@sda21(r13)
/* 8031EB68 0031BAC8 90 0D A8 F4 */ stw r0, mCurrentParticleSystem__16CParticleGlobals@sda21(r13)
lbl_8031EB6C:
/* 8031EB6C 0031BACC 80 01 00 34 */ lwz r0, 0x34(r1)
/* 8031EB70 0031BAD0 CB E1 00 28 */ lfd f31, 0x28(r1)
@@ -8579,19 +8579,19 @@ lbl_8031F124:
.global ShutDown__11CElementGenFv
ShutDown__11CElementGenFv:
/* 8031F15C 0031C0BC 38 00 00 00 */ li r0, 0
/* 8031F160 0031C0C0 98 0D A8 BA */ stb r0, lbl_805A947A@sda21(r13)
/* 8031F160 0031C0C0 98 0D A8 BA */ stb r0, sStaticListInitialized@sda21(r13)
/* 8031F164 0031C0C4 4E 80 00 20 */ blr
.global Initialize__11CElementGenFv
Initialize__11CElementGenFv:
/* 8031F168 0031C0C8 88 0D A8 BA */ lbz r0, lbl_805A947A@sda21(r13)
/* 8031F168 0031C0C8 88 0D A8 BA */ lbz r0, sStaticListInitialized@sda21(r13)
/* 8031F16C 0031C0CC 28 00 00 00 */ cmplwi r0, 0
/* 8031F170 0031C0D0 4C 82 00 20 */ bnelr
/* 8031F174 0031C0D4 38 60 00 00 */ li r3, 0
/* 8031F178 0031C0D8 38 00 00 01 */ li r0, 1
/* 8031F17C 0031C0DC 90 6D A8 B0 */ stw r3, lbl_805A9470@sda21(r13)
/* 8031F180 0031C0E0 90 6D A8 B4 */ stw r3, lbl_805A9474@sda21(r13)
/* 8031F184 0031C0E4 98 0D A8 BA */ stb r0, lbl_805A947A@sda21(r13)
/* 8031F17C 0031C0DC 90 6D A8 B0 */ stw r3, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031F180 0031C0E0 90 6D A8 B4 */ stw r3, mParticleSystemAliveCount__11CElementGen@sda21(r13)
/* 8031F184 0031C0E4 98 0D A8 BA */ stb r0, sStaticListInitialized@sda21(r13)
/* 8031F188 0031C0E8 4E 80 00 20 */ blr
.global __dt__11CElementGenFv
@@ -8608,13 +8608,13 @@ __dt__11CElementGenFv:
/* 8031F1B0 0031C110 3C 60 80 3F */ lis r3, lbl_803EDA80@ha
/* 8031F1B4 0031C114 38 03 DA 80 */ addi r0, r3, lbl_803EDA80@l
/* 8031F1B8 0031C118 90 1E 00 00 */ stw r0, 0(r30)
/* 8031F1BC 0031C11C 80 6D A8 B4 */ lwz r3, lbl_805A9474@sda21(r13)
/* 8031F1C0 0031C120 80 0D A8 B0 */ lwz r0, lbl_805A9470@sda21(r13)
/* 8031F1BC 0031C11C 80 6D A8 B4 */ lwz r3, mParticleSystemAliveCount__11CElementGen@sda21(r13)
/* 8031F1C0 0031C120 80 0D A8 B0 */ lwz r0, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031F1C4 0031C124 38 63 FF FF */ addi r3, r3, -1
/* 8031F1C8 0031C128 90 6D A8 B4 */ stw r3, lbl_805A9474@sda21(r13)
/* 8031F1C8 0031C128 90 6D A8 B4 */ stw r3, mParticleSystemAliveCount__11CElementGen@sda21(r13)
/* 8031F1CC 0031C12C 80 7E 00 34 */ lwz r3, 0x34(r30)
/* 8031F1D0 0031C130 7C 03 00 50 */ subf r0, r3, r0
/* 8031F1D4 0031C134 90 0D A8 B0 */ stw r0, lbl_805A9470@sda21(r13)
/* 8031F1D4 0031C134 90 0D A8 B0 */ stw r0, mParticleAliveCount__11CElementGen@sda21(r13)
/* 8031F1D8 0031C138 83 BE 02 9C */ lwz r29, 0x29c(r30)
/* 8031F1DC 0031C13C 48 00 00 28 */ b lbl_8031F204
lbl_8031F1E0:
@@ -9005,9 +9005,9 @@ lbl_8031F780:
/* 8031F780 0031C6E0 A8 9F 00 94 */ lha r4, 0x94(r31)
/* 8031F784 0031C6E4 38 7F 02 7C */ addi r3, r31, 0x27c
/* 8031F788 0031C6E8 4B FF 2E 5D */ bl SetSeed__9CRandom16FUi
/* 8031F78C 0031C6EC 80 6D A8 B4 */ lwz r3, lbl_805A9474@sda21(r13)
/* 8031F78C 0031C6EC 80 6D A8 B4 */ lwz r3, mParticleSystemAliveCount__11CElementGen@sda21(r13)
/* 8031F790 0031C6F0 38 03 00 01 */ addi r0, r3, 1
/* 8031F794 0031C6F4 90 0D A8 B4 */ stw r0, lbl_805A9474@sda21(r13)
/* 8031F794 0031C6F4 90 0D A8 B4 */ stw r0, mParticleSystemAliveCount__11CElementGen@sda21(r13)
/* 8031F798 0031C6F8 80 7F 00 28 */ lwz r3, 0x28(r31)
/* 8031F79C 0031C6FC 88 1F 02 6C */ lbz r0, 0x26c(r31)
/* 8031F7A0 0031C700 88 63 00 30 */ lbz r3, 0x30(r3)
@@ -9368,9 +9368,9 @@ lbl_8031FCBC:
/* 8031FCC8 0031CC28 88 1F 02 6D */ lbz r0, 0x26d(r31)
/* 8031FCCC 0031CC2C 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f
/* 8031FCD0 0031CC30 41 82 00 5C */ beq lbl_8031FD2C
/* 8031FCD4 0031CC34 3C 60 80 4C */ lis r3, lbl_804BFE28@ha
/* 8031FCD4 0031CC34 3C 60 80 4C */ lis r3, mStaticParticleList@ha
/* 8031FCD8 0031CC38 38 A1 00 20 */ addi r5, r1, 0x20
/* 8031FCDC 0031CC3C 3B A3 FE 28 */ addi r29, r3, lbl_804BFE28@l
/* 8031FCDC 0031CC3C 3B A3 FE 28 */ addi r29, r3, mStaticParticleList@l
/* 8031FCE0 0031CC40 7F C4 F3 78 */ mr r4, r30
/* 8031FCE4 0031CC44 81 9D 00 00 */ lwz r12, 0(r29)
/* 8031FCE8 0031CC48 38 7F 00 60 */ addi r3, r31, 0x60
asm/Kyoto/Particles/CEmitterElement.s
+18 -19
View File
@@ -288,15 +288,15 @@ lbl_80356CAC:
/* 80356CB8 00353C18 38 03 F7 58 */ addi r0, r3, lbl_803EF758@l
/* 80356CBC 00353C1C 90 1E 00 00 */ stw r0, 0(r30)
/* 80356CC0 00353C20 41 82 00 10 */ beq lbl_80356CD0
/* 80356CC4 00353C24 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80356CC8 00353C28 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80356CC4 00353C24 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80356CC8 00353C28 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80356CCC 00353C2C 90 1E 00 00 */ stw r0, 0(r30)
lbl_80356CD0:
/* 80356CD0 00353C30 7F E0 07 35 */ extsh. r0, r31
/* 80356CD4 00353C34 40 81 00 10 */ ble lbl_80356CE4
/* 80356CD8 00353C38 7F C3 F3 78 */ mr r3, r30
/* 80356CDC 00353C3C 38 80 00 20 */ li r4, 0x20
/* 80356CE0 00353C40 48 01 5D 85 */ bl sub_8036ca64
/* 80356CE0 00353C40 48 01 5D 85 */ bl __dl__8IElementFPvUl
lbl_80356CE4:
/* 80356CE4 00353C44 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80356CE8 00353C48 7F C3 F3 78 */ mr r3, r30
@@ -313,8 +313,8 @@ __ct__14CVEAngleSphereFP14CVectorElementP12CRealElementP12CRealElementP12CRealEl
/* 80356D08 00353C68 39 8C F7 58 */ addi r12, r12, lbl_803EF758@l
/* 80356D0C 00353C6C 3D 60 80 3F */ lis r11, lbl_803EF748@ha
/* 80356D10 00353C70 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80356D14 00353C74 3F E0 80 3F */ lis r31, lbl_803EC5A8@ha
/* 80356D18 00353C78 38 1F C5 A8 */ addi r0, r31, lbl_803EC5A8@l
/* 80356D14 00353C74 3F E0 80 3F */ lis r31, __vt__8IElement@ha
/* 80356D18 00353C78 38 1F C5 A8 */ addi r0, r31, __vt__8IElement@l
/* 80356D1C 00353C7C 90 03 00 00 */ stw r0, 0(r3)
/* 80356D20 00353C80 38 0B F7 48 */ addi r0, r11, lbl_803EF748@l
/* 80356D24 00353C84 91 83 00 00 */ stw r12, 0(r3)
@@ -342,15 +342,15 @@ __dt__15CEmitterElement:
/* 80356D70 00353CD0 38 03 F7 58 */ addi r0, r3, lbl_803EF758@l
/* 80356D74 00353CD4 90 1F 00 00 */ stw r0, 0(r31)
/* 80356D78 00353CD8 41 82 00 10 */ beq lbl_80356D88
/* 80356D7C 00353CDC 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80356D80 00353CE0 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80356D7C 00353CDC 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80356D80 00353CE0 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80356D84 00353CE4 90 1F 00 00 */ stw r0, 0(r31)
lbl_80356D88:
/* 80356D88 00353CE8 7C 80 07 35 */ extsh. r0, r4
/* 80356D8C 00353CEC 40 81 00 10 */ ble lbl_80356D9C
/* 80356D90 00353CF0 7F E3 FB 78 */ mr r3, r31
/* 80356D94 00353CF4 38 80 00 04 */ li r4, 4
/* 80356D98 00353CF8 48 01 5C CD */ bl sub_8036ca64
/* 80356D98 00353CF8 48 01 5C CD */ bl __dl__8IElementFPvUl
lbl_80356D9C:
/* 80356D9C 00353CFC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80356DA0 00353D00 7F E3 FB 78 */ mr r3, r31
@@ -589,15 +589,15 @@ lbl_80357104:
/* 80357110 00354070 38 03 F7 58 */ addi r0, r3, lbl_803EF758@l
/* 80357114 00354074 90 1E 00 00 */ stw r0, 0(r30)
/* 80357118 00354078 41 82 00 10 */ beq lbl_80357128
/* 8035711C 0035407C 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80357120 00354080 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 8035711C 0035407C 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80357120 00354080 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80357124 00354084 90 1E 00 00 */ stw r0, 0(r30)
lbl_80357128:
/* 80357128 00354088 7F E0 07 35 */ extsh. r0, r31
/* 8035712C 0035408C 40 81 00 10 */ ble lbl_8035713C
/* 80357130 00354090 7F C3 F3 78 */ mr r3, r30
/* 80357134 00354094 38 80 00 10 */ li r4, 0x10
/* 80357138 00354098 48 01 59 2D */ bl sub_8036ca64
/* 80357138 00354098 48 01 59 2D */ bl __dl__8IElementFPvUl
lbl_8035713C:
/* 8035713C 0035409C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80357140 003540A0 7F C3 F3 78 */ mr r3, r30
@@ -609,9 +609,9 @@ lbl_8035713C:
.global __ct__9CVESphereFP14CVectorElementP12CRealElementP12CRealElement
__ct__9CVESphereFP14CVectorElementP12CRealElementP12CRealElement:
/* 80357158 003540B8 3D 20 80 3F */ lis r9, lbl_803EC5A8@ha
/* 80357158 003540B8 3D 20 80 3F */ lis r9, __vt__8IElement@ha
/* 8035715C 003540BC 3D 00 80 3F */ lis r8, lbl_803EF758@ha
/* 80357160 003540C0 38 09 C5 A8 */ addi r0, r9, lbl_803EC5A8@l
/* 80357160 003540C0 38 09 C5 A8 */ addi r0, r9, __vt__8IElement@l
/* 80357164 003540C4 3C E0 80 3F */ lis r7, lbl_803EF768@ha
/* 80357168 003540C8 90 03 00 00 */ stw r0, 0(r3)
/* 8035716C 003540CC 39 08 F7 58 */ addi r8, r8, lbl_803EF758@l
@@ -704,15 +704,15 @@ lbl_80357294:
/* 803572A0 00354200 38 03 F7 58 */ addi r0, r3, lbl_803EF758@l
/* 803572A4 00354204 90 1E 00 00 */ stw r0, 0(r30)
/* 803572A8 00354208 41 82 00 10 */ beq lbl_803572B8
/* 803572AC 0035420C 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 803572B0 00354210 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 803572AC 0035420C 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 803572B0 00354210 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 803572B4 00354214 90 1E 00 00 */ stw r0, 0(r30)
lbl_803572B8:
/* 803572B8 00354218 7F E0 07 35 */ extsh. r0, r31
/* 803572BC 0035421C 40 81 00 10 */ ble lbl_803572CC
/* 803572C0 00354220 7F C3 F3 78 */ mr r3, r30
/* 803572C4 00354224 38 80 00 0C */ li r4, 0xc
/* 803572C8 00354228 48 01 57 9D */ bl sub_8036ca64
/* 803572C8 00354228 48 01 57 9D */ bl __dl__8IElementFPvUl
lbl_803572CC:
/* 803572CC 0035422C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 803572D0 00354230 7F C3 F3 78 */ mr r3, r30
@@ -724,9 +724,9 @@ lbl_803572CC:
.global __ct__16CEESimpleEmitterFP14CVectorElementP14CVectorElement
__ct__16CEESimpleEmitterFP14CVectorElementP14CVectorElement:
/* 803572E8 00354248 3D 00 80 3F */ lis r8, lbl_803EC5A8@ha
/* 803572E8 00354248 3D 00 80 3F */ lis r8, __vt__8IElement@ha
/* 803572EC 0035424C 3C E0 80 3F */ lis r7, lbl_803EF758@ha
/* 803572F0 00354250 38 08 C5 A8 */ addi r0, r8, lbl_803EC5A8@l
/* 803572F0 00354250 38 08 C5 A8 */ addi r0, r8, __vt__8IElement@l
/* 803572F4 00354254 3C C0 80 3F */ lis r6, lbl_803EF778@ha
/* 803572F8 00354258 90 03 00 00 */ stw r0, 0(r3)
/* 803572FC 0035425C 38 E7 F7 58 */ addi r7, r7, lbl_803EF758@l
@@ -759,4 +759,3 @@ lbl_805AE9D0:
lbl_805AE9D8:
# ROM: 0x3FB278
.double 4.503601774854144E15
asm/Kyoto/Particles/CIntElement.s
+236 -236
View File
File diff suppressed because it is too large Load Diff
asm/Kyoto/Particles/CModVectorElement.s
+117 -117
View File
File diff suppressed because it is too large Load Diff
asm/Kyoto/Particles/CParticleDataFactory.s
+193 -193
View File
File diff suppressed because it is too large Load Diff
asm/Kyoto/Particles/CParticleGlobals.s
+29 -30
View File
@@ -3,39 +3,39 @@
.section .sbss, "wa"
.balign 8
.global lbl_805A9490
lbl_805A9490:
.global mParticleLifetime__16CParticleGlobals
mParticleLifetime__16CParticleGlobals:
.skip 0x4
.global lbl_805A9494
lbl_805A9494:
.global mParticleLifetimeReal__16CParticleGlobals
mParticleLifetimeReal__16CParticleGlobals:
.skip 0x4
.global lbl_805A9498
lbl_805A9498:
.global mEmitterTime__16CParticleGlobals
mEmitterTime__16CParticleGlobals:
.skip 0x4
.global lbl_805A949C
lbl_805A949C:
.global mEmitterTimeReal__16CParticleGlobals
mEmitterTimeReal__16CParticleGlobals:
.skip 0x4
.global lbl_805A94A0
lbl_805A94A0:
.global mParticleLifetimePercentage__16CParticleGlobals
mParticleLifetimePercentage__16CParticleGlobals:
.skip 0x4
.global lbl_805A94A4
lbl_805A94A4:
.global mParticleLifetimePercentageReal__16CParticleGlobals
mParticleLifetimePercentageReal__16CParticleGlobals:
.skip 0x4
.global lbl_805A94A8
lbl_805A94A8:
.global mParticleLifetimePercentageRemainder__16CParticleGlobals
mParticleLifetimePercentageRemainder__16CParticleGlobals:
.skip 0x4
# mCurrentParticle
.global lbl_805A94AC
lbl_805A94AC:
.skip 0x4
# mParticleAccessParameters
.global lbl_805A94B0
lbl_805A94B0:
.skip 0x4
.global lbl_805A94B4
lbl_805A94B4:
# mCurrentParticleSystem
.global mCurrentParticleSystem__16CParticleGlobals
mCurrentParticleSystem__16CParticleGlobals:
.skip 0x4
.global lbl_805A94B8
lbl_805A94B8:
.skip 0x8
.section .text, "ax"
@@ -44,7 +44,7 @@ UpdateParticleLifetimeTweenValues__16CParticleGlobalsFi:
/* 8032A67C 003275DC 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8032A680 003275E0 3C 00 43 30 */ lis r0, 0x4330
/* 8032A684 003275E4 C8 22 CA 88 */ lfd f1, lbl_805AE7A8@sda21(r2)
/* 8032A688 003275E8 80 8D A8 D0 */ lwz r4, lbl_805A9490@sda21(r13)
/* 8032A688 003275E8 80 8D A8 D0 */ lwz r4, mParticleLifetime__16CParticleGlobals@sda21(r13)
/* 8032A68C 003275EC 90 01 00 08 */ stw r0, 8(r1)
/* 8032A690 003275F0 6C 84 80 00 */ xoris r4, r4, 0x8000
/* 8032A694 003275F4 C0 42 CA 7C */ lfs f2, lbl_805AE79C@sda21(r2)
@@ -73,26 +73,26 @@ lbl_8032A6C4:
/* 8032A6E8 00327648 EC 01 00 32 */ fmuls f0, f1, f0
/* 8032A6EC 0032764C EC 20 18 24 */ fdivs f1, f0, f3
/* 8032A6F0 00327650 FC 00 08 1E */ fctiwz f0, f1
/* 8032A6F4 00327654 D0 2D A8 E4 */ stfs f1, lbl_805A94A4@sda21(r13)
/* 8032A6F4 00327654 D0 2D A8 E4 */ stfs f1, mParticleLifetimePercentageReal__16CParticleGlobals@sda21(r13)
/* 8032A6F8 00327658 D8 01 00 20 */ stfd f0, 0x20(r1)
/* 8032A6FC 0032765C 80 61 00 24 */ lwz r3, 0x24(r1)
/* 8032A700 00327660 6C 60 80 00 */ xoris r0, r3, 0x8000
/* 8032A704 00327664 2C 03 00 00 */ cmpwi r3, 0
/* 8032A708 00327668 90 01 00 2C */ stw r0, 0x2c(r1)
/* 8032A70C 0032766C C8 01 00 28 */ lfd f0, 0x28(r1)
/* 8032A710 00327670 90 6D A8 E0 */ stw r3, lbl_805A94A0@sda21(r13)
/* 8032A710 00327670 90 6D A8 E0 */ stw r3, mParticleLifetimePercentage__16CParticleGlobals@sda21(r13)
/* 8032A714 00327674 EC 00 10 28 */ fsubs f0, f0, f2
/* 8032A718 00327678 EC 01 00 28 */ fsubs f0, f1, f0
/* 8032A71C 0032767C D0 0D A8 E8 */ stfs f0, lbl_805A94A8@sda21(r13)
/* 8032A71C 0032767C D0 0D A8 E8 */ stfs f0, mParticleLifetimePercentageRemainder__16CParticleGlobals@sda21(r13)
/* 8032A720 00327680 40 80 00 10 */ bge lbl_8032A730
/* 8032A724 00327684 38 00 00 00 */ li r0, 0
/* 8032A728 00327688 90 0D A8 E0 */ stw r0, lbl_805A94A0@sda21(r13)
/* 8032A728 00327688 90 0D A8 E0 */ stw r0, mParticleLifetimePercentage__16CParticleGlobals@sda21(r13)
/* 8032A72C 0032768C 48 00 00 14 */ b lbl_8032A740
lbl_8032A730:
/* 8032A730 00327690 2C 03 00 64 */ cmpwi r3, 0x64
/* 8032A734 00327694 40 81 00 0C */ ble lbl_8032A740
/* 8032A738 00327698 38 00 00 64 */ li r0, 0x64
/* 8032A73C 0032769C 90 0D A8 E0 */ stw r0, lbl_805A94A0@sda21(r13)
/* 8032A73C 0032769C 90 0D A8 E0 */ stw r0, mParticleLifetimePercentage__16CParticleGlobals@sda21(r13)
lbl_8032A740:
/* 8032A740 003276A0 38 21 00 30 */ addi r1, r1, 0x30
/* 8032A744 003276A4 4E 80 00 20 */ blr
@@ -106,9 +106,9 @@ SetEmitterTime__16CParticleGlobalsFi:
/* 8032A758 003276B8 90 81 00 0C */ stw r4, 0xc(r1)
/* 8032A75C 003276BC 90 01 00 08 */ stw r0, 8(r1)
/* 8032A760 003276C0 C8 01 00 08 */ lfd f0, 8(r1)
/* 8032A764 003276C4 90 6D A8 D8 */ stw r3, lbl_805A9498@sda21(r13)
/* 8032A764 003276C4 90 6D A8 D8 */ stw r3, mEmitterTime__16CParticleGlobals@sda21(r13)
/* 8032A768 003276C8 EC 00 08 28 */ fsubs f0, f0, f1
/* 8032A76C 003276CC D0 0D A8 DC */ stfs f0, lbl_805A949C@sda21(r13)
/* 8032A76C 003276CC D0 0D A8 DC */ stfs f0, mEmitterTimeReal__16CParticleGlobals@sda21(r13)
/* 8032A770 003276D0 38 21 00 10 */ addi r1, r1, 0x10
/* 8032A774 003276D4 4E 80 00 20 */ blr
@@ -121,9 +121,9 @@ SetParticleLifetime__16CParticleGlobalsFi:
/* 8032A788 003276E8 90 81 00 0C */ stw r4, 0xc(r1)
/* 8032A78C 003276EC 90 01 00 08 */ stw r0, 8(r1)
/* 8032A790 003276F0 C8 01 00 08 */ lfd f0, 8(r1)
/* 8032A794 003276F4 90 6D A8 D0 */ stw r3, lbl_805A9490@sda21(r13)
/* 8032A794 003276F4 90 6D A8 D0 */ stw r3, mParticleLifetime__16CParticleGlobals@sda21(r13)
/* 8032A798 003276F8 EC 00 08 28 */ fsubs f0, f0, f1
/* 8032A79C 003276FC D0 0D A8 D4 */ stfs f0, lbl_805A9494@sda21(r13)
/* 8032A79C 003276FC D0 0D A8 D4 */ stfs f0, mParticleLifetimeReal__16CParticleGlobals@sda21(r13)
/* 8032A7A0 00327700 38 21 00 10 */ addi r1, r1, 0x10
/* 8032A7A4 00327704 4E 80 00 20 */ blr
@@ -149,4 +149,3 @@ lbl_805AE7A0:
lbl_805AE7A8:
# ROM: 0x3FB048
.double 4.503601774854144E15
asm/Kyoto/Particles/CParticleSwoosh.s
+11 -4
View File
@@ -50,6 +50,13 @@ lbl_805A88DC:
# ROM: 0x3F627C
.4byte 0
.section .sbss, "wa"
.balign 8
.global mSwooshAliveCount__15CParticleSwoosh
mSwooshAliveCount__15CParticleSwoosh:
.skip 0x8
.section .text, "ax"
.global GetTranslation__15CParticleSwooshCFv
@@ -4755,9 +4762,9 @@ __dt__15CParticleSwooshFv:
/* 8032EC00 0032BB60 34 1E 01 9C */ addic. r0, r30, 0x19c
/* 8032EC04 0032BB64 38 03 DD 80 */ addi r0, r3, lbl_803EDD80@l
/* 8032EC08 0032BB68 90 1E 00 00 */ stw r0, 0(r30)
/* 8032EC0C 0032BB6C 80 6D A8 F8 */ lwz r3, lbl_805A94B8@sda21(r13)
/* 8032EC0C 0032BB6C 80 6D A8 F8 */ lwz r3, mSwooshAliveCount__15CParticleSwoosh@sda21(r13)
/* 8032EC10 0032BB70 38 03 FF FF */ addi r0, r3, -1
/* 8032EC14 0032BB74 90 0D A8 F8 */ stw r0, lbl_805A94B8@sda21(r13)
/* 8032EC14 0032BB74 90 0D A8 F8 */ stw r0, mSwooshAliveCount__15CParticleSwoosh@sda21(r13)
/* 8032EC18 0032BB78 41 82 00 44 */ beq lbl_8032EC5C
/* 8032EC1C 0032BB7C 80 1E 01 A0 */ lwz r0, 0x1a0(r30)
/* 8032EC20 0032BB80 80 7E 01 A8 */ lwz r3, 0x1a8(r30)
@@ -5058,10 +5065,10 @@ lbl_8032EFA0:
/* 8032F060 0032BFC0 D0 3F 02 08 */ stfs f1, 0x208(r31)
/* 8032F064 0032BFC4 90 1F 02 0C */ stw r0, 0x20c(r31)
/* 8032F068 0032BFC8 4B FE 36 19 */ bl __ct__13CGlobalRandomFR9CRandom16
/* 8032F06C 0032BFCC 80 6D A8 F8 */ lwz r3, lbl_805A94B8@sda21(r13)
/* 8032F06C 0032BFCC 80 6D A8 F8 */ lwz r3, mSwooshAliveCount__15CParticleSwoosh@sda21(r13)
/* 8032F070 0032BFD0 2C 1E 00 00 */ cmpwi r30, 0
/* 8032F074 0032BFD4 38 03 00 01 */ addi r0, r3, 1
/* 8032F078 0032BFD8 90 0D A8 F8 */ stw r0, lbl_805A94B8@sda21(r13)
/* 8032F078 0032BFD8 90 0D A8 F8 */ stw r0, mSwooshAliveCount__15CParticleSwoosh@sda21(r13)
/* 8032F07C 0032BFDC 40 81 00 0C */ ble lbl_8032F088
/* 8032F080 0032BFE0 93 DF 01 B4 */ stw r30, 0x1b4(r31)
/* 8032F084 0032BFE4 48 00 00 2C */ b lbl_8032F0B0
asm/Kyoto/Particles/CRealElement.s
+317 -318
View File
File diff suppressed because it is too large Load Diff
asm/Kyoto/Particles/CUVElement.s
+18 -19
View File
@@ -220,19 +220,19 @@ lbl_803341E4:
lbl_80334200:
/* 80334200 00331160 28 1F 00 00 */ cmplwi r31, 0
/* 80334204 00331164 41 82 00 20 */ beq lbl_80334224
/* 80334208 00331168 3C 60 80 3F */ lis r3, lbl_803EC568@ha
/* 8033420C 0033116C 38 03 C5 68 */ addi r0, r3, lbl_803EC568@l
/* 80334208 00331168 3C 60 80 3F */ lis r3, __vt__10CUVElement@ha
/* 8033420C 0033116C 38 03 C5 68 */ addi r0, r3, __vt__10CUVElement@l
/* 80334210 00331170 90 1F 00 00 */ stw r0, 0(r31)
/* 80334214 00331174 41 82 00 10 */ beq lbl_80334224
/* 80334218 00331178 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 8033421C 0033117C 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80334218 00331178 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 8033421C 0033117C 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80334220 00331180 90 1F 00 00 */ stw r0, 0(r31)
lbl_80334224:
/* 80334224 00331184 7F C0 07 35 */ extsh. r0, r30
/* 80334228 00331188 40 81 00 10 */ ble lbl_80334238
/* 8033422C 0033118C 7F E3 FB 78 */ mr r3, r31
/* 80334230 00331190 38 80 00 3C */ li r4, 0x3c
/* 80334234 00331194 48 03 88 31 */ bl sub_8036ca64
/* 80334234 00331194 48 03 88 31 */ bl __dl__8IElementFPvUl
lbl_80334238:
/* 80334238 00331198 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8033423C 0033119C 7F E3 FB 78 */ mr r3, r31
@@ -251,11 +251,11 @@ lbl_80334238:
/* 80334264 003311C4 F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0
/* 80334268 003311C8 BF 01 00 70 */ stmw r24, 0x70(r1)
/* 8033426C 003311CC 7C 79 1B 78 */ mr r25, r3
/* 80334270 003311D0 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80334274 003311D4 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 80334278 003311D8 3D 60 80 3F */ lis r11, lbl_803EC568@ha
/* 80334270 003311D0 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80334274 003311D4 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80334278 003311D8 3D 60 80 3F */ lis r11, __vt__10CUVElement@ha
/* 8033427C 003311DC 90 19 00 00 */ stw r0, 0(r25)
/* 80334280 003311E0 38 0B C5 68 */ addi r0, r11, lbl_803EC568@l
/* 80334280 003311E0 38 0B C5 68 */ addi r0, r11, __vt__10CUVElement@l
/* 80334284 003311E4 3C 60 80 3F */ lis r3, lbl_803EE118@ha
/* 80334288 003311E8 3B 19 00 04 */ addi r24, r25, 4
/* 8033428C 003311EC 90 19 00 00 */ stw r0, 0(r25)
@@ -542,19 +542,19 @@ __dt__12CUVEConstantFv:
lbl_80334698:
/* 80334698 003315F8 28 1E 00 00 */ cmplwi r30, 0
/* 8033469C 003315FC 41 82 00 20 */ beq lbl_803346BC
/* 803346A0 00331600 3C 60 80 3F */ lis r3, lbl_803EC568@ha
/* 803346A4 00331604 38 03 C5 68 */ addi r0, r3, lbl_803EC568@l
/* 803346A0 00331600 3C 60 80 3F */ lis r3, __vt__10CUVElement@ha
/* 803346A4 00331604 38 03 C5 68 */ addi r0, r3, __vt__10CUVElement@l
/* 803346A8 00331608 90 1E 00 00 */ stw r0, 0(r30)
/* 803346AC 0033160C 41 82 00 10 */ beq lbl_803346BC
/* 803346B0 00331610 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 803346B4 00331614 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 803346B0 00331610 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 803346B4 00331614 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 803346B8 00331618 90 1E 00 00 */ stw r0, 0(r30)
lbl_803346BC:
/* 803346BC 0033161C 7F E0 07 35 */ extsh. r0, r31
/* 803346C0 00331620 40 81 00 10 */ ble lbl_803346D0
/* 803346C4 00331624 7F C3 F3 78 */ mr r3, r30
/* 803346C8 00331628 38 80 00 10 */ li r4, 0x10
/* 803346CC 0033162C 48 03 83 99 */ bl sub_8036ca64
/* 803346CC 0033162C 48 03 83 99 */ bl __dl__8IElementFPvUl
lbl_803346D0:
/* 803346D0 00331630 80 01 00 14 */ lwz r0, 0x14(r1)
/* 803346D4 00331634 7F C3 F3 78 */ mr r3, r30
@@ -568,17 +568,17 @@ lbl_803346D0:
"__ct__12CUVEConstantF17TToken<8CTexture>":
/* 803346EC 0033164C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 803346F0 00331650 7C 08 02 A6 */ mflr r0
/* 803346F4 00331654 3C A0 80 3F */ lis r5, lbl_803EC568@ha
/* 803346F4 00331654 3C A0 80 3F */ lis r5, __vt__10CUVElement@ha
/* 803346F8 00331658 90 01 00 14 */ stw r0, 0x14(r1)
/* 803346FC 0033165C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80334700 00331660 7C 7F 1B 78 */ mr r31, r3
/* 80334704 00331664 3C 60 80 3F */ lis r3, lbl_803EC5A8@ha
/* 80334704 00331664 3C 60 80 3F */ lis r3, __vt__8IElement@ha
/* 80334708 00331668 93 C1 00 08 */ stw r30, 8(r1)
/* 8033470C 0033166C 38 03 C5 A8 */ addi r0, r3, lbl_803EC5A8@l
/* 8033470C 0033166C 38 03 C5 A8 */ addi r0, r3, __vt__8IElement@l
/* 80334710 00331670 3C 60 80 3F */ lis r3, lbl_803EE134@ha
/* 80334714 00331674 3B DF 00 04 */ addi r30, r31, 4
/* 80334718 00331678 90 1F 00 00 */ stw r0, 0(r31)
/* 8033471C 0033167C 38 05 C5 68 */ addi r0, r5, lbl_803EC568@l
/* 8033471C 0033167C 38 05 C5 68 */ addi r0, r5, __vt__10CUVElement@l
/* 80334720 00331680 7F E6 FB 78 */ mr r6, r31
/* 80334724 00331684 90 1F 00 00 */ stw r0, 0(r31)
/* 80334728 00331688 38 03 E1 34 */ addi r0, r3, lbl_803EE134@l
@@ -709,4 +709,3 @@ lbl_803D7980:
# ROM: 0x3D4980
.asciz "??(??)"
.balign 4
asm/Kyoto/Particles/CVectorElement.s
+168 -169
View File
File diff suppressed because it is too large Load Diff
asm/MetaRender/CCubeRenderer.s
+3 -3
View File
@@ -3753,7 +3753,7 @@ SetThermal__13CCubeRendererFbfRC6CColor:
/* 802B8F9C 002B5EFC 80 85 00 00 */ lwz r4, 0(r5)
/* 802B8FA0 002B5F00 90 83 02 F4 */ stw r4, 0x2f4(r3)
/* 802B8FA4 002B5F04 98 0D A5 EC */ stb r0, sMoveRedToAlphaBuffer__6CDecal@sda21(r13)
/* 802B8FA8 002B5F08 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 802B8FA8 002B5F08 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 802B8FAC 002B5F0C 4E 80 00 20 */ blr
.global ReallyRenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC6CModelPC13CSkinnedModel
@@ -5381,7 +5381,7 @@ DoThermalBlendHot__13CCubeRendererFv:
/* 802BA7B8 002B7718 38 61 00 24 */ addi r3, r1, 0x24
/* 802BA7BC 002B771C 48 05 1F 91 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f
/* 802BA7C0 002B7720 38 00 00 00 */ li r0, 0
/* 802BA7C4 002B7724 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 802BA7C4 002B7724 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 802BA7C8 002B7728 98 0D A5 EC */ stb r0, sMoveRedToAlphaBuffer__6CDecal@sda21(r13)
/* 802BA7CC 002B772C BB 41 00 88 */ lmw r26, 0x88(r1)
/* 802BA7D0 002B7730 80 01 00 A4 */ lwz r0, 0xa4(r1)
@@ -5785,7 +5785,7 @@ lbl_802BAA1C:
/* 802BADEC 002B7D4C 38 61 00 64 */ addi r3, r1, 0x64
/* 802BADF0 002B7D50 48 05 19 5D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f
/* 802BADF4 002B7D54 38 00 00 01 */ li r0, 1
/* 802BADF8 002B7D58 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 802BADF8 002B7D58 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 802BADFC 002B7D5C 98 0D A5 EC */ stb r0, sMoveRedToAlphaBuffer__6CDecal@sda21(r13)
/* 802BAE00 002B7D60 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, qr0
/* 802BAE04 002B7D64 CB E1 00 F0 */ lfd f31, 0xf0(r1)
asm/MetroidPrime/CExplosion.s
+4 -4
View File
@@ -73,7 +73,7 @@ Render__10CExplosionCFRC13CStateManager:
/* 8005A140 000570A0 41 82 00 3C */ beq lbl_8005A17C
/* 8005A144 000570A4 38 00 00 01 */ li r0, 1
/* 8005A148 000570A8 38 60 00 01 */ li r3, 1
/* 8005A14C 000570AC 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 8005A14C 000570AC 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 8005A150 000570B0 48 2E B6 99 */ bl SetRenderModelBlack__10CCubeModelFb
/* 8005A154 000570B4 80 7E 00 E8 */ lwz r3, 0xe8(r30)
/* 8005A158 000570B8 81 83 00 00 */ lwz r12, 0(r3)
@@ -83,14 +83,14 @@ Render__10CExplosionCFRC13CStateManager:
/* 8005A168 000570C8 38 60 00 00 */ li r3, 0
/* 8005A16C 000570CC 48 2E B6 7D */ bl SetRenderModelBlack__10CCubeModelFb
/* 8005A170 000570D0 38 00 00 00 */ li r0, 0
/* 8005A174 000570D4 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 8005A174 000570D4 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 8005A178 000570D8 48 00 00 64 */ b lbl_8005A1DC
lbl_8005A17C:
/* 8005A17C 000570DC 88 1E 00 F4 */ lbz r0, 0xf4(r30)
/* 8005A180 000570E0 54 00 CF FE */ rlwinm r0, r0, 0x19, 0x1f, 0x1f
/* 8005A184 000570E4 7C 00 00 34 */ cntlzw r0, r0
/* 8005A188 000570E8 54 00 D9 7E */ srwi r0, r0, 5
/* 8005A18C 000570EC 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 8005A18C 000570EC 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 8005A190 000570F0 48 2E FE 25 */ bl Black__6CColorFv
/* 8005A194 000570F4 C0 22 86 A8 */ lfs f1, lbl_805AA3C8@sda21(r2)
/* 8005A198 000570F8 7C 64 1B 78 */ mr r4, r3
@@ -109,7 +109,7 @@ lbl_8005A17C:
/* 8005A1CC 0005712C 90 01 00 0C */ stw r0, 0xc(r1)
/* 8005A1D0 00057130 4B FE CB B1 */ bl SetupFogForArea__13CStateManagerCF7TAreaId
/* 8005A1D4 00057134 38 00 00 00 */ li r0, 0
/* 8005A1D8 00057138 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 8005A1D8 00057138 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
lbl_8005A1DC:
/* 8005A1DC 0005713C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8005A1E0 00057140 83 E1 00 1C */ lwz r31, 0x1c(r1)
asm/MetroidPrime/Enemies/CBouncyGrenade.s
+4 -4
View File
@@ -582,8 +582,8 @@ lbl_8022E9D0:
/* 8022E9DC 0022B93C 2C 03 00 01 */ cmpwi r3, 1
/* 8022E9E0 0022B940 40 82 00 60 */ bne lbl_8022EA40
/* 8022E9E4 0022B944 38 00 00 01 */ li r0, 1
/* 8022E9E8 0022B948 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 8022E9EC 0022B94C 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 8022E9E8 0022B948 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 8022E9EC 0022B94C 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 8022E9F0 0022B950 48 11 B5 C5 */ bl Black__6CColorFv
/* 8022E9F4 0022B954 C0 22 B6 3C */ lfs f1, lbl_805AD35C@sda21(r2)
/* 8022E9F8 0022B958 7C 64 1B 78 */ mr r4, r3
@@ -602,8 +602,8 @@ lbl_8022E9D0:
/* 8022EA2C 0022B98C 90 01 00 0C */ stw r0, 0xc(r1)
/* 8022EA30 0022B990 4B E1 83 51 */ bl SetupFogForArea__13CStateManagerCF7TAreaId
/* 8022EA34 0022B994 38 00 00 00 */ li r0, 0
/* 8022EA38 0022B998 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 8022EA3C 0022B99C 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 8022EA38 0022B998 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 8022EA3C 0022B99C 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
lbl_8022EA40:
/* 8022EA40 0022B9A0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8022EA44 0022B9A4 83 E1 00 1C */ lwz r31, 0x1c(r1)
asm/MetroidPrime/Enemies/CChozoGhost.s
+4 -4
View File
@@ -2946,8 +2946,8 @@ lbl_801417E8:
/* 8014180C 0013E76C 54 9F D9 7E */ srwi r31, r4, 5
/* 80141810 0013E770 41 82 00 4C */ beq lbl_8014185C
/* 80141814 0013E774 38 00 00 01 */ li r0, 1
/* 80141818 0013E778 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 8014181C 0013E77C 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 80141818 0013E778 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 8014181C 0013E77C 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 80141820 0013E780 48 20 87 95 */ bl Black__6CColorFv
/* 80141824 0013E784 C0 22 9B 5C */ lfs f1, lbl_805AB87C@sda21(r2)
/* 80141828 0013E788 7C 64 1B 78 */ mr r4, r3
@@ -2985,8 +2985,8 @@ lbl_8014185C:
/* 801418A4 0013E804 90 01 00 08 */ stw r0, 8(r1)
/* 801418A8 0013E808 4B F0 54 D9 */ bl SetupFogForArea__13CStateManagerCF7TAreaId
/* 801418AC 0013E80C 38 00 00 00 */ li r0, 0
/* 801418B0 0013E810 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 801418B4 0013E814 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 801418B0 0013E810 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 801418B4 0013E814 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
lbl_801418B8:
/* 801418B8 0013E818 80 01 00 34 */ lwz r0, 0x34(r1)
/* 801418BC 0013E81C 83 E1 00 2C */ lwz r31, 0x2c(r1)
asm/MetroidPrime/Enemies/CDrone.s
+4 -4
View File
@@ -3852,8 +3852,8 @@ lbl_80161E5C:
/* 80161E80 0015EDE0 57 80 06 3F */ clrlwi. r0, r28, 0x18
/* 80161E84 0015EDE4 41 82 00 4C */ beq lbl_80161ED0
/* 80161E88 0015EDE8 38 00 00 01 */ li r0, 1
/* 80161E8C 0015EDEC 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 80161E90 0015EDF0 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 80161E8C 0015EDEC 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 80161E90 0015EDF0 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
/* 80161E94 0015EDF4 48 1E 81 21 */ bl Black__6CColorFv
/* 80161E98 0015EDF8 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2)
/* 80161E9C 0015EDFC 7C 64 1B 78 */ mr r4, r3
@@ -3893,8 +3893,8 @@ lbl_80161ED0:
/* 80161F20 0015EE80 90 01 00 14 */ stw r0, 0x14(r1)
/* 80161F24 0015EE84 4B EE 4E 5D */ bl SetupFogForArea__13CStateManagerCF7TAreaId
/* 80161F28 0015EE88 38 00 00 00 */ li r0, 0
/* 80161F2C 0015EE8C 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 80161F30 0015EE90 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13)
/* 80161F2C 0015EE8C 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 80161F30 0015EE90 98 0D A8 B8 */ stb r0, sMoveRedToAlphaBuffer__11CElementGen@sda21(r13)
lbl_80161F34:
/* 80161F34 0015EE94 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 80161F38 0015EE98 41 82 00 F0 */ beq lbl_80162028
asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
+1 -1
View File
@@ -5518,7 +5518,7 @@ lbl_80275548:
.global sub_802755a4
sub_802755a4:
/* 802755A4 00272504 80 6D A8 F8 */ lwz r3, lbl_805A94B8@sda21(r13)
/* 802755A4 00272504 80 6D A8 F8 */ lwz r3, mSwooshAliveCount__15CParticleSwoosh@sda21(r13)
/* 802755A8 00272508 4E 80 00 20 */ blr
.global sub_802755ac
asm/MetroidPrime/Weapons/CEnergyProjectile.s
+4 -4
View File
@@ -1076,7 +1076,7 @@ lbl_802149D8:
/* 802149EC 0021194C 20 04 00 08 */ subfic r0, r4, 8
/* 802149F0 00211950 7C 60 03 78 */ or r0, r3, r0
/* 802149F4 00211954 54 00 0F FE */ srwi r0, r0, 0x1f
/* 802149F8 00211958 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 802149F8 00211958 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 802149FC 0021195C 48 13 55 B9 */ bl Black__6CColorFv
/* 80214A00 00211960 C0 22 B3 10 */ lfs f1, lbl_805AD030@sda21(r2)
/* 80214A04 00211964 7C 64 1B 78 */ mr r4, r3
@@ -1095,7 +1095,7 @@ lbl_802149D8:
/* 80214A38 00211998 90 01 00 14 */ stw r0, 0x14(r1)
/* 80214A3C 0021199C 4B E3 23 45 */ bl SetupFogForArea__13CStateManagerCF7TAreaId
/* 80214A40 002119A0 38 00 00 00 */ li r0, 0
/* 80214A44 002119A4 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 80214A44 002119A4 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 80214A48 002119A8 48 00 00 6C */ b lbl_80214AB4
lbl_80214A4C:
/* 80214A4C 002119AC 80 1E 00 E8 */ lwz r0, 0xe8(r30)
@@ -1107,7 +1107,7 @@ lbl_80214A4C:
/* 80214A64 002119C4 40 82 00 44 */ bne lbl_80214AA8
/* 80214A68 002119C8 38 00 00 01 */ li r0, 1
/* 80214A6C 002119CC 38 7E 01 70 */ addi r3, r30, 0x170
/* 80214A70 002119D0 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 80214A70 002119D0 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 80214A74 002119D4 48 09 AB CD */ bl RenderParticles__17CProjectileWeaponCFv
/* 80214A78 002119D8 7F C3 F3 78 */ mr r3, r30
/* 80214A7C 002119DC 7F E4 FB 78 */ mr r4, r31
@@ -1119,7 +1119,7 @@ lbl_80214A4C:
/* 80214A94 002119F4 90 01 00 0C */ stw r0, 0xc(r1)
/* 80214A98 002119F8 4B E3 22 E9 */ bl SetupFogForArea__13CStateManagerCF7TAreaId
/* 80214A9C 002119FC 38 00 00 00 */ li r0, 0
/* 80214AA0 00211A00 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 80214AA0 00211A00 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 80214AA4 00211A04 48 00 00 10 */ b lbl_80214AB4
lbl_80214AA8:
/* 80214AA8 00211A08 7F C3 F3 78 */ mr r3, r30
asm/MetroidPrime/Weapons/CGunWeapon.s
+2 -2
View File
@@ -2654,7 +2654,7 @@ DrawMuzzleFx__10CGunWeaponCFRC13CStateManager:
/* 801BC170 001B90D0 40 82 00 38 */ bne lbl_801BC1A8
/* 801BC174 001B90D4 80 1E 02 08 */ lwz r0, 0x208(r30)
/* 801BC178 001B90D8 38 60 00 01 */ li r3, 1
/* 801BC17C 001B90DC 98 6D A8 B9 */ stb r3, lbl_805A9479@sda21(r13)
/* 801BC17C 001B90DC 98 6D A8 B9 */ stb r3, sSubtractBlend__11CElementGen@sda21(r13)
/* 801BC180 001B90E0 54 03 18 38 */ slwi r3, r0, 3
/* 801BC184 001B90E4 38 03 00 04 */ addi r0, r3, 4
/* 801BC188 001B90E8 7C 7F 00 2E */ lwzx r3, r31, r0
@@ -2663,7 +2663,7 @@ DrawMuzzleFx__10CGunWeaponCFRC13CStateManager:
/* 801BC194 001B90F4 7D 89 03 A6 */ mtctr r12
/* 801BC198 001B90F8 4E 80 04 21 */ bctrl
/* 801BC19C 001B90FC 38 00 00 00 */ li r0, 0
/* 801BC1A0 001B9100 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13)
/* 801BC1A0 001B9100 98 0D A8 B9 */ stb r0, sSubtractBlend__11CElementGen@sda21(r13)
/* 801BC1A4 001B9104 48 00 00 24 */ b lbl_801BC1C8
lbl_801BC1A8:
/* 801BC1A8 001B9108 80 1E 02 08 */ lwz r0, 0x208(r30)

Some files were not shown because too many files have changed in this diff Show More