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

Renaming & more CActor progress

Browse Source 
Former-commit-id: bcfefcc34a
This commit is contained in:
Luke Street
2022-08-15 22:14:28 -04:00
parent 9675db47b4
commit f3e607a3af
82 changed files with 1579 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/GuiSys/CAuiEnergyBarT01.s
+3 -3
View File
@@ -222,11 +222,11 @@ lbl_802CB440:
lbl_802CB450:
/* 802CB450 002C83B0 FC 1B E0 00 */ fcmpu cr0, f27, f28
/* 802CB454 002C83B4 41 82 01 84 */ beq lbl_802CB5D8
/* 802CB458 002C83B8 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 802CB458 002C83B8 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 802CB45C 002C83BC 38 60 00 00 */ li r3, 0
/* 802CB460 002C83C0 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 802CB460 002C83C0 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 802CB464 002C83C4 48 03 EE 55 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802CB468 002C83C8 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 802CB468 002C83C8 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 802CB46C 002C83CC 38 60 00 01 */ li r3, 1
/* 802CB470 002C83D0 48 03 EE 49 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802CB474 002C83D4 7F C3 F3 78 */ mr r3, r30
asm/GuiSys/CAuiImagePane.s
+6 -6
View File
@@ -471,11 +471,11 @@ lbl_802CC2F0:
lbl_802CC2F4:
/* 802CC2F4 002C9254 57 C0 06 3F */ clrlwi. r0, r30, 0x18
/* 802CC2F8 002C9258 41 82 00 DC */ beq lbl_802CC3D4
/* 802CC2FC 002C925C 3C 80 80 5A */ lis r4, lbl_805A5FEC@ha
/* 802CC2FC 002C925C 3C 80 80 5A */ lis r4, kEnvModulateAlpha__9CGraphics@ha
/* 802CC300 002C9260 38 60 00 00 */ li r3, 0
/* 802CC304 002C9264 38 84 5F EC */ addi r4, r4, lbl_805A5FEC@l
/* 802CC304 002C9264 38 84 5F EC */ addi r4, r4, kEnvModulateAlpha__9CGraphics@l
/* 802CC308 002C9268 48 03 DF B1 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802CC30C 002C926C 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 802CC30C 002C926C 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 802CC310 002C9270 38 60 00 01 */ li r3, 1
/* 802CC314 002C9274 48 03 DF A5 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802CC318 002C9278 7F A3 EB 78 */ mr r3, r29
@@ -544,11 +544,11 @@ lbl_802CC3F8:
/* 802CC3F8 002C9358 2C 03 00 01 */ cmpwi r3, 1
/* 802CC3FC 002C935C 40 82 00 8C */ bne lbl_802CC488
lbl_802CC400:
/* 802CC400 002C9360 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 802CC400 002C9360 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 802CC404 002C9364 38 60 00 00 */ li r3, 0
/* 802CC408 002C9368 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 802CC408 002C9368 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 802CC40C 002C936C 48 03 DE AD */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802CC410 002C9370 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 802CC410 002C9370 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 802CC414 002C9374 38 60 00 01 */ li r3, 1
/* 802CC418 002C9378 48 03 DE A1 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802CC41C 002C937C 7F A3 EB 78 */ mr r3, r29
asm/GuiSys/CGuiGroup.s
+2 -2
View File
@@ -1690,9 +1690,9 @@ Draw__9CGuiFrameCFRC19CGuiWidgetDrawParms:
/* 802C2780 002BF6E0 81 8C 00 10 */ lwz r12, 0x10(r12)
/* 802C2784 002BF6E4 7D 89 03 A6 */ mtctr r12
/* 802C2788 002BF6E8 4E 80 04 21 */ bctrl
/* 802C278C 002BF6EC 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 802C278C 002BF6EC 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 802C2790 002BF6F0 38 60 00 00 */ li r3, 0
/* 802C2794 002BF6F4 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 802C2794 002BF6F4 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 802C2798 002BF6F8 48 04 7B 21 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802C279C 002BF6FC 38 60 00 01 */ li r3, 1
/* 802C27A0 002BF700 38 80 00 04 */ li r4, 4
asm/GuiSys/CGuiPane.s
+1 -1
View File
@@ -219,7 +219,7 @@ Draw__8CGuiPaneCFRC19CGuiWidgetDrawParms:
/* 802C577C 002C26DC 4E 80 04 21 */ bctrl
/* 802C5780 002C26E0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802C5784 002C26E4 41 82 00 74 */ beq lbl_802C57F8
/* 802C5788 002C26E8 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 802C5788 002C26E8 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 802C578C 002C26EC 38 60 00 00 */ li r3, 0
/* 802C5790 002C26F0 48 04 4B 29 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 802C5794 002C26F4 88 7E 00 AB */ lbz r3, 0xab(r30)
asm/GuiSys/CGuiTextSupport.s
+2 -2
View File
@@ -1853,9 +1853,9 @@ Render__15CGuiTextSupportFv:
/* 802C9550 002C64B0 93 E1 00 AC */ stw r31, 0xac(r1)
/* 802C9554 002C64B4 7C 7F 1B 78 */ mr r31, r3
/* 802C9558 002C64B8 4B FF F5 D5 */ bl CheckAndRebuildRenderBuffer__15CGuiTextSupportFv
/* 802C955C 002C64BC 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 802C955C 002C64BC 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 802C9560 002C64C0 38 61 00 74 */ addi r3, r1, 0x74
/* 802C9564 002C64C4 38 84 62 04 */ addi r4, r4, lbl_805A6204@l
/* 802C9564 002C64C4 38 84 62 04 */ addi r4, r4, mModelMatrix__9CGraphics@l
/* 802C9568 002C64C8 48 04 96 0D */ bl __ct__12CTransform4fFRC12CTransform4f
/* 802C956C 002C64CC C0 22 C3 F0 */ lfs f1, lbl_805AE110@sda21(r2)
/* 802C9570 002C64D0 38 61 00 14 */ addi r3, r1, 0x14
asm/Kyoto/Animation/DolphinCSkinnedModel.s
+4 -4
View File
@@ -701,9 +701,9 @@ DoDrawCallback__13CSkinnedModelF14FCustomDrawCPv:
/* 80352F48 0034FEA8 88 03 00 39 */ lbz r0, 0x39(r3)
/* 80352F4C 0034FEAC 28 00 00 00 */ cmplwi r0, 0
/* 80352F50 0034FEB0 41 82 00 68 */ beq lbl_80352FB8
/* 80352F54 0034FEB4 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 80352F54 0034FEB4 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 80352F58 0034FEB8 38 61 00 38 */ addi r3, r1, 0x38
/* 80352F5C 0034FEBC 38 84 62 04 */ addi r4, r4, lbl_805A6204@l
/* 80352F5C 0034FEBC 38 84 62 04 */ addi r4, r4, mModelMatrix__9CGraphics@l
/* 80352F60 0034FEC0 4B FB FC 15 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 80352F64 0034FEC4 80 BF 00 18 */ lwz r5, 0x18(r31)
/* 80352F68 0034FEC8 38 61 00 08 */ addi r3, r1, 8
@@ -785,9 +785,9 @@ sub_80353064:
/* 80353080 0034FFE0 88 03 00 39 */ lbz r0, 0x39(r3)
/* 80353084 0034FFE4 28 00 00 00 */ cmplwi r0, 0
/* 80353088 0034FFE8 41 82 00 4C */ beq lbl_803530D4
/* 8035308C 0034FFEC 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 8035308C 0034FFEC 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 80353090 0034FFF0 38 61 00 38 */ addi r3, r1, 0x38
/* 80353094 0034FFF4 38 84 62 04 */ addi r4, r4, lbl_805A6204@l
/* 80353094 0034FFF4 38 84 62 04 */ addi r4, r4, mModelMatrix__9CGraphics@l
/* 80353098 0034FFF8 4B FB FA DD */ bl __ct__12CTransform4fFRC12CTransform4f
/* 8035309C 0034FFFC 80 BE 00 18 */ lwz r5, 0x18(r30)
/* 803530A0 00350000 38 61 00 08 */ addi r3, r1, 8
asm/Kyoto/Graphics/CCubeMaterial.s
+24 -24
View File
@@ -283,8 +283,8 @@ lbl_80345990:
/* 8034599C 003428FC 48 00 04 90 */ b lbl_80345E2C
lbl_803459A0:
/* 803459A0 00342900 3C A0 80 4C */ lis r5, lbl_804BFF50@ha
/* 803459A4 00342904 3C 60 80 5A */ lis r3, lbl_805A6204@ha
/* 803459A8 00342908 38 83 62 04 */ addi r4, r3, lbl_805A6204@l
/* 803459A4 00342904 3C 60 80 5A */ lis r3, mModelMatrix__9CGraphics@ha
/* 803459A8 00342908 38 83 62 04 */ addi r4, r3, mModelMatrix__9CGraphics@l
/* 803459AC 0034290C 3B E5 FF 50 */ addi r31, r5, lbl_804BFF50@l
/* 803459B0 00342910 C0 04 00 0C */ lfs f0, 0xc(r4)
/* 803459B4 00342914 C0 3F 00 00 */ lfs f1, 0(r31)
@@ -460,15 +460,15 @@ lbl_80345BE0:
/* 80345C4C 00342BAC 48 00 01 E0 */ b lbl_80345E2C
lbl_80345C50:
/* 80345C50 00342BB0 EC 01 F8 28 */ fsubs f0, f1, f31
/* 80345C54 00342BB4 3C 60 80 5A */ lis r3, lbl_805A61D4@ha
/* 80345C58 00342BB8 38 83 61 D4 */ addi r4, r3, lbl_805A61D4@l
/* 80345C54 00342BB4 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 80345C58 00342BB8 38 83 61 D4 */ addi r4, r3, mViewMatrix__9CGraphics@l
/* 80345C5C 00342BBC 38 61 00 88 */ addi r3, r1, 0x88
/* 80345C60 00342BC0 EC 00 08 24 */ fdivs f0, f0, f1
/* 80345C64 00342BC4 D0 0D A9 90 */ stfs f0, lbl_805A9550@sda21(r13)
/* 80345C68 00342BC8 4B FC D0 35 */ bl GetQuickInverse__12CTransform4fCFv
/* 80345C6C 00342BCC 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 80345C6C 00342BCC 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 80345C70 00342BD0 38 61 00 B8 */ addi r3, r1, 0xb8
/* 80345C74 00342BD4 38 A4 62 04 */ addi r5, r4, lbl_805A6204@l
/* 80345C74 00342BD4 38 A4 62 04 */ addi r5, r4, mModelMatrix__9CGraphics@l
/* 80345C78 00342BD8 38 81 00 88 */ addi r4, r1, 0x88
/* 80345C7C 00342BDC 4B FC CC D5 */ bl __ml__12CTransform4fCFRC12CTransform4f
/* 80345C80 00342BE0 38 61 01 18 */ addi r3, r1, 0x118
@@ -1299,7 +1299,7 @@ lbl_80346810:
/* 8034682C 0034378C 38 00 00 00 */ li r0, 0
lbl_80346830:
/* 80346830 00343790 54 05 07 FE */ clrlwi r5, r0, 0x1f
/* 80346834 00343794 88 6D A8 16 */ lbz r3, lbl_805A93D6@sda21(r13)
/* 80346834 00343794 88 6D A8 16 */ lbz r3, mLightActive__9CGraphics@sda21(r13)
/* 80346838 00343798 88 0D A9 A0 */ lbz r0, lbl_805A9560@sda21(r13)
/* 8034683C 0034379C 51 25 1D 78 */ rlwimi r5, r9, 3, 0x15, 0x1c
/* 80346840 003437A0 3C 80 80 5A */ lis r4, lbl_805A53EC@ha
@@ -1397,7 +1397,7 @@ lbl_8034696C:
lbl_80346998:
/* 80346998 003438F8 28 1E 00 01 */ cmplwi r30, 1
/* 8034699C 003438FC 41 80 00 A8 */ blt lbl_80346A44
/* 803469A0 00343900 88 8D A8 16 */ lbz r4, lbl_805A93D6@sda21(r13)
/* 803469A0 00343900 88 8D A8 16 */ lbz r4, mLightActive__9CGraphics@sda21(r13)
/* 803469A4 00343904 3C 60 80 5A */ lis r3, lbl_805A53EC@ha
/* 803469A8 00343908 39 03 53 EC */ addi r8, r3, lbl_805A53EC@l
/* 803469AC 0034390C 57 E7 00 3C */ rlwinm r7, r31, 0, 0, 0x1e
@@ -2569,13 +2569,13 @@ HandleAnimatedUV__FPCUi9_GXTexMtx11_GXPTTexMtx:
/* 80347A58 003449B8 4E 80 04 20 */ bctr
.global lbl_80347A5C
lbl_80347A5C:
/* 80347A5C 003449BC 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 80347A5C 003449BC 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 80347A60 003449C0 38 61 00 CC */ addi r3, r1, 0xcc
/* 80347A64 003449C4 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 80347A64 003449C4 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 80347A68 003449C8 4B FC B2 35 */ bl GetQuickInverse__12CTransform4fCFv
/* 80347A6C 003449CC 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 80347A6C 003449CC 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 80347A70 003449D0 38 61 00 FC */ addi r3, r1, 0xfc
/* 80347A74 003449D4 38 A4 62 04 */ addi r5, r4, lbl_805A6204@l
/* 80347A74 003449D4 38 A4 62 04 */ addi r5, r4, mModelMatrix__9CGraphics@l
/* 80347A78 003449D8 38 81 00 CC */ addi r4, r1, 0xcc
/* 80347A7C 003449DC 4B FC B4 B5 */ bl MultiplyIgnoreTranslation__12CTransform4fCFRC12CTransform4f
/* 80347A80 003449E0 38 61 02 4C */ addi r3, r1, 0x24c
@@ -2601,13 +2601,13 @@ lbl_80347A5C:
/* 80347AD0 00344A30 48 00 05 14 */ b lbl_80347FE4
.global lbl_80347AD4
lbl_80347AD4:
/* 80347AD4 00344A34 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 80347AD4 00344A34 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 80347AD8 00344A38 38 61 00 6C */ addi r3, r1, 0x6c
/* 80347ADC 00344A3C 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 80347ADC 00344A3C 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 80347AE0 00344A40 4B FC B1 BD */ bl GetQuickInverse__12CTransform4fCFv
/* 80347AE4 00344A44 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 80347AE4 00344A44 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 80347AE8 00344A48 38 61 00 9C */ addi r3, r1, 0x9c
/* 80347AEC 00344A4C 38 A4 62 04 */ addi r5, r4, lbl_805A6204@l
/* 80347AEC 00344A4C 38 A4 62 04 */ addi r5, r4, mModelMatrix__9CGraphics@l
/* 80347AF0 00344A50 38 81 00 6C */ addi r4, r1, 0x6c
/* 80347AF4 00344A54 4B FC AE 5D */ bl __ml__12CTransform4fCFRC12CTransform4f
/* 80347AF8 00344A58 38 61 02 1C */ addi r3, r1, 0x21c
@@ -2753,9 +2753,9 @@ lbl_80347CF0:
/* 80347D08 00344C68 48 00 02 DC */ b lbl_80347FE4
.global lbl_80347D0C
lbl_80347D0C:
/* 80347D0C 00344C6C 3C 60 80 5A */ lis r3, lbl_805A6204@ha
/* 80347D0C 00344C6C 3C 60 80 5A */ lis r3, mModelMatrix__9CGraphics@ha
/* 80347D10 00344C70 83 9F 00 60 */ lwz r28, 0x60(r31)
/* 80347D14 00344C74 3B 63 62 04 */ addi r27, r3, lbl_805A6204@l
/* 80347D14 00344C74 3B 63 62 04 */ addi r27, r3, mModelMatrix__9CGraphics@l
/* 80347D18 00344C78 83 BF 00 64 */ lwz r29, 0x64(r31)
/* 80347D1C 00344C7C C0 42 CB D8 */ lfs f2, lbl_805AE8F8@sda21(r2)
/* 80347D20 00344C80 38 61 01 BC */ addi r3, r1, 0x1bc
@@ -2839,21 +2839,21 @@ lbl_80347D0C:
/* 80347E58 00344DB8 48 00 01 8C */ b lbl_80347FE4
.global lbl_80347E5C
lbl_80347E5C:
/* 80347E5C 00344DBC 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 80347E5C 00344DBC 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 80347E60 00344DC0 38 61 00 0C */ addi r3, r1, 0xc
/* 80347E64 00344DC4 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 80347E64 00344DC4 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 80347E68 00344DC8 4B FC AE 35 */ bl GetQuickInverse__12CTransform4fCFv
/* 80347E6C 00344DCC 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 80347E6C 00344DCC 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 80347E70 00344DD0 38 61 00 3C */ addi r3, r1, 0x3c
/* 80347E74 00344DD4 38 A4 62 04 */ addi r5, r4, lbl_805A6204@l
/* 80347E74 00344DD4 38 A4 62 04 */ addi r5, r4, mModelMatrix__9CGraphics@l
/* 80347E78 00344DD8 38 81 00 0C */ addi r4, r1, 0xc
/* 80347E7C 00344DDC 4B FC B0 B5 */ bl MultiplyIgnoreTranslation__12CTransform4fCFRC12CTransform4f
/* 80347E80 00344DE0 38 61 01 5C */ addi r3, r1, 0x15c
/* 80347E84 00344DE4 38 81 00 3C */ addi r4, r1, 0x3c
/* 80347E88 00344DE8 4B FC AC ED */ bl __ct__12CTransform4fFRC12CTransform4f
/* 80347E8C 00344DEC 3C 60 80 5A */ lis r3, lbl_805A61D4@ha
/* 80347E8C 00344DEC 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 80347E90 00344DF0 3C C0 43 30 */ lis r6, 0x4330
/* 80347E94 00344DF4 38 A3 61 D4 */ addi r5, r3, lbl_805A61D4@l
/* 80347E94 00344DF4 38 A3 61 D4 */ addi r5, r3, mViewMatrix__9CGraphics@l
/* 80347E98 00344DF8 81 1F 00 C0 */ lwz r8, 0xc0(r31)
/* 80347E9C 00344DFC C0 25 00 0C */ lfs f1, 0xc(r5)
/* 80347EA0 00344E00 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
asm/Kyoto/Graphics/CCubeModel.s
+1 -1
View File
@@ -1179,7 +1179,7 @@ SetSkinningArraysCurrent__10CCubeModelCFPCfPCf:
/* 803075EC 0030454C 90 01 00 14 */ stw r0, 0x14(r1)
/* 803075F0 00304550 93 E1 00 0C */ stw r31, 0xc(r1)
/* 803075F4 00304554 7C 7F 1B 78 */ mr r31, r3
/* 803075F8 00304558 38 6D A7 B8 */ addi r3, r13, lbl_805A9378@sda21
/* 803075F8 00304558 38 6D A7 B8 */ addi r3, r13, sRenderState__9CGraphics@sda21
/* 803075FC 0030455C 80 DF 00 10 */ lwz r6, 0x10(r31)
/* 80307600 00304560 48 00 1D 69 */ bl SetVtxState__Q29CGraphics12CRenderStateFPCfPCfPCUi
/* 80307604 00304564 7F E3 FB 78 */ mr r3, r31
asm/Kyoto/Graphics/CCubeMoviePlayer.s
+1 -1
View File
@@ -550,7 +550,7 @@ DrawFrame__12CMoviePlayerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f:
/* 8035BC38 00358B98 88 1B 00 F4 */ lbz r0, 0xf4(r27)
/* 8035BC3C 00358B9C 1C A3 00 28 */ mulli r5, r3, 0x28
/* 8035BC40 00358BA0 80 DB 00 8C */ lwz r6, 0x8c(r27)
/* 8035BC44 00358BA4 8B 2D A8 14 */ lbz r25, lbl_805A93D4@sda21(r13)
/* 8035BC44 00358BA4 8B 2D A8 14 */ lbz r25, mLastFrameUsedAbove__9CGraphics@sda21(r13)
/* 8035BC48 00358BA8 54 04 D7 FE */ rlwinm r4, r0, 0x1a, 0x1f, 0x1f
/* 8035BC4C 00358BAC 7F 23 CB 78 */ mr r3, r25
/* 8035BC50 00358BB0 7F 46 2A 14 */ add r26, r6, r5
asm/Kyoto/Graphics/CTevCombiners.s
+10 -9
View File
@@ -1,6 +1,7 @@
.include "macros.inc"
.comm lbl_805A564C, 0x4C, 4
# Moved from kEnvPassthru__9CGraphics in retail
.comm kEnvPassthru__13CTevCombiners, 0x4C, 4
.section .ctors, "wa"
lbl_ctor:
@@ -38,11 +39,11 @@ lbl_805A9360:
ResetStates__13CTevCombinersFv:
/* 80308EA8 00305E08 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80308EAC 00305E0C 7C 08 02 A6 */ mflr r0
/* 80308EB0 00305E10 3C 60 80 5A */ lis r3, lbl_805A564C@ha
/* 80308EB0 00305E10 3C 60 80 5A */ lis r3, kEnvPassthru__13CTevCombiners@ha
/* 80308EB4 00305E14 38 AD 9C 60 */ addi r5, r13, lbl_805A8820@sda21
/* 80308EB8 00305E18 90 01 00 14 */ stw r0, 0x14(r1)
/* 80308EBC 00305E1C 38 00 00 00 */ li r0, 0
/* 80308EC0 00305E20 38 63 56 4C */ addi r3, r3, lbl_805A564C@l
/* 80308EC0 00305E20 38 63 56 4C */ addi r3, r3, kEnvPassthru__13CTevCombiners@l
/* 80308EC4 00305E24 38 80 00 00 */ li r4, 0
/* 80308EC8 00305E28 98 0D 9C 60 */ stb r0, lbl_805A8820@sda21(r13)
/* 80308ECC 00305E2C 98 05 00 01 */ stb r0, 1(r5)
@@ -123,9 +124,9 @@ SetPassCombiners__13CTevCombinersFiRCQ213CTevCombiners8CTevPass:
SetupPass__13CTevCombinersFiRCQ213CTevCombiners8CTevPass:
/* 80308FD8 00305F38 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80308FDC 00305F3C 7C 08 02 A6 */ mflr r0
/* 80308FE0 00305F40 3C A0 80 5A */ lis r5, lbl_805A564C@ha
/* 80308FE0 00305F40 3C A0 80 5A */ lis r5, kEnvPassthru__13CTevCombiners@ha
/* 80308FE4 00305F44 90 01 00 14 */ stw r0, 0x14(r1)
/* 80308FE8 00305F48 38 05 56 4C */ addi r0, r5, lbl_805A564C@l
/* 80308FE8 00305F48 38 05 56 4C */ addi r0, r5, kEnvPassthru__13CTevCombiners@l
/* 80308FEC 00305F4C 7C 04 00 40 */ cmplw r4, r0
/* 80308FF0 00305F50 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80308FF4 00305F54 7C 7F 1B 78 */ mr r31, r3
@@ -151,9 +152,9 @@ lbl_80309020:
DeletePass__13CTevCombinersFi:
/* 80309034 00305F94 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80309038 00305F98 7C 08 02 A6 */ mflr r0
/* 8030903C 00305F9C 3C 80 80 5A */ lis r4, lbl_805A564C@ha
/* 8030903C 00305F9C 3C 80 80 5A */ lis r4, kEnvPassthru__13CTevCombiners@ha
/* 80309040 00305FA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80309044 00305FA4 38 84 56 4C */ addi r4, r4, lbl_805A564C@l
/* 80309044 00305FA4 38 84 56 4C */ addi r4, r4, kEnvPassthru__13CTevCombiners@l
/* 80309048 00305FA8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8030904C 00305FAC 7C 7F 1B 78 */ mr r31, r3
/* 80309050 00305FB0 4B FF FF 59 */ bl SetPassCombiners__13CTevCombinersFiRCQ213CTevCombiners8CTevPass
@@ -283,9 +284,9 @@ __sinit_CTevCombiners_cpp:
/* 80309200 00306160 38 80 00 0F */ li r4, 0xf
/* 80309204 00306164 4B FF FF 21 */ bl __ct__Q213CTevCombiners8ColorVarFQ213CTevCombiners9EColorSrc
/* 80309208 00306168 80 A1 00 24 */ lwz r5, 0x24(r1)
/* 8030920C 0030616C 3C 60 80 5A */ lis r3, lbl_805A564C@ha
/* 8030920C 0030616C 3C 60 80 5A */ lis r3, kEnvPassthru__13CTevCombiners@ha
/* 80309210 00306170 81 21 00 20 */ lwz r9, 0x20(r1)
/* 80309214 00306174 38 63 56 4C */ addi r3, r3, lbl_805A564C@l
/* 80309214 00306174 38 63 56 4C */ addi r3, r3, kEnvPassthru__13CTevCombiners@l
/* 80309218 00306178 81 01 00 1C */ lwz r8, 0x1c(r1)
/* 8030921C 0030617C 38 81 00 38 */ addi r4, r1, 0x38
/* 80309220 00306180 80 01 00 18 */ lwz r0, 0x18(r1)
asm/Kyoto/Graphics/DolphinCGraphics.s
+604 -617
View File
File diff suppressed because it is too large Load Diff
asm/Kyoto/Particles/CElementGen.s
+29 -29
View File
@@ -1218,9 +1218,9 @@ lbl_80318054:
/* 803180B4 00315014 38 80 00 00 */ li r4, 0
/* 803180B8 00315018 38 A0 00 01 */ li r5, 1
/* 803180BC 0031501C 4B FF 76 81 */ bl Load__8CTextureCF11_GXTexMapIDQ28CTexture10EClampMode
/* 803180C0 00315020 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 803180C0 00315020 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 803180C4 00315024 38 60 00 00 */ li r3, 0
/* 803180C8 00315028 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 803180C8 00315028 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 803180CC 0031502C 4B FF 21 ED */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 803180D0 00315030 56 80 06 3F */ clrlwi. r0, r20, 0x18
/* 803180D4 00315034 41 82 00 D8 */ beq lbl_803181AC
@@ -1278,7 +1278,7 @@ lbl_80318054:
/* 803181A4 00315104 4B FF 0C 71 */ bl SetNumTexGens__3CGXFUc
/* 803181A8 00315108 48 00 00 10 */ b lbl_803181B8
lbl_803181AC:
/* 803181AC 0031510C 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 803181AC 0031510C 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 803181B0 00315110 38 60 00 01 */ li r3, 1
/* 803181B4 00315114 4B FF 21 05 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
lbl_803181B8:
@@ -1304,10 +1304,10 @@ lbl_803181B8:
/* 80318204 00315164 48 02 8C 3D */ bl __dt__6CTokenFv
/* 80318208 00315168 48 00 00 1C */ b lbl_80318224
lbl_8031820C:
/* 8031820C 0031516C 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 8031820C 0031516C 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 80318210 00315170 38 60 00 00 */ li r3, 0
/* 80318214 00315174 4B FF 20 A5 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80318218 00315178 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 80318218 00315178 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 8031821C 0031517C 38 60 00 01 */ li r3, 1
/* 80318220 00315180 4B FF 20 99 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
lbl_80318224:
@@ -1925,9 +1925,9 @@ RenderLines__11CElementGenFv:
/* 80318B4C 00315AAC 7C A0 03 78 */ or r0, r5, r0
/* 80318B50 00315AB0 54 1E 0F FE */ srwi r30, r0, 0x1f
/* 80318B54 00315AB4 4B FF 9B 2D */ bl __ct__13CGlobalRandomFR9CRandom16
/* 80318B58 00315AB8 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 80318B58 00315AB8 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 80318B5C 00315ABC 38 61 02 34 */ addi r3, r1, 0x234
/* 80318B60 00315AC0 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 80318B60 00315AC0 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 80318B64 00315AC4 4B FF A0 11 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 80318B68 00315AC8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha
/* 80318B6C 00315ACC 38 61 01 A4 */ addi r3, r1, 0x1a4
@@ -2042,9 +2042,9 @@ lbl_80318CBC:
/* 80318D14 00315C74 38 80 00 00 */ li r4, 0
/* 80318D18 00315C78 38 A0 00 01 */ li r5, 1
/* 80318D1C 00315C7C 4B FF 6A 21 */ bl Load__8CTextureCF11_GXTexMapIDQ28CTexture10EClampMode
/* 80318D20 00315C80 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 80318D20 00315C80 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 80318D24 00315C84 38 60 00 00 */ li r3, 0
/* 80318D28 00315C88 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 80318D28 00315C88 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 80318D2C 00315C8C 4B FF 15 8D */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80318D30 00315C90 28 1E 00 00 */ cmplwi r30, 0
/* 80318D34 00315C94 41 82 01 18 */ beq lbl_80318E4C
@@ -2119,7 +2119,7 @@ lbl_80318E38:
/* 80318E44 00315DA4 4B FF 14 75 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80318E48 00315DA8 48 00 00 10 */ b lbl_80318E58
lbl_80318E4C:
/* 80318E4C 00315DAC 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 80318E4C 00315DAC 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 80318E50 00315DB0 38 60 00 01 */ li r3, 1
/* 80318E54 00315DB4 4B FF 14 65 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
lbl_80318E58:
@@ -2147,10 +2147,10 @@ lbl_80318E58:
/* 80318EAC 00315E0C 48 02 7F 95 */ bl __dt__6CTokenFv
/* 80318EB0 00315E10 48 00 00 1C */ b lbl_80318ECC
lbl_80318EB4:
/* 80318EB4 00315E14 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 80318EB4 00315E14 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 80318EB8 00315E18 38 60 00 00 */ li r3, 0
/* 80318EBC 00315E1C 4B FF 13 FD */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80318EC0 00315E20 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 80318EC0 00315E20 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 80318EC4 00315E24 38 60 00 01 */ li r3, 1
/* 80318EC8 00315E28 4B FF 13 F1 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
lbl_80318ECC:
@@ -2454,9 +2454,9 @@ RenderParticlesIndirectTexture__11CElementGenFv:
/* 8031932C 0031628C F2 C1 03 18 */ psq_st f22, 792(r1), 0, qr0
/* 80319330 00316290 BD C1 02 C8 */ stmw r14, 0x2c8(r1)
/* 80319334 00316294 7C 3F 0B 78 */ mr r31, r1
/* 80319338 00316298 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 80319338 00316298 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 8031933C 0031629C 7C 7E 1B 78 */ mr r30, r3
/* 80319340 003162A0 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 80319340 003162A0 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 80319344 003162A4 38 7F 02 8C */ addi r3, r31, 0x28c
/* 80319348 003162A8 4B FF 98 2D */ bl __ct__12CTransform4fFRC12CTransform4f
/* 8031934C 003162AC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha
@@ -3035,7 +3035,7 @@ lbl_80319B98:
/* 80319C00 00316B60 C3 7F 01 34 */ lfs f27, 0x134(r31)
/* 80319C04 00316B64 C3 5F 01 38 */ lfs f26, 0x138(r31)
/* 80319C08 00316B68 41 82 01 8C */ beq lbl_80319D94
/* 80319C0C 00316B6C 81 ED A8 28 */ lwz r15, lbl_805A93E8@sda21(r13)
/* 80319C0C 00316B6C 81 ED A8 28 */ lwz r15, mpSpareBuffer__9CGraphics@sda21(r13)
/* 80319C10 00316B70 54 63 04 3E */ clrlwi r3, r3, 0x10
/* 80319C14 00316B74 54 04 04 3E */ clrlwi r4, r0, 0x10
/* 80319C18 00316B78 54 A5 04 3E */ clrlwi r5, r5, 0x10
@@ -3046,7 +3046,7 @@ lbl_80319B98:
/* 80319C2C 00316B8C 38 A0 00 04 */ li r5, 4
/* 80319C30 00316B90 38 C0 00 00 */ li r6, 0
/* 80319C34 00316B94 48 05 F2 4D */ bl GXSetTexCopyDst
/* 80319C38 00316B98 83 0D A8 24 */ lwz r24, lbl_805A93E4@sda21(r13)
/* 80319C38 00316B98 83 0D A8 24 */ lwz r24, mSpareBufferSize__9CGraphics@sda21(r13)
/* 80319C3C 00316B9C 56 C3 04 3E */ clrlwi r3, r22, 0x10
/* 80319C40 00316BA0 56 E4 04 3E */ clrlwi r4, r23, 0x10
/* 80319C44 00316BA4 38 A0 00 04 */ li r5, 4
@@ -3195,9 +3195,9 @@ sub_80319e3c:
/* 80319E6C 00316DCC F3 61 01 78 */ psq_st f27, 376(r1), 0, qr0
/* 80319E70 00316DD0 BE 01 01 30 */ stmw r16, 0x130(r1)
/* 80319E74 00316DD4 7C 3F 0B 78 */ mr r31, r1
/* 80319E78 00316DD8 3C A0 80 5A */ lis r5, lbl_805A61D4@ha
/* 80319E78 00316DD8 3C A0 80 5A */ lis r5, mViewMatrix__9CGraphics@ha
/* 80319E7C 00316DDC 7C 7E 1B 78 */ mr r30, r3
/* 80319E80 00316DE0 38 05 61 D4 */ addi r0, r5, lbl_805A61D4@l
/* 80319E80 00316DE0 38 05 61 D4 */ addi r0, r5, mViewMatrix__9CGraphics@l
/* 80319E84 00316DE4 7C 93 23 78 */ mr r19, r4
/* 80319E88 00316DE8 7C 04 03 78 */ mr r4, r0
/* 80319E8C 00316DEC 38 7F 00 F4 */ addi r3, r31, 0xf4
@@ -3233,11 +3233,11 @@ sub_80319e3c:
/* 80319F04 00316E64 38 C0 00 07 */ li r6, 7
/* 80319F08 00316E68 38 E0 00 00 */ li r7, 0
/* 80319F0C 00316E6C 4B FF 1B 1D */ bl SetAlphaCompare__9CGraphicsF13ERglAlphaFuncUc11ERglAlphaOp13ERglAlphaFuncUc
/* 80319F10 00316E70 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 80319F10 00316E70 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 80319F14 00316E74 38 60 00 00 */ li r3, 0
/* 80319F18 00316E78 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 80319F18 00316E78 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 80319F1C 00316E7C 4B FF 03 9D */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80319F20 00316E80 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 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)
@@ -3736,8 +3736,8 @@ lbl_8031A688:
/* 8031A688 003175E8 38 60 00 00 */ li r3, 0
/* 8031A68C 003175EC 4B FF 13 E5 */ bl SetCullMode__9CGraphicsF12ERglCullMode
/* 8031A690 003175F0 80 DE 03 38 */ lwz r6, 0x338(r30)
/* 8031A694 003175F4 3C 60 80 5A */ lis r3, lbl_805A61D4@ha
/* 8031A698 003175F8 38 83 61 D4 */ addi r4, r3, lbl_805A61D4@l
/* 8031A694 003175F4 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 8031A698 003175F8 38 83 61 D4 */ addi r4, r3, mViewMatrix__9CGraphics@l
/* 8031A69C 003175FC 20 A6 FF FF */ subfic r5, r6, -1
/* 8031A6A0 00317600 38 06 00 01 */ addi r0, r6, 1
/* 8031A6A4 00317604 7C A0 03 78 */ or r0, r5, r0
@@ -3877,9 +3877,9 @@ lbl_8031A858:
/* 8031A8B0 00317810 38 80 00 00 */ li r4, 0
/* 8031A8B4 00317814 38 A0 00 01 */ li r5, 1
/* 8031A8B8 00317818 4B FF 4E 85 */ bl Load__8CTextureCF11_GXTexMapIDQ28CTexture10EClampMode
/* 8031A8BC 0031781C 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 8031A8BC 0031781C 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 8031A8C0 00317820 38 60 00 00 */ li r3, 0
/* 8031A8C4 00317824 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 8031A8C4 00317824 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 8031A8C8 00317828 4B FE F9 F1 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 8031A8CC 0031782C 28 14 00 00 */ cmplwi r20, 0
/* 8031A8D0 00317830 41 82 01 18 */ beq lbl_8031A9E8
@@ -3954,7 +3954,7 @@ lbl_8031A9D4:
/* 8031A9E0 00317940 4B FE F8 D9 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 8031A9E4 00317944 48 00 00 10 */ b lbl_8031A9F4
lbl_8031A9E8:
/* 8031A9E8 00317948 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 8031A9E8 00317948 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 8031A9EC 0031794C 38 60 00 01 */ li r3, 1
/* 8031A9F0 00317950 4B FE F8 C9 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
lbl_8031A9F4:
@@ -3982,10 +3982,10 @@ lbl_8031A9F4:
/* 8031AA48 003179A8 48 02 63 F9 */ bl __dt__6CTokenFv
/* 8031AA4C 003179AC 48 00 00 1C */ b lbl_8031AA68
lbl_8031AA50:
/* 8031AA50 003179B0 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 8031AA50 003179B0 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 8031AA54 003179B4 38 60 00 00 */ li r3, 0
/* 8031AA58 003179B8 4B FE F8 61 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 8031AA5C 003179BC 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 8031AA5C 003179BC 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 8031AA60 003179C0 38 60 00 01 */ li r3, 1
/* 8031AA64 003179C4 4B FE F8 55 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
lbl_8031AA68:
@@ -5802,7 +5802,7 @@ Render__11CElementGenFv:
/* 8031C564 003194C4 7C 7D 1B 78 */ mr r29, r3
/* 8031C568 003194C8 93 81 00 20 */ stw r28, 0x20(r1)
/* 8031C56C 003194CC 48 06 8E 3D */ bl OSGetTime
/* 8031C570 003194D0 88 0D A8 16 */ lbz r0, lbl_805A93D6@sda21(r13)
/* 8031C570 003194D0 88 0D A8 16 */ lbz r0, mLightActive__9CGraphics@sda21(r13)
/* 8031C574 003194D4 7C 9E 23 78 */ mr r30, r4
/* 8031C578 003194D8 7C 7F 1B 78 */ mr r31, r3
/* 8031C57C 003194DC 98 1D 02 74 */ stb r0, 0x274(r29)
asm/Kyoto/Particles/CParticleSwoosh.s
+6 -6
View File
@@ -3094,9 +3094,9 @@ Render2SidedNoSplineNoGaps__15CParticleSwooshFv:
/* 8032D3F8 0032A358 38 61 01 F4 */ addi r3, r1, 0x1f4
/* 8032D3FC 0032A35C 38 81 01 94 */ addi r4, r1, 0x194
/* 8032D400 0032A360 4B FE 57 75 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 8032D404 0032A364 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 8032D404 0032A364 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 8032D408 0032A368 38 61 00 D4 */ addi r3, r1, 0xd4
/* 8032D40C 0032A36C 38 A4 61 D4 */ addi r5, r4, lbl_805A61D4@l
/* 8032D40C 0032A36C 38 A4 61 D4 */ addi r5, r4, mViewMatrix__9CGraphics@l
/* 8032D410 0032A370 38 81 01 F4 */ addi r4, r1, 0x1f4
/* 8032D414 0032A374 4B FE 55 3D */ bl __ml__12CTransform4fCFRC12CTransform4f
/* 8032D418 0032A378 38 61 01 C4 */ addi r3, r1, 0x1c4
@@ -3838,17 +3838,17 @@ lbl_8032DEE0:
/* 8032DF10 0032AE70 EC 02 00 24 */ fdivs f0, f2, f0
/* 8032DF14 0032AE74 D0 1D 01 E8 */ stfs f0, 0x1e8(r29)
lbl_8032DF18:
/* 8032DF18 0032AE78 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 8032DF18 0032AE78 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 8032DF1C 0032AE7C 38 60 00 00 */ li r3, 0
/* 8032DF20 0032AE80 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 8032DF20 0032AE80 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 8032DF24 0032AE84 4B FD C3 95 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 8032DF28 0032AE88 48 00 00 10 */ b lbl_8032DF38
lbl_8032DF2C:
/* 8032DF2C 0032AE8C 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 8032DF2C 0032AE8C 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 8032DF30 0032AE90 38 60 00 00 */ li r3, 0
/* 8032DF34 0032AE94 4B FD C3 85 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
lbl_8032DF38:
/* 8032DF38 0032AE98 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13)
/* 8032DF38 0032AE98 80 8D 9C 68 */ lwz r4, kEnvPassthru__9CGraphics@sda21(r13)
/* 8032DF3C 0032AE9C 38 60 00 01 */ li r3, 1
/* 8032DF40 0032AEA0 4B FD C3 79 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 8032DF44 0032AEA4 80 1D 01 B8 */ lwz r0, 0x1b8(r29)
asm/MetaRender/CCubeRenderer.s
+64 -64
View File
@@ -447,9 +447,9 @@ AllocatePhazonSuitMaskTexture__13CCubeRendererFv:
/* 802B5FB4 002B2F14 48 05 F8 B9 */ bl __nw__FUlPCcPCc
/* 802B5FB8 002B2F18 7C 7F 1B 79 */ or. r31, r3, r3
/* 802B5FBC 002B2F1C 41 82 00 34 */ beq lbl_802B5FF0
/* 802B5FC0 002B2F20 3C A0 80 3F */ lis r5, lbl_803ED910@ha
/* 802B5FC0 002B2F20 3C A0 80 3F */ lis r5, mViewport__9CGraphics@ha
/* 802B5FC4 002B2F24 38 80 00 01 */ li r4, 1
/* 802B5FC8 002B2F28 38 C5 D9 10 */ addi r6, r5, lbl_803ED910@l
/* 802B5FC8 002B2F28 38 C5 D9 10 */ addi r6, r5, mViewport__9CGraphics@l
/* 802B5FCC 002B2F2C 38 E0 00 01 */ li r7, 1
/* 802B5FD0 002B2F30 80 A6 00 08 */ lwz r5, 8(r6)
/* 802B5FD4 002B2F34 80 06 00 0C */ lwz r0, 0xc(r6)
@@ -505,9 +505,9 @@ lbl_802B6000:
/* 802B6088 002B2FE8 80 1C 03 10 */ lwz r0, 0x310(r28)
/* 802B608C 002B2FEC 2C 00 00 00 */ cmpwi r0, 0
/* 802B6090 002B2FF0 41 82 01 64 */ beq lbl_802B61F4
/* 802B6094 002B2FF4 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802B6094 002B2FF4 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802B6098 002B2FF8 38 61 00 28 */ addi r3, r1, 0x28
/* 802B609C 002B2FFC 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 802B609C 002B2FFC 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 802B60A0 002B3000 48 05 CA D5 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 802B60A4 002B3004 48 05 3D B9 */ bl GetProjectionState__9CGraphicsFv
/* 802B60A8 002B3008 88 03 00 00 */ lbz r0, 0(r3)
@@ -527,9 +527,9 @@ lbl_802B6000:
/* 802B60E0 002B3040 80 BC 03 14 */ lwz r5, 0x314(r28)
/* 802B60E4 002B3044 28 05 00 00 */ cmplwi r5, 0
/* 802B60E8 002B3048 41 82 01 18 */ beq lbl_802B6200
/* 802B60EC 002B304C 3C 60 80 3F */ lis r3, lbl_803ED910@ha
/* 802B60EC 002B304C 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha
/* 802B60F0 002B3050 A8 85 00 04 */ lha r4, 4(r5)
/* 802B60F4 002B3054 38 63 D9 10 */ addi r3, r3, lbl_803ED910@l
/* 802B60F4 002B3054 38 63 D9 10 */ addi r3, r3, mViewport__9CGraphics@l
/* 802B60F8 002B3058 80 03 00 08 */ lwz r0, 8(r3)
/* 802B60FC 002B305C 7C 00 16 70 */ srawi r0, r0, 2
/* 802B6100 002B3060 7C 04 00 00 */ cmpw r4, r0
@@ -630,9 +630,9 @@ ReallyDrawPhazonSuitIndirectEffect__13CCubeRendererFRC6CColorRC8CTextureRC8CText
/* 802B625C 002B31BC DB A1 01 30 */ stfd f29, 0x130(r1)
/* 802B6260 002B31C0 F3 A1 01 38 */ psq_st f29, 312(r1), 0, qr0
/* 802B6264 002B31C4 BF 41 01 18 */ stmw r26, 0x118(r1)
/* 802B6268 002B31C8 3C 60 80 3F */ lis r3, lbl_803ED910@ha
/* 802B6268 002B31C8 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha
/* 802B626C 002B31CC 7C 9D 23 78 */ mr r29, r4
/* 802B6270 002B31D0 38 63 D9 10 */ addi r3, r3, lbl_803ED910@l
/* 802B6270 002B31D0 38 63 D9 10 */ addi r3, r3, mViewport__9CGraphics@l
/* 802B6274 002B31D4 FF A0 08 90 */ fmr f29, f1
/* 802B6278 002B31D8 FF C0 10 90 */ fmr f30, f2
/* 802B627C 002B31DC 83 E3 00 08 */ lwz r31, 8(r3)
@@ -681,7 +681,7 @@ ReallyDrawPhazonSuitIndirectEffect__13CCubeRendererFRC6CColorRC8CTextureRC8CText
/* 802B6328 002B3288 41 81 00 08 */ bgt lbl_802B6330
/* 802B632C 002B328C 48 00 05 E0 */ b lbl_802B690C
lbl_802B6330:
/* 802B6330 002B3290 80 CD A8 28 */ lwz r6, lbl_805A93E8@sda21(r13)
/* 802B6330 002B3290 80 CD A8 28 */ lwz r6, mpSpareBuffer__9CGraphics@sda21(r13)
/* 802B6334 002B3294 38 A0 00 04 */ li r5, 4
/* 802B6338 002B3298 80 E2 C7 A8 */ lwz r7, lbl_805AE4C8@sda21(r2)
/* 802B633C 002B329C 48 05 3C E5 */ bl LoadDolphinSpareTexture__9CGraphicsFii9_GXTexFmtPv11_GXTexMapID
@@ -889,8 +889,8 @@ lbl_802B6568:
/* 802B6654 002B35B4 48 05 17 D5 */ bl SetVtxDescv__3CGXFPC14_GXVtxDescList
/* 802B6658 002B35B8 48 05 38 05 */ bl GetProjectionState__9CGraphicsFv
/* 802B665C 002B35BC 88 03 00 00 */ lbz r0, 0(r3)
/* 802B6660 002B35C0 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802B6664 002B35C4 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 802B6660 002B35C0 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802B6664 002B35C4 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 802B6668 002B35C8 98 01 00 64 */ stb r0, 0x64(r1)
/* 802B666C 002B35CC C0 03 00 04 */ lfs f0, 4(r3)
/* 802B6670 002B35D0 D0 01 00 68 */ stfs f0, 0x68(r1)
@@ -1240,9 +1240,9 @@ DoPhazonSuitIndirectAlphaBlur__13CCubeRendererFff:
/* 802B6BB4 002B3B14 C0 22 C2 74 */ lfs f1, lbl_805ADF94@sda21(r2)
/* 802B6BB8 002B3B18 FF C0 10 90 */ fmr f30, f2
/* 802B6BBC 002B3B1C C0 42 C2 70 */ lfs f2, lbl_805ADF90@sda21(r2)
/* 802B6BC0 002B3B20 3C 80 80 3F */ lis r4, lbl_803ED910@ha
/* 802B6BC0 002B3B20 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha
/* 802B6BC4 002B3B24 FC 80 08 90 */ fmr f4, f1
/* 802B6BC8 002B3B28 38 84 D9 10 */ addi r4, r4, lbl_803ED910@l
/* 802B6BC8 002B3B28 38 84 D9 10 */ addi r4, r4, mViewport__9CGraphics@l
/* 802B6BCC 002B3B2C FC 60 10 90 */ fmr f3, f2
/* 802B6BD0 002B3B30 FC C0 10 90 */ fmr f6, f2
/* 802B6BD4 002B3B34 83 A4 00 08 */ lwz r29, 8(r4)
@@ -1730,9 +1730,9 @@ lbl_802B7244:
CopyTex__13CCubeRendererFibPv8GXTexFmtb:
/* 802B734C 002B42AC 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 802B7350 002B42B0 7C 08 02 A6 */ mflr r0
/* 802B7354 002B42B4 3C 60 80 3F */ lis r3, lbl_803ED910@ha
/* 802B7354 002B42B4 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha
/* 802B7358 002B42B8 90 01 00 34 */ stw r0, 0x34(r1)
/* 802B735C 002B42BC 38 63 D9 10 */ addi r3, r3, lbl_803ED910@l
/* 802B735C 002B42BC 38 63 D9 10 */ addi r3, r3, mViewport__9CGraphics@l
/* 802B7360 002B42C0 BF 21 00 14 */ stmw r25, 0x14(r1)
/* 802B7364 002B42C4 7C 9A 23 78 */ mr r26, r4
/* 802B7368 002B42C8 7C BB 2B 78 */ mr r27, r5
@@ -1788,7 +1788,7 @@ lbl_802B73EC:
/* 802B7420 002B4380 7F 83 E3 78 */ mr r3, r28
/* 802B7424 002B4384 48 00 00 08 */ b lbl_802B742C
lbl_802B7428:
/* 802B7428 002B4388 80 6D A8 28 */ lwz r3, lbl_805A93E8@sda21(r13)
/* 802B7428 002B4388 80 6D A8 28 */ lwz r3, mpSpareBuffer__9CGraphics@sda21(r13)
lbl_802B742C:
/* 802B742C 002B438C 57 C4 06 3E */ clrlwi r4, r30, 0x18
/* 802B7430 002B4390 48 0C 21 05 */ bl GXCopyTex
@@ -1803,8 +1803,8 @@ lbl_802B742C:
.global GetRenderToTexBuffer__13CCubeRendererFi
GetRenderToTexBuffer__13CCubeRendererFi:
/* 802B7454 002B43B4 80 0D A8 24 */ lwz r0, lbl_805A93E4@sda21(r13)
/* 802B7458 002B43B8 80 8D A8 28 */ lwz r4, lbl_805A93E8@sda21(r13)
/* 802B7454 002B43B4 80 0D A8 24 */ lwz r0, mSpareBufferSize__9CGraphics@sda21(r13)
/* 802B7458 002B43B8 80 8D A8 28 */ lwz r4, mpSpareBuffer__9CGraphics@sda21(r13)
/* 802B745C 002B43BC 7C 03 01 D6 */ mullw r0, r3, r0
/* 802B7460 002B43C0 54 00 E1 3E */ srwi r0, r0, 4
/* 802B7464 002B43C4 7C 64 02 14 */ add r3, r4, r0
@@ -3070,13 +3070,13 @@ sub_802b85cc:
/* 802B8628 002B5588 38 80 00 00 */ li r4, 0
/* 802B862C 002B558C 38 A0 00 00 */ li r5, 0
/* 802B8630 002B5590 48 05 71 0D */ bl Load__8CTextureCF11_GXTexMapIDQ28CTexture10EClampMode
/* 802B8634 002B5594 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802B8634 002B5594 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802B8638 002B5598 38 61 00 0C */ addi r3, r1, 0xc
/* 802B863C 002B559C 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 802B863C 002B559C 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 802B8640 002B55A0 48 05 A6 5D */ bl GetQuickInverse__12CTransform4fCFv
/* 802B8644 002B55A4 3C 80 80 5A */ lis r4, lbl_805A6204@ha
/* 802B8644 002B55A4 3C 80 80 5A */ lis r4, mModelMatrix__9CGraphics@ha
/* 802B8648 002B55A8 38 61 00 3C */ addi r3, r1, 0x3c
/* 802B864C 002B55AC 38 A4 62 04 */ addi r5, r4, lbl_805A6204@l
/* 802B864C 002B55AC 38 A4 62 04 */ addi r5, r4, mModelMatrix__9CGraphics@l
/* 802B8650 002B55B0 38 81 00 0C */ addi r4, r1, 0xc
/* 802B8654 002B55B4 48 05 A8 DD */ bl MultiplyIgnoreTranslation__12CTransform4fCFRC12CTransform4f
/* 802B8658 002B55B8 38 61 00 6C */ addi r3, r1, 0x6c
@@ -3448,9 +3448,9 @@ sub_802b8b48:
/* 802B8B60 002B5AC0 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, qr0
/* 802B8B64 002B5AC4 93 E1 00 AC */ stw r31, 0xac(r1)
/* 802B8B68 002B5AC8 93 C1 00 A8 */ stw r30, 0xa8(r1)
/* 802B8B6C 002B5ACC 3C 60 80 5A */ lis r3, lbl_805A61D4@ha
/* 802B8B6C 002B5ACC 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 802B8B70 002B5AD0 7C BE 2B 78 */ mr r30, r5
/* 802B8B74 002B5AD4 3B E3 61 D4 */ addi r31, r3, lbl_805A61D4@l
/* 802B8B74 002B5AD4 3B E3 61 D4 */ addi r31, r3, mViewMatrix__9CGraphics@l
/* 802B8B78 002B5AD8 7C 85 23 78 */ mr r5, r4
/* 802B8B7C 002B5ADC C3 DF 00 1C */ lfs f30, 0x1c(r31)
/* 802B8B80 002B5AE0 38 61 00 5C */ addi r3, r1, 0x5c
@@ -3771,9 +3771,9 @@ ReallyRenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC6CModelPC13CSkinnedMo
/* 802B8FF4 002B5F54 DB 01 03 A0 */ stfd f24, 0x3a0(r1)
/* 802B8FF8 002B5F58 F3 01 03 A8 */ psq_st f24, 936(r1), 0, qr0
/* 802B8FFC 002B5F5C BD C1 03 58 */ stmw r14, 0x358(r1)
/* 802B9000 002B5F60 80 0D A8 28 */ lwz r0, lbl_805A93E8@sda21(r13)
/* 802B9004 002B5F64 3D 00 80 3F */ lis r8, lbl_803ED910@ha
/* 802B9008 002B5F68 39 E8 D9 10 */ addi r15, r8, lbl_803ED910@l
/* 802B9000 002B5F60 80 0D A8 28 */ lwz r0, mpSpareBuffer__9CGraphics@sda21(r13)
/* 802B9004 002B5F64 3D 00 80 3F */ lis r8, mViewport__9CGraphics@ha
/* 802B9008 002B5F68 39 E8 D9 10 */ addi r15, r8, mViewport__9CGraphics@l
/* 802B900C 002B5F6C C3 62 C2 74 */ lfs f27, lbl_805ADF94@sda21(r2)
/* 802B9010 002B5F70 7C 08 03 78 */ mr r8, r0
/* 802B9014 002B5F74 90 01 03 2C */ stw r0, 0x32c(r1)
@@ -3790,7 +3790,7 @@ ReallyRenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC6CModelPC13CSkinnedMo
/* 802B9040 002B5FA0 80 0F 00 04 */ lwz r0, 4(r15)
/* 802B9044 002B5FA4 38 A5 30 00 */ addi r5, r5, 0x3000
/* 802B9048 002B5FA8 81 8F 00 0C */ lwz r12, 0xc(r15)
/* 802B904C 002B5FAC 3D 20 80 5A */ lis r9, lbl_805A6204@ha
/* 802B904C 002B5FAC 3D 20 80 5A */ lis r9, mModelMatrix__9CGraphics@ha
/* 802B9050 002B5FB0 90 01 03 34 */ stw r0, 0x334(r1)
/* 802B9054 002B5FB4 38 08 65 70 */ addi r0, r8, lbl_803D6570@l
/* 802B9058 002B5FB8 FF 40 D8 90 */ fmr f26, f27
@@ -3804,7 +3804,7 @@ ReallyRenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC6CModelPC13CSkinnedMo
/* 802B9078 002B5FD8 FF 00 D8 90 */ fmr f24, f27
/* 802B907C 002B5FDC 3A 00 00 00 */ li r16, 0
/* 802B9080 002B5FE0 90 61 00 10 */ stw r3, 0x10(r1)
/* 802B9084 002B5FE4 38 69 62 04 */ addi r3, r9, lbl_805A6204@l
/* 802B9084 002B5FE4 38 69 62 04 */ addi r3, r9, mModelMatrix__9CGraphics@l
/* 802B9088 002B5FE8 39 E0 01 40 */ li r15, 0x140
/* 802B908C 002B5FEC 3A 20 00 E0 */ li r17, 0xe0
/* 802B9090 002B5FF0 90 81 00 14 */ stw r4, 0x14(r1)
@@ -3817,9 +3817,9 @@ ReallyRenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC6CModelPC13CSkinnedMo
/* 802B90AC 002B600C 98 01 03 24 */ stb r0, 0x324(r1)
/* 802B90B0 002B6010 90 A1 03 28 */ stw r5, 0x328(r1)
/* 802B90B4 002B6014 48 05 9A C1 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 802B90B8 002B6018 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802B90B8 002B6018 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802B90BC 002B601C 38 61 02 14 */ addi r3, r1, 0x214
/* 802B90C0 002B6020 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 802B90C0 002B6020 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 802B90C4 002B6024 48 05 9A B1 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 802B90C8 002B6028 38 61 01 40 */ addi r3, r1, 0x140
/* 802B90CC 002B602C 48 05 32 65 */ bl GetPerspectiveProjectionMatrix__9CGraphicsFv
@@ -4346,9 +4346,9 @@ lbl_802B973C:
/* 802B9868 002B67C8 D0 21 00 A8 */ stfs f1, 0xa8(r1)
/* 802B986C 002B67CC D0 01 00 AC */ stfs f0, 0xac(r1)
/* 802B9870 002B67D0 48 07 EC 99 */ bl __ct__6CAABoxFRC9CVector3fRC9CVector3f
/* 802B9874 002B67D4 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802B9874 002B67D4 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802B9878 002B67D8 38 61 01 08 */ addi r3, r1, 0x108
/* 802B987C 002B67DC 38 A4 61 D4 */ addi r5, r4, lbl_805A61D4@l
/* 802B987C 002B67DC 38 A4 61 D4 */ addi r5, r4, mViewMatrix__9CGraphics@l
/* 802B9880 002B67E0 38 81 00 74 */ addi r4, r1, 0x74
/* 802B9884 002B67E4 C0 45 00 0C */ lfs f2, 0xc(r5)
/* 802B9888 002B67E8 7C BF 2B 78 */ mr r31, r5
@@ -4392,12 +4392,12 @@ lbl_802B9904:
/* 802B9910 002B6870 55 D8 06 3E */ clrlwi r24, r14, 0x18
/* 802B9914 002B6874 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha
/* 802B9918 002B6878 7C 18 00 D0 */ neg r0, r24
/* 802B991C 002B687C 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802B991C 002B687C 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802B9920 002B6880 7C 00 C3 78 */ or r0, r0, r24
/* 802B9924 002B6884 39 C3 66 70 */ addi r14, r3, sIdentity__12CTransform4f@l
/* 802B9928 002B6888 54 03 0F FE */ srwi r3, r0, 0x1f
/* 802B992C 002B688C CB C2 C2 A0 */ lfd f30, lbl_805ADFC0@sda21(r2)
/* 802B9930 002B6890 38 04 61 D4 */ addi r0, r4, lbl_805A61D4@l
/* 802B9930 002B6890 38 04 61 D4 */ addi r0, r4, mViewMatrix__9CGraphics@l
/* 802B9934 002B6894 C3 E2 C2 80 */ lfs f31, lbl_805ADFA0@sda21(r2)
/* 802B9938 002B6898 92 01 03 18 */ stw r16, 0x318(r1)
/* 802B993C 002B689C 3B 23 00 01 */ addi r25, r3, 1
@@ -5035,8 +5035,8 @@ lbl_802BA240:
/* 802BA2B4 002B7214 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f
/* 802BA2B8 002B7218 40 82 00 64 */ bne lbl_802BA31C
/* 802BA2BC 002B721C 80 04 00 00 */ lwz r0, 0(r4)
/* 802BA2C0 002B7220 3C 60 80 5A */ lis r3, lbl_805A6204@ha
/* 802BA2C4 002B7224 38 83 62 04 */ addi r4, r3, lbl_805A6204@l
/* 802BA2C0 002B7220 3C 60 80 5A */ lis r3, mModelMatrix__9CGraphics@ha
/* 802BA2C4 002B7224 38 83 62 04 */ addi r4, r3, mModelMatrix__9CGraphics@l
/* 802BA2C8 002B7228 7C A6 2B 78 */ mr r6, r5
/* 802BA2CC 002B722C 90 01 00 08 */ stw r0, 8(r1)
/* 802BA2D0 002B7230 7D 27 4B 78 */ mr r7, r9
@@ -5188,9 +5188,9 @@ DoThermalBlendHot__13CCubeRendererFv:
/* 802BA4D0 002B7430 38 60 00 01 */ li r3, 1
/* 802BA4D4 002B7434 38 80 00 00 */ li r4, 0
/* 802BA4D8 002B7438 48 0C 1C 09 */ bl GXSetDstAlpha
/* 802BA4DC 002B743C 3C 60 80 3F */ lis r3, lbl_803ED910@ha
/* 802BA4E0 002B7440 83 6D A8 28 */ lwz r27, lbl_805A93E8@sda21(r13)
/* 802BA4E4 002B7444 38 C3 D9 10 */ addi r6, r3, lbl_803ED910@l
/* 802BA4DC 002B743C 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha
/* 802BA4E0 002B7440 83 6D A8 28 */ lwz r27, mpSpareBuffer__9CGraphics@sda21(r13)
/* 802BA4E4 002B7444 38 C3 D9 10 */ addi r6, r3, mViewport__9CGraphics@l
/* 802BA4E8 002B7448 38 60 00 01 */ li r3, 1
/* 802BA4EC 002B744C 83 A6 00 00 */ lwz r29, 0(r6)
/* 802BA4F0 002B7450 38 80 00 03 */ li r4, 3
@@ -5271,9 +5271,9 @@ DoThermalBlendHot__13CCubeRendererFv:
/* 802BA61C 002B757C 38 A0 00 07 */ li r5, 7
/* 802BA620 002B7580 38 C0 00 00 */ li r6, 0
/* 802BA624 002B7584 48 04 E2 AD */ bl SetBlendMode__3CGXF12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOp
/* 802BA628 002B7588 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802BA628 002B7588 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802BA62C 002B758C 38 61 00 24 */ addi r3, r1, 0x24
/* 802BA630 002B7590 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 802BA630 002B7590 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 802BA634 002B7594 48 05 85 41 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 802BA638 002B7598 48 04 F8 25 */ bl GetProjectionState__9CGraphicsFv
/* 802BA63C 002B759C 88 C3 00 00 */ lbz r6, 0(r3)
@@ -5409,9 +5409,9 @@ DoThermalBlendCold__13CCubeRendererFv:
/* 802BA838 002B7798 38 60 00 00 */ li r3, 0
/* 802BA83C 002B779C 38 80 00 00 */ li r4, 0
/* 802BA840 002B77A0 48 0C 18 A1 */ bl GXSetDstAlpha
/* 802BA844 002B77A4 3C 60 80 3F */ lis r3, lbl_803ED910@ha
/* 802BA848 002B77A8 83 4D A8 28 */ lwz r26, lbl_805A93E8@sda21(r13)
/* 802BA84C 002B77AC 38 C3 D9 10 */ addi r6, r3, lbl_803ED910@l
/* 802BA844 002B77A4 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha
/* 802BA848 002B77A8 83 4D A8 28 */ lwz r26, mpSpareBuffer__9CGraphics@sda21(r13)
/* 802BA84C 002B77AC 38 C3 D9 10 */ addi r6, r3, mViewport__9CGraphics@l
/* 802BA850 002B77B0 38 60 00 01 */ li r3, 1
/* 802BA854 002B77B4 83 E6 00 00 */ lwz r31, 0(r6)
/* 802BA858 002B77B8 38 80 00 03 */ li r4, 3
@@ -5666,9 +5666,9 @@ lbl_802BAA1C:
/* 802BAC2C 002B7B8C 38 A0 00 00 */ li r5, 0
/* 802BAC30 002B7B90 38 C0 00 00 */ li r6, 0
/* 802BAC34 002B7B94 48 04 DC 9D */ bl SetBlendMode__3CGXF12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOp
/* 802BAC38 002B7B98 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802BAC38 002B7B98 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802BAC3C 002B7B9C 38 61 00 64 */ addi r3, r1, 0x64
/* 802BAC40 002B7BA0 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 802BAC40 002B7BA0 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 802BAC44 002B7BA4 48 05 7F 31 */ bl __ct__12CTransform4fFRC12CTransform4f
/* 802BAC48 002B7BA8 48 04 F2 15 */ bl GetProjectionState__9CGraphicsFv
/* 802BAC4C 002B7BAC 88 C3 00 00 */ lbz r6, 0(r3)
@@ -6743,9 +6743,9 @@ _DrawSpaceWarp__13CCubeRendererFRC9CVector3ff:
/* 802BBBC4 002B8B24 DB E1 01 70 */ stfd f31, 0x170(r1)
/* 802BBBC8 002B8B28 F3 E1 01 78 */ psq_st f31, 376(r1), 0, qr0
/* 802BBBCC 002B8B2C BF 41 01 58 */ stmw r26, 0x158(r1)
/* 802BBBD0 002B8B30 3C A0 80 3F */ lis r5, lbl_803ED910@ha
/* 802BBBD0 002B8B30 3C A0 80 3F */ lis r5, mViewport__9CGraphics@ha
/* 802BBBD4 002B8B34 3C E0 43 30 */ lis r7, 0x4330
/* 802BBBD8 002B8B38 38 A5 D9 10 */ addi r5, r5, lbl_803ED910@l
/* 802BBBD8 002B8B38 38 A5 D9 10 */ addi r5, r5, mViewport__9CGraphics@l
/* 802BBBDC 002B8B3C C0 E4 00 04 */ lfs f7, 4(r4)
/* 802BBBE0 002B8B40 83 A5 00 08 */ lwz r29, 8(r5)
/* 802BBBE4 002B8B44 7C 7B 1B 78 */ mr r27, r3
@@ -6954,7 +6954,7 @@ lbl_802BBEB8:
/* 802BBEFC 002B8E5C 54 03 04 3E */ clrlwi r3, r0, 0x10
/* 802BBF00 002B8E60 80 01 00 54 */ lwz r0, 0x54(r1)
/* 802BBF04 002B8E64 54 84 04 3E */ clrlwi r4, r4, 0x10
/* 802BBF08 002B8E68 83 4D A8 28 */ lwz r26, lbl_805A93E8@sda21(r13)
/* 802BBF08 002B8E68 83 4D A8 28 */ lwz r26, mpSpareBuffer__9CGraphics@sda21(r13)
/* 802BBF0C 002B8E6C 54 A5 04 3E */ clrlwi r5, r5, 0x10
/* 802BBF10 002B8E70 54 06 04 3E */ clrlwi r6, r0, 0x10
/* 802BBF14 002B8E74 48 0B CE A1 */ bl GXSetTexCopySrc
@@ -7068,8 +7068,8 @@ lbl_802BBEB8:
/* 802BC0C4 002B9024 48 04 BD 65 */ bl SetVtxDescv__3CGXFPC14_GXVtxDescList
/* 802BC0C8 002B9028 48 04 DD 95 */ bl GetProjectionState__9CGraphicsFv
/* 802BC0CC 002B902C 88 03 00 00 */ lbz r0, 0(r3)
/* 802BC0D0 002B9030 3C 80 80 5A */ lis r4, lbl_805A61D4@ha
/* 802BC0D4 002B9034 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l
/* 802BC0D0 002B9030 3C 80 80 5A */ lis r4, mViewMatrix__9CGraphics@ha
/* 802BC0D4 002B9034 38 84 61 D4 */ addi r4, r4, mViewMatrix__9CGraphics@l
/* 802BC0D8 002B9038 98 01 00 8C */ stb r0, 0x8c(r1)
/* 802BC0DC 002B903C C0 03 00 04 */ lfs f0, 4(r3)
/* 802BC0E0 002B9040 D0 01 00 90 */ stfs f0, 0x90(r1)
@@ -7291,12 +7291,12 @@ lbl_802BC414:
/* 802BC41C 002B937C 48 05 35 DD */ bl __dt__8CTextureFv
/* 802BC420 002B9380 93 7C 01 4C */ stw r27, 0x14c(r28)
lbl_802BC424:
/* 802BC424 002B9384 3C 60 80 5A */ lis r3, lbl_805A6500@ha
/* 802BC428 002B9388 3C A0 80 3F */ lis r5, lbl_803ED910@ha
/* 802BC42C 002B938C 38 83 65 00 */ addi r4, r3, lbl_805A6500@l
/* 802BC424 002B9384 3C 60 80 5A */ lis r3, mRenderModeObj__9CGraphics@ha
/* 802BC428 002B9388 3C A0 80 3F */ lis r5, mViewport__9CGraphics@ha
/* 802BC42C 002B938C 38 83 65 00 */ addi r4, r3, mRenderModeObj__9CGraphics@l
/* 802BC430 002B9390 38 60 00 00 */ li r3, 0
/* 802BC434 002B9394 A0 84 00 06 */ lhz r4, 6(r4)
/* 802BC438 002B9398 38 C5 D9 10 */ addi r6, r5, lbl_803ED910@l
/* 802BC438 002B9398 38 C5 D9 10 */ addi r6, r5, mViewport__9CGraphics@l
/* 802BC43C 002B939C 83 46 00 00 */ lwz r26, 0(r6)
/* 802BC440 002B93A0 38 A0 01 00 */ li r5, 0x100
/* 802BC444 002B93A4 3B 64 FF 00 */ addi r27, r4, -256
@@ -7311,7 +7311,7 @@ lbl_802BC424:
/* 802BC468 002B93C8 38 A0 01 00 */ li r5, 0x100
/* 802BC46C 002B93CC 38 C0 01 00 */ li r6, 0x100
/* 802BC470 002B93D0 48 04 FB ED */ bl SetScissor__9CGraphicsFiiii
/* 802BC474 002B93D4 83 6D A8 28 */ lwz r27, lbl_805A93E8@sda21(r13)
/* 802BC474 002B93D4 83 6D A8 28 */ lwz r27, mpSpareBuffer__9CGraphics@sda21(r13)
/* 802BC478 002B93D8 38 60 00 00 */ li r3, 0
/* 802BC47C 002B93DC 38 80 00 00 */ li r4, 0
/* 802BC480 002B93E0 38 A0 01 00 */ li r5, 0x100
@@ -8928,9 +8928,9 @@ lbl_802BDA30:
/* 802BDA38 002BA998 7C 00 1B 78 */ or r0, r0, r3
/* 802BDA3C 002BA99C 54 06 0F FF */ rlwinm. r6, r0, 1, 0x1f, 0x1f
/* 802BDA40 002BA9A0 41 82 00 44 */ beq lbl_802BDA84
/* 802BDA44 002BA9A4 3C 60 80 5A */ lis r3, lbl_805A61D4@ha
/* 802BDA44 002BA9A4 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 802BDA48 002BA9A8 C0 1E 00 0C */ lfs f0, 0xc(r30)
/* 802BDA4C 002BA9AC 38 63 61 D4 */ addi r3, r3, lbl_805A61D4@l
/* 802BDA4C 002BA9AC 38 63 61 D4 */ addi r3, r3, mViewMatrix__9CGraphics@l
/* 802BDA50 002BA9B0 C0 23 00 2C */ lfs f1, 0x2c(r3)
/* 802BDA54 002BA9B4 C0 83 00 0C */ lfs f4, 0xc(r3)
/* 802BDA58 002BA9B8 C0 63 00 1C */ lfs f3, 0x1c(r3)
@@ -8946,9 +8946,9 @@ lbl_802BDA7C:
/* 802BDA7C 002BA9DC 38 80 00 00 */ li r4, 0
/* 802BDA80 002BA9E0 48 00 00 50 */ b lbl_802BDAD0
lbl_802BDA84:
/* 802BDA84 002BA9E4 3C 60 80 5A */ lis r3, lbl_805A61D4@ha
/* 802BDA84 002BA9E4 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 802BDA88 002BA9E8 C0 3E 00 04 */ lfs f1, 4(r30)
/* 802BDA8C 002BA9EC 38 63 61 D4 */ addi r3, r3, lbl_805A61D4@l
/* 802BDA8C 002BA9EC 38 63 61 D4 */ addi r3, r3, mViewMatrix__9CGraphics@l
/* 802BDA90 002BA9F0 C0 DE 00 08 */ lfs f6, 8(r30)
/* 802BDA94 002BA9F4 C0 03 00 1C */ lfs f0, 0x1c(r3)
/* 802BDA98 002BA9F8 C0 83 00 0C */ lfs f4, 0xc(r3)
@@ -9073,7 +9073,7 @@ EndScene__13CCubeRendererFv:
/* 802BDC3C 002BAB9C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802BDC40 002BABA0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802BDC44 002BABA4 7C 7F 1B 78 */ mr r31, r3
/* 802BDC48 002BABA8 88 8D 9C 6C */ lbz r4, lbl_805A882C@sda21(r13)
/* 802BDC48 002BABA8 88 8D 9C 6C */ lbz r4, mIsBeginSceneClearFb__9CGraphics@sda21(r13)
/* 802BDC4C 002BABAC 88 03 03 18 */ lbz r0, 0x318(r3)
/* 802BDC50 002BABB0 7C 83 00 34 */ cntlzw r3, r4
/* 802BDC54 002BABB4 50 60 DF FE */ rlwimi r0, r3, 0x1b, 0x1f, 0x1f
@@ -9102,9 +9102,9 @@ lbl_802BDC8C:
BeginScene__13CCubeRendererFv:
/* 802BDCA0 002BAC00 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802BDCA4 002BAC04 7C 08 02 A6 */ mflr r0
/* 802BDCA8 002BAC08 3C 80 80 3F */ lis r4, lbl_803ED910@ha
/* 802BDCA8 002BAC08 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha
/* 802BDCAC 002BAC0C 90 01 00 24 */ stw r0, 0x24(r1)
/* 802BDCB0 002BAC10 38 84 D9 10 */ addi r4, r4, lbl_803ED910@l
/* 802BDCB0 002BAC10 38 84 D9 10 */ addi r4, r4, mViewport__9CGraphics@l
/* 802BDCB4 002BAC14 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802BDCB8 002BAC18 7C 7F 1B 78 */ mr r31, r3
/* 802BDCBC 002BAC1C 38 60 00 01 */ li r3, 1
asm/MetroidPrime/CActor.s
+5 -5
View File
@@ -2376,9 +2376,9 @@ EnsureRendered__6CActorCFRC13CStateManager:
/* 800549F8 00051958 81 8C 00 64 */ lwz r12, 0x64(r12)
/* 800549FC 0005195C 7D 89 03 A6 */ mtctr r12
/* 80054A00 00051960 4E 80 04 21 */ bctrl
/* 80054A04 00051964 3C 60 80 5A */ lis r3, lbl_805A61D4@ha
/* 80054A04 00051964 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 80054A08 00051968 C1 01 00 2C */ lfs f8, 0x2c(r1)
/* 80054A0C 0005196C 38 C3 61 D4 */ addi r6, r3, lbl_805A61D4@l
/* 80054A0C 0005196C 38 C3 61 D4 */ addi r6, r3, mViewMatrix__9CGraphics@l
/* 80054A10 00051970 C0 E1 00 30 */ lfs f7, 0x30(r1)
/* 80054A14 00051974 C0 C1 00 34 */ lfs f6, 0x34(r1)
/* 80054A18 00051978 38 61 00 08 */ addi r3, r1, 8
@@ -2410,7 +2410,7 @@ EnsureRendered__6CActorCFRC13CStateManager:
/* 80054A80 000519E0 38 C1 00 44 */ addi r6, r1, 0x44
/* 80054A84 000519E4 D0 21 00 18 */ stfs f1, 0x18(r1)
/* 80054A88 000519E8 D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 80054A8C 000519EC 48 00 00 1D */ bl EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3f
/* 80054A8C 000519EC 48 00 00 1D */ bl EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3fRC6CAABox
/* 80054A90 000519F0 80 01 00 74 */ lwz r0, 0x74(r1)
/* 80054A94 000519F4 83 E1 00 6C */ lwz r31, 0x6c(r1)
/* 80054A98 000519F8 83 C1 00 68 */ lwz r30, 0x68(r1)
@@ -2418,8 +2418,8 @@ EnsureRendered__6CActorCFRC13CStateManager:
/* 80054AA0 00051A00 38 21 00 70 */ addi r1, r1, 0x70
/* 80054AA4 00051A04 4E 80 00 20 */ blr
.global EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3f
EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3f:
.global EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3fRC6CAABox
EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3fRC6CAABox:
/* 80054AA8 00051A08 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80054AAC 00051A0C 7C 08 02 A6 */ mflr r0
/* 80054AB0 00051A10 90 01 00 24 */ stw r0, 0x24(r1)
asm/MetroidPrime/CActorParticles.s
+2 -2
View File
@@ -426,9 +426,9 @@ lbl_801E3E04:
Render__20CActorModelParticlesCFRC6CActor:
/* 801E3E24 001E0D84 94 21 FF A0 */ stwu r1, -0x60(r1)
/* 801E3E28 001E0D88 7C 08 02 A6 */ mflr r0
/* 801E3E2C 001E0D8C 3C C0 80 5A */ lis r6, lbl_805A6204@ha
/* 801E3E2C 001E0D8C 3C C0 80 5A */ lis r6, mModelMatrix__9CGraphics@ha
/* 801E3E30 001E0D90 90 01 00 64 */ stw r0, 0x64(r1)
/* 801E3E34 001E0D94 38 06 62 04 */ addi r0, r6, lbl_805A6204@l
/* 801E3E34 001E0D94 38 06 62 04 */ addi r0, r6, mModelMatrix__9CGraphics@l
/* 801E3E38 001E0D98 BF 41 00 48 */ stmw r26, 0x48(r1)
/* 801E3E3C 001E0D9C 7C 7A 1B 78 */ mr r26, r3
/* 801E3E40 001E0DA0 7C 9D 23 78 */ mr r29, r4
asm/MetroidPrime/CAnimData.s
+1 -1
View File
@@ -5736,7 +5736,7 @@ DrawSkinnedModel__9CAnimDataCFRC13CSkinnedModelRC11CModelFlags:
/* 8002E444 0002B3A4 7C BF 2B 78 */ mr r31, r5
/* 8002E448 0002B3A8 93 C1 00 08 */ stw r30, 8(r1)
/* 8002E44C 0002B3AC 7C 9E 23 78 */ mr r30, r4
/* 8002E450 0002B3B0 88 ED A8 16 */ lbz r7, lbl_805A93D6@sda21(r13)
/* 8002E450 0002B3B0 88 ED A8 16 */ lbz r7, mLightActive__9CGraphics@sda21(r13)
/* 8002E454 0002B3B4 28 07 00 00 */ cmplwi r7, 0
/* 8002E458 0002B3B8 41 82 00 08 */ beq lbl_8002E460
/* 8002E45C 0002B3BC 39 20 00 01 */ li r9, 1
asm/MetroidPrime/CArtifactDoll.s
+2 -2
View File
@@ -136,9 +136,9 @@ Draw__13CArtifactDollFfRC13CStateManagerbUi:
/* 8029C9BC 0029991C 48 00 0A 65 */ bl IsLoaded__13CArtifactDollCFv
/* 8029C9C0 00299920 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8029C9C4 00299924 41 82 03 F4 */ beq lbl_8029CDB8
/* 8029C9C8 00299928 3C 60 80 3F */ lis r3, lbl_803ED910@ha
/* 8029C9C8 00299928 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha
/* 8029C9CC 0029992C 3C 80 43 30 */ lis r4, 0x4330
/* 8029C9D0 00299930 38 C3 D9 10 */ addi r6, r3, lbl_803ED910@l
/* 8029C9D0 00299930 38 C3 D9 10 */ addi r6, r3, mViewport__9CGraphics@l
/* 8029C9D4 00299934 80 6D A0 68 */ lwz r3, gpRender@sda21(r13)
/* 8029C9D8 00299938 80 A6 00 08 */ lwz r5, 8(r6)
/* 8029C9DC 0029993C 80 06 00 0C */ lwz r0, 0xc(r6)
asm/MetroidPrime/CAutoMapper.s
+6 -6
View File
@@ -1251,9 +1251,9 @@ GetMapAreaMiniMapDrawDepth__11CAutoMapperFv:
GetMapScreenViewportSize__11CAutoMapperFv:
/* 800962BC 0009321C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800962C0 00093220 7C 08 02 A6 */ mflr r0
/* 800962C4 00093224 3C 80 80 3F */ lis r4, lbl_803ED910@ha
/* 800962C4 00093224 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha
/* 800962C8 00093228 90 01 00 14 */ stw r0, 0x14(r1)
/* 800962CC 0009322C 38 A4 D9 10 */ addi r5, r4, lbl_803ED910@l
/* 800962CC 0009322C 38 A4 D9 10 */ addi r5, r4, mViewport__9CGraphics@l
/* 800962D0 00093230 80 85 00 08 */ lwz r4, 8(r5)
/* 800962D4 00093234 80 A5 00 0C */ lwz r5, 0xc(r5)
/* 800962D8 00093238 48 27 E0 75 */ bl __ct__9CVector2iFii
@@ -1267,9 +1267,9 @@ GetMiniMapViewportSize__11CAutoMapperFv:
/* 800962EC 0009324C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 800962F0 00093250 7C 08 02 A6 */ mflr r0
/* 800962F4 00093254 3C 80 43 30 */ lis r4, 0x4330
/* 800962F8 00093258 3C A0 80 3F */ lis r5, lbl_803ED910@ha
/* 800962F8 00093258 3C A0 80 3F */ lis r5, mViewport__9CGraphics@ha
/* 800962FC 0009325C 90 01 00 34 */ stw r0, 0x34(r1)
/* 80096300 00093260 38 C5 D9 10 */ addi r6, r5, lbl_803ED910@l
/* 80096300 00093260 38 C5 D9 10 */ addi r6, r5, mViewport__9CGraphics@l
/* 80096304 00093264 C8 A2 8B 88 */ lfd f5, lbl_805AA8A8@sda21(r2)
/* 80096308 00093268 80 A6 00 08 */ lwz r5, 8(r6)
/* 8009630C 0009326C 80 06 00 0C */ lwz r0, 0xc(r6)
@@ -5232,9 +5232,9 @@ lbl_80099CBC:
/* 80099CBC 00096C1C C0 02 8B A8 */ lfs f0, lbl_805AA8C8@sda21(r2)
/* 80099CC0 00096C20 FC 19 00 40 */ fcmpo cr0, f25, f0
/* 80099CC4 00096C24 40 81 01 68 */ ble lbl_80099E2C
/* 80099CC8 00096C28 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha
/* 80099CC8 00096C28 3C 80 80 5A */ lis r4, kEnvModulate__9CGraphics@ha
/* 80099CCC 00096C2C 38 60 00 00 */ li r3, 0
/* 80099CD0 00096C30 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l
/* 80099CD0 00096C30 38 84 5E BC */ addi r4, r4, kEnvModulate__9CGraphics@l
/* 80099CD4 00096C34 48 27 05 E5 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass
/* 80099CD8 00096C38 80 7F 00 44 */ lwz r3, 0x44(r31)
/* 80099CDC 00096C3C 38 80 00 00 */ li r4, 0
asm/MetroidPrime/CCredits.s
+6 -6
View File
@@ -768,8 +768,8 @@ lbl_8002589C:
/* 800258A0 00022800 48 00 06 54 */ b lbl_80025EF4
lbl_800258A4:
/* 800258A4 00022804 80 1F 00 44 */ lwz r0, 0x44(r31)
/* 800258A8 00022808 3C 60 80 3F */ lis r3, lbl_803ED910@ha
/* 800258AC 0002280C 38 83 D9 10 */ addi r4, r3, lbl_803ED910@l
/* 800258A8 00022808 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha
/* 800258AC 0002280C 38 83 D9 10 */ addi r4, r3, mViewport__9CGraphics@l
/* 800258B0 00022810 80 64 00 08 */ lwz r3, 8(r4)
/* 800258B4 00022814 2C 00 00 00 */ cmpwi r0, 0
/* 800258B8 00022818 83 64 00 0C */ lwz r27, 0xc(r4)
@@ -1819,9 +1819,9 @@ sub_80026770:
/* 800267A8 00023708 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 800267AC 0002370C 41 81 01 60 */ bgt lbl_8002690C
lbl_800267B0:
/* 800267B0 00023710 3C 80 80 3F */ lis r4, lbl_803ED910@ha
/* 800267B0 00023710 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha
/* 800267B4 00023714 3C 60 43 30 */ lis r3, 0x4330
/* 800267B8 00023718 38 84 D9 10 */ addi r4, r4, lbl_803ED910@l
/* 800267B8 00023718 38 84 D9 10 */ addi r4, r4, mViewport__9CGraphics@l
/* 800267BC 0002371C 80 1F 00 58 */ lwz r0, 0x58(r31)
/* 800267C0 00023720 83 C4 00 0C */ lwz r30, 0xc(r4)
/* 800267C4 00023724 90 61 00 38 */ stw r3, 0x38(r1)
@@ -2015,8 +2015,8 @@ lbl_80026A60:
/* 80026A64 000239C4 48 00 0B 18 */ b lbl_8002757C
lbl_80026A68:
/* 80026A68 000239C8 80 6D A0 60 */ lwz r3, gpResourceFactory@sda21(r13)
/* 80026A6C 000239CC 3C 80 80 3F */ lis r4, lbl_803ED910@ha
/* 80026A70 000239D0 38 A4 D9 10 */ addi r5, r4, lbl_803ED910@l
/* 80026A6C 000239CC 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha
/* 80026A70 000239D0 38 A4 D9 10 */ addi r5, r4, mViewport__9CGraphics@l
/* 80026A74 000239D4 80 8D A1 38 */ lwz r4, gpTweakGui@sda21(r13)
/* 80026A78 000239D8 81 83 00 00 */ lwz r12, 0(r3)
/* 80026A7C 000239DC 83 A5 00 08 */ lwz r29, 8(r5)

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