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

Match and link CGameLight 

Former-commit-id: 61215c124c
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-19 01:00:44 +03:00
parent a1776db0cf
commit ed89bb1c93
22 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/GuiSys/CGuiLight.s
View File

@ -53,7 +53,7 @@ BuildLight__9CGuiLightCFv:
/* 802C3790 002C06F0 48 04 2D 15 */ bl BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor /* 802C3790 002C06F0 48 04 2D 15 */ bl BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor
/* 802C3794 002C06F4 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 802C3794 002C06F4 38 61 01 C4 */ addi r3, r1, 0x1c4
/* 802C3798 002C06F8 38 81 01 74 */ addi r4, r1, 0x174 /* 802C3798 002C06F8 38 81 01 74 */ addi r4, r1, 0x174
/* 802C379C 002C06FC 4B D7 7D D5 */ bl __ct__6CLightFCR6CLight /* 802C379C 002C06FC 4B D7 7D D5 */ bl __ct__6CLightFRC6CLight
/* 802C37A0 002C0700 7F E4 FB 78 */ mr r4, r31 /* 802C37A0 002C0700 7F E4 FB 78 */ mr r4, r31
/* 802C37A4 002C0704 38 61 00 10 */ addi r3, r1, 0x10 /* 802C37A4 002C0704 38 61 00 10 */ addi r3, r1, 0x10
/* 802C37A8 002C0708 48 00 1A 91 */ bl GetWorldPosition__10CGuiObjectCFv /* 802C37A8 002C0708 48 00 1A 91 */ bl GetWorldPosition__10CGuiObjectCFv
@ -290,7 +290,7 @@ lbl_802C3B00:
/* 802C3B2C 002C0A8C 7F C3 F3 78 */ mr r3, r30 /* 802C3B2C 002C0A8C 7F C3 F3 78 */ mr r3, r30
/* 802C3B30 002C0A90 38 81 01 C4 */ addi r4, r1, 0x1c4 /* 802C3B30 002C0A90 38 81 01 C4 */ addi r4, r1, 0x1c4
/* 802C3B34 002C0A94 90 01 02 04 */ stw r0, 0x204(r1) /* 802C3B34 002C0A94 90 01 02 04 */ stw r0, 0x204(r1)
/* 802C3B38 002C0A98 4B D7 7A 39 */ bl __ct__6CLightFCR6CLight /* 802C3B38 002C0A98 4B D7 7A 39 */ bl __ct__6CLightFRC6CLight
/* 802C3B3C 002C0A9C 80 01 02 24 */ lwz r0, 0x224(r1) /* 802C3B3C 002C0A9C 80 01 02 24 */ lwz r0, 0x224(r1)
/* 802C3B40 002C0AA0 83 E1 02 1C */ lwz r31, 0x21c(r1) /* 802C3B40 002C0AA0 83 E1 02 1C */ lwz r31, 0x21c(r1)
/* 802C3B44 002C0AA4 83 C1 02 18 */ lwz r30, 0x218(r1) /* 802C3B44 002C0AA4 83 C1 02 18 */ lwz r30, 0x218(r1)
@ -485,7 +485,7 @@ lbl_802C3DD8:
/* 802C3DF4 002C0D54 48 04 26 09 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf /* 802C3DF4 002C0D54 48 04 26 09 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf
/* 802C3DF8 002C0D58 38 61 01 CC */ addi r3, r1, 0x1cc /* 802C3DF8 002C0D58 38 61 01 CC */ addi r3, r1, 0x1cc
/* 802C3DFC 002C0D5C 38 81 00 DC */ addi r4, r1, 0xdc /* 802C3DFC 002C0D5C 38 81 00 DC */ addi r4, r1, 0xdc
/* 802C3E00 002C0D60 4B D7 77 71 */ bl __ct__6CLightFCR6CLight /* 802C3E00 002C0D60 4B D7 77 71 */ bl __ct__6CLightFRC6CLight
/* 802C3E04 002C0D64 FC 20 F8 90 */ fmr f1, f31 /* 802C3E04 002C0D64 FC 20 F8 90 */ fmr f1, f31
/* 802C3E08 002C0D68 38 61 01 CC */ addi r3, r1, 0x1cc /* 802C3E08 002C0D68 38 61 01 CC */ addi r3, r1, 0x1cc
/* 802C3E0C 002C0D6C FC 40 F0 90 */ fmr f2, f30 /* 802C3E0C 002C0D6C FC 40 F0 90 */ fmr f2, f30
@ -519,7 +519,7 @@ lbl_802C3E64:
/* 802C3E74 002C0DD4 48 04 25 C1 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 802C3E74 002C0DD4 48 04 25 C1 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor
/* 802C3E78 002C0DD8 38 61 01 7C */ addi r3, r1, 0x17c /* 802C3E78 002C0DD8 38 61 01 7C */ addi r3, r1, 0x17c
/* 802C3E7C 002C0DDC 38 81 00 8C */ addi r4, r1, 0x8c /* 802C3E7C 002C0DDC 38 81 00 8C */ addi r4, r1, 0x8c
/* 802C3E80 002C0DE0 4B D7 76 F1 */ bl __ct__6CLightFCR6CLight /* 802C3E80 002C0DE0 4B D7 76 F1 */ bl __ct__6CLightFRC6CLight
/* 802C3E84 002C0DE4 FC 20 F8 90 */ fmr f1, f31 /* 802C3E84 002C0DE4 FC 20 F8 90 */ fmr f1, f31
/* 802C3E88 002C0DE8 38 61 01 7C */ addi r3, r1, 0x17c /* 802C3E88 002C0DE8 38 61 01 7C */ addi r3, r1, 0x17c
/* 802C3E8C 002C0DEC FC 40 F0 90 */ fmr f2, f30 /* 802C3E8C 002C0DEC FC 40 F0 90 */ fmr f2, f30
@ -548,7 +548,7 @@ lbl_802C3ED0:
/* 802C3EE0 002C0E40 48 04 25 8D */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 802C3EE0 002C0E40 48 04 25 8D */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor
/* 802C3EE4 002C0E44 38 61 01 2C */ addi r3, r1, 0x12c /* 802C3EE4 002C0E44 38 61 01 2C */ addi r3, r1, 0x12c
/* 802C3EE8 002C0E48 38 81 00 3C */ addi r4, r1, 0x3c /* 802C3EE8 002C0E48 38 81 00 3C */ addi r4, r1, 0x3c
/* 802C3EEC 002C0E4C 4B D7 76 85 */ bl __ct__6CLightFCR6CLight /* 802C3EEC 002C0E4C 4B D7 76 85 */ bl __ct__6CLightFRC6CLight
/* 802C3EF0 002C0E50 3C 60 80 3D */ lis r3, lbl_803D68A8@ha /* 802C3EF0 002C0E50 3C 60 80 3D */ lis r3, lbl_803D68A8@ha
/* 802C3EF4 002C0E54 93 A1 01 6C */ stw r29, 0x16c(r1) /* 802C3EF4 002C0E54 93 A1 01 6C */ stw r29, 0x16c(r1)
/* 802C3EF8 002C0E58 38 83 68 A8 */ addi r4, r3, lbl_803D68A8@l /* 802C3EF8 002C0E58 38 83 68 A8 */ addi r4, r3, lbl_803D68A8@l
@ -601,4 +601,3 @@ lbl_803D68A8:
# ROM: 0x3D38A8 # ROM: 0x3D38A8
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4

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

@ -311,7 +311,7 @@ lbl_80317818:
/* 8031787C 003147DC 4B FE EB 81 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf /* 8031787C 003147DC 4B FE EB 81 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf
/* 80317880 003147E0 38 61 00 84 */ addi r3, r1, 0x84 /* 80317880 003147E0 38 61 00 84 */ addi r3, r1, 0x84
/* 80317884 003147E4 38 81 00 34 */ addi r4, r1, 0x34 /* 80317884 003147E4 38 81 00 34 */ addi r4, r1, 0x34
/* 80317888 003147E8 4B D2 3C E9 */ bl __ct__6CLightFCR6CLight /* 80317888 003147E8 4B D2 3C E9 */ bl __ct__6CLightFRC6CLight
/* 8031788C 003147EC 80 1E 03 2C */ lwz r0, 0x32c(r30) /* 8031788C 003147EC 80 1E 03 2C */ lwz r0, 0x32c(r30)
/* 80317890 003147F0 2C 00 00 02 */ cmpwi r0, 2 /* 80317890 003147F0 2C 00 00 02 */ cmpwi r0, 2
/* 80317894 003147F4 40 82 00 0C */ bne lbl_803178A0 /* 80317894 003147F4 40 82 00 0C */ bne lbl_803178A0
@ -338,7 +338,7 @@ lbl_803178D0:
/* 803178D0 00314830 4B FE EA E1 */ bl SetAttenuation__6CLightFfff /* 803178D0 00314830 4B FE EA E1 */ bl SetAttenuation__6CLightFfff
/* 803178D4 00314834 7F A3 EB 78 */ mr r3, r29 /* 803178D4 00314834 7F A3 EB 78 */ mr r3, r29
/* 803178D8 00314838 38 81 00 84 */ addi r4, r1, 0x84 /* 803178D8 00314838 38 81 00 84 */ addi r4, r1, 0x84
/* 803178DC 0031483C 4B D2 3C 95 */ bl __ct__6CLightFCR6CLight /* 803178DC 0031483C 4B D2 3C 95 */ bl __ct__6CLightFRC6CLight
/* 803178E0 00314840 48 00 00 74 */ b lbl_80317954 /* 803178E0 00314840 48 00 00 74 */ b lbl_80317954
lbl_803178E4: lbl_803178E4:
/* 803178E4 00314844 80 1E 03 2C */ lwz r0, 0x32c(r30) /* 803178E4 00314844 80 1E 03 2C */ lwz r0, 0x32c(r30)

10
asm/MetroidPrime/CActorLights.s
View File

@ -297,7 +297,7 @@ lbl_8010322C:
/* 8010329C 001001FC 28 03 00 00 */ cmplwi r3, 0 /* 8010329C 001001FC 28 03 00 00 */ cmplwi r3, 0
/* 801032A0 00100200 90 01 00 14 */ stw r0, 0x14(r1) /* 801032A0 00100200 90 01 00 14 */ stw r0, 0x14(r1)
/* 801032A4 00100204 41 82 00 08 */ beq lbl_801032AC /* 801032A4 00100204 41 82 00 08 */ beq lbl_801032AC
/* 801032A8 00100208 4B F3 82 C9 */ bl __ct__6CLightFCR6CLight /* 801032A8 00100208 4B F3 82 C9 */ bl __ct__6CLightFRC6CLight
lbl_801032AC: lbl_801032AC:
/* 801032AC 0010020C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801032AC 0010020C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801032B0 00100210 7C 08 03 A6 */ mtlr r0 /* 801032B0 00100210 7C 08 03 A6 */ mtlr r0
@ -403,7 +403,7 @@ lbl_801033B4:
/* 80103420 00100380 3B 01 00 A8 */ addi r24, r1, 0xa8 /* 80103420 00100380 3B 01 00 A8 */ addi r24, r1, 0xa8
/* 80103424 00100384 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80103424 00100384 38 61 00 F8 */ addi r3, r1, 0xf8
/* 80103428 00100388 7F 04 C3 78 */ mr r4, r24 /* 80103428 00100388 7F 04 C3 78 */ mr r4, r24
/* 8010342C 0010038C 4B F3 81 45 */ bl __ct__6CLightFCR6CLight /* 8010342C 0010038C 4B F3 81 45 */ bl __ct__6CLightFRC6CLight
/* 80103430 00100390 80 8D A1 38 */ lwz r4, gpTweakGui@sda21(r13) /* 80103430 00100390 80 8D A1 38 */ lwz r4, gpTweakGui@sda21(r13)
/* 80103434 00100394 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80103434 00100394 38 61 00 F8 */ addi r3, r1, 0xf8
/* 80103438 00100398 C0 01 01 1C */ lfs f0, 0x11c(r1) /* 80103438 00100398 C0 01 01 1C */ lfs f0, 0x11c(r1)
@ -997,7 +997,7 @@ lbl_80103BF8:
/* 80103CA8 00100C08 48 20 27 35 */ bl BuildCustom__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff /* 80103CA8 00100C08 48 20 27 35 */ bl BuildCustom__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff
/* 80103CAC 00100C0C 38 61 00 74 */ addi r3, r1, 0x74 /* 80103CAC 00100C0C 38 61 00 74 */ addi r3, r1, 0x74
/* 80103CB0 00100C10 38 81 00 24 */ addi r4, r1, 0x24 /* 80103CB0 00100C10 38 81 00 24 */ addi r4, r1, 0x24
/* 80103CB4 00100C14 4B F3 78 BD */ bl __ct__6CLightFCR6CLight /* 80103CB4 00100C14 4B F3 78 BD */ bl __ct__6CLightFRC6CLight
/* 80103CB8 00100C18 7F C3 F3 78 */ mr r3, r30 /* 80103CB8 00100C18 7F C3 F3 78 */ mr r3, r30
/* 80103CBC 00100C1C 38 81 00 74 */ addi r4, r1, 0x74 /* 80103CBC 00100C1C 38 81 00 74 */ addi r4, r1, 0x74
/* 80103CC0 00100C20 4B FF F5 8D */ bl "push_back__Q24rstl26reserved_vector<6CLight,4>FRC6CLight" /* 80103CC0 00100C20 4B FF F5 8D */ bl "push_back__Q24rstl26reserved_vector<6CLight,4>FRC6CLight"
@ -1647,7 +1647,7 @@ lbl_801045BC:
/* 80104608 00101568 48 20 1D D5 */ bl BuildCustom__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff /* 80104608 00101568 48 20 1D D5 */ bl BuildCustom__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff
/* 8010460C 0010156C 38 7F 01 DC */ addi r3, r31, 0x1dc /* 8010460C 0010156C 38 7F 01 DC */ addi r3, r31, 0x1dc
/* 80104610 00101570 38 9F 01 8C */ addi r4, r31, 0x18c /* 80104610 00101570 38 9F 01 8C */ addi r4, r31, 0x18c
/* 80104614 00101574 4B F3 6F 5D */ bl __ct__6CLightFCR6CLight /* 80104614 00101574 4B F3 6F 5D */ bl __ct__6CLightFRC6CLight
/* 80104618 00101578 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80104618 00101578 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 8010461C 0010157C C0 32 00 04 */ lfs f1, 4(r18) /* 8010461C 0010157C C0 32 00 04 */ lfs f1, 4(r18)
/* 80104620 00101580 C0 12 00 08 */ lfs f0, 8(r18) /* 80104620 00101580 C0 12 00 08 */ lfs f0, 8(r18)
@ -2239,7 +2239,7 @@ lbl_80104E58:
/* 80104E7C 00101DDC 41 82 00 98 */ beq lbl_80104F14 /* 80104E7C 00101DDC 41 82 00 98 */ beq lbl_80104F14
/* 80104E80 00101DE0 38 61 00 28 */ addi r3, r1, 0x28 /* 80104E80 00101DE0 38 61 00 28 */ addi r3, r1, 0x28
/* 80104E84 00101DE4 38 9F 00 04 */ addi r4, r31, 4 /* 80104E84 00101DE4 38 9F 00 04 */ addi r4, r31, 4
/* 80104E88 00101DE8 4B F3 66 E9 */ bl __ct__6CLightFCR6CLight /* 80104E88 00101DE8 4B F3 66 E9 */ bl __ct__6CLightFRC6CLight
/* 80104E8C 00101DEC 80 01 00 40 */ lwz r0, 0x40(r1) /* 80104E8C 00101DEC 80 01 00 40 */ lwz r0, 0x40(r1)
/* 80104E90 00101DF0 38 61 00 24 */ addi r3, r1, 0x24 /* 80104E90 00101DF0 38 61 00 24 */ addi r3, r1, 0x24
/* 80104E94 00101DF4 38 81 00 20 */ addi r4, r1, 0x20 /* 80104E94 00101DF4 38 81 00 20 */ addi r4, r1, 0x20

2
asm/MetroidPrime/CFluidPlaneCPU.s
View File

@ -939,7 +939,7 @@ lbl_8019A4F0:
/* 8019A55C 001974BC 48 16 BF 11 */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 8019A55C 001974BC 48 16 BF 11 */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor
/* 8019A560 001974C0 38 61 03 30 */ addi r3, r1, 0x330 /* 8019A560 001974C0 38 61 03 30 */ addi r3, r1, 0x330
/* 8019A564 001974C4 38 81 02 E0 */ addi r4, r1, 0x2e0 /* 8019A564 001974C4 38 81 02 E0 */ addi r4, r1, 0x2e0
/* 8019A568 001974C8 4B EA 10 09 */ bl __ct__6CLightFCR6CLight /* 8019A568 001974C8 4B EA 10 09 */ bl __ct__6CLightFRC6CLight
/* 8019A56C 001974CC 38 81 03 30 */ addi r4, r1, 0x330 /* 8019A56C 001974CC 38 81 03 30 */ addi r4, r1, 0x330
/* 8019A570 001974D0 38 60 00 03 */ li r3, 3 /* 8019A570 001974D0 38 60 00 03 */ li r3, 3
/* 8019A574 001974D4 48 17 24 51 */ bl LoadLight__9CGraphicsF9ERglLightRC6CLight /* 8019A574 001974D4 48 17 24 51 */ bl LoadLight__9CGraphicsF9ERglLightRC6CLight

6
asm/MetroidPrime/CGameLight.s
View File

@ -146,7 +146,7 @@ GetLight__10CGameLightCFv:
/* 800B56C0 000B2620 93 C1 00 88 */ stw r30, 0x88(r1) /* 800B56C0 000B2620 93 C1 00 88 */ stw r30, 0x88(r1)
/* 800B56C4 000B2624 7C 7E 1B 78 */ mr r30, r3 /* 800B56C4 000B2624 7C 7E 1B 78 */ mr r30, r3
/* 800B56C8 000B2628 38 61 00 2C */ addi r3, r1, 0x2c /* 800B56C8 000B2628 38 61 00 2C */ addi r3, r1, 0x2c
/* 800B56CC 000B262C 4B F8 5E A5 */ bl __ct__6CLightFCR6CLight /* 800B56CC 000B262C 4B F8 5E A5 */ bl __ct__6CLightFRC6CLight
/* 800B56D0 000B2630 38 61 00 20 */ addi r3, r1, 0x20 /* 800B56D0 000B2630 38 61 00 20 */ addi r3, r1, 0x20
/* 800B56D4 000B2634 38 9F 00 34 */ addi r4, r31, 0x34 /* 800B56D4 000B2634 38 9F 00 34 */ addi r4, r31, 0x34
/* 800B56D8 000B2638 38 BF 00 EC */ addi r5, r31, 0xec /* 800B56D8 000B2638 38 BF 00 EC */ addi r5, r31, 0xec
@ -170,7 +170,7 @@ GetLight__10CGameLightCFv:
lbl_800B5720: lbl_800B5720:
/* 800B5720 000B2680 7F C3 F3 78 */ mr r3, r30 /* 800B5720 000B2680 7F C3 F3 78 */ mr r3, r30
/* 800B5724 000B2684 38 81 00 2C */ addi r4, r1, 0x2c /* 800B5724 000B2684 38 81 00 2C */ addi r4, r1, 0x2c
/* 800B5728 000B2688 4B F8 5E 49 */ bl __ct__6CLightFCR6CLight /* 800B5728 000B2688 4B F8 5E 49 */ bl __ct__6CLightFRC6CLight
/* 800B572C 000B268C 80 01 00 94 */ lwz r0, 0x94(r1) /* 800B572C 000B268C 80 01 00 94 */ lwz r0, 0x94(r1)
/* 800B5730 000B2690 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 800B5730 000B2690 83 E1 00 8C */ lwz r31, 0x8c(r1)
/* 800B5734 000B2694 83 C1 00 88 */ lwz r30, 0x88(r1) /* 800B5734 000B2694 83 C1 00 88 */ lwz r30, 0x88(r1)
@ -330,7 +330,7 @@ lbl_800B5968:
/* 800B5978 000B28D8 90 17 00 00 */ stw r0, 0(r23) /* 800B5978 000B28D8 90 17 00 00 */ stw r0, 0(r23)
/* 800B597C 000B28DC A0 1C 00 00 */ lhz r0, 0(r28) /* 800B597C 000B28DC A0 1C 00 00 */ lhz r0, 0(r28)
/* 800B5980 000B28E0 B0 17 00 E8 */ sth r0, 0xe8(r23) /* 800B5980 000B28E0 B0 17 00 E8 */ sth r0, 0xe8(r23)
/* 800B5984 000B28E4 4B F8 5B ED */ bl __ct__6CLightFCR6CLight /* 800B5984 000B28E4 4B F8 5B ED */ bl __ct__6CLightFRC6CLight
/* 800B5988 000B28E8 93 D7 01 3C */ stw r30, 0x13c(r23) /* 800B5988 000B28E8 93 D7 01 3C */ stw r30, 0x13c(r23)
/* 800B598C 000B28EC 38 77 00 EC */ addi r3, r23, 0xec /* 800B598C 000B28EC 38 77 00 EC */ addi r3, r23, 0xec
/* 800B5990 000B28F0 93 F7 01 40 */ stw r31, 0x140(r23) /* 800B5990 000B28F0 93 F7 01 40 */ stw r31, 0x140(r23)

3
asm/MetroidPrime/CProjectedShadow.s
View File

@ -90,7 +90,7 @@ lbl_8029D724:
/* 8029D7C0 0029A720 48 06 8C AD */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 8029D7C0 0029A720 48 06 8C AD */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor
/* 8029D7C4 0029A724 38 61 02 98 */ addi r3, r1, 0x298 /* 8029D7C4 0029A724 38 61 02 98 */ addi r3, r1, 0x298
/* 8029D7C8 0029A728 38 81 02 48 */ addi r4, r1, 0x248 /* 8029D7C8 0029A728 38 81 02 48 */ addi r4, r1, 0x248
/* 8029D7CC 0029A72C 4B D9 DD A5 */ bl __ct__6CLightFCR6CLight /* 8029D7CC 0029A72C 4B D9 DD A5 */ bl __ct__6CLightFRC6CLight
/* 8029D7D0 0029A730 38 81 02 98 */ addi r4, r1, 0x298 /* 8029D7D0 0029A730 38 81 02 98 */ addi r4, r1, 0x298
/* 8029D7D4 0029A734 38 60 00 00 */ li r3, 0 /* 8029D7D4 0029A734 38 60 00 00 */ li r3, 0
/* 8029D7D8 0029A738 48 06 F1 ED */ bl LoadLight__9CGraphicsF9ERglLightRC6CLight /* 8029D7D8 0029A738 48 06 F1 ED */ bl LoadLight__9CGraphicsF9ERglLightRC6CLight
@ -1001,4 +1001,3 @@ lbl_803D5E50:
.4byte 0 .4byte 0
.4byte 0 .4byte 0
.float 1.0 .float 1.0

2
asm/MetroidPrime/CSamusDoll.s
View File

@ -4580,7 +4580,7 @@ lbl_800DE788:
/* 800DE78C 000DB6EC 41 82 00 10 */ beq lbl_800DE79C /* 800DE78C 000DB6EC 41 82 00 10 */ beq lbl_800DE79C
/* 800DE790 000DB6F0 7F E3 FB 78 */ mr r3, r31 /* 800DE790 000DB6F0 7F E3 FB 78 */ mr r3, r31
/* 800DE794 000DB6F4 7F A4 EB 78 */ mr r4, r29 /* 800DE794 000DB6F4 7F A4 EB 78 */ mr r4, r29
/* 800DE798 000DB6F8 4B F5 CD D9 */ bl __ct__6CLightFCR6CLight /* 800DE798 000DB6F8 4B F5 CD D9 */ bl __ct__6CLightFRC6CLight
lbl_800DE79C: lbl_800DE79C:
/* 800DE79C 000DB6FC 3B DE 00 01 */ addi r30, r30, 1 /* 800DE79C 000DB6FC 3B DE 00 01 */ addi r30, r30, 1
/* 800DE7A0 000DB700 3B FF 00 50 */ addi r31, r31, 0x50 /* 800DE7A0 000DB700 3B FF 00 50 */ addi r31, r31, 0x50

12
asm/MetroidPrime/CStateManager.s
View File

@ -2514,7 +2514,7 @@ sub_80045a40:
/* 80045A48 000429A8 28 03 00 00 */ cmplwi r3, 0 /* 80045A48 000429A8 28 03 00 00 */ cmplwi r3, 0
/* 80045A4C 000429AC 90 01 00 14 */ stw r0, 0x14(r1) /* 80045A4C 000429AC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80045A50 000429B0 41 82 00 08 */ beq lbl_80045A58 /* 80045A50 000429B0 41 82 00 08 */ beq lbl_80045A58
/* 80045A54 000429B4 4B FF 5B 1D */ bl __ct__6CLightFCR6CLight /* 80045A54 000429B4 4B FF 5B 1D */ bl __ct__6CLightFRC6CLight
lbl_80045A58: lbl_80045A58:
/* 80045A58 000429B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80045A58 000429B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80045A5C 000429BC 7C 08 03 A6 */ mtlr r0 /* 80045A5C 000429BC 7C 08 03 A6 */ mtlr r0
@ -13870,7 +13870,7 @@ lbl_8004F964:
/* 8004F990 0004C8F0 48 00 0E ED */ bl sub_8005087c /* 8004F990 0004C8F0 48 00 0E ED */ bl sub_8005087c
/* 8004F994 0004C8F4 7F 84 E3 78 */ mr r4, r28 /* 8004F994 0004C8F4 7F 84 E3 78 */ mr r4, r28
/* 8004F998 0004C8F8 38 61 00 40 */ addi r3, r1, 0x40 /* 8004F998 0004C8F8 38 61 00 40 */ addi r3, r1, 0x40
/* 8004F99C 0004C8FC 4B FE BB D5 */ bl __ct__6CLightFCR6CLight /* 8004F99C 0004C8FC 4B FE BB D5 */ bl __ct__6CLightFRC6CLight
/* 8004F9A0 0004C900 80 9D 00 00 */ lwz r4, 0(r29) /* 8004F9A0 0004C900 80 9D 00 00 */ lwz r4, 0(r29)
/* 8004F9A4 0004C904 80 61 00 3C */ lwz r3, 0x3c(r1) /* 8004F9A4 0004C904 80 61 00 3C */ lwz r3, 0x3c(r1)
/* 8004F9A8 0004C908 38 84 00 50 */ addi r4, r4, 0x50 /* 8004F9A8 0004C908 38 84 00 50 */ addi r4, r4, 0x50
@ -13995,7 +13995,7 @@ sub_8004fb30:
/* 8004FB48 0004CAA8 7C 7E 1B 78 */ mr r30, r3 /* 8004FB48 0004CAA8 7C 7E 1B 78 */ mr r30, r3
/* 8004FB4C 0004CAAC 80 83 00 00 */ lwz r4, 0(r3) /* 8004FB4C 0004CAAC 80 83 00 00 */ lwz r4, 0(r3)
/* 8004FB50 0004CAB0 38 61 00 08 */ addi r3, r1, 8 /* 8004FB50 0004CAB0 38 61 00 08 */ addi r3, r1, 8
/* 8004FB54 0004CAB4 4B FE BA 1D */ bl __ct__6CLightFCR6CLight /* 8004FB54 0004CAB4 4B FE BA 1D */ bl __ct__6CLightFRC6CLight
/* 8004FB58 0004CAB8 80 9F 00 00 */ lwz r4, 0(r31) /* 8004FB58 0004CAB8 80 9F 00 00 */ lwz r4, 0(r31)
/* 8004FB5C 0004CABC 80 BE 00 00 */ lwz r5, 0(r30) /* 8004FB5C 0004CABC 80 BE 00 00 */ lwz r5, 0(r30)
/* 8004FB60 0004CAC0 80 64 00 00 */ lwz r3, 0(r4) /* 8004FB60 0004CAC0 80 64 00 00 */ lwz r3, 0(r4)
@ -15017,7 +15017,7 @@ lbl_80050940:
/* 80050944 0004D8A4 41 82 02 E0 */ beq lbl_80050C24 /* 80050944 0004D8A4 41 82 02 E0 */ beq lbl_80050C24
/* 80050948 0004D8A8 7F E4 FB 78 */ mr r4, r31 /* 80050948 0004D8A8 7F E4 FB 78 */ mr r4, r31
/* 8005094C 0004D8AC 38 61 00 08 */ addi r3, r1, 8 /* 8005094C 0004D8AC 38 61 00 08 */ addi r3, r1, 8
/* 80050950 0004D8B0 4B FE AC 21 */ bl __ct__6CLightFCR6CLight /* 80050950 0004D8B0 4B FE AC 21 */ bl __ct__6CLightFRC6CLight
/* 80050954 0004D8B4 80 7E 00 00 */ lwz r3, 0(r30) /* 80050954 0004D8B4 80 7E 00 00 */ lwz r3, 0(r30)
/* 80050958 0004D8B8 80 1E 00 04 */ lwz r0, 4(r30) /* 80050958 0004D8B8 80 1E 00 04 */ lwz r0, 4(r30)
/* 8005095C 0004D8BC 90 7F 00 00 */ stw r3, 0(r31) /* 8005095C 0004D8BC 90 7F 00 00 */ stw r3, 0(r31)
@ -15224,7 +15224,7 @@ sub_80050c48:
/* 80050C60 0004DBC0 7C 7E 1B 78 */ mr r30, r3 /* 80050C60 0004DBC0 7C 7E 1B 78 */ mr r30, r3
/* 80050C64 0004DBC4 7F C4 F3 78 */ mr r4, r30 /* 80050C64 0004DBC4 7F C4 F3 78 */ mr r4, r30
/* 80050C68 0004DBC8 38 61 00 08 */ addi r3, r1, 8 /* 80050C68 0004DBC8 38 61 00 08 */ addi r3, r1, 8
/* 80050C6C 0004DBCC 4B FE A9 05 */ bl __ct__6CLightFCR6CLight /* 80050C6C 0004DBCC 4B FE A9 05 */ bl __ct__6CLightFRC6CLight
/* 80050C70 0004DBD0 80 7F 00 00 */ lwz r3, 0(r31) /* 80050C70 0004DBD0 80 7F 00 00 */ lwz r3, 0(r31)
/* 80050C74 0004DBD4 80 1F 00 04 */ lwz r0, 4(r31) /* 80050C74 0004DBD4 80 1F 00 04 */ lwz r0, 4(r31)
/* 80050C78 0004DBD8 90 7E 00 00 */ stw r3, 0(r30) /* 80050C78 0004DBD8 90 7E 00 00 */ stw r3, 0(r30)
@ -15377,7 +15377,7 @@ lbl_80050E60:
lbl_80050EA0: lbl_80050EA0:
/* 80050EA0 0004DE00 7F E4 FB 78 */ mr r4, r31 /* 80050EA0 0004DE00 7F E4 FB 78 */ mr r4, r31
/* 80050EA4 0004DE04 38 61 00 08 */ addi r3, r1, 8 /* 80050EA4 0004DE04 38 61 00 08 */ addi r3, r1, 8
/* 80050EA8 0004DE08 4B FE A6 C9 */ bl __ct__6CLightFCR6CLight /* 80050EA8 0004DE08 4B FE A6 C9 */ bl __ct__6CLightFRC6CLight
/* 80050EAC 0004DE0C 7F FD FB 78 */ mr r29, r31 /* 80050EAC 0004DE0C 7F FD FB 78 */ mr r29, r31
/* 80050EB0 0004DE10 3B DF FF B0 */ addi r30, r31, -80 /* 80050EB0 0004DE10 3B DF FF B0 */ addi r30, r31, -80
/* 80050EB4 0004DE14 48 00 00 AC */ b lbl_80050F60 /* 80050EB4 0004DE14 48 00 00 AC */ b lbl_80050F60

6
asm/MetroidPrime/CWorldTransManager.s
View File

@ -1717,7 +1717,7 @@ lbl_8020A588:
/* 8020A5C8 00207528 48 0F BE 35 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf /* 8020A5C8 00207528 48 0F BE 35 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf
/* 8020A5CC 0020752C 38 61 01 34 */ addi r3, r1, 0x134 /* 8020A5CC 0020752C 38 61 01 34 */ addi r3, r1, 0x134
/* 8020A5D0 00207530 38 81 00 44 */ addi r4, r1, 0x44 /* 8020A5D0 00207530 38 81 00 44 */ addi r4, r1, 0x44
/* 8020A5D4 00207534 4B E3 0F 9D */ bl __ct__6CLightFCR6CLight /* 8020A5D4 00207534 4B E3 0F 9D */ bl __ct__6CLightFRC6CLight
/* 8020A5D8 00207538 C0 42 B1 28 */ lfs f2, lbl_805ACE48@sda21(r2) /* 8020A5D8 00207538 C0 42 B1 28 */ lfs f2, lbl_805ACE48@sda21(r2)
/* 8020A5DC 0020753C 38 61 01 34 */ addi r3, r1, 0x134 /* 8020A5DC 0020753C 38 61 01 34 */ addi r3, r1, 0x134
/* 8020A5E0 00207540 C0 22 B1 30 */ lfs f1, lbl_805ACE50@sda21(r2) /* 8020A5E0 00207540 C0 22 B1 30 */ lfs f1, lbl_805ACE50@sda21(r2)
@ -1725,7 +1725,7 @@ lbl_8020A588:
/* 8020A5E8 00207548 48 0F BD C9 */ bl SetAttenuation__6CLightFfff /* 8020A5E8 00207548 48 0F BD C9 */ bl SetAttenuation__6CLightFfff
/* 8020A5EC 0020754C 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8020A5EC 0020754C 38 61 00 E4 */ addi r3, r1, 0xe4
/* 8020A5F0 00207550 38 81 01 34 */ addi r4, r1, 0x134 /* 8020A5F0 00207550 38 81 01 34 */ addi r4, r1, 0x134
/* 8020A5F4 00207554 4B E3 0F 7D */ bl __ct__6CLightFCR6CLight /* 8020A5F4 00207554 4B E3 0F 7D */ bl __ct__6CLightFRC6CLight
/* 8020A5F8 00207558 C0 42 B1 48 */ lfs f2, lbl_805ACE68@sda21(r2) /* 8020A5F8 00207558 C0 42 B1 48 */ lfs f2, lbl_805ACE68@sda21(r2)
/* 8020A5FC 0020755C 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8020A5FC 0020755C 38 61 00 E4 */ addi r3, r1, 0xe4
/* 8020A600 00207560 C0 3E 00 18 */ lfs f1, 0x18(r30) /* 8020A600 00207560 C0 3E 00 18 */ lfs f1, 0x18(r30)
@ -1771,7 +1771,7 @@ lbl_8020A690:
/* 8020A698 002075F8 40 80 00 B8 */ bge lbl_8020A750 /* 8020A698 002075F8 40 80 00 B8 */ bge lbl_8020A750
/* 8020A69C 002075FC 38 61 00 94 */ addi r3, r1, 0x94 /* 8020A69C 002075FC 38 61 00 94 */ addi r3, r1, 0x94
/* 8020A6A0 00207600 38 81 01 34 */ addi r4, r1, 0x134 /* 8020A6A0 00207600 38 81 01 34 */ addi r4, r1, 0x134
/* 8020A6A4 00207604 4B E3 0E CD */ bl __ct__6CLightFCR6CLight /* 8020A6A4 00207604 4B E3 0E CD */ bl __ct__6CLightFRC6CLight
/* 8020A6A8 00207608 88 1E 00 44 */ lbz r0, 0x44(r30) /* 8020A6A8 00207608 88 1E 00 44 */ lbz r0, 0x44(r30)
/* 8020A6AC 0020760C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 8020A6AC 0020760C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f
/* 8020A6B0 00207610 41 82 00 0C */ beq lbl_8020A6BC /* 8020A6B0 00207610 41 82 00 0C */ beq lbl_8020A6BC

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

@ -8697,7 +8697,7 @@ lbl_80166498:
/* 80166508 00163468 48 19 FF 2D */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 80166508 00163468 48 19 FF 2D */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor
/* 8016650C 0016346C 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8016650C 0016346C 38 61 00 B0 */ addi r3, r1, 0xb0
/* 80166510 00163470 38 81 00 60 */ addi r4, r1, 0x60 /* 80166510 00163470 38 81 00 60 */ addi r4, r1, 0x60
/* 80166514 00163474 4B ED 50 5D */ bl __ct__6CLightFCR6CLight /* 80166514 00163474 4B ED 50 5D */ bl __ct__6CLightFRC6CLight
/* 80166518 00163478 3C 60 80 3D */ lis r3, lbl_803D0398@ha /* 80166518 00163478 3C 60 80 3D */ lis r3, lbl_803D0398@ha
/* 8016651C 0016347C 3B 80 00 00 */ li r28, 0 /* 8016651C 0016347C 3B 80 00 00 */ li r28, 0
/* 80166520 00163480 38 83 03 98 */ addi r4, r3, lbl_803D0398@l /* 80166520 00163480 38 83 03 98 */ addi r4, r3, lbl_803D0398@l
@ -9846,7 +9846,7 @@ lbl_801675E4:
/* 8016760C 0016456C 48 19 EE 29 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 8016760C 0016456C 48 19 EE 29 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor
/* 80167610 00164570 38 61 00 90 */ addi r3, r1, 0x90 /* 80167610 00164570 38 61 00 90 */ addi r3, r1, 0x90
/* 80167614 00164574 38 81 00 40 */ addi r4, r1, 0x40 /* 80167614 00164574 38 81 00 40 */ addi r4, r1, 0x40
/* 80167618 00164578 4B ED 3F 59 */ bl __ct__6CLightFCR6CLight /* 80167618 00164578 4B ED 3F 59 */ bl __ct__6CLightFRC6CLight
/* 8016761C 0016457C 3C 60 80 3D */ lis r3, lbl_803D0398@ha /* 8016761C 0016457C 3C 60 80 3D */ lis r3, lbl_803D0398@ha
/* 80167620 00164580 3B 80 00 00 */ li r28, 0 /* 80167620 00164580 3B 80 00 00 */ li r28, 0
/* 80167624 00164584 38 83 03 98 */ addi r4, r3, lbl_803D0398@l /* 80167624 00164584 38 83 03 98 */ addi r4, r3, lbl_803D0398@l

4
asm/MetroidPrime/HUD/CSamusHud.s
View File

@ -5129,7 +5129,7 @@ lbl_80068920:
/* 80068944 000658A4 48 29 DA F1 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 80068944 000658A4 48 29 DA F1 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor
/* 80068948 000658A8 38 61 02 EC */ addi r3, r1, 0x2ec /* 80068948 000658A8 38 61 02 EC */ addi r3, r1, 0x2ec
/* 8006894C 000658AC 38 81 02 9C */ addi r4, r1, 0x29c /* 8006894C 000658AC 38 81 02 9C */ addi r4, r1, 0x29c
/* 80068950 000658B0 4B FD 2C 21 */ bl __ct__6CLightFCR6CLight /* 80068950 000658B0 4B FD 2C 21 */ bl __ct__6CLightFRC6CLight
/* 80068954 000658B4 AA 77 20 08 */ lha r19, 0x2008(r23) /* 80068954 000658B4 AA 77 20 08 */ lha r19, 0x2008(r23)
/* 80068958 000658B8 3A A1 03 04 */ addi r21, r1, 0x304 /* 80068958 000658B8 3A A1 03 04 */ addi r21, r1, 0x304
/* 8006895C 000658BC 48 00 01 78 */ b lbl_80068AD4 /* 8006895C 000658BC 48 00 01 78 */ b lbl_80068AD4
@ -9806,7 +9806,7 @@ InitializeDamageLight__9CSamusHudFv:
/* 8006CB40 00069AA0 48 29 98 BD */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf /* 8006CB40 00069AA0 48 29 98 BD */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf
/* 8006CB44 00069AA4 38 61 06 28 */ addi r3, r1, 0x628 /* 8006CB44 00069AA4 38 61 06 28 */ addi r3, r1, 0x628
/* 8006CB48 00069AA8 38 81 05 D8 */ addi r4, r1, 0x5d8 /* 8006CB48 00069AA8 38 81 05 D8 */ addi r4, r1, 0x5d8
/* 8006CB4C 00069AAC 4B FC EA 25 */ bl __ct__6CLightFCR6CLight /* 8006CB4C 00069AAC 4B FC EA 25 */ bl __ct__6CLightFRC6CLight
/* 8006CB50 00069AB0 3C 80 80 3D */ lis r4, lbl_803CD0C0@ha /* 8006CB50 00069AB0 3C 80 80 3D */ lis r4, lbl_803CD0C0@ha
/* 8006CB54 00069AB4 38 60 00 E0 */ li r3, 0xe0 /* 8006CB54 00069AB4 38 60 00 E0 */ li r3, 0xe0
/* 8006CB58 00069AB8 38 84 D0 C0 */ addi r4, r4, lbl_803CD0C0@l /* 8006CB58 00069AB8 38 84 D0 C0 */ addi r4, r4, lbl_803CD0C0@l

4
asm/MetroidPrime/Player/CMorphBall.s
View File

@ -7288,7 +7288,7 @@ sub_800f3454:
/* 800F345C 000F03BC 28 03 00 00 */ cmplwi r3, 0 /* 800F345C 000F03BC 28 03 00 00 */ cmplwi r3, 0
/* 800F3460 000F03C0 90 01 00 14 */ stw r0, 0x14(r1) /* 800F3460 000F03C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 800F3464 000F03C4 41 82 00 08 */ beq lbl_800F346C /* 800F3464 000F03C4 41 82 00 08 */ beq lbl_800F346C
/* 800F3468 000F03C8 4B F4 81 09 */ bl __ct__6CLightFCR6CLight /* 800F3468 000F03C8 4B F4 81 09 */ bl __ct__6CLightFRC6CLight
lbl_800F346C: lbl_800F346C:
/* 800F346C 000F03CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800F346C 000F03CC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800F3470 000F03D0 7C 08 03 A6 */ mtlr r0 /* 800F3470 000F03D0 7C 08 03 A6 */ mtlr r0
@ -9314,7 +9314,7 @@ lbl_800F5224:
/* 800F522C 000F218C 41 82 01 94 */ beq lbl_800F53C0 /* 800F522C 000F218C 41 82 01 94 */ beq lbl_800F53C0
/* 800F5230 000F2190 38 61 03 A0 */ addi r3, r1, 0x3a0 /* 800F5230 000F2190 38 61 03 A0 */ addi r3, r1, 0x3a0
/* 800F5234 000F2194 38 81 03 F0 */ addi r4, r1, 0x3f0 /* 800F5234 000F2194 38 81 03 F0 */ addi r4, r1, 0x3f0
/* 800F5238 000F2198 4B F4 63 39 */ bl __ct__6CLightFCR6CLight /* 800F5238 000F2198 4B F4 63 39 */ bl __ct__6CLightFRC6CLight
/* 800F523C 000F219C 80 9D 00 08 */ lwz r4, 8(r29) /* 800F523C 000F219C 80 9D 00 08 */ lwz r4, 8(r29)
/* 800F5240 000F21A0 3C 60 80 3D */ lis r3, lbl_803CEB78@ha /* 800F5240 000F21A0 3C 60 80 3D */ lis r3, lbl_803CEB78@ha
/* 800F5244 000F21A4 38 00 00 FF */ li r0, 0xff /* 800F5244 000F21A4 38 00 00 FF */ li r0, 0xff

3
asm/MetroidPrime/Player/CMorphBallShadow.s
View File

@ -198,7 +198,7 @@ lbl_80295D78:
/* 80295DB0 00292D10 48 07 06 BD */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 80295DB0 00292D10 48 07 06 BD */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor
/* 80295DB4 00292D14 38 61 02 50 */ addi r3, r1, 0x250 /* 80295DB4 00292D14 38 61 02 50 */ addi r3, r1, 0x250
/* 80295DB8 00292D18 38 81 02 00 */ addi r4, r1, 0x200 /* 80295DB8 00292D18 38 81 02 00 */ addi r4, r1, 0x200
/* 80295DBC 00292D1C 4B DA 57 B5 */ bl __ct__6CLightFCR6CLight /* 80295DBC 00292D1C 4B DA 57 B5 */ bl __ct__6CLightFRC6CLight
/* 80295DC0 00292D20 38 81 02 50 */ addi r4, r1, 0x250 /* 80295DC0 00292D20 38 81 02 50 */ addi r4, r1, 0x250
/* 80295DC4 00292D24 38 60 00 00 */ li r3, 0 /* 80295DC4 00292D24 38 60 00 00 */ li r3, 0
/* 80295DC8 00292D28 48 07 6B FD */ bl LoadLight__9CGraphicsF9ERglLightRC6CLight /* 80295DC8 00292D28 48 07 6B FD */ bl LoadLight__9CGraphicsF9ERglLightRC6CLight
@ -1383,4 +1383,3 @@ lbl_803D5C30:
# ROM: 0x3D2C30 # ROM: 0x3D2C30
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4

8
asm/MetroidPrime/Player/CPlayerGun.s
View File

@ -1445,7 +1445,7 @@ SetGunLightActive__10CPlayerGunFbR13CStateManager:
/* 8003B528 00038488 4E 80 04 21 */ bctrl /* 8003B528 00038488 4E 80 04 21 */ bctrl
/* 8003B52C 0003848C 38 61 00 64 */ addi r3, r1, 0x64 /* 8003B52C 0003848C 38 61 00 64 */ addi r3, r1, 0x64
/* 8003B530 00038490 38 81 00 14 */ addi r4, r1, 0x14 /* 8003B530 00038490 38 81 00 14 */ addi r4, r1, 0x14
/* 8003B534 00038494 48 00 00 3D */ bl __ct__6CLightFCR6CLight /* 8003B534 00038494 48 00 00 3D */ bl __ct__6CLightFRC6CLight
/* 8003B538 00038498 48 30 EA 7D */ bl Black__6CColorFv /* 8003B538 00038498 48 30 EA 7D */ bl Black__6CColorFv
/* 8003B53C 0003849C 7C 64 1B 78 */ mr r4, r3 /* 8003B53C 0003849C 7C 64 1B 78 */ mr r4, r3
/* 8003B540 000384A0 38 61 00 64 */ addi r3, r1, 0x64 /* 8003B540 000384A0 38 61 00 64 */ addi r3, r1, 0x64
@ -1462,8 +1462,8 @@ lbl_8003B554:
/* 8003B568 000384C8 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8003B568 000384C8 38 21 00 D0 */ addi r1, r1, 0xd0
/* 8003B56C 000384CC 4E 80 00 20 */ blr /* 8003B56C 000384CC 4E 80 00 20 */ blr
.global __ct__6CLightFCR6CLight .global __ct__6CLightFRC6CLight
__ct__6CLightFCR6CLight: __ct__6CLightFRC6CLight:
/* 8003B570 000384D0 C0 04 00 00 */ lfs f0, 0(r4) /* 8003B570 000384D0 C0 04 00 00 */ lfs f0, 0(r4)
/* 8003B574 000384D4 D0 03 00 00 */ stfs f0, 0(r3) /* 8003B574 000384D4 D0 03 00 00 */ stfs f0, 0(r3)
/* 8003B578 000384D8 C0 04 00 04 */ lfs f0, 4(r4) /* 8003B578 000384D8 C0 04 00 04 */ lfs f0, 4(r4)
@ -1580,7 +1580,7 @@ UpdateGunLight__10CPlayerGunFRC12CTransform4fR13CStateManager:
/* 8003B728 00038688 4E 80 04 21 */ bctrl /* 8003B728 00038688 4E 80 04 21 */ bctrl
/* 8003B72C 0003868C 38 61 00 74 */ addi r3, r1, 0x74 /* 8003B72C 0003868C 38 61 00 74 */ addi r3, r1, 0x74
/* 8003B730 00038690 38 81 00 24 */ addi r4, r1, 0x24 /* 8003B730 00038690 38 81 00 24 */ addi r4, r1, 0x24
/* 8003B734 00038694 4B FF FE 3D */ bl __ct__6CLightFCR6CLight /* 8003B734 00038694 4B FF FE 3D */ bl __ct__6CLightFRC6CLight
/* 8003B738 00038698 80 81 00 8C */ lwz r4, 0x8c(r1) /* 8003B738 00038698 80 81 00 8C */ lwz r4, 0x8c(r1)
/* 8003B73C 0003869C 38 60 00 00 */ li r3, 0 /* 8003B73C 0003869C 38 60 00 00 */ li r3, 0
/* 8003B740 000386A0 C0 3F 03 40 */ lfs f1, 0x340(r31) /* 8003B740 000386A0 C0 3F 03 40 */ lfs f1, 0x340(r31)

2
asm/MetroidPrime/Weapons/CIceProjectile.s
View File

@ -1899,7 +1899,7 @@ sub_801f34cc:
/* 801F34D4 001F0434 28 03 00 00 */ cmplwi r3, 0 /* 801F34D4 001F0434 28 03 00 00 */ cmplwi r3, 0
/* 801F34D8 001F0438 90 01 00 14 */ stw r0, 0x14(r1) /* 801F34D8 001F0438 90 01 00 14 */ stw r0, 0x14(r1)
/* 801F34DC 001F043C 41 82 00 08 */ beq lbl_801F34E4 /* 801F34DC 001F043C 41 82 00 08 */ beq lbl_801F34E4
/* 801F34E0 001F0440 4B E4 80 91 */ bl __ct__6CLightFCR6CLight /* 801F34E0 001F0440 4B E4 80 91 */ bl __ct__6CLightFRC6CLight
lbl_801F34E4: lbl_801F34E4:
/* 801F34E4 001F0444 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F34E4 001F0444 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801F34E8 001F0448 7C 08 03 A6 */ mtlr r0 /* 801F34E8 001F0448 7C 08 03 A6 */ mtlr r0

2
asm/MetroidPrime/Weapons/CNewFlameThrower.s
View File

@ -954,7 +954,7 @@ lbl_80261BFC:
/* 80261C30 0025EB90 4E 80 04 21 */ bctrl /* 80261C30 0025EB90 4E 80 04 21 */ bctrl
/* 80261C34 0025EB94 38 61 00 7C */ addi r3, r1, 0x7c /* 80261C34 0025EB94 38 61 00 7C */ addi r3, r1, 0x7c
/* 80261C38 0025EB98 38 81 00 2C */ addi r4, r1, 0x2c /* 80261C38 0025EB98 38 81 00 2C */ addi r4, r1, 0x2c
/* 80261C3C 0025EB9C 4B DD 99 35 */ bl __ct__6CLightFCR6CLight /* 80261C3C 0025EB9C 4B DD 99 35 */ bl __ct__6CLightFRC6CLight
/* 80261C40 0025EBA0 80 75 03 0C */ lwz r3, 0x30c(r21) /* 80261C40 0025EBA0 80 75 03 0C */ lwz r3, 0x30c(r21)
/* 80261C44 0025EBA4 82 E3 00 F0 */ lwz r23, 0xf0(r3) /* 80261C44 0025EBA4 82 E3 00 F0 */ lwz r23, 0xf0(r3)
/* 80261C48 0025EBA8 28 17 00 00 */ cmplwi r23, 0 /* 80261C48 0025EBA8 28 17 00 00 */ cmplwi r23, 0

2
asm/MetroidPrime/Weapons/CPlasmaProjectile.s
View File

@ -348,7 +348,7 @@ UpdateLights__17CPlasmaProjectileFffR13CStateManager:
/* 80176F28 00173E88 4E 80 04 21 */ bctrl /* 80176F28 00173E88 4E 80 04 21 */ bctrl
/* 80176F2C 00173E8C 38 61 00 80 */ addi r3, r1, 0x80 /* 80176F2C 00173E8C 38 61 00 80 */ addi r3, r1, 0x80
/* 80176F30 00173E90 38 81 00 30 */ addi r4, r1, 0x30 /* 80176F30 00173E90 38 81 00 30 */ addi r4, r1, 0x30
/* 80176F34 00173E94 4B EC 46 3D */ bl __ct__6CLightFCR6CLight /* 80176F34 00173E94 4B EC 46 3D */ bl __ct__6CLightFRC6CLight
/* 80176F38 00173E98 FC 20 F8 90 */ fmr f1, f31 /* 80176F38 00173E98 FC 20 F8 90 */ fmr f1, f31
/* 80176F3C 00173E9C 80 81 00 98 */ lwz r4, 0x98(r1) /* 80176F3C 00173E9C 80 81 00 98 */ lwz r4, 0x98(r1)
/* 80176F40 00173EA0 38 60 00 00 */ li r3, 0 /* 80176F40 00173EA0 38 60 00 00 */ li r3, 0

3
asm/Weapons/CProjectileWeapon.s
View File

@ -914,7 +914,7 @@ Render__17CProjectileWeaponCFv:
/* 802AF940 002AC8A0 48 05 6B 65 */ bl BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor /* 802AF940 002AC8A0 48 05 6B 65 */ bl BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor
/* 802AF944 002AC8A4 38 61 02 64 */ addi r3, r1, 0x264 /* 802AF944 002AC8A4 38 61 02 64 */ addi r3, r1, 0x264
/* 802AF948 002AC8A8 38 81 02 14 */ addi r4, r1, 0x214 /* 802AF948 002AC8A8 38 81 02 14 */ addi r4, r1, 0x214
/* 802AF94C 002AC8AC 4B D8 BC 25 */ bl __ct__6CLightFCR6CLight /* 802AF94C 002AC8AC 4B D8 BC 25 */ bl __ct__6CLightFRC6CLight
/* 802AF950 002AC8B0 C0 22 C1 F8 */ lfs f1, lbl_805ADF18@sda21(r2) /* 802AF950 002AC8B0 C0 22 C1 F8 */ lfs f1, lbl_805ADF18@sda21(r2)
/* 802AF954 002AC8B4 38 80 00 00 */ li r4, 0 /* 802AF954 002AC8B4 38 80 00 00 */ li r4, 0
/* 802AF958 002AC8B8 38 00 00 03 */ li r0, 3 /* 802AF958 002AC8B8 38 00 00 03 */ li r0, 3
@ -2665,4 +2665,3 @@ lbl_803D6188:
# ROM: 0x3D3188 # ROM: 0x3D3188
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4

4
asm/WorldFormat/CWorldLight.s
View File

@ -138,7 +138,7 @@ lbl_802A7748:
/* 802A7778 002A46D8 48 05 EC 85 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf /* 802A7778 002A46D8 48 05 EC 85 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf
/* 802A777C 002A46DC 38 61 00 84 */ addi r3, r1, 0x84 /* 802A777C 002A46DC 38 61 00 84 */ addi r3, r1, 0x84
/* 802A7780 002A46E0 38 81 00 34 */ addi r4, r1, 0x34 /* 802A7780 002A46E0 38 81 00 34 */ addi r4, r1, 0x34
/* 802A7784 002A46E4 4B D9 3D ED */ bl __ct__6CLightFCR6CLight /* 802A7784 002A46E4 4B D9 3D ED */ bl __ct__6CLightFRC6CLight
/* 802A7788 002A46E8 80 1D 00 3C */ lwz r0, 0x3c(r29) /* 802A7788 002A46E8 80 1D 00 3C */ lwz r0, 0x3c(r29)
/* 802A778C 002A46EC 2C 00 00 02 */ cmpwi r0, 2 /* 802A778C 002A46EC 2C 00 00 02 */ cmpwi r0, 2
/* 802A7790 002A46F0 40 82 00 10 */ bne lbl_802A77A0 /* 802A7790 002A46F0 40 82 00 10 */ bne lbl_802A77A0
@ -168,7 +168,7 @@ lbl_802A77D8:
/* 802A77D8 002A4738 48 05 EB D9 */ bl SetAttenuation__6CLightFfff /* 802A77D8 002A4738 48 05 EB D9 */ bl SetAttenuation__6CLightFfff
/* 802A77DC 002A473C 7F 83 E3 78 */ mr r3, r28 /* 802A77DC 002A473C 7F 83 E3 78 */ mr r3, r28
/* 802A77E0 002A4740 38 81 00 84 */ addi r4, r1, 0x84 /* 802A77E0 002A4740 38 81 00 84 */ addi r4, r1, 0x84
/* 802A77E4 002A4744 4B D9 3D 8D */ bl __ct__6CLightFCR6CLight /* 802A77E4 002A4744 4B D9 3D 8D */ bl __ct__6CLightFRC6CLight
/* 802A77E8 002A4748 48 00 00 7C */ b lbl_802A7864 /* 802A77E8 002A4748 48 00 00 7C */ b lbl_802A7864
lbl_802A77EC: lbl_802A77EC:
/* 802A77EC 002A474C 80 1D 00 3C */ lwz r0, 0x3c(r29) /* 802A77EC 002A474C 80 1D 00 3C */ lwz r0, 0x3c(r29)

2
configure.py
View File

@ -110,7 +110,7 @@ LIBS = [
["MetroidPrime/UserNames", True], ["MetroidPrime/UserNames", True],
"MetroidPrime/ScriptObjects/CScriptGenerator", "MetroidPrime/ScriptObjects/CScriptGenerator",
"MetroidPrime/ScriptObjects/CScriptCameraWaypoint", "MetroidPrime/ScriptObjects/CScriptCameraWaypoint",
["MetroidPrime/CGameLight", False], ["MetroidPrime/CGameLight", True],
"MetroidPrime/Tweaks/CTweakTargeting", "MetroidPrime/Tweaks/CTweakTargeting",
"MetroidPrime/Tweaks/CTweakAutoMapper", "MetroidPrime/Tweaks/CTweakAutoMapper",
["MetroidPrime/CParticleGenInfoGeneric", True], ["MetroidPrime/CParticleGenInfoGeneric", True],

1
include/Kyoto/Graphics/CLight.hpp
View File

@ -25,6 +25,7 @@ public:
const CColor& color, float cutoff); const CColor& color, float cutoff);
CLight(const CVector3f& pos, const CVector3f& direction, const CColor& color, float distC, CLight(const CVector3f& pos, const CVector3f& direction, const CColor& color, float distC,
float distL, float distQ, float angleC, float angleL, float angleQ); float distL, float distQ, float angleC, float angleL, float angleQ);
CLight(const CLight&);
void SetPosition(const CVector3f& pos); void SetPosition(const CVector3f& pos);
const CVector3f& GetPosition() const { return x0_pos; } const CVector3f& GetPosition() const { return x0_pos; }

2
obj_files.mk
View File

@ -77,7 +77,7 @@ METROIDPRIME :=\
$(BUILD_DIR)/src/MetroidPrime/UserNames.o\ $(BUILD_DIR)/src/MetroidPrime/UserNames.o\
$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptGenerator.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptGenerator.o\
$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.o\
$(BUILD_DIR)/asm/MetroidPrime/CGameLight.o\ $(BUILD_DIR)/src/MetroidPrime/CGameLight.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakTargeting.o\ $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakTargeting.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakAutoMapper.o\ $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakAutoMapper.o\
$(BUILD_DIR)/src/MetroidPrime/CParticleGenInfoGeneric.o\ $(BUILD_DIR)/src/MetroidPrime/CParticleGenInfoGeneric.o\