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

Correct __dt__16CActorParametersFv to __dt__16CLightParametersFv 

Former-commit-id: 0cfb3d0aff
This commit is contained in:
Luke Street 2022-09-13 22:24:13 -04:00
parent 3b21bc6dd2
commit a781d2de6e
50 changed files with 236 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
asm/MetroidPrime/CActorParameters.s
View File

@ -8,7 +8,7 @@ lbl_803DFF80:
# ROM: 0x3DCF80
.4byte 0
.4byte 0
.4byte __dt__16CActorParametersFv
.4byte __dt__16CLightParametersFv
.4byte 0
.section .sdata
@ -190,8 +190,8 @@ lbl_80106600:
/* 80106600 00103560 38 60 00 08 */ li r3, 8
/* 80106604 00103564 4E 80 00 20 */ blr
.global __dt__16CActorParametersFv
__dt__16CActorParametersFv:
.global __dt__16CLightParametersFv
__dt__16CLightParametersFv:
/* 80106608 00103568 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8010660C 0010356C 7C 08 02 A6 */ mflr r0
/* 80106610 00103570 90 01 00 14 */ stw r0, 0x14(r1)
@ -328,7 +328,7 @@ MakeDamageableTriggerActorParms__FRC16CActorParametersRC16CVisorParameters:
/* 801067E4 00103744 4B FB EE 39 */ bl __ct__16CActorParametersFRC16CActorParameters
/* 801067E8 00103748 38 61 00 08 */ addi r3, r1, 8
/* 801067EC 0010374C 38 80 FF FF */ li r4, -1
/* 801067F0 00103750 4B FF FE 19 */ bl __dt__16CActorParametersFv
/* 801067F0 00103750 4B FF FE 19 */ bl __dt__16CLightParametersFv
/* 801067F4 00103754 80 01 00 84 */ lwz r0, 0x84(r1)
/* 801067F8 00103758 83 E1 00 7C */ lwz r31, 0x7c(r1)
/* 801067FC 0010375C 83 C1 00 78 */ lwz r30, 0x78(r1)
@ -355,7 +355,7 @@ sub_8010680c:
/* 80106844 001037A4 4B FB ED D9 */ bl __ct__16CActorParametersFRC16CActorParameters
/* 80106848 001037A8 38 61 00 08 */ addi r3, r1, 8
/* 8010684C 001037AC 38 80 FF FF */ li r4, -1
/* 80106850 001037B0 4B FF FD B9 */ bl __dt__16CActorParametersFv
/* 80106850 001037B0 4B FF FD B9 */ bl __dt__16CLightParametersFv
/* 80106854 001037B4 80 01 00 84 */ lwz r0, 0x84(r1)
/* 80106858 001037B8 83 E1 00 7C */ lwz r31, 0x7c(r1)
/* 8010685C 001037BC 83 C1 00 78 */ lwz r30, 0x78(r1)
@ -381,7 +381,7 @@ Scannable__16CActorParametersCFRC20CScannableParameters:
/* 801068A0 00103800 4B FB ED 7D */ bl __ct__16CActorParametersFRC16CActorParameters
/* 801068A4 00103804 38 61 00 08 */ addi r3, r1, 8
/* 801068A8 00103808 38 80 FF FF */ li r4, -1
/* 801068AC 0010380C 4B FF FD 5D */ bl __dt__16CActorParametersFv
/* 801068AC 0010380C 4B FF FD 5D */ bl __dt__16CLightParametersFv
/* 801068B0 00103810 80 01 00 84 */ lwz r0, 0x84(r1)
/* 801068B4 00103814 83 E1 00 7C */ lwz r31, 0x7c(r1)
/* 801068B8 00103818 83 C1 00 78 */ lwz r30, 0x78(r1)
@ -504,7 +504,7 @@ __ct__16CActorParametersFv:
/* 80106A74 001039D4 90 1F 00 38 */ stw r0, 0x38(r31)
/* 80106A78 001039D8 80 01 00 48 */ lwz r0, 0x48(r1)
/* 80106A7C 001039DC 90 1F 00 3C */ stw r0, 0x3c(r31)
/* 80106A80 001039E0 4B FF FB 89 */ bl __dt__16CActorParametersFv
/* 80106A80 001039E0 4B FF FB 89 */ bl __dt__16CLightParametersFv
/* 80106A84 001039E4 38 60 FF FF */ li r3, -1
/* 80106A88 001039E8 80 01 00 08 */ lwz r0, 8(r1)
/* 80106A8C 001039EC 90 7F 00 40 */ stw r3, 0x40(r31)

6
asm/MetroidPrime/CCollisionActor.s
View File

@ -1087,7 +1087,7 @@ __ct__15CCollisionActorF9TUniqueId7TAreaId9TUniqueIdbff:
/* 801A9588 001A64E8 4B F7 2F 29 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff"
/* 801A958C 001A64EC 38 61 00 B4 */ addi r3, r1, 0xb4
/* 801A9590 001A64F0 38 80 FF FF */ li r4, -1
/* 801A9594 001A64F4 4B F5 D0 75 */ bl __dt__16CActorParametersFv
/* 801A9594 001A64F4 4B F5 D0 75 */ bl __dt__16CLightParametersFv
/* 801A9598 001A64F8 38 61 01 1C */ addi r3, r1, 0x11c
/* 801A959C 001A64FC 38 80 FF FF */ li r4, -1
/* 801A95A0 001A6500 4B F6 D4 AD */ bl __dt__10CModelDataFv
@ -1384,7 +1384,7 @@ __ct__15CCollisionActorF9TUniqueId9TUniqueIdRC9CVector3fRC9CVector3fbf:
/* 801A9A10 001A6970 4B F7 2A A1 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff"
/* 801A9A14 001A6974 38 61 00 E4 */ addi r3, r1, 0xe4
/* 801A9A18 001A6978 38 80 FF FF */ li r4, -1
/* 801A9A1C 001A697C 4B F5 CB ED */ bl __dt__16CActorParametersFv
/* 801A9A1C 001A697C 4B F5 CB ED */ bl __dt__16CLightParametersFv
/* 801A9A20 001A6980 38 61 01 4C */ addi r3, r1, 0x14c
/* 801A9A24 001A6984 38 80 FF FF */ li r4, -1
/* 801A9A28 001A6988 4B F6 D0 25 */ bl __dt__10CModelDataFv
@ -1701,7 +1701,7 @@ __ct__15CCollisionActorF9TUniqueIdCRi9TUniqueIdRC9CVector3fRC9CVector3fbf:
/* 801A9EE8 001A6E48 4B F7 25 C9 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff"
/* 801A9EEC 001A6E4C 38 61 00 AC */ addi r3, r1, 0xac
/* 801A9EF0 001A6E50 38 80 FF FF */ li r4, -1
/* 801A9EF4 001A6E54 4B F5 C7 15 */ bl __dt__16CActorParametersFv
/* 801A9EF4 001A6E54 4B F5 C7 15 */ bl __dt__16CLightParametersFv
/* 801A9EF8 001A6E58 38 61 01 14 */ addi r3, r1, 0x114
/* 801A9EFC 001A6E5C 38 80 FF FF */ li r4, -1
/* 801A9F00 001A6E60 4B F6 CB 4D */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/CEffect.s
View File

@ -139,7 +139,7 @@ nullsub_84:
/* 8005ADFC 00057D5C 4B FF AA 25 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8005AE00 00057D60 38 61 00 20 */ addi r3, r1, 0x20
/* 8005AE04 00057D64 38 80 FF FF */ li r4, -1
/* 8005AE08 00057D68 48 0A B8 01 */ bl __dt__16CActorParametersFv
/* 8005AE08 00057D68 48 0A B8 01 */ bl __dt__16CLightParametersFv
/* 8005AE0C 00057D6C 38 61 00 88 */ addi r3, r1, 0x88
/* 8005AE10 00057D70 38 80 FF FF */ li r4, -1
/* 8005AE14 00057D74 48 0B BC 39 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/CGameLight.s
View File

@ -300,7 +300,7 @@ SetLight__10CGameLightFRC6CLight:
/* 800B590C 000B286C 4B F9 FF 15 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 800B5910 000B2870 38 61 00 50 */ addi r3, r1, 0x50
/* 800B5914 000B2874 38 80 FF FF */ li r4, -1
/* 800B5918 000B2878 48 05 0C F1 */ bl __dt__16CActorParametersFv
/* 800B5918 000B2878 48 05 0C F1 */ bl __dt__16CLightParametersFv
/* 800B591C 000B287C 38 61 00 B8 */ addi r3, r1, 0xb8
/* 800B5920 000B2880 38 80 FF FF */ li r4, -1
/* 800B5924 000B2884 48 06 11 29 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/Cameras/CGameCamera.s
View File

@ -3385,7 +3385,7 @@ lbl_8005DAA0:
/* 8005DBA4 0005AB04 4B FF 7C 7D */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8005DBA8 0005AB08 38 61 00 20 */ addi r3, r1, 0x20
/* 8005DBAC 0005AB0C 38 80 FF FF */ li r4, -1
/* 8005DBB0 0005AB10 48 0A 8A 59 */ bl __dt__16CActorParametersFv
/* 8005DBB0 0005AB10 48 0A 8A 59 */ bl __dt__16CLightParametersFv
/* 8005DBB4 0005AB14 38 61 00 88 */ addi r3, r1, 0x88
/* 8005DBB8 0005AB18 38 80 FF FF */ li r4, -1
/* 8005DBBC 0005AB1C 48 0B 8E 91 */ bl __dt__10CModelDataFv

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

@ -10111,10 +10111,10 @@ __ct__11CDroneLaserF9TUniqueIdRC12CTransform4fUi:
/* 801679F8 00164958 4B EE DE 29 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801679FC 0016495C 38 61 00 78 */ addi r3, r1, 0x78
/* 80167A00 00164960 38 80 FF FF */ li r4, -1
/* 80167A04 00164964 4B F9 EC 05 */ bl __dt__16CActorParametersFv
/* 80167A04 00164964 4B F9 EC 05 */ bl __dt__16CLightParametersFv
/* 80167A08 00164968 38 61 00 E0 */ addi r3, r1, 0xe0
/* 80167A0C 0016496C 38 80 FF FF */ li r4, -1
/* 80167A10 00164970 4B F9 EB F9 */ bl __dt__16CActorParametersFv
/* 80167A10 00164970 4B F9 EB F9 */ bl __dt__16CLightParametersFv
/* 80167A14 00164974 38 61 01 48 */ addi r3, r1, 0x148
/* 80167A18 00164978 38 80 FF FF */ li r4, -1
/* 80167A1C 0016497C 4B FA F0 31 */ bl __dt__10CModelDataFv

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

@ -7322,7 +7322,7 @@ lbl_8022D72C:
/* 8022D734 0022A694 34 7E 06 00 */ addic. r3, r30, 0x600
/* 8022D738 0022A698 41 82 00 0C */ beq lbl_8022D744
/* 8022D73C 0022A69C 38 80 FF FF */ li r4, -1
/* 8022D740 0022A6A0 4B ED 8E C9 */ bl __dt__16CActorParametersFv
/* 8022D740 0022A6A0 4B ED 8E C9 */ bl __dt__16CLightParametersFv
lbl_8022D744:
/* 8022D744 0022A6A4 34 1E 05 D4 */ addic. r0, r30, 0x5d4
/* 8022D748 0022A6A8 41 82 00 10 */ beq lbl_8022D758
@ -7848,7 +7848,7 @@ __ct__16CElitePirateDataFR12CInputStreami:
/* 8022DF14 0022AE74 4B E9 77 09 */ bl __ct__16CActorParametersFRC16CActorParameters
/* 8022DF18 0022AE78 38 61 00 14 */ addi r3, r1, 0x14
/* 8022DF1C 0022AE7C 38 80 FF FF */ li r4, -1
/* 8022DF20 0022AE80 4B ED 86 E9 */ bl __dt__16CActorParametersFv
/* 8022DF20 0022AE80 4B ED 86 E9 */ bl __dt__16CLightParametersFv
/* 8022DF24 0022AE84 7F C4 F3 78 */ mr r4, r30
/* 8022DF28 0022AE88 38 61 00 08 */ addi r3, r1, 8
/* 8022DF2C 0022AE8C 4B EA C4 E1 */ bl LoadAnimationParameters__FR12CInputStream

6
asm/MetroidPrime/Enemies/CFlaahgra.s
View File

@ -583,7 +583,7 @@ Accept__17CFlaahgraRendererFR8IVisitor:
/* 801AD748 001AA6A8 4B EA 80 D9 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801AD74C 001AA6AC 38 61 00 20 */ addi r3, r1, 0x20
/* 801AD750 001AA6B0 38 80 FF FF */ li r4, -1
/* 801AD754 001AA6B4 4B F5 8E B5 */ bl __dt__16CActorParametersFv
/* 801AD754 001AA6B4 4B F5 8E B5 */ bl __dt__16CLightParametersFv
/* 801AD758 001AA6B8 38 61 00 88 */ addi r3, r1, 0x88
/* 801AD75C 001AA6BC 38 80 FF FF */ li r4, -1
/* 801AD760 001AA6C0 4B F6 92 ED */ bl __dt__10CModelDataFv
@ -7487,7 +7487,7 @@ lbl_801B3978:
/* 801B3980 001B08E0 34 7E 06 44 */ addic. r3, r30, 0x644
/* 801B3984 001B08E4 41 82 00 0C */ beq lbl_801B3990
/* 801B3988 001B08E8 38 80 FF FF */ li r4, -1
/* 801B398C 001B08EC 4B F5 2C 7D */ bl __dt__16CActorParametersFv
/* 801B398C 001B08EC 4B F5 2C 7D */ bl __dt__16CLightParametersFv
lbl_801B3990:
/* 801B3990 001B08F0 7F C3 F3 78 */ mr r3, r30
/* 801B3994 001B08F4 38 80 00 00 */ li r4, 0
@ -8082,7 +8082,7 @@ __ct__13CFlaahgraDataFR12CInputStream:
/* 801B428C 001B11EC 4B F1 13 91 */ bl __ct__16CActorParametersFRC16CActorParameters
/* 801B4290 001B11F0 38 61 00 14 */ addi r3, r1, 0x14
/* 801B4294 001B11F4 38 80 FF FF */ li r4, -1
/* 801B4298 001B11F8 4B F5 23 71 */ bl __dt__16CActorParametersFv
/* 801B4298 001B11F8 4B F5 23 71 */ bl __dt__16CLightParametersFv
/* 801B429C 001B11FC 7F E3 FB 78 */ mr r3, r31
/* 801B42A0 001B1200 48 18 A9 89 */ bl ReadFloat__12CInputStreamFv
/* 801B42A4 001B1204 D0 3E 01 40 */ stfs f1, 0x140(r30)

2
asm/MetroidPrime/Enemies/CGrenadeLauncher.s
View File

@ -1886,7 +1886,7 @@ lbl_80230F14:
/* 80230F18 0022DE78 41 82 00 10 */ beq lbl_80230F28
/* 80230F1C 0022DE7C 38 7E 03 50 */ addi r3, r30, 0x350
/* 80230F20 0022DE80 38 80 FF FF */ li r4, -1
/* 80230F24 0022DE84 4B ED 56 E5 */ bl __dt__16CActorParametersFv
/* 80230F24 0022DE84 4B ED 56 E5 */ bl __dt__16CLightParametersFv
lbl_80230F28:
/* 80230F28 0022DE88 34 1E 03 28 */ addic. r0, r30, 0x328
/* 80230F2C 0022DE8C 41 82 00 24 */ beq lbl_80230F50

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

@ -2016,7 +2016,7 @@ lbl_8016B74C:
/* 8016B750 001686B0 41 82 00 10 */ beq lbl_8016B760
/* 8016B754 001686B4 38 61 00 A8 */ addi r3, r1, 0xa8
/* 8016B758 001686B8 38 80 FF FF */ li r4, -1
/* 8016B75C 001686BC 4B F9 AE AD */ bl __dt__16CActorParametersFv
/* 8016B75C 001686BC 4B F9 AE AD */ bl __dt__16CLightParametersFv
lbl_8016B760:
/* 8016B760 001686C0 28 1F 00 00 */ cmplwi r31, 0
/* 8016B764 001686C4 41 82 00 88 */ beq lbl_8016B7EC
@ -9087,7 +9087,7 @@ __dt__8CMetroid:
/* 80171D88 0016ECE8 41 82 00 10 */ beq lbl_80171D98
/* 80171D8C 0016ECEC 38 7E 09 54 */ addi r3, r30, 0x954
/* 80171D90 0016ECF0 38 80 FF FF */ li r4, -1
/* 80171D94 0016ECF4 4B F9 48 75 */ bl __dt__16CActorParametersFv
/* 80171D94 0016ECF4 4B F9 48 75 */ bl __dt__16CLightParametersFv
lbl_80171D98:
/* 80171D98 0016ECF8 34 1E 06 C0 */ addic. r0, r30, 0x6c0
/* 80171D9C 0016ECFC 41 82 00 60 */ beq lbl_80171DFC

2
asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
View File

@ -4302,7 +4302,7 @@ sub_80274230:
/* 802743A0 00271300 4B EA 81 11 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff"
/* 802743A4 00271304 38 61 00 8C */ addi r3, r1, 0x8c
/* 802743A8 00271308 38 80 FF FF */ li r4, -1
/* 802743AC 0027130C 4B E9 22 5D */ bl __dt__16CActorParametersFv
/* 802743AC 0027130C 4B E9 22 5D */ bl __dt__16CLightParametersFv
/* 802743B0 00271310 38 61 00 F4 */ addi r3, r1, 0xf4
/* 802743B4 00271314 38 80 FF FF */ li r4, -1
/* 802743B8 00271318 4B EA 26 95 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s
View File

@ -1384,7 +1384,7 @@ __ct__19SPrimeExoParametersFR12CInputStream:
/* 802817F4 0027E754 4B E4 3E 29 */ bl __ct__16CActorParametersFRC16CActorParameters
/* 802817F8 0027E758 38 61 00 10 */ addi r3, r1, 0x10
/* 802817FC 0027E75C 38 80 FF FF */ li r4, -1
/* 80281800 0027E760 4B E8 4E 09 */ bl __dt__16CActorParametersFv
/* 80281800 0027E760 4B E8 4E 09 */ bl __dt__16CLightParametersFv
/* 80281804 0027E764 7F E3 FB 78 */ mr r3, r31
/* 80281808 0027E768 48 0B D4 7D */ bl ReadLong__12CInputStreamFv
/* 8028180C 0027E76C 38 03 FF FF */ addi r0, r3, -1

2
asm/MetroidPrime/Enemies/COmegaPirate.s
View File

@ -1047,7 +1047,7 @@ AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager:
/* 8028BDB0 00288D10 4B DC 9A 71 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8028BDB4 00288D14 38 61 00 60 */ addi r3, r1, 0x60
/* 8028BDB8 00288D18 38 80 FF FF */ li r4, -1
/* 8028BDBC 00288D1C 4B E7 A8 4D */ bl __dt__16CActorParametersFv
/* 8028BDBC 00288D1C 4B E7 A8 4D */ bl __dt__16CLightParametersFv
/* 8028BDC0 00288D20 38 61 00 C8 */ addi r3, r1, 0xc8
/* 8028BDC4 00288D24 38 80 FF FF */ li r4, -1
/* 8028BDC8 00288D28 4B E8 AC 85 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/Enemies/CRipperControlledPlatform.s
View File

@ -365,7 +365,7 @@ lbl_80232B78:
/* 80232C50 0022FBB0 4B E8 11 B1 */ bl "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii"
/* 80232C54 0022FBB4 38 61 00 34 */ addi r3, r1, 0x34
/* 80232C58 0022FBB8 38 80 FF FF */ li r4, -1
/* 80232C5C 0022FBBC 4B ED 39 AD */ bl __dt__16CActorParametersFv
/* 80232C5C 0022FBBC 4B ED 39 AD */ bl __dt__16CLightParametersFv
/* 80232C60 0022FBC0 38 61 00 9C */ addi r3, r1, 0x9c
/* 80232C64 0022FBC4 38 80 FF FF */ li r4, -1
/* 80232C68 0022FBC8 4B EE 3D E5 */ bl __dt__10CModelDataFv

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

@ -8232,13 +8232,13 @@ lbl_801E1438:
/* 801E143C 001DE39C 41 82 00 10 */ beq lbl_801E144C
/* 801E1440 001DE3A0 38 61 03 AC */ addi r3, r1, 0x3ac
/* 801E1444 001DE3A4 38 80 FF FF */ li r4, -1
/* 801E1448 001DE3A8 4B F2 51 C1 */ bl __dt__16CActorParametersFv
/* 801E1448 001DE3A8 4B F2 51 C1 */ bl __dt__16CLightParametersFv
lbl_801E144C:
/* 801E144C 001DE3AC 7E E0 07 75 */ extsb. r0, r23
/* 801E1450 001DE3B0 41 82 00 10 */ beq lbl_801E1460
/* 801E1454 001DE3B4 38 61 02 90 */ addi r3, r1, 0x290
/* 801E1458 001DE3B8 38 80 FF FF */ li r4, -1
/* 801E145C 001DE3BC 4B F2 51 AD */ bl __dt__16CActorParametersFv
/* 801E145C 001DE3BC 4B F2 51 AD */ bl __dt__16CLightParametersFv
lbl_801E1460:
/* 801E1460 001DE3C0 7F C3 F3 78 */ mr r3, r30
/* 801E1464 001DE3C4 7E 64 9B 78 */ mr r4, r19

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

@ -2371,13 +2371,13 @@ lbl_80205590:
/* 80205594 002024F4 41 82 00 10 */ beq lbl_802055A4
/* 80205598 002024F8 38 61 01 D0 */ addi r3, r1, 0x1d0
/* 8020559C 002024FC 38 80 FF FF */ li r4, -1
/* 802055A0 00202500 4B F0 10 69 */ bl __dt__16CActorParametersFv
/* 802055A0 00202500 4B F0 10 69 */ bl __dt__16CLightParametersFv
lbl_802055A4:
/* 802055A4 00202504 7E C0 07 75 */ extsb. r0, r22
/* 802055A8 00202508 41 82 00 10 */ beq lbl_802055B8
/* 802055AC 0020250C 38 61 01 90 */ addi r3, r1, 0x190
/* 802055B0 00202510 38 80 FF FF */ li r4, -1
/* 802055B4 00202514 4B F0 10 55 */ bl __dt__16CActorParametersFv
/* 802055B4 00202514 4B F0 10 55 */ bl __dt__16CLightParametersFv
lbl_802055B8:
/* 802055B8 00202518 38 00 00 00 */ li r0, 0
/* 802055BC 0020251C 7F C3 F3 78 */ mr r3, r30

2
asm/MetroidPrime/Player/CPlayer.s
View File

@ -12409,7 +12409,7 @@ __ct__7CPlayerF9TUniqueIdRC12CTransform4fRC6CAABoxUi9CVector3fffffRC13CMaterialL
/* 8001A3A8 00017308 48 10 21 09 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff"
/* 8001A3AC 0001730C 38 61 01 44 */ addi r3, r1, 0x144
/* 8001A3B0 00017310 38 80 FF FF */ li r4, -1
/* 8001A3B4 00017314 48 0E C2 55 */ bl __dt__16CActorParametersFv
/* 8001A3B4 00017314 48 0E C2 55 */ bl __dt__16CLightParametersFv
/* 8001A3B8 00017318 38 61 01 AC */ addi r3, r1, 0x1ac
/* 8001A3BC 0001731C 38 80 FF FF */ li r4, -1
/* 8001A3C0 00017320 48 0F C6 8D */ bl __dt__10CModelDataFv

330
asm/MetroidPrime/ScriptLoader.s
View File

File diff suppressed because it is too large Load Diff

2
asm/MetroidPrime/ScriptObjects/CFire.s
View File

@ -544,7 +544,7 @@ __ct__5CFire:
/* 8025D320 0025A280 4B DF 85 01 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8025D324 0025A284 38 61 00 7C */ addi r3, r1, 0x7c
/* 8025D328 0025A288 38 80 FF FF */ li r4, -1
/* 8025D32C 0025A28C 4B EA 92 DD */ bl __dt__16CActorParametersFv
/* 8025D32C 0025A28C 4B EA 92 DD */ bl __dt__16CLightParametersFv
/* 8025D330 0025A290 38 61 00 E4 */ addi r3, r1, 0xe4
/* 8025D334 0025A294 38 80 FF FF */ li r4, -1
/* 8025D338 0025A298 4B EB 97 15 */ bl __dt__10CModelDataFv

6
asm/MetroidPrime/ScriptObjects/CFishCloud.s
View File

@ -4656,10 +4656,10 @@ lbl_801D2090:
/* 801D22D8 001CF238 4B E8 35 49 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801D22DC 001CF23C 38 61 00 EC */ addi r3, r1, 0xec
/* 801D22E0 001CF240 38 80 FF FF */ li r4, -1
/* 801D22E4 001CF244 4B F3 43 25 */ bl __dt__16CActorParametersFv
/* 801D22E4 001CF244 4B F3 43 25 */ bl __dt__16CLightParametersFv
/* 801D22E8 001CF248 38 61 01 54 */ addi r3, r1, 0x154
/* 801D22EC 001CF24C 38 80 FF FF */ li r4, -1
/* 801D22F0 001CF250 4B F3 43 19 */ bl __dt__16CActorParametersFv
/* 801D22F0 001CF250 4B F3 43 19 */ bl __dt__16CLightParametersFv
/* 801D22F4 001CF254 3C 60 80 3E */ lis r3, lbl_803E5758@ha
/* 801D22F8 001CF258 38 00 00 01 */ li r0, 1
/* 801D22FC 001CF25C 38 63 57 58 */ addi r3, r3, lbl_803E5758@l
@ -5745,7 +5745,7 @@ Accept__18CFishCloudModifierFR8IVisitor:
/* 801D32A8 001D0208 4B E8 25 79 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801D32AC 001D020C 38 61 00 50 */ addi r3, r1, 0x50
/* 801D32B0 001D0210 38 80 FF FF */ li r4, -1
/* 801D32B4 001D0214 4B F3 33 55 */ bl __dt__16CActorParametersFv
/* 801D32B4 001D0214 4B F3 33 55 */ bl __dt__16CLightParametersFv
/* 801D32B8 001D0218 38 61 00 B8 */ addi r3, r1, 0xb8
/* 801D32BC 001D021C 38 80 FF FF */ li r4, -1
/* 801D32C0 001D0220 4B F4 37 8D */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CRepulsor.s
View File

@ -159,7 +159,7 @@ Accept__9CRepulsorFR8IVisitor:
/* 8020FDCC 0020CD2C 4B E4 5A 55 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8020FDD0 0020CD30 38 61 00 50 */ addi r3, r1, 0x50
/* 8020FDD4 0020CD34 38 80 FF FF */ li r4, -1
/* 8020FDD8 0020CD38 4B EF 68 31 */ bl __dt__16CActorParametersFv
/* 8020FDD8 0020CD38 4B EF 68 31 */ bl __dt__16CLightParametersFv
/* 8020FDDC 0020CD3C 38 61 00 B8 */ addi r3, r1, 0xb8
/* 8020FDE0 0020CD40 38 80 FF FF */ li r4, -1
/* 8020FDE4 0020CD44 4B F0 6C 69 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s
View File

@ -286,7 +286,7 @@ Accept__18CScriptAiJumpPointFR8IVisitor:
/* 801EF514 001EC474 4B E6 63 0D */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801EF518 001EC478 38 61 00 50 */ addi r3, r1, 0x50
/* 801EF51C 001EC47C 38 80 FF FF */ li r4, -1
/* 801EF520 001EC480 4B F1 70 E9 */ bl __dt__16CActorParametersFv
/* 801EF520 001EC480 4B F1 70 E9 */ bl __dt__16CLightParametersFv
/* 801EF524 001EC484 38 61 00 B8 */ addi r3, r1, 0xb8
/* 801EF528 001EC488 38 80 FF FF */ li r4, -1
/* 801EF52C 001EC48C 4B F2 75 21 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptBeam.s
View File

@ -340,7 +340,7 @@ lbl_8027C950:
/* 8027CA10 00279970 4B DD 8E 11 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8027CA14 00279974 38 61 00 20 */ addi r3, r1, 0x20
/* 8027CA18 00279978 38 80 FF FF */ li r4, -1
/* 8027CA1C 0027997C 4B E8 9B ED */ bl __dt__16CActorParametersFv
/* 8027CA1C 0027997C 4B E8 9B ED */ bl __dt__16CLightParametersFv
/* 8027CA20 00279980 38 61 00 88 */ addi r3, r1, 0x88
/* 8027CA24 00279984 38 80 FF FF */ li r4, -1
/* 8027CA28 00279988 4B E9 A0 25 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s
View File

@ -784,7 +784,7 @@ lbl_800C4EF4:
/* 800C5070 000C1FD0 4B F9 07 B1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 800C5074 000C1FD4 38 61 00 30 */ addi r3, r1, 0x30
/* 800C5078 000C1FD8 38 80 FF FF */ li r4, -1
/* 800C507C 000C1FDC 48 04 15 8D */ bl __dt__16CActorParametersFv
/* 800C507C 000C1FDC 48 04 15 8D */ bl __dt__16CLightParametersFv
/* 800C5080 000C1FE0 38 61 00 98 */ addi r3, r1, 0x98
/* 800C5084 000C1FE4 38 80 FF FF */ li r4, -1
/* 800C5088 000C1FE8 48 05 19 C5 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s
View File

@ -332,7 +332,7 @@ Accept__24CScriptCameraHintTriggerFR8IVisitor:
/* 8024B7A0 00248700 4B E0 A0 81 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8024B7A4 00248704 38 61 00 20 */ addi r3, r1, 0x20
/* 8024B7A8 00248708 38 80 FF FF */ li r4, -1
/* 8024B7AC 0024870C 4B EB AE 5D */ bl __dt__16CActorParametersFv
/* 8024B7AC 0024870C 4B EB AE 5D */ bl __dt__16CLightParametersFv
/* 8024B7B0 00248710 38 61 00 88 */ addi r3, r1, 0x88
/* 8024B7B4 00248714 38 80 FF FF */ li r4, -1
/* 8024B7B8 00248718 4B EC B2 95 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s
View File

@ -333,7 +333,7 @@ Accept__24CScriptCameraPitchVolumeFR8IVisitor:
/* 802268AC 0022380C 4B E2 EF 75 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 802268B0 00223810 38 61 00 2C */ addi r3, r1, 0x2c
/* 802268B4 00223814 38 80 FF FF */ li r4, -1
/* 802268B8 00223818 4B ED FD 51 */ bl __dt__16CActorParametersFv
/* 802268B8 00223818 4B ED FD 51 */ bl __dt__16CLightParametersFv
/* 802268BC 0022381C 38 61 00 94 */ addi r3, r1, 0x94
/* 802268C0 00223820 38 80 FF FF */ li r4, -1
/* 802268C4 00223824 4B EF 01 89 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s
View File

@ -312,7 +312,7 @@ lbl_800B5480:
/* 800B5554 000B24B4 4B FA 02 CD */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 800B5558 000B24B8 38 61 00 20 */ addi r3, r1, 0x20
/* 800B555C 000B24BC 38 80 FF FF */ li r4, -1
/* 800B5560 000B24C0 48 05 10 A9 */ bl __dt__16CActorParametersFv
/* 800B5560 000B24C0 48 05 10 A9 */ bl __dt__16CLightParametersFv
/* 800B5564 000B24C4 38 61 00 88 */ addi r3, r1, 0x88
/* 800B5568 000B24C8 38 80 FF FF */ li r4, -1
/* 800B556C 000B24CC 48 06 14 E1 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s
View File

@ -449,7 +449,7 @@ Accept__17CScriptCoverPointFR8IVisitor:
/* 8012D7EC 0012A74C 4B F2 80 35 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8012D7F0 0012A750 38 61 00 50 */ addi r3, r1, 0x50
/* 8012D7F4 0012A754 38 80 FF FF */ li r4, -1
/* 8012D7F8 0012A758 4B FD 8E 11 */ bl __dt__16CActorParametersFv
/* 8012D7F8 0012A758 4B FD 8E 11 */ bl __dt__16CLightParametersFv
/* 8012D7FC 0012A75C 38 61 00 B8 */ addi r3, r1, 0xb8
/* 8012D800 0012A760 38 80 FF FF */ li r4, -1
/* 8012D804 0012A764 4B FE 92 49 */ bl __dt__10CModelDataFv

4
asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s
View File

@ -1177,10 +1177,10 @@ lbl_800FB468:
/* 800FB4A8 000F8408 4B F5 A3 79 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 800FB4AC 000F840C 38 61 01 FC */ addi r3, r1, 0x1fc
/* 800FB4B0 000F8410 38 80 FF FF */ li r4, -1
/* 800FB4B4 000F8414 48 00 B1 55 */ bl __dt__16CActorParametersFv
/* 800FB4B4 000F8414 48 00 B1 55 */ bl __dt__16CLightParametersFv
/* 800FB4B8 000F8418 38 61 02 64 */ addi r3, r1, 0x264
/* 800FB4BC 000F841C 38 80 FF FF */ li r4, -1
/* 800FB4C0 000F8420 48 00 B1 49 */ bl __dt__16CActorParametersFv
/* 800FB4C0 000F8420 48 00 B1 49 */ bl __dt__16CLightParametersFv
/* 800FB4C4 000F8424 38 61 02 CC */ addi r3, r1, 0x2cc
/* 800FB4C8 000F8428 38 80 FF FF */ li r4, -1
/* 800FB4CC 000F842C 48 01 B5 81 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s
View File

@ -138,7 +138,7 @@ Accept__26CScriptDebugCameraWaypointFR8IVisitor:
/* 8014AD28 00147C88 4B F0 AA F9 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8014AD2C 00147C8C 38 61 00 20 */ addi r3, r1, 0x20
/* 8014AD30 00147C90 38 80 FF FF */ li r4, -1
/* 8014AD34 00147C94 4B FB B8 D5 */ bl __dt__16CActorParametersFv
/* 8014AD34 00147C94 4B FB B8 D5 */ bl __dt__16CLightParametersFv
/* 8014AD38 00147C98 38 61 00 88 */ addi r3, r1, 0x88
/* 8014AD3C 00147C9C 38 80 FF FF */ li r4, -1
/* 8014AD40 00147CA0 4B FC BD 0D */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptDock.s
View File

@ -1203,7 +1203,7 @@ lbl_800C4410:
/* 800C460C 000C156C 48 05 7E A5 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff"
/* 800C4610 000C1570 38 61 00 BC */ addi r3, r1, 0xbc
/* 800C4614 000C1574 38 80 FF FF */ li r4, -1
/* 800C4618 000C1578 48 04 1F F1 */ bl __dt__16CActorParametersFv
/* 800C4618 000C1578 48 04 1F F1 */ bl __dt__16CLightParametersFv
/* 800C461C 000C157C 38 61 01 24 */ addi r3, r1, 0x124
/* 800C4620 000C1580 38 80 FF FF */ li r4, -1
/* 800C4624 000C1584 48 05 24 29 */ bl __dt__10CModelDataFv

4
asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s
View File

@ -531,10 +531,10 @@ lbl_8018F18C:
/* 8018F290 0018C1F0 4B EC 65 91 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8018F294 0018C1F4 38 61 00 30 */ addi r3, r1, 0x30
/* 8018F298 0018C1F8 38 80 FF FF */ li r4, -1
/* 8018F29C 0018C1FC 4B F7 73 6D */ bl __dt__16CActorParametersFv
/* 8018F29C 0018C1FC 4B F7 73 6D */ bl __dt__16CLightParametersFv
/* 8018F2A0 0018C200 38 61 00 98 */ addi r3, r1, 0x98
/* 8018F2A4 0018C204 38 80 FF FF */ li r4, -1
/* 8018F2A8 0018C208 4B F7 73 61 */ bl __dt__16CActorParametersFv
/* 8018F2A8 0018C208 4B F7 73 61 */ bl __dt__16CLightParametersFv
/* 8018F2AC 0018C20C 38 61 01 00 */ addi r3, r1, 0x100
/* 8018F2B0 0018C210 38 80 FF FF */ li r4, -1
/* 8018F2B4 0018C214 4B F8 77 99 */ bl __dt__10CModelDataFv

4
asm/MetroidPrime/ScriptObjects/CScriptEffect.s
View File

@ -1816,10 +1816,10 @@ lbl_8008F11C:
/* 8008F280 0008C1E0 4B FC 65 A1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8008F284 0008C1E4 38 61 01 58 */ addi r3, r1, 0x158
/* 8008F288 0008C1E8 38 80 FF FF */ li r4, -1
/* 8008F28C 0008C1EC 48 07 73 7D */ bl __dt__16CActorParametersFv
/* 8008F28C 0008C1EC 48 07 73 7D */ bl __dt__16CLightParametersFv
/* 8008F290 0008C1F0 38 61 01 C0 */ addi r3, r1, 0x1c0
/* 8008F294 0008C1F4 38 80 FF FF */ li r4, -1
/* 8008F298 0008C1F8 48 07 73 71 */ bl __dt__16CActorParametersFv
/* 8008F298 0008C1F8 48 07 73 71 */ bl __dt__16CLightParametersFv
/* 8008F29C 0008C1FC 38 61 02 28 */ addi r3, r1, 0x228
/* 8008F2A0 0008C200 38 80 FF FF */ li r4, -1
/* 8008F2A4 0008C204 48 08 77 A9 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s
View File

@ -236,7 +236,7 @@ lbl_8012F904:
/* 8012F9D0 0012C930 4B F2 5E 51 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8012F9D4 0012C934 38 61 00 50 */ addi r3, r1, 0x50
/* 8012F9D8 0012C938 38 80 FF FF */ li r4, -1
/* 8012F9DC 0012C93C 4B FD 6C 2D */ bl __dt__16CActorParametersFv
/* 8012F9DC 0012C93C 4B FD 6C 2D */ bl __dt__16CLightParametersFv
/* 8012F9E0 0012C940 38 61 00 B8 */ addi r3, r1, 0xb8
/* 8012F9E4 0012C944 38 80 FF FF */ li r4, -1
/* 8012F9E8 0012C948 4B FE 70 65 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s
View File

@ -1102,7 +1102,7 @@ Accept__15CScriptMazeNodeFR8IVisitor:
/* 80289708 00286668 4B DC C1 19 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8028970C 0028666C 38 61 00 20 */ addi r3, r1, 0x20
/* 80289710 00286670 38 80 FF FF */ li r4, -1
/* 80289714 00286674 4B E7 CE F5 */ bl __dt__16CActorParametersFv
/* 80289714 00286674 4B E7 CE F5 */ bl __dt__16CLightParametersFv
/* 80289718 00286678 38 61 00 88 */ addi r3, r1, 0x88
/* 8028971C 0028667C 38 80 FF FF */ li r4, -1
/* 80289720 00286680 4B E8 D3 2D */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s
View File

@ -429,7 +429,7 @@ lbl_8015BCB0:
/* 8015BD70 00158CD0 4B EF 9A B1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8015BD74 00158CD4 38 61 00 20 */ addi r3, r1, 0x20
/* 8015BD78 00158CD8 38 80 FF FF */ li r4, -1
/* 8015BD7C 00158CDC 4B FA A8 8D */ bl __dt__16CActorParametersFv
/* 8015BD7C 00158CDC 4B FA A8 8D */ bl __dt__16CLightParametersFv
/* 8015BD80 00158CE0 38 61 00 88 */ addi r3, r1, 0x88
/* 8015BD84 00158CE4 38 80 FF FF */ li r4, -1
/* 8015BD88 00158CE8 4B FB AC C5 */ bl __dt__10CModelDataFv

4
asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s
View File

@ -282,10 +282,10 @@ lbl_8015ED18:
/* 8015EDFC 0015BD5C 4B EF 6A 25 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8015EE00 0015BD60 38 61 00 20 */ addi r3, r1, 0x20
/* 8015EE04 0015BD64 38 80 FF FF */ li r4, -1
/* 8015EE08 0015BD68 4B FA 78 01 */ bl __dt__16CActorParametersFv
/* 8015EE08 0015BD68 4B FA 78 01 */ bl __dt__16CLightParametersFv
/* 8015EE0C 0015BD6C 38 61 00 88 */ addi r3, r1, 0x88
/* 8015EE10 0015BD70 38 80 FF FF */ li r4, -1
/* 8015EE14 0015BD74 4B FA 77 F5 */ bl __dt__16CActorParametersFv
/* 8015EE14 0015BD74 4B FA 77 F5 */ bl __dt__16CLightParametersFv
/* 8015EE18 0015BD78 38 61 00 F0 */ addi r3, r1, 0xf0
/* 8015EE1C 0015BD7C 38 80 FF FF */ li r4, -1
/* 8015EE20 0015BD80 4B FB 7C 2D */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s
View File

@ -429,7 +429,7 @@ lbl_8029F164:
/* 8029F240 0029C1A0 4B DB 65 E1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8029F244 0029C1A4 38 61 00 20 */ addi r3, r1, 0x20
/* 8029F248 0029C1A8 38 80 FF FF */ li r4, -1
/* 8029F24C 0029C1AC 4B E6 73 BD */ bl __dt__16CActorParametersFv
/* 8029F24C 0029C1AC 4B E6 73 BD */ bl __dt__16CLightParametersFv
/* 8029F250 0029C1B0 38 61 00 88 */ addi r3, r1, 0x88
/* 8029F254 0029C1B4 38 80 FF FF */ li r4, -1
/* 8029F258 0029C1B8 4B E7 77 F5 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptSound.s
View File

@ -1097,7 +1097,7 @@ PreThink__12CScriptSoundFfR13CStateManager:
/* 800B0AA4 000ADA04 4B FA 4D 7D */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 800B0AA8 000ADA08 38 61 00 20 */ addi r3, r1, 0x20
/* 800B0AAC 000ADA0C 38 80 FF FF */ li r4, -1
/* 800B0AB0 000ADA10 48 05 5B 59 */ bl __dt__16CActorParametersFv
/* 800B0AB0 000ADA10 48 05 5B 59 */ bl __dt__16CLightParametersFv
/* 800B0AB4 000ADA14 38 61 00 88 */ addi r3, r1, 0x88
/* 800B0AB8 000ADA18 38 80 FF FF */ li r4, -1
/* 800B0ABC 000ADA1C 48 06 5F 91 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s
View File

@ -4392,7 +4392,7 @@ lbl_80152BA8:
/* 80152CA0 0014FC00 4B F0 2B 81 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 80152CA4 0014FC04 38 61 00 50 */ addi r3, r1, 0x50
/* 80152CA8 0014FC08 38 80 FF FF */ li r4, -1
/* 80152CAC 0014FC0C 4B FB 39 5D */ bl __dt__16CActorParametersFv
/* 80152CAC 0014FC0C 4B FB 39 5D */ bl __dt__16CLightParametersFv
/* 80152CB0 0014FC10 38 61 00 B8 */ addi r3, r1, 0xb8
/* 80152CB4 0014FC14 38 80 FF FF */ li r4, -1
/* 80152CB8 0014FC18 4B FC 3D 95 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s
View File

@ -225,7 +225,7 @@ lbl_8014AF00:
/* 8014AFCC 00147F2C 4B F0 A8 55 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8014AFD0 00147F30 38 61 00 98 */ addi r3, r1, 0x98
/* 8014AFD4 00147F34 38 80 FF FF */ li r4, -1
/* 8014AFD8 00147F38 4B FB B6 31 */ bl __dt__16CActorParametersFv
/* 8014AFD8 00147F38 4B FB B6 31 */ bl __dt__16CLightParametersFv
/* 8014AFDC 00147F3C 38 61 01 00 */ addi r3, r1, 0x100
/* 8014AFE0 00147F40 38 80 FF FF */ li r4, -1
/* 8014AFE4 00147F44 4B FC BA 69 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s
View File

@ -1124,7 +1124,7 @@ lbl_80118ABC:
/* 80118B88 00115AE8 4B F3 CC 99 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 80118B8C 00115AEC 38 61 00 20 */ addi r3, r1, 0x20
/* 80118B90 00115AF0 38 80 FF FF */ li r4, -1
/* 80118B94 00115AF4 4B FE DA 75 */ bl __dt__16CActorParametersFv
/* 80118B94 00115AF4 4B FE DA 75 */ bl __dt__16CLightParametersFv
/* 80118B98 00115AF8 38 61 00 88 */ addi r3, r1, 0x88
/* 80118B9C 00115AFC 38 80 FF FF */ li r4, -1
/* 80118BA0 00115B00 4B FF DE AD */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s
View File

@ -202,7 +202,7 @@ Accept__21CScriptTargetingPointFR8IVisitor:
/* 8018D45C 0018A3BC 4B EC 83 C5 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 8018D460 0018A3C0 38 61 00 20 */ addi r3, r1, 0x20
/* 8018D464 0018A3C4 38 80 FF FF */ li r4, -1
/* 8018D468 0018A3C8 4B F7 91 A1 */ bl __dt__16CActorParametersFv
/* 8018D468 0018A3C8 4B F7 91 A1 */ bl __dt__16CLightParametersFv
/* 8018D46C 0018A3CC 38 61 00 88 */ addi r3, r1, 0x88
/* 8018D470 0018A3D0 38 80 FF FF */ li r4, -1
/* 8018D474 0018A3D4 4B F8 95 D9 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptTrigger.s
View File

@ -1331,7 +1331,7 @@ lbl_80076D34:
/* 80076E28 00073D88 4B FD E9 F9 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 80076E2C 00073D8C 38 61 00 50 */ addi r3, r1, 0x50
/* 80076E30 00073D90 38 80 FF FF */ li r4, -1
/* 80076E34 00073D94 48 08 F7 D5 */ bl __dt__16CActorParametersFv
/* 80076E34 00073D94 48 08 F7 D5 */ bl __dt__16CLightParametersFv
/* 80076E38 00073D98 38 61 00 B8 */ addi r3, r1, 0xb8
/* 80076E3C 00073D9C 38 80 FF FF */ li r4, -1
/* 80076E40 00073DA0 48 09 FC 0D */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s
View File

@ -303,7 +303,7 @@ lbl_801D6710:
/* 801D6810 001D3770 4B E7 F0 11 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801D6814 001D3774 38 61 00 50 */ addi r3, r1, 0x50
/* 801D6818 001D3778 38 80 FF FF */ li r4, -1
/* 801D681C 001D377C 4B F2 FD ED */ bl __dt__16CActorParametersFv
/* 801D681C 001D377C 4B F2 FD ED */ bl __dt__16CLightParametersFv
/* 801D6820 001D3780 38 61 00 B8 */ addi r3, r1, 0xb8
/* 801D6824 001D3784 38 80 FF FF */ li r4, -1
/* 801D6828 001D3788 4B F4 02 25 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s
View File

@ -566,7 +566,7 @@ lbl_801D7614:
/* 801D76F0 001D4650 4B E7 E1 31 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801D76F4 001D4654 38 61 00 68 */ addi r3, r1, 0x68
/* 801D76F8 001D4658 38 80 FF FF */ li r4, -1
/* 801D76FC 001D465C 4B F2 EF 0D */ bl __dt__16CActorParametersFv
/* 801D76FC 001D465C 4B F2 EF 0D */ bl __dt__16CLightParametersFv
/* 801D7700 001D4660 38 61 00 D0 */ addi r3, r1, 0xd0
/* 801D7704 001D4664 38 80 FF FF */ li r4, -1
/* 801D7708 001D4668 4B F3 F3 45 */ bl __dt__10CModelDataFv

2
asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s
View File

@ -395,7 +395,7 @@ lbl_800773F8:
/* 800774EC 0007444C 4B FD E3 35 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 800774F0 00074450 38 61 00 20 */ addi r3, r1, 0x20
/* 800774F4 00074454 38 80 FF FF */ li r4, -1
/* 800774F8 00074458 48 08 F1 11 */ bl __dt__16CActorParametersFv
/* 800774F8 00074458 48 08 F1 11 */ bl __dt__16CLightParametersFv
/* 800774FC 0007445C 38 61 00 88 */ addi r3, r1, 0x88
/* 80077500 00074460 38 80 FF FF */ li r4, -1
/* 80077504 00074464 48 09 F5 49 */ bl __dt__10CModelDataFv

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

@ -2357,7 +2357,7 @@ lbl_801F39D4:
/* 801F3B44 001F0AA4 4B E6 1C DD */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 801F3B48 001F0AA8 38 61 01 00 */ addi r3, r1, 0x100
/* 801F3B4C 001F0AAC 38 80 FF FF */ li r4, -1
/* 801F3B50 001F0AB0 4B F1 2A B9 */ bl __dt__16CActorParametersFv
/* 801F3B50 001F0AB0 4B F1 2A B9 */ bl __dt__16CLightParametersFv
/* 801F3B54 001F0AB4 38 61 01 68 */ addi r3, r1, 0x168
/* 801F3B58 001F0AB8 38 80 FF FF */ li r4, -1
/* 801F3B5C 001F0ABC 4B F2 2E F1 */ bl __dt__10CModelDataFv

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

@ -1011,7 +1011,7 @@ __ct__10CShockWaveFv:
/* 80232420 0022F380 4B E2 34 01 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 80232424 0022F384 38 61 00 A4 */ addi r3, r1, 0xa4
/* 80232428 0022F388 38 80 FF FF */ li r4, -1
/* 8023242C 0022F38C 4B ED 41 DD */ bl __dt__16CActorParametersFv
/* 8023242C 0022F38C 4B ED 41 DD */ bl __dt__16CLightParametersFv
/* 80232430 0022F390 38 61 01 0C */ addi r3, r1, 0x10c
/* 80232434 0022F394 38 80 FF FF */ li r4, -1
/* 80232438 0022F398 4B EE 46 15 */ bl __dt__10CModelDataFv

4
asm/MetroidPrime/Weapons/CWeapon.s
View File

@ -417,10 +417,10 @@ lbl_80102278:
/* 80102354 000FF2B4 4B F5 34 CD */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId"
/* 80102358 000FF2B8 38 61 00 48 */ addi r3, r1, 0x48
/* 8010235C 000FF2BC 38 80 FF FF */ li r4, -1
/* 80102360 000FF2C0 48 00 42 A9 */ bl __dt__16CActorParametersFv
/* 80102360 000FF2C0 48 00 42 A9 */ bl __dt__16CLightParametersFv
/* 80102364 000FF2C4 38 61 00 B0 */ addi r3, r1, 0xb0
/* 80102368 000FF2C8 38 80 FF FF */ li r4, -1
/* 8010236C 000FF2CC 48 00 42 9D */ bl __dt__16CActorParametersFv
/* 8010236C 000FF2CC 48 00 42 9D */ bl __dt__16CLightParametersFv
/* 80102370 000FF2D0 80 01 00 38 */ lwz r0, 0x38(r1)
/* 80102374 000FF2D4 80 61 00 40 */ lwz r3, 0x40(r1)
/* 80102378 000FF2D8 1C 00 00 0C */ mulli r0, r0, 0xc