From a781d2de6e25f13e50955a2fb06521d43d94f54f Mon Sep 17 00:00:00 2001 From: Luke Street Date: Tue, 13 Sep 2022 22:24:13 -0400 Subject: [PATCH] Correct __dt__16CActorParametersFv to __dt__16CLightParametersFv Former-commit-id: 0cfb3d0aff4bc240b858279f33e5b1604f690d4c --- asm/MetroidPrime/CActorParameters.s | 14 +- asm/MetroidPrime/CCollisionActor.s | 6 +- asm/MetroidPrime/CEffect.s | 2 +- asm/MetroidPrime/CGameLight.s | 2 +- asm/MetroidPrime/Cameras/CGameCamera.s | 2 +- asm/MetroidPrime/Enemies/CDrone.s | 4 +- asm/MetroidPrime/Enemies/CElitePirate.s | 4 +- asm/MetroidPrime/Enemies/CFlaahgra.s | 6 +- asm/MetroidPrime/Enemies/CGrenadeLauncher.s | 2 +- asm/MetroidPrime/Enemies/CMetroid.s | 4 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 2 +- asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s | 2 +- asm/MetroidPrime/Enemies/COmegaPirate.s | 2 +- .../Enemies/CRipperControlledPlatform.s | 2 +- asm/MetroidPrime/Enemies/CThardus.s | 4 +- .../Enemies/CThardusRockProjectile.s | 4 +- asm/MetroidPrime/Player/CPlayer.s | 2 +- asm/MetroidPrime/ScriptLoader.s | 330 +++++++++--------- asm/MetroidPrime/ScriptObjects/CFire.s | 2 +- asm/MetroidPrime/ScriptObjects/CFishCloud.s | 6 +- asm/MetroidPrime/ScriptObjects/CRepulsor.s | 2 +- .../ScriptObjects/CScriptAiJumpPoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptBeam.s | 2 +- .../ScriptObjects/CScriptCameraHint.s | 2 +- .../ScriptObjects/CScriptCameraHintTrigger.s | 2 +- .../ScriptObjects/CScriptCameraPitchVolume.s | 2 +- .../ScriptObjects/CScriptCameraWaypoint.s | 2 +- .../ScriptObjects/CScriptCoverPoint.s | 2 +- .../ScriptObjects/CScriptDamageableTrigger.s | 4 +- .../CScriptDebugCameraWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDock.s | 2 +- .../ScriptObjects/CScriptEMPulse.s | 4 +- .../ScriptObjects/CScriptEffect.s | 4 +- .../ScriptObjects/CScriptGrapplePoint.s | 2 +- .../ScriptObjects/CScriptMazeNode.s | 2 +- .../ScriptObjects/CScriptPlayerHint.s | 2 +- .../ScriptObjects/CScriptPointOfInterest.s | 4 +- .../ScriptObjects/CScriptProjectedShadow.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSound.s | 2 +- .../ScriptObjects/CScriptSpecialFunction.s | 2 +- .../CScriptSpiderBallAttractionSurface.s | 2 +- .../ScriptObjects/CScriptSpiderBallWaypoint.s | 2 +- .../ScriptObjects/CScriptTargetingPoint.s | 2 +- .../ScriptObjects/CScriptTrigger.s | 2 +- .../ScriptObjects/CScriptVisorFlare.s | 2 +- .../ScriptObjects/CScriptVisorGoo.s | 2 +- .../ScriptObjects/CScriptWaypoint.s | 2 +- asm/MetroidPrime/Weapons/CIceProjectile.s | 2 +- asm/MetroidPrime/Weapons/CShockWave.s | 2 +- asm/MetroidPrime/Weapons/CWeapon.s | 4 +- 50 files changed, 236 insertions(+), 236 deletions(-) diff --git a/asm/MetroidPrime/CActorParameters.s b/asm/MetroidPrime/CActorParameters.s index 5236055c..1a48958d 100644 --- a/asm/MetroidPrime/CActorParameters.s +++ b/asm/MetroidPrime/CActorParameters.s @@ -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) diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index 7f8d3cdc..48c47d7e 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -1087,7 +1087,7 @@ __ct__15CCollisionActorF9TUniqueId7TAreaId9TUniqueIdbff: /* 801A9588 001A64E8 4B F7 2F 29 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string,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,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,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 diff --git a/asm/MetroidPrime/CEffect.s b/asm/MetroidPrime/CEffect.s index 55bc8d6e..7308b3f3 100644 --- a/asm/MetroidPrime/CEffect.s +++ b/asm/MetroidPrime/CEffect.s @@ -139,7 +139,7 @@ nullsub_84: /* 8005ADFC 00057D5C 4B FF AA 25 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index 47a4da8d..ce00ef68 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -300,7 +300,7 @@ SetLight__10CGameLightFRC6CLight: /* 800B590C 000B286C 4B F9 FF 15 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index 3ad8e634..61fc4384 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -3385,7 +3385,7 @@ lbl_8005DAA0: /* 8005DBA4 0005AB04 4B FF 7C 7D */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 88d8bc92..7e1542d0 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -10111,10 +10111,10 @@ __ct__11CDroneLaserF9TUniqueIdRC12CTransform4fUi: /* 801679F8 00164958 4B EE DE 29 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index f028f31d..09f518f3 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -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 diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index 4973ffd2..a6517461 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -583,7 +583,7 @@ Accept__17CFlaahgraRendererFR8IVisitor: /* 801AD748 001AA6A8 4B EA 80 D9 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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) diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index 63906818..a7564697 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -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 diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 2348cdc3..4bb83883 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -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 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 5fc95565..0940c6a8 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -4302,7 +4302,7 @@ sub_80274230: /* 802743A0 00271300 4B EA 81 11 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index ecd7093c..183babfb 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -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 diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index e9f0e921..f3c7ff0f 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -1047,7 +1047,7 @@ AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager: /* 8028BDB0 00288D10 4B DC 9A 71 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s index 8e656ff1..0c100192 100644 --- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s +++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s @@ -365,7 +365,7 @@ lbl_80232B78: /* 80232C50 0022FBB0 4B E8 11 B1 */ bl "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 61bf63fc..316d125f 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -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 diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 19b7f939..780cd7fa 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -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 diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 397be154..f8e69311 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -12409,7 +12409,7 @@ __ct__7CPlayerF9TUniqueIdRC12CTransform4fRC6CAABoxUi9CVector3fffffRC13CMaterialL /* 8001A3A8 00017308 48 10 21 09 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index e1f024b3..ebd4beed 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -213,7 +213,7 @@ lbl_800C5340: /* 800C5354 000C22B4 48 00 02 C9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C5358 000C22B8 38 61 01 20 */ addi r3, r1, 0x120 /* 800C535C 000C22BC 38 80 FF FF */ li r4, -1 -/* 800C5360 000C22C0 48 04 12 A9 */ bl __dt__16CActorParametersFv +/* 800C5360 000C22C0 48 04 12 A9 */ bl __dt__16CLightParametersFv /* 800C5364 000C22C4 7E C3 B3 78 */ mr r3, r22 /* 800C5368 000C22C8 48 27 99 1D */ bl ReadLong__12CInputStreamFv /* 800C536C 000C22CC 7C 79 1B 78 */ mr r25, r3 @@ -375,7 +375,7 @@ lbl_800C55B4: lbl_800C55C8: /* 800C55C8 000C2528 38 61 01 88 */ addi r3, r1, 0x188 /* 800C55CC 000C252C 38 80 FF FF */ li r4, -1 -/* 800C55D0 000C2530 48 04 10 39 */ bl __dt__16CActorParametersFv +/* 800C55D0 000C2530 48 04 10 39 */ bl __dt__16CLightParametersFv /* 800C55D4 000C2534 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 800C55D8 000C2538 48 27 85 09 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C55DC 000C253C 7F 03 C3 78 */ mr r3, r24 @@ -591,7 +591,7 @@ lbl_800C58C8: /* 800C58E8 000C2848 4B FF FD 35 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C58EC 000C284C 38 61 00 9C */ addi r3, r1, 0x9c /* 800C58F0 000C2850 38 80 FF FF */ li r4, -1 -/* 800C58F4 000C2854 48 04 0D 15 */ bl __dt__16CActorParametersFv +/* 800C58F4 000C2854 48 04 0D 15 */ bl __dt__16CLightParametersFv /* 800C58F8 000C2858 7F 83 E3 78 */ mr r3, r28 /* 800C58FC 000C285C 48 27 93 E1 */ bl ReadBool__12CInputStreamFv /* 800C5900 000C2860 7F 83 E3 78 */ mr r3, r28 @@ -609,7 +609,7 @@ lbl_800C58C8: /* 800C5930 000C2890 48 27 81 B1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C5934 000C2894 38 61 01 04 */ addi r3, r1, 0x104 /* 800C5938 000C2898 38 80 FF FF */ li r4, -1 -/* 800C593C 000C289C 48 04 0C CD */ bl __dt__16CActorParametersFv +/* 800C593C 000C289C 48 04 0C CD */ bl __dt__16CLightParametersFv /* 800C5940 000C28A0 38 61 01 6C */ addi r3, r1, 0x16c /* 800C5944 000C28A4 48 27 81 9D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C5948 000C28A8 38 60 00 00 */ li r3, 0 @@ -671,7 +671,7 @@ lbl_800C5A18: /* 800C5A1C 000C297C 48 27 80 C5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C5A20 000C2980 38 61 01 04 */ addi r3, r1, 0x104 /* 800C5A24 000C2984 38 80 FF FF */ li r4, -1 -/* 800C5A28 000C2988 48 04 0B E1 */ bl __dt__16CActorParametersFv +/* 800C5A28 000C2988 48 04 0B E1 */ bl __dt__16CLightParametersFv /* 800C5A2C 000C298C 38 61 01 6C */ addi r3, r1, 0x16c /* 800C5A30 000C2990 48 27 80 B1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C5A34 000C2994 7F 83 E3 78 */ mr r3, r28 @@ -884,7 +884,7 @@ lbl_800C5D20: /* 800C5D40 000C2CA0 4B FF F8 DD */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C5D44 000C2CA4 38 61 00 90 */ addi r3, r1, 0x90 /* 800C5D48 000C2CA8 38 80 FF FF */ li r4, -1 -/* 800C5D4C 000C2CAC 48 04 08 BD */ bl __dt__16CActorParametersFv +/* 800C5D4C 000C2CAC 48 04 08 BD */ bl __dt__16CLightParametersFv /* 800C5D50 000C2CB0 7F A4 EB 78 */ mr r4, r29 /* 800C5D54 000C2CB4 7F 45 D3 78 */ mr r5, r26 /* 800C5D58 000C2CB8 38 61 01 AC */ addi r3, r1, 0x1ac @@ -896,11 +896,11 @@ lbl_800C5D20: /* 800C5D70 000C2CD0 34 61 01 D4 */ addic. r3, r1, 0x1d4 /* 800C5D74 000C2CD4 41 82 00 0C */ beq lbl_800C5D80 /* 800C5D78 000C2CD8 38 80 FF FF */ li r4, -1 -/* 800C5D7C 000C2CDC 48 04 08 8D */ bl __dt__16CActorParametersFv +/* 800C5D7C 000C2CDC 48 04 08 8D */ bl __dt__16CLightParametersFv lbl_800C5D80: /* 800C5D80 000C2CE0 38 61 00 F8 */ addi r3, r1, 0xf8 /* 800C5D84 000C2CE4 38 80 FF FF */ li r4, -1 -/* 800C5D88 000C2CE8 48 04 08 81 */ bl __dt__16CActorParametersFv +/* 800C5D88 000C2CE8 48 04 08 81 */ bl __dt__16CLightParametersFv /* 800C5D8C 000C2CEC 38 61 01 60 */ addi r3, r1, 0x160 /* 800C5D90 000C2CF0 48 27 7D 51 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C5D94 000C2CF4 38 60 00 00 */ li r3, 0 @@ -972,11 +972,11 @@ lbl_800C5E90: /* 800C5E90 000C2DF0 34 61 01 D4 */ addic. r3, r1, 0x1d4 /* 800C5E94 000C2DF4 41 82 00 0C */ beq lbl_800C5EA0 /* 800C5E98 000C2DF8 38 80 FF FF */ li r4, -1 -/* 800C5E9C 000C2DFC 48 04 07 6D */ bl __dt__16CActorParametersFv +/* 800C5E9C 000C2DFC 48 04 07 6D */ bl __dt__16CLightParametersFv lbl_800C5EA0: /* 800C5EA0 000C2E00 38 61 00 F8 */ addi r3, r1, 0xf8 /* 800C5EA4 000C2E04 38 80 FF FF */ li r4, -1 -/* 800C5EA8 000C2E08 48 04 07 61 */ bl __dt__16CActorParametersFv +/* 800C5EA8 000C2E08 48 04 07 61 */ bl __dt__16CLightParametersFv /* 800C5EAC 000C2E0C 38 61 01 60 */ addi r3, r1, 0x160 /* 800C5EB0 000C2E10 48 27 7C 31 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C5EB4 000C2E14 7F 43 D3 78 */ mr r3, r26 @@ -1118,7 +1118,7 @@ lbl_800C608C: /* 800C60A0 000C3000 4B FF F5 7D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C60A4 000C3004 38 61 00 EC */ addi r3, r1, 0xec /* 800C60A8 000C3008 38 80 FF FF */ li r4, -1 -/* 800C60AC 000C300C 48 04 05 5D */ bl __dt__16CActorParametersFv +/* 800C60AC 000C300C 48 04 05 5D */ bl __dt__16CLightParametersFv /* 800C60B0 000C3010 7E E3 BB 78 */ mr r3, r23 /* 800C60B4 000C3014 48 27 8B D1 */ bl ReadLong__12CInputStreamFv /* 800C60B8 000C3018 7C 7C 1B 78 */ mr r28, r3 @@ -1219,7 +1219,7 @@ lbl_800C621C: lbl_800C6230: /* 800C6230 000C3190 38 61 01 54 */ addi r3, r1, 0x154 /* 800C6234 000C3194 38 80 FF FF */ li r4, -1 -/* 800C6238 000C3198 48 04 03 D1 */ bl __dt__16CActorParametersFv +/* 800C6238 000C3198 48 04 03 D1 */ bl __dt__16CLightParametersFv /* 800C623C 000C319C 38 61 01 BC */ addi r3, r1, 0x1bc /* 800C6240 000C31A0 48 27 78 A1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C6244 000C31A4 7F 63 DB 78 */ mr r3, r27 @@ -2227,7 +2227,7 @@ lbl_800C7014: /* 800C7018 000C3F78 41 82 00 10 */ beq lbl_800C7028 /* 800C701C 000C3F7C 38 7E 01 3C */ addi r3, r30, 0x13c /* 800C7020 000C3F80 38 80 FF FF */ li r4, -1 -/* 800C7024 000C3F84 48 03 F5 E5 */ bl __dt__16CActorParametersFv +/* 800C7024 000C3F84 48 03 F5 E5 */ bl __dt__16CLightParametersFv lbl_800C7028: /* 800C7028 000C3F88 7F E0 07 35 */ extsh. r0, r31 /* 800C702C 000C3F8C 40 81 00 0C */ ble lbl_800C7038 @@ -2294,7 +2294,7 @@ lbl_800C70F0: /* 800C7104 000C4064 4B FF E5 19 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C7108 000C4068 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800C710C 000C406C 38 80 FF FF */ li r4, -1 -/* 800C7110 000C4070 48 03 F4 F9 */ bl __dt__16CActorParametersFv +/* 800C7110 000C4070 48 03 F4 F9 */ bl __dt__16CLightParametersFv /* 800C7114 000C4074 7F 63 DB 78 */ mr r3, r27 /* 800C7118 000C4078 48 27 7B 6D */ bl ReadLong__12CInputStreamFv /* 800C711C 000C407C 90 61 00 3C */ stw r3, 0x3c(r1) @@ -2393,7 +2393,7 @@ lbl_800C7278: lbl_800C728C: /* 800C728C 000C41EC 38 61 01 50 */ addi r3, r1, 0x150 /* 800C7290 000C41F0 38 80 FF FF */ li r4, -1 -/* 800C7294 000C41F4 48 03 F3 75 */ bl __dt__16CActorParametersFv +/* 800C7294 000C41F4 48 03 F3 75 */ bl __dt__16CLightParametersFv /* 800C7298 000C41F8 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 800C729C 000C41FC 48 27 68 45 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C72A0 000C4200 7F 63 DB 78 */ mr r3, r27 @@ -2565,7 +2565,7 @@ lbl_800C74F0: /* 800C7504 000C4464 4B FF E1 19 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C7508 000C4468 38 61 01 08 */ addi r3, r1, 0x108 /* 800C750C 000C446C 38 80 FF FF */ li r4, -1 -/* 800C7510 000C4470 48 03 F0 F9 */ bl __dt__16CActorParametersFv +/* 800C7510 000C4470 48 03 F0 F9 */ bl __dt__16CLightParametersFv /* 800C7514 000C4474 7F A3 EB 78 */ mr r3, r29 /* 800C7518 000C4478 48 27 77 6D */ bl ReadLong__12CInputStreamFv /* 800C751C 000C447C 90 61 00 24 */ stw r3, 0x24(r1) @@ -2681,7 +2681,7 @@ lbl_800C76BC: lbl_800C76D0: /* 800C76D0 000C4630 38 61 01 70 */ addi r3, r1, 0x170 /* 800C76D4 000C4634 38 80 FF FF */ li r4, -1 -/* 800C76D8 000C4638 48 03 EF 31 */ bl __dt__16CActorParametersFv +/* 800C76D8 000C4638 48 03 EF 31 */ bl __dt__16CLightParametersFv /* 800C76DC 000C463C 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 800C76E0 000C4640 48 27 64 01 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C76E4 000C4644 7F A3 EB 78 */ mr r3, r29 @@ -2766,7 +2766,7 @@ lbl_800C77F0: /* 800C7804 000C4764 4B FF DE 19 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C7808 000C4768 38 61 00 80 */ addi r3, r1, 0x80 /* 800C780C 000C476C 38 80 FF FF */ li r4, -1 -/* 800C7810 000C4770 48 03 ED F9 */ bl __dt__16CActorParametersFv +/* 800C7810 000C4770 48 03 ED F9 */ bl __dt__16CLightParametersFv /* 800C7814 000C4774 7F E3 FB 78 */ mr r3, r31 /* 800C7818 000C4778 48 27 74 11 */ bl ReadFloat__12CInputStreamFv /* 800C781C 000C477C FF E0 08 90 */ fmr f31, f1 @@ -2834,7 +2834,7 @@ lbl_800C78FC: lbl_800C7910: /* 800C7910 000C4870 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800C7914 000C4874 38 80 FF FF */ li r4, -1 -/* 800C7918 000C4878 48 03 EC F1 */ bl __dt__16CActorParametersFv +/* 800C7918 000C4878 48 03 EC F1 */ bl __dt__16CLightParametersFv /* 800C791C 000C487C 38 61 01 50 */ addi r3, r1, 0x150 /* 800C7920 000C4880 48 27 61 C1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C7924 000C4884 7F E3 FB 78 */ mr r3, r31 @@ -2912,7 +2912,7 @@ lbl_800C7A14: /* 800C7A28 000C4988 4B FF DB F5 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C7A2C 000C498C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 800C7A30 000C4990 38 80 FF FF */ li r4, -1 -/* 800C7A34 000C4994 48 03 EB D5 */ bl __dt__16CActorParametersFv +/* 800C7A34 000C4994 48 03 EB D5 */ bl __dt__16CLightParametersFv /* 800C7A38 000C4998 7E E3 BB 78 */ mr r3, r23 /* 800C7A3C 000C499C 48 27 71 ED */ bl ReadFloat__12CInputStreamFv /* 800C7A40 000C49A0 FF E0 08 90 */ fmr f31, f1 @@ -3006,7 +3006,7 @@ lbl_800C7B88: lbl_800C7B9C: /* 800C7B9C 000C4AFC 38 61 01 40 */ addi r3, r1, 0x140 /* 800C7BA0 000C4B00 38 80 FF FF */ li r4, -1 -/* 800C7BA4 000C4B04 48 03 EA 65 */ bl __dt__16CActorParametersFv +/* 800C7BA4 000C4B04 48 03 EA 65 */ bl __dt__16CLightParametersFv /* 800C7BA8 000C4B08 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 800C7BAC 000C4B0C 48 27 5F 35 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C7BB0 000C4B10 7E E3 BB 78 */ mr r3, r23 @@ -3066,14 +3066,14 @@ lbl_800C7C50: /* 800C7C70 000C4BD0 4B FF D9 AD */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C7C74 000C4BD4 38 61 00 88 */ addi r3, r1, 0x88 /* 800C7C78 000C4BD8 38 80 FF FF */ li r4, -1 -/* 800C7C7C 000C4BDC 48 03 E9 8D */ bl __dt__16CActorParametersFv +/* 800C7C7C 000C4BDC 48 03 E9 8D */ bl __dt__16CLightParametersFv /* 800C7C80 000C4BE0 80 61 02 90 */ lwz r3, 0x290(r1) /* 800C7C84 000C4BE4 3C 03 00 01 */ addis r0, r3, 1 /* 800C7C88 000C4BE8 28 00 FF FF */ cmplwi r0, 0xffff /* 800C7C8C 000C4BEC 40 82 00 20 */ bne lbl_800C7CAC /* 800C7C90 000C4BF0 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800C7C94 000C4BF4 38 80 FF FF */ li r4, -1 -/* 800C7C98 000C4BF8 48 03 E9 71 */ bl __dt__16CActorParametersFv +/* 800C7C98 000C4BF8 48 03 E9 71 */ bl __dt__16CLightParametersFv /* 800C7C9C 000C4BFC 38 61 01 58 */ addi r3, r1, 0x158 /* 800C7CA0 000C4C00 48 27 5E 41 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C7CA4 000C4C04 38 60 00 00 */ li r3, 0 @@ -3132,7 +3132,7 @@ lbl_800C7D5C: lbl_800C7D70: /* 800C7D70 000C4CD0 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800C7D74 000C4CD4 38 80 FF FF */ li r4, -1 -/* 800C7D78 000C4CD8 48 03 E8 91 */ bl __dt__16CActorParametersFv +/* 800C7D78 000C4CD8 48 03 E8 91 */ bl __dt__16CLightParametersFv /* 800C7D7C 000C4CDC 38 61 01 58 */ addi r3, r1, 0x158 /* 800C7D80 000C4CE0 48 27 5D 61 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C7D84 000C4CE4 7F 63 DB 78 */ mr r3, r27 @@ -3200,14 +3200,14 @@ lbl_800C7E44: /* 800C7E64 000C4DC4 4B FF D7 B9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C7E68 000C4DC8 38 61 00 FC */ addi r3, r1, 0xfc /* 800C7E6C 000C4DCC 38 80 FF FF */ li r4, -1 -/* 800C7E70 000C4DD0 48 03 E7 99 */ bl __dt__16CActorParametersFv +/* 800C7E70 000C4DD0 48 03 E7 99 */ bl __dt__16CLightParametersFv /* 800C7E74 000C4DD4 80 61 03 6C */ lwz r3, 0x36c(r1) /* 800C7E78 000C4DD8 3C 03 00 01 */ addis r0, r3, 1 /* 800C7E7C 000C4DDC 28 00 FF FF */ cmplwi r0, 0xffff /* 800C7E80 000C4DE0 40 82 00 20 */ bne lbl_800C7EA0 /* 800C7E84 000C4DE4 38 61 01 CC */ addi r3, r1, 0x1cc /* 800C7E88 000C4DE8 38 80 FF FF */ li r4, -1 -/* 800C7E8C 000C4DEC 48 03 E7 7D */ bl __dt__16CActorParametersFv +/* 800C7E8C 000C4DEC 48 03 E7 7D */ bl __dt__16CLightParametersFv /* 800C7E90 000C4DF0 38 61 02 34 */ addi r3, r1, 0x234 /* 800C7E94 000C4DF4 48 27 5C 4D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C7E98 000C4DF8 38 60 00 00 */ li r3, 0 @@ -3353,7 +3353,7 @@ lbl_800C80AC: lbl_800C80C0: /* 800C80C0 000C5020 38 61 01 CC */ addi r3, r1, 0x1cc /* 800C80C4 000C5024 38 80 FF FF */ li r4, -1 -/* 800C80C8 000C5028 48 03 E5 41 */ bl __dt__16CActorParametersFv +/* 800C80C8 000C5028 48 03 E5 41 */ bl __dt__16CLightParametersFv /* 800C80CC 000C502C 38 61 02 34 */ addi r3, r1, 0x234 /* 800C80D0 000C5030 48 27 5A 11 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C80D4 000C5034 7F A3 EB 78 */ mr r3, r29 @@ -3444,7 +3444,7 @@ lbl_800C81F8: /* 800C820C 000C516C 4B FF D4 11 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C8210 000C5170 38 61 00 BC */ addi r3, r1, 0xbc /* 800C8214 000C5174 38 80 FF FF */ li r4, -1 -/* 800C8218 000C5178 48 03 E3 F1 */ bl __dt__16CActorParametersFv +/* 800C8218 000C5178 48 03 E3 F1 */ bl __dt__16CLightParametersFv /* 800C821C 000C517C 7E E3 BB 78 */ mr r3, r23 /* 800C8220 000C5180 48 27 6A 65 */ bl ReadLong__12CInputStreamFv /* 800C8224 000C5184 7C 7D 1B 78 */ mr r29, r3 @@ -3558,7 +3558,7 @@ lbl_800C83BC: lbl_800C83D0: /* 800C83D0 000C5330 38 61 01 8C */ addi r3, r1, 0x18c /* 800C83D4 000C5334 38 80 FF FF */ li r4, -1 -/* 800C83D8 000C5338 48 03 E2 31 */ bl __dt__16CActorParametersFv +/* 800C83D8 000C5338 48 03 E2 31 */ bl __dt__16CLightParametersFv /* 800C83DC 000C533C 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 800C83E0 000C5340 48 27 57 01 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C83E4 000C5344 7E E3 BB 78 */ mr r3, r23 @@ -3635,7 +3635,7 @@ lbl_800C8478: /* 800C84EC 000C544C 4B FF D1 31 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C84F0 000C5450 38 61 00 F8 */ addi r3, r1, 0xf8 /* 800C84F4 000C5454 38 80 FF FF */ li r4, -1 -/* 800C84F8 000C5458 48 03 E1 11 */ bl __dt__16CActorParametersFv +/* 800C84F8 000C5458 48 03 E1 11 */ bl __dt__16CLightParametersFv /* 800C84FC 000C545C 7E C3 B3 78 */ mr r3, r22 /* 800C8500 000C5460 48 27 67 29 */ bl ReadFloat__12CInputStreamFv /* 800C8504 000C5464 FF C0 08 90 */ fmr f30, f1 @@ -3659,7 +3659,7 @@ lbl_800C8478: /* 800C854C 000C54AC 40 82 00 20 */ bne lbl_800C856C /* 800C8550 000C54B0 38 61 01 AC */ addi r3, r1, 0x1ac /* 800C8554 000C54B4 38 80 FF FF */ li r4, -1 -/* 800C8558 000C54B8 48 03 E0 B1 */ bl __dt__16CActorParametersFv +/* 800C8558 000C54B8 48 03 E0 B1 */ bl __dt__16CLightParametersFv /* 800C855C 000C54BC 38 61 02 7C */ addi r3, r1, 0x27c /* 800C8560 000C54C0 48 27 55 81 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C8564 000C54C4 38 60 00 00 */ li r3, 0 @@ -3827,7 +3827,7 @@ lbl_800C87C0: /* 800C87C8 000C5728 48 04 E2 85 */ bl __dt__10CModelDataFv /* 800C87CC 000C572C 38 61 01 AC */ addi r3, r1, 0x1ac /* 800C87D0 000C5730 38 80 FF FF */ li r4, -1 -/* 800C87D4 000C5734 48 03 DE 35 */ bl __dt__16CActorParametersFv +/* 800C87D4 000C5734 48 03 DE 35 */ bl __dt__16CLightParametersFv /* 800C87D8 000C5738 38 61 02 7C */ addi r3, r1, 0x27c /* 800C87DC 000C573C 48 27 53 05 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C87E0 000C5740 7E C3 B3 78 */ mr r3, r22 @@ -4041,7 +4041,7 @@ lbl_800C8AD4: /* 800C8AE8 000C5A48 4B FF CB 35 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C8AEC 000C5A4C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 800C8AF0 000C5A50 38 80 FF FF */ li r4, -1 -/* 800C8AF4 000C5A54 48 03 DB 15 */ bl __dt__16CActorParametersFv +/* 800C8AF4 000C5A54 48 03 DB 15 */ bl __dt__16CLightParametersFv /* 800C8AF8 000C5A58 7F 23 CB 78 */ mr r3, r25 /* 800C8AFC 000C5A5C 48 27 61 89 */ bl ReadLong__12CInputStreamFv /* 800C8B00 000C5A60 7C 7A 1B 78 */ mr r26, r3 @@ -4126,7 +4126,7 @@ lbl_800C8C24: lbl_800C8C38: /* 800C8C38 000C5B98 38 61 01 1C */ addi r3, r1, 0x11c /* 800C8C3C 000C5B9C 38 80 FF FF */ li r4, -1 -/* 800C8C40 000C5BA0 48 03 D9 C9 */ bl __dt__16CActorParametersFv +/* 800C8C40 000C5BA0 48 03 D9 C9 */ bl __dt__16CLightParametersFv /* 800C8C44 000C5BA4 38 61 01 84 */ addi r3, r1, 0x184 /* 800C8C48 000C5BA8 48 27 4E 99 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C8C4C 000C5BAC 7F 23 CB 78 */ mr r3, r25 @@ -4200,14 +4200,14 @@ lbl_800C8D24: /* 800C8D44 000C5CA4 4B FF C8 D9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C8D48 000C5CA8 38 61 00 FC */ addi r3, r1, 0xfc /* 800C8D4C 000C5CAC 38 80 FF FF */ li r4, -1 -/* 800C8D50 000C5CB0 48 03 D8 B9 */ bl __dt__16CActorParametersFv +/* 800C8D50 000C5CB0 48 03 D8 B9 */ bl __dt__16CLightParametersFv /* 800C8D54 000C5CB4 80 61 03 04 */ lwz r3, 0x304(r1) /* 800C8D58 000C5CB8 3C 03 00 01 */ addis r0, r3, 1 /* 800C8D5C 000C5CBC 28 00 FF FF */ cmplwi r0, 0xffff /* 800C8D60 000C5CC0 40 82 00 20 */ bne lbl_800C8D80 /* 800C8D64 000C5CC4 38 61 01 64 */ addi r3, r1, 0x164 /* 800C8D68 000C5CC8 38 80 FF FF */ li r4, -1 -/* 800C8D6C 000C5CCC 48 03 D8 9D */ bl __dt__16CActorParametersFv +/* 800C8D6C 000C5CCC 48 03 D8 9D */ bl __dt__16CLightParametersFv /* 800C8D70 000C5CD0 38 61 01 CC */ addi r3, r1, 0x1cc /* 800C8D74 000C5CD4 48 27 4D 6D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C8D78 000C5CD8 38 60 00 00 */ li r3, 0 @@ -4354,7 +4354,7 @@ lbl_800C8F90: lbl_800C8FA4: /* 800C8FA4 000C5F04 38 61 01 64 */ addi r3, r1, 0x164 /* 800C8FA8 000C5F08 38 80 FF FF */ li r4, -1 -/* 800C8FAC 000C5F0C 48 03 D6 5D */ bl __dt__16CActorParametersFv +/* 800C8FAC 000C5F0C 48 03 D6 5D */ bl __dt__16CLightParametersFv /* 800C8FB0 000C5F10 38 61 01 CC */ addi r3, r1, 0x1cc /* 800C8FB4 000C5F14 48 27 4B 2D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C8FB8 000C5F18 7F E3 FB 78 */ mr r3, r31 @@ -4436,14 +4436,14 @@ lbl_800C90B0: /* 800C90D0 000C6030 4B FF C5 4D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C90D4 000C6034 38 61 00 F4 */ addi r3, r1, 0xf4 /* 800C90D8 000C6038 38 80 FF FF */ li r4, -1 -/* 800C90DC 000C603C 48 03 D5 2D */ bl __dt__16CActorParametersFv +/* 800C90DC 000C603C 48 03 D5 2D */ bl __dt__16CLightParametersFv /* 800C90E0 000C6040 80 61 03 64 */ lwz r3, 0x364(r1) /* 800C90E4 000C6044 3C 03 00 01 */ addis r0, r3, 1 /* 800C90E8 000C6048 28 00 FF FF */ cmplwi r0, 0xffff /* 800C90EC 000C604C 40 82 00 20 */ bne lbl_800C910C /* 800C90F0 000C6050 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 800C90F4 000C6054 38 80 FF FF */ li r4, -1 -/* 800C90F8 000C6058 48 03 D5 11 */ bl __dt__16CActorParametersFv +/* 800C90F8 000C6058 48 03 D5 11 */ bl __dt__16CLightParametersFv /* 800C90FC 000C605C 38 61 02 2C */ addi r3, r1, 0x22c /* 800C9100 000C6060 48 27 49 E1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C9104 000C6064 38 60 00 00 */ li r3, 0 @@ -4566,7 +4566,7 @@ lbl_800C92BC: lbl_800C92D0: /* 800C92D0 000C6230 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 800C92D4 000C6234 38 80 FF FF */ li r4, -1 -/* 800C92D8 000C6238 48 03 D3 31 */ bl __dt__16CActorParametersFv +/* 800C92D8 000C6238 48 03 D3 31 */ bl __dt__16CLightParametersFv /* 800C92DC 000C623C 38 61 02 2C */ addi r3, r1, 0x22c /* 800C92E0 000C6240 48 27 48 01 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C92E4 000C6244 7F 63 DB 78 */ mr r3, r27 @@ -4644,7 +4644,7 @@ lbl_800C9370: /* 800C93F0 000C6350 4B FF C2 2D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C93F4 000C6354 38 61 01 30 */ addi r3, r1, 0x130 /* 800C93F8 000C6358 38 80 FF FF */ li r4, -1 -/* 800C93FC 000C635C 48 03 D2 0D */ bl __dt__16CActorParametersFv +/* 800C93FC 000C635C 48 03 D2 0D */ bl __dt__16CLightParametersFv /* 800C9400 000C6360 7E E3 BB 78 */ mr r3, r23 /* 800C9404 000C6364 48 27 58 81 */ bl ReadLong__12CInputStreamFv /* 800C9408 000C6368 7C 7E 1B 78 */ mr r30, r3 @@ -4662,7 +4662,7 @@ lbl_800C9370: /* 800C9438 000C6398 40 82 00 20 */ bne lbl_800C9458 /* 800C943C 000C639C 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 800C9440 000C63A0 38 80 FF FF */ li r4, -1 -/* 800C9444 000C63A4 48 03 D1 C5 */ bl __dt__16CActorParametersFv +/* 800C9444 000C63A4 48 03 D1 C5 */ bl __dt__16CLightParametersFv /* 800C9448 000C63A8 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 800C944C 000C63AC 48 27 46 95 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C9450 000C63B0 38 60 00 00 */ li r3, 0 @@ -4844,7 +4844,7 @@ lbl_800C96E4: /* 800C96EC 000C664C 48 04 D3 61 */ bl __dt__10CModelDataFv /* 800C96F0 000C6650 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 800C96F4 000C6654 38 80 FF FF */ li r4, -1 -/* 800C96F8 000C6658 48 03 CF 11 */ bl __dt__16CActorParametersFv +/* 800C96F8 000C6658 48 03 CF 11 */ bl __dt__16CLightParametersFv /* 800C96FC 000C665C 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 800C9700 000C6660 48 27 43 E1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C9704 000C6664 7F A3 EB 78 */ mr r3, r29 @@ -4945,7 +4945,7 @@ lbl_800C97F4: /* 800C9868 000C67C8 4B FF BD B5 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C986C 000C67CC 38 61 00 B0 */ addi r3, r1, 0xb0 /* 800C9870 000C67D0 38 80 FF FF */ li r4, -1 -/* 800C9874 000C67D4 48 03 CD 95 */ bl __dt__16CActorParametersFv +/* 800C9874 000C67D4 48 03 CD 95 */ bl __dt__16CLightParametersFv /* 800C9878 000C67D8 7F C3 F3 78 */ mr r3, r30 /* 800C987C 000C67DC 48 27 53 AD */ bl ReadFloat__12CInputStreamFv /* 800C9880 000C67E0 FF 00 08 90 */ fmr f24, f1 @@ -5100,7 +5100,7 @@ lbl_800C99CC: lbl_800C9AB4: /* 800C9AB4 000C6A14 38 61 01 18 */ addi r3, r1, 0x118 /* 800C9AB8 000C6A18 38 80 FF FF */ li r4, -1 -/* 800C9ABC 000C6A1C 48 03 CB 4D */ bl __dt__16CActorParametersFv +/* 800C9ABC 000C6A1C 48 03 CB 4D */ bl __dt__16CLightParametersFv /* 800C9AC0 000C6A20 38 61 00 68 */ addi r3, r1, 0x68 /* 800C9AC4 000C6A24 48 27 40 1D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C9AC8 000C6A28 7F C3 F3 78 */ mr r3, r30 @@ -5265,14 +5265,14 @@ lbl_800C9CF4: /* 800C9D14 000C6C74 4B FF B9 09 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800C9D18 000C6C78 38 61 00 F8 */ addi r3, r1, 0xf8 /* 800C9D1C 000C6C7C 38 80 FF FF */ li r4, -1 -/* 800C9D20 000C6C80 48 03 C8 E9 */ bl __dt__16CActorParametersFv +/* 800C9D20 000C6C80 48 03 C8 E9 */ bl __dt__16CLightParametersFv /* 800C9D24 000C6C84 80 61 03 D0 */ lwz r3, 0x3d0(r1) /* 800C9D28 000C6C88 3C 03 00 01 */ addis r0, r3, 1 /* 800C9D2C 000C6C8C 28 00 FF FF */ cmplwi r0, 0xffff /* 800C9D30 000C6C90 40 82 00 20 */ bne lbl_800C9D50 /* 800C9D34 000C6C94 38 61 02 30 */ addi r3, r1, 0x230 /* 800C9D38 000C6C98 38 80 FF FF */ li r4, -1 -/* 800C9D3C 000C6C9C 48 03 C8 CD */ bl __dt__16CActorParametersFv +/* 800C9D3C 000C6C9C 48 03 C8 CD */ bl __dt__16CLightParametersFv /* 800C9D40 000C6CA0 38 61 02 98 */ addi r3, r1, 0x298 /* 800C9D44 000C6CA4 48 27 3D 9D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C9D48 000C6CA8 38 60 00 00 */ li r3, 0 @@ -5398,7 +5398,7 @@ lbl_800C9F0C: lbl_800C9F20: /* 800C9F20 000C6E80 38 61 02 30 */ addi r3, r1, 0x230 /* 800C9F24 000C6E84 38 80 FF FF */ li r4, -1 -/* 800C9F28 000C6E88 48 03 C6 E1 */ bl __dt__16CActorParametersFv +/* 800C9F28 000C6E88 48 03 C6 E1 */ bl __dt__16CLightParametersFv /* 800C9F2C 000C6E8C 38 61 02 98 */ addi r3, r1, 0x298 /* 800C9F30 000C6E90 48 27 3B B1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800C9F34 000C6E94 7F 63 DB 78 */ mr r3, r27 @@ -5637,7 +5637,7 @@ lbl_800CA278: /* 800CA298 000C71F8 4B FF B3 85 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CA29C 000C71FC 38 61 00 88 */ addi r3, r1, 0x88 /* 800CA2A0 000C7200 38 80 FF FF */ li r4, -1 -/* 800CA2A4 000C7204 48 03 C3 65 */ bl __dt__16CActorParametersFv +/* 800CA2A4 000C7204 48 03 C3 65 */ bl __dt__16CLightParametersFv /* 800CA2A8 000C7208 7F 84 E3 78 */ mr r4, r28 /* 800CA2AC 000C720C 7F A5 EB 78 */ mr r5, r29 /* 800CA2B0 000C7210 38 61 01 A4 */ addi r3, r1, 0x1a4 @@ -5649,11 +5649,11 @@ lbl_800CA278: /* 800CA2C8 000C7228 34 61 01 CC */ addic. r3, r1, 0x1cc /* 800CA2CC 000C722C 41 82 00 0C */ beq lbl_800CA2D8 /* 800CA2D0 000C7230 38 80 FF FF */ li r4, -1 -/* 800CA2D4 000C7234 48 03 C3 35 */ bl __dt__16CActorParametersFv +/* 800CA2D4 000C7234 48 03 C3 35 */ bl __dt__16CLightParametersFv lbl_800CA2D8: /* 800CA2D8 000C7238 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800CA2DC 000C723C 38 80 FF FF */ li r4, -1 -/* 800CA2E0 000C7240 48 03 C3 29 */ bl __dt__16CActorParametersFv +/* 800CA2E0 000C7240 48 03 C3 29 */ bl __dt__16CLightParametersFv /* 800CA2E4 000C7244 38 61 01 58 */ addi r3, r1, 0x158 /* 800CA2E8 000C7248 48 27 37 F9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CA2EC 000C724C 38 60 00 00 */ li r3, 0 @@ -5713,11 +5713,11 @@ lbl_800CA3B8: /* 800CA3B8 000C7318 34 61 01 CC */ addic. r3, r1, 0x1cc /* 800CA3BC 000C731C 41 82 00 0C */ beq lbl_800CA3C8 /* 800CA3C0 000C7320 38 80 FF FF */ li r4, -1 -/* 800CA3C4 000C7324 48 03 C2 45 */ bl __dt__16CActorParametersFv +/* 800CA3C4 000C7324 48 03 C2 45 */ bl __dt__16CLightParametersFv lbl_800CA3C8: /* 800CA3C8 000C7328 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800CA3CC 000C732C 38 80 FF FF */ li r4, -1 -/* 800CA3D0 000C7330 48 03 C2 39 */ bl __dt__16CActorParametersFv +/* 800CA3D0 000C7330 48 03 C2 39 */ bl __dt__16CLightParametersFv /* 800CA3D4 000C7334 38 61 01 58 */ addi r3, r1, 0x158 /* 800CA3D8 000C7338 48 27 37 09 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CA3DC 000C733C 7F A3 EB 78 */ mr r3, r29 @@ -5999,7 +5999,7 @@ lbl_800CA7C0: /* 800CA7E0 000C7740 4B FF AE 3D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CA7E4 000C7744 38 61 01 50 */ addi r3, r1, 0x150 /* 800CA7E8 000C7748 38 80 FF FF */ li r4, -1 -/* 800CA7EC 000C774C 48 03 BE 1D */ bl __dt__16CActorParametersFv +/* 800CA7EC 000C774C 48 03 BE 1D */ bl __dt__16CLightParametersFv /* 800CA7F0 000C7750 7E 03 83 78 */ mr r3, r16 /* 800CA7F4 000C7754 48 27 44 35 */ bl ReadFloat__12CInputStreamFv /* 800CA7F8 000C7758 FF E0 08 90 */ fmr f31, f1 @@ -6048,7 +6048,7 @@ lbl_800CA7C0: /* 800CA8A4 000C7804 41 82 00 20 */ beq lbl_800CA8C4 /* 800CA8A8 000C7808 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 800CA8AC 000C780C 38 80 FF FF */ li r4, -1 -/* 800CA8B0 000C7810 48 03 BD 59 */ bl __dt__16CActorParametersFv +/* 800CA8B0 000C7810 48 03 BD 59 */ bl __dt__16CLightParametersFv /* 800CA8B4 000C7814 38 61 00 5C */ addi r3, r1, 0x5c /* 800CA8B8 000C7818 48 27 32 29 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CA8BC 000C781C 38 60 00 00 */ li r3, 0 @@ -6125,7 +6125,7 @@ lbl_800CA9BC: lbl_800CA9D0: /* 800CA9D0 000C7930 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 800CA9D4 000C7934 38 80 FF FF */ li r4, -1 -/* 800CA9D8 000C7938 48 03 BC 31 */ bl __dt__16CActorParametersFv +/* 800CA9D8 000C7938 48 03 BC 31 */ bl __dt__16CLightParametersFv /* 800CA9DC 000C793C 38 61 00 5C */ addi r3, r1, 0x5c /* 800CA9E0 000C7940 48 27 31 01 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CA9E4 000C7944 7E 03 83 78 */ mr r3, r16 @@ -6188,7 +6188,7 @@ lbl_800CAA90: /* 800CAAB0 000C7A10 4B FF AB 6D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CAAB4 000C7A14 38 61 00 88 */ addi r3, r1, 0x88 /* 800CAAB8 000C7A18 38 80 FF FF */ li r4, -1 -/* 800CAABC 000C7A1C 48 03 BB 4D */ bl __dt__16CActorParametersFv +/* 800CAABC 000C7A1C 48 03 BB 4D */ bl __dt__16CLightParametersFv /* 800CAAC0 000C7A20 7F 84 E3 78 */ mr r4, r28 /* 800CAAC4 000C7A24 7F A5 EB 78 */ mr r5, r29 /* 800CAAC8 000C7A28 38 61 01 A4 */ addi r3, r1, 0x1a4 @@ -6199,7 +6199,7 @@ lbl_800CAA90: /* 800CAADC 000C7A3C 40 82 00 20 */ bne lbl_800CAAFC /* 800CAAE0 000C7A40 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800CAAE4 000C7A44 38 80 FF FF */ li r4, -1 -/* 800CAAE8 000C7A48 48 03 BB 21 */ bl __dt__16CActorParametersFv +/* 800CAAE8 000C7A48 48 03 BB 21 */ bl __dt__16CLightParametersFv /* 800CAAEC 000C7A4C 38 61 01 58 */ addi r3, r1, 0x158 /* 800CAAF0 000C7A50 48 27 2F F1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CAAF4 000C7A54 38 60 00 00 */ li r3, 0 @@ -6258,7 +6258,7 @@ lbl_800CABAC: lbl_800CABC0: /* 800CABC0 000C7B20 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800CABC4 000C7B24 38 80 FF FF */ li r4, -1 -/* 800CABC8 000C7B28 48 03 BA 41 */ bl __dt__16CActorParametersFv +/* 800CABC8 000C7B28 48 03 BA 41 */ bl __dt__16CLightParametersFv /* 800CABCC 000C7B2C 38 61 01 58 */ addi r3, r1, 0x158 /* 800CABD0 000C7B30 48 27 2F 11 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CABD4 000C7B34 7F A3 EB 78 */ mr r3, r29 @@ -6324,7 +6324,7 @@ lbl_800CAC2C: /* 800CACB0 000C7C10 4B FF A9 6D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CACB4 000C7C14 38 61 01 64 */ addi r3, r1, 0x164 /* 800CACB8 000C7C18 38 80 FF FF */ li r4, -1 -/* 800CACBC 000C7C1C 48 03 B9 4D */ bl __dt__16CActorParametersFv +/* 800CACBC 000C7C1C 48 03 B9 4D */ bl __dt__16CLightParametersFv /* 800CACC0 000C7C20 7F 04 C3 78 */ mr r4, r24 /* 800CACC4 000C7C24 38 61 00 28 */ addi r3, r1, 0x28 /* 800CACC8 000C7C28 48 10 8B 7D */ bl __ct__11CHealthInfoFR12CInputStream @@ -6347,7 +6347,7 @@ lbl_800CAC2C: lbl_800CAD0C: /* 800CAD0C 000C7C6C 38 61 02 80 */ addi r3, r1, 0x280 /* 800CAD10 000C7C70 38 80 FF FF */ li r4, -1 -/* 800CAD14 000C7C74 48 03 B8 F5 */ bl __dt__16CActorParametersFv +/* 800CAD14 000C7C74 48 03 B8 F5 */ bl __dt__16CLightParametersFv /* 800CAD18 000C7C78 38 61 00 60 */ addi r3, r1, 0x60 /* 800CAD1C 000C7C7C 48 27 2D C5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CAD20 000C7C80 38 60 00 00 */ li r3, 0 @@ -6487,7 +6487,7 @@ lbl_800CAF0C: /* 800CAF14 000C7E74 48 04 BB 39 */ bl __dt__10CModelDataFv /* 800CAF18 000C7E78 38 61 02 80 */ addi r3, r1, 0x280 /* 800CAF1C 000C7E7C 38 80 FF FF */ li r4, -1 -/* 800CAF20 000C7E80 48 03 B6 E9 */ bl __dt__16CActorParametersFv +/* 800CAF20 000C7E80 48 03 B6 E9 */ bl __dt__16CLightParametersFv /* 800CAF24 000C7E84 38 61 00 60 */ addi r3, r1, 0x60 /* 800CAF28 000C7E88 48 27 2B B9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CAF2C 000C7E8C 7F 63 DB 78 */ mr r3, r27 @@ -6771,7 +6771,7 @@ lbl_800CB304: /* 800CB324 000C8284 4B FF A2 F9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CB328 000C8288 38 61 01 04 */ addi r3, r1, 0x104 /* 800CB32C 000C828C 38 80 FF FF */ li r4, -1 -/* 800CB330 000C8290 48 03 B2 D9 */ bl __dt__16CActorParametersFv +/* 800CB330 000C8290 48 03 B2 D9 */ bl __dt__16CLightParametersFv /* 800CB334 000C8294 7F A3 EB 78 */ mr r3, r29 /* 800CB338 000C8298 48 27 39 A5 */ bl ReadBool__12CInputStreamFv /* 800CB33C 000C829C 7F A3 EB 78 */ mr r3, r29 @@ -6791,7 +6791,7 @@ lbl_800CB304: /* 800CB374 000C82D4 40 82 00 20 */ bne lbl_800CB394 /* 800CB378 000C82D8 38 61 01 6C */ addi r3, r1, 0x16c /* 800CB37C 000C82DC 38 80 FF FF */ li r4, -1 -/* 800CB380 000C82E0 48 03 B2 89 */ bl __dt__16CActorParametersFv +/* 800CB380 000C82E0 48 03 B2 89 */ bl __dt__16CLightParametersFv /* 800CB384 000C82E4 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 800CB388 000C82E8 48 27 27 59 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CB38C 000C82EC 38 60 00 00 */ li r3, 0 @@ -6895,7 +6895,7 @@ lbl_800CB4E8: lbl_800CB500: /* 800CB500 000C8460 38 61 01 6C */ addi r3, r1, 0x16c /* 800CB504 000C8464 38 80 FF FF */ li r4, -1 -/* 800CB508 000C8468 48 03 B1 01 */ bl __dt__16CActorParametersFv +/* 800CB508 000C8468 48 03 B1 01 */ bl __dt__16CLightParametersFv /* 800CB50C 000C846C 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 800CB510 000C8470 48 27 25 D1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CB514 000C8474 7F 83 E3 78 */ mr r3, r28 @@ -7004,14 +7004,14 @@ lbl_800CB654: /* 800CB674 000C85D4 4B FF 9F A9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CB678 000C85D8 38 61 00 80 */ addi r3, r1, 0x80 /* 800CB67C 000C85DC 38 80 FF FF */ li r4, -1 -/* 800CB680 000C85E0 48 03 AF 89 */ bl __dt__16CActorParametersFv +/* 800CB680 000C85E0 48 03 AF 89 */ bl __dt__16CLightParametersFv /* 800CB684 000C85E4 80 61 02 88 */ lwz r3, 0x288(r1) /* 800CB688 000C85E8 3C 03 00 01 */ addis r0, r3, 1 /* 800CB68C 000C85EC 28 00 FF FF */ cmplwi r0, 0xffff /* 800CB690 000C85F0 40 82 00 20 */ bne lbl_800CB6B0 /* 800CB694 000C85F4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800CB698 000C85F8 38 80 FF FF */ li r4, -1 -/* 800CB69C 000C85FC 48 03 AF 6D */ bl __dt__16CActorParametersFv +/* 800CB69C 000C85FC 48 03 AF 6D */ bl __dt__16CLightParametersFv /* 800CB6A0 000C8600 38 61 01 50 */ addi r3, r1, 0x150 /* 800CB6A4 000C8604 48 27 24 3D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CB6A8 000C8608 38 60 00 00 */ li r3, 0 @@ -7068,7 +7068,7 @@ lbl_800CB758: lbl_800CB76C: /* 800CB76C 000C86CC 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800CB770 000C86D0 38 80 FF FF */ li r4, -1 -/* 800CB774 000C86D4 48 03 AE 95 */ bl __dt__16CActorParametersFv +/* 800CB774 000C86D4 48 03 AE 95 */ bl __dt__16CLightParametersFv /* 800CB778 000C86D8 38 61 01 50 */ addi r3, r1, 0x150 /* 800CB77C 000C86DC 48 27 23 65 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CB780 000C86E0 7F E3 FB 78 */ mr r3, r31 @@ -7142,7 +7142,7 @@ lbl_800CB850: /* 800CB87C 000C87DC 4B FF 9D A1 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CB880 000C87E0 38 61 01 40 */ addi r3, r1, 0x140 /* 800CB884 000C87E4 38 80 FF FF */ li r4, -1 -/* 800CB888 000C87E8 48 03 AD 81 */ bl __dt__16CActorParametersFv +/* 800CB888 000C87E8 48 03 AD 81 */ bl __dt__16CLightParametersFv /* 800CB88C 000C87EC 7D C3 73 78 */ mr r3, r14 /* 800CB890 000C87F0 48 27 33 F5 */ bl ReadLong__12CInputStreamFv /* 800CB894 000C87F4 7C 60 1B 78 */ mr r0, r3 @@ -7330,11 +7330,11 @@ lbl_800CBB64: /* 800CBB68 000C8AC8 41 82 00 10 */ beq lbl_800CBB78 /* 800CBB6C 000C8ACC 38 61 00 D8 */ addi r3, r1, 0xd8 /* 800CBB70 000C8AD0 38 80 FF FF */ li r4, -1 -/* 800CBB74 000C8AD4 48 03 AA 95 */ bl __dt__16CActorParametersFv +/* 800CBB74 000C8AD4 48 03 AA 95 */ bl __dt__16CLightParametersFv lbl_800CBB78: /* 800CBB78 000C8AD8 38 61 02 10 */ addi r3, r1, 0x210 /* 800CBB7C 000C8ADC 38 80 FF FF */ li r4, -1 -/* 800CBB80 000C8AE0 48 03 AA 89 */ bl __dt__16CActorParametersFv +/* 800CBB80 000C8AE0 48 03 AA 89 */ bl __dt__16CLightParametersFv /* 800CBB84 000C8AE4 38 61 02 78 */ addi r3, r1, 0x278 /* 800CBB88 000C8AE8 48 27 1F 59 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CBB8C 000C8AEC 7E 43 93 78 */ mr r3, r18 @@ -7433,7 +7433,7 @@ lbl_800CBCC8: /* 800CBCE8 000C8C48 4B FF 99 35 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CBCEC 000C8C4C 38 61 06 14 */ addi r3, r1, 0x614 /* 800CBCF0 000C8C50 38 80 FF FF */ li r4, -1 -/* 800CBCF4 000C8C54 48 03 A9 15 */ bl __dt__16CActorParametersFv +/* 800CBCF4 000C8C54 48 03 A9 15 */ bl __dt__16CLightParametersFv /* 800CBCF8 000C8C58 7F C3 F3 78 */ mr r3, r30 /* 800CBCFC 000C8C5C 48 27 2F E1 */ bl ReadBool__12CInputStreamFv /* 800CBD00 000C8C60 7F C3 F3 78 */ mr r3, r30 @@ -7444,7 +7444,7 @@ lbl_800CBCC8: /* 800CBD14 000C8C74 40 82 00 20 */ bne lbl_800CBD34 /* 800CBD18 000C8C78 38 61 06 7C */ addi r3, r1, 0x67c /* 800CBD1C 000C8C7C 38 80 FF FF */ li r4, -1 -/* 800CBD20 000C8C80 48 03 A8 E9 */ bl __dt__16CActorParametersFv +/* 800CBD20 000C8C80 48 03 A8 E9 */ bl __dt__16CLightParametersFv /* 800CBD24 000C8C84 38 61 06 E4 */ addi r3, r1, 0x6e4 /* 800CBD28 000C8C88 48 27 1D B9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CBD2C 000C8C8C 38 60 00 00 */ li r3, 0 @@ -7907,7 +7907,7 @@ lbl_800CC410: lbl_800CC428: /* 800CC428 000C9388 38 61 06 7C */ addi r3, r1, 0x67c /* 800CC42C 000C938C 38 80 FF FF */ li r4, -1 -/* 800CC430 000C9390 48 03 A1 D9 */ bl __dt__16CActorParametersFv +/* 800CC430 000C9390 48 03 A1 D9 */ bl __dt__16CLightParametersFv /* 800CC434 000C9394 38 61 06 E4 */ addi r3, r1, 0x6e4 /* 800CC438 000C9398 48 27 16 A9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CC43C 000C939C 7E 03 83 78 */ mr r3, r16 @@ -7997,7 +7997,7 @@ lbl_800CC554: /* 800CC574 000C94D4 4B FF 90 A9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CC578 000C94D8 38 61 00 B4 */ addi r3, r1, 0xb4 /* 800CC57C 000C94DC 38 80 FF FF */ li r4, -1 -/* 800CC580 000C94E0 48 03 A0 89 */ bl __dt__16CActorParametersFv +/* 800CC580 000C94E0 48 03 A0 89 */ bl __dt__16CLightParametersFv /* 800CC584 000C94E4 7F 84 E3 78 */ mr r4, r28 /* 800CC588 000C94E8 38 61 00 4C */ addi r3, r1, 0x4c /* 800CC58C 000C94EC 4B FF 6F D5 */ bl __ct__11CDamageInfoFR12CInputStream @@ -8049,7 +8049,7 @@ lbl_800CC554: /* 800CC644 000C95A4 41 82 00 20 */ beq lbl_800CC664 /* 800CC648 000C95A8 38 61 01 1C */ addi r3, r1, 0x11c /* 800CC64C 000C95AC 38 80 FF FF */ li r4, -1 -/* 800CC650 000C95B0 48 03 9F B9 */ bl __dt__16CActorParametersFv +/* 800CC650 000C95B0 48 03 9F B9 */ bl __dt__16CLightParametersFv /* 800CC654 000C95B4 38 61 01 84 */ addi r3, r1, 0x184 /* 800CC658 000C95B8 48 27 14 89 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CC65C 000C95BC 38 60 00 00 */ li r3, 0 @@ -8122,7 +8122,7 @@ lbl_800CC74C: lbl_800CC760: /* 800CC760 000C96C0 38 61 01 1C */ addi r3, r1, 0x11c /* 800CC764 000C96C4 38 80 FF FF */ li r4, -1 -/* 800CC768 000C96C8 48 03 9E A1 */ bl __dt__16CActorParametersFv +/* 800CC768 000C96C8 48 03 9E A1 */ bl __dt__16CLightParametersFv /* 800CC76C 000C96CC 38 61 01 84 */ addi r3, r1, 0x184 /* 800CC770 000C96D0 48 27 13 71 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CC774 000C96D4 7F 83 E3 78 */ mr r3, r28 @@ -9421,7 +9421,7 @@ lbl_800CD9AC: /* 800CD9CC 000CA92C 4B FF 7C 51 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CD9D0 000CA930 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 800CD9D4 000CA934 38 80 FF FF */ li r4, -1 -/* 800CD9D8 000CA938 48 03 8C 31 */ bl __dt__16CActorParametersFv +/* 800CD9D8 000CA938 48 03 8C 31 */ bl __dt__16CLightParametersFv /* 800CD9DC 000CA93C 7F E4 FB 78 */ mr r4, r31 /* 800CD9E0 000CA940 38 61 01 EC */ addi r3, r1, 0x1ec /* 800CD9E4 000CA944 4B FF 5B 7D */ bl __ct__11CDamageInfoFR12CInputStream @@ -9846,7 +9846,7 @@ lbl_800CDFE0: /* 800CDFE4 000CAF44 38 61 03 1C */ addi r3, r1, 0x31c /* 800CDFE8 000CAF48 98 01 01 CC */ stb r0, 0x1cc(r1) /* 800CDFEC 000CAF4C 38 80 FF FF */ li r4, -1 -/* 800CDFF0 000CAF50 48 03 86 19 */ bl __dt__16CActorParametersFv +/* 800CDFF0 000CAF50 48 03 86 19 */ bl __dt__16CLightParametersFv /* 800CDFF4 000CAF54 38 61 00 B4 */ addi r3, r1, 0xb4 /* 800CDFF8 000CAF58 48 26 FA E9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CDFFC 000CAF5C 38 60 00 00 */ li r3, 0 @@ -10097,7 +10097,7 @@ lbl_800CE3A8: /* 800CE3AC 000CB30C 38 61 03 1C */ addi r3, r1, 0x31c /* 800CE3B0 000CB310 98 01 01 CC */ stb r0, 0x1cc(r1) /* 800CE3B4 000CB314 38 80 FF FF */ li r4, -1 -/* 800CE3B8 000CB318 48 03 82 51 */ bl __dt__16CActorParametersFv +/* 800CE3B8 000CB318 48 03 82 51 */ bl __dt__16CLightParametersFv /* 800CE3BC 000CB31C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 800CE3C0 000CB320 48 26 F7 21 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CE3C4 000CB324 7E E3 BB 78 */ mr r3, r23 @@ -10911,7 +10911,7 @@ lbl_800CEF30: /* 800CEFB4 000CBF14 4B FF 66 69 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CEFB8 000CBF18 38 61 01 3C */ addi r3, r1, 0x13c /* 800CEFBC 000CBF1C 38 80 FF FF */ li r4, -1 -/* 800CEFC0 000CBF20 48 03 76 49 */ bl __dt__16CActorParametersFv +/* 800CEFC0 000CBF20 48 03 76 49 */ bl __dt__16CLightParametersFv /* 800CEFC4 000CBF24 7F 23 CB 78 */ mr r3, r25 /* 800CEFC8 000CBF28 48 26 FD 15 */ bl ReadBool__12CInputStreamFv /* 800CEFCC 000CBF2C 7C 7C 1B 78 */ mr r28, r3 @@ -10938,7 +10938,7 @@ lbl_800CEF30: /* 800CF020 000CBF80 40 82 00 20 */ bne lbl_800CF040 /* 800CF024 000CBF84 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 800CF028 000CBF88 38 80 FF FF */ li r4, -1 -/* 800CF02C 000CBF8C 48 03 75 DD */ bl __dt__16CActorParametersFv +/* 800CF02C 000CBF8C 48 03 75 DD */ bl __dt__16CLightParametersFv /* 800CF030 000CBF90 38 61 02 74 */ addi r3, r1, 0x274 /* 800CF034 000CBF94 48 26 EA AD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CF038 000CBF98 38 60 00 00 */ li r3, 0 @@ -11116,7 +11116,7 @@ lbl_800CF2A4: lbl_800CF2B8: /* 800CF2B8 000CC218 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 800CF2BC 000CC21C 38 80 FF FF */ li r4, -1 -/* 800CF2C0 000CC220 48 03 73 49 */ bl __dt__16CActorParametersFv +/* 800CF2C0 000CC220 48 03 73 49 */ bl __dt__16CLightParametersFv /* 800CF2C4 000CC224 38 61 02 74 */ addi r3, r1, 0x274 /* 800CF2C8 000CC228 48 26 E8 19 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CF2CC 000CC22C 7E A3 AB 78 */ mr r3, r21 @@ -11124,7 +11124,7 @@ lbl_800CF2B8: lbl_800CF2D4: /* 800CF2D4 000CC234 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 800CF2D8 000CC238 38 80 FF FF */ li r4, -1 -/* 800CF2DC 000CC23C 48 03 73 2D */ bl __dt__16CActorParametersFv +/* 800CF2DC 000CC23C 48 03 73 2D */ bl __dt__16CLightParametersFv /* 800CF2E0 000CC240 38 61 02 74 */ addi r3, r1, 0x274 /* 800CF2E4 000CC244 48 26 E7 FD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CF2E8 000CC248 38 60 00 00 */ li r3, 0 @@ -11187,7 +11187,7 @@ lbl_800CF394: /* 800CF3B4 000CC314 4B FF 62 69 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CF3B8 000CC318 38 61 00 88 */ addi r3, r1, 0x88 /* 800CF3BC 000CC31C 38 80 FF FF */ li r4, -1 -/* 800CF3C0 000CC320 48 03 72 49 */ bl __dt__16CActorParametersFv +/* 800CF3C0 000CC320 48 03 72 49 */ bl __dt__16CLightParametersFv /* 800CF3C4 000CC324 7F 84 E3 78 */ mr r4, r28 /* 800CF3C8 000CC328 7F A5 EB 78 */ mr r5, r29 /* 800CF3CC 000CC32C 38 61 01 A4 */ addi r3, r1, 0x1a4 @@ -11198,7 +11198,7 @@ lbl_800CF394: /* 800CF3E0 000CC340 40 82 00 20 */ bne lbl_800CF400 /* 800CF3E4 000CC344 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800CF3E8 000CC348 38 80 FF FF */ li r4, -1 -/* 800CF3EC 000CC34C 48 03 72 1D */ bl __dt__16CActorParametersFv +/* 800CF3EC 000CC34C 48 03 72 1D */ bl __dt__16CLightParametersFv /* 800CF3F0 000CC350 38 61 01 58 */ addi r3, r1, 0x158 /* 800CF3F4 000CC354 48 26 E6 ED */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CF3F8 000CC358 38 60 00 00 */ li r3, 0 @@ -11257,7 +11257,7 @@ lbl_800CF4B0: lbl_800CF4C4: /* 800CF4C4 000CC424 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800CF4C8 000CC428 38 80 FF FF */ li r4, -1 -/* 800CF4CC 000CC42C 48 03 71 3D */ bl __dt__16CActorParametersFv +/* 800CF4CC 000CC42C 48 03 71 3D */ bl __dt__16CLightParametersFv /* 800CF4D0 000CC430 38 61 01 58 */ addi r3, r1, 0x158 /* 800CF4D4 000CC434 48 26 E6 0D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CF4D8 000CC438 7F A3 EB 78 */ mr r3, r29 @@ -11578,7 +11578,7 @@ lbl_800CF944: /* 800CF964 000CC8C4 4B FF 5C B9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CF968 000CC8C8 38 61 01 04 */ addi r3, r1, 0x104 /* 800CF96C 000CC8CC 38 80 FF FF */ li r4, -1 -/* 800CF970 000CC8D0 48 03 6C 99 */ bl __dt__16CActorParametersFv +/* 800CF970 000CC8D0 48 03 6C 99 */ bl __dt__16CLightParametersFv /* 800CF974 000CC8D4 7F 84 E3 78 */ mr r4, r28 /* 800CF978 000CC8D8 7F A5 EB 78 */ mr r5, r29 /* 800CF97C 000CC8DC 38 61 01 D4 */ addi r3, r1, 0x1d4 @@ -11589,7 +11589,7 @@ lbl_800CF944: /* 800CF990 000CC8F0 40 82 00 20 */ bne lbl_800CF9B0 /* 800CF994 000CC8F4 38 61 01 6C */ addi r3, r1, 0x16c /* 800CF998 000CC8F8 38 80 FF FF */ li r4, -1 -/* 800CF99C 000CC8FC 48 03 6C 6D */ bl __dt__16CActorParametersFv +/* 800CF99C 000CC8FC 48 03 6C 6D */ bl __dt__16CLightParametersFv /* 800CF9A0 000CC900 38 61 00 2C */ addi r3, r1, 0x2c /* 800CF9A4 000CC904 48 26 E1 3D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CF9A8 000CC908 38 60 00 00 */ li r3, 0 @@ -11648,7 +11648,7 @@ lbl_800CFA60: lbl_800CFA74: /* 800CFA74 000CC9D4 38 61 01 6C */ addi r3, r1, 0x16c /* 800CFA78 000CC9D8 38 80 FF FF */ li r4, -1 -/* 800CFA7C 000CC9DC 48 03 6B 8D */ bl __dt__16CActorParametersFv +/* 800CFA7C 000CC9DC 48 03 6B 8D */ bl __dt__16CLightParametersFv /* 800CFA80 000CC9E0 38 61 00 2C */ addi r3, r1, 0x2c /* 800CFA84 000CC9E4 48 26 E0 5D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CFA88 000CC9E8 7F A3 EB 78 */ mr r3, r29 @@ -11721,7 +11721,7 @@ lbl_800CFB5C: /* 800CFB7C 000CCADC 4B FF 5A A1 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CFB80 000CCAE0 38 61 01 10 */ addi r3, r1, 0x110 /* 800CFB84 000CCAE4 38 80 FF FF */ li r4, -1 -/* 800CFB88 000CCAE8 48 03 6A 81 */ bl __dt__16CActorParametersFv +/* 800CFB88 000CCAE8 48 03 6A 81 */ bl __dt__16CLightParametersFv /* 800CFB8C 000CCAEC 7F 64 DB 78 */ mr r4, r27 /* 800CFB90 000CCAF0 7F 85 E3 78 */ mr r5, r28 /* 800CFB94 000CCAF4 38 61 01 E0 */ addi r3, r1, 0x1e0 @@ -11735,7 +11735,7 @@ lbl_800CFB5C: /* 800CFBB4 000CCB14 48 00 01 65 */ bl sub_800cfd18 /* 800CFBB8 000CCB18 38 61 01 78 */ addi r3, r1, 0x178 /* 800CFBBC 000CCB1C 38 80 FF FF */ li r4, -1 -/* 800CFBC0 000CCB20 48 03 6A 49 */ bl __dt__16CActorParametersFv +/* 800CFBC0 000CCB20 48 03 6A 49 */ bl __dt__16CLightParametersFv /* 800CFBC4 000CCB24 38 61 00 38 */ addi r3, r1, 0x38 /* 800CFBC8 000CCB28 48 26 DF 19 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CFBCC 000CCB2C 38 60 00 00 */ li r3, 0 @@ -11748,7 +11748,7 @@ lbl_800CFBD4: /* 800CFBE4 000CCB44 48 00 01 35 */ bl sub_800cfd18 /* 800CFBE8 000CCB48 38 61 01 78 */ addi r3, r1, 0x178 /* 800CFBEC 000CCB4C 38 80 FF FF */ li r4, -1 -/* 800CFBF0 000CCB50 48 03 6A 19 */ bl __dt__16CActorParametersFv +/* 800CFBF0 000CCB50 48 03 6A 19 */ bl __dt__16CLightParametersFv /* 800CFBF4 000CCB54 38 61 00 38 */ addi r3, r1, 0x38 /* 800CFBF8 000CCB58 48 26 DE E9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CFBFC 000CCB5C 38 60 00 00 */ li r3, 0 @@ -11816,7 +11816,7 @@ lbl_800CFCE0: /* 800CFCE8 000CCC48 48 00 00 31 */ bl sub_800cfd18 /* 800CFCEC 000CCC4C 38 61 01 78 */ addi r3, r1, 0x178 /* 800CFCF0 000CCC50 38 80 FF FF */ li r4, -1 -/* 800CFCF4 000CCC54 48 03 69 15 */ bl __dt__16CActorParametersFv +/* 800CFCF4 000CCC54 48 03 69 15 */ bl __dt__16CLightParametersFv /* 800CFCF8 000CCC58 38 61 00 38 */ addi r3, r1, 0x38 /* 800CFCFC 000CCC5C 48 26 DD E5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CFD00 000CCC60 7F 83 E3 78 */ mr r3, r28 @@ -11993,14 +11993,14 @@ lbl_800CFF3C: /* 800CFF5C 000CCEBC 4B FF 56 C1 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800CFF60 000CCEC0 38 61 01 64 */ addi r3, r1, 0x164 /* 800CFF64 000CCEC4 38 80 FF FF */ li r4, -1 -/* 800CFF68 000CCEC8 48 03 66 A1 */ bl __dt__16CActorParametersFv +/* 800CFF68 000CCEC8 48 03 66 A1 */ bl __dt__16CLightParametersFv /* 800CFF6C 000CCECC 80 61 03 20 */ lwz r3, 0x320(r1) /* 800CFF70 000CCED0 3C 03 00 01 */ addis r0, r3, 1 /* 800CFF74 000CCED4 28 00 FF FF */ cmplwi r0, 0xffff /* 800CFF78 000CCED8 40 82 00 20 */ bne lbl_800CFF98 /* 800CFF7C 000CCEDC 38 61 01 CC */ addi r3, r1, 0x1cc /* 800CFF80 000CCEE0 38 80 FF FF */ li r4, -1 -/* 800CFF84 000CCEE4 48 03 66 85 */ bl __dt__16CActorParametersFv +/* 800CFF84 000CCEE4 48 03 66 85 */ bl __dt__16CLightParametersFv /* 800CFF88 000CCEE8 38 61 00 2C */ addi r3, r1, 0x2c /* 800CFF8C 000CCEEC 48 26 DB 55 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800CFF90 000CCEF0 38 60 00 00 */ li r3, 0 @@ -12088,7 +12088,7 @@ lbl_800D00BC: lbl_800D00D0: /* 800D00D0 000CD030 38 61 01 CC */ addi r3, r1, 0x1cc /* 800D00D4 000CD034 38 80 FF FF */ li r4, -1 -/* 800D00D8 000CD038 48 03 65 31 */ bl __dt__16CActorParametersFv +/* 800D00D8 000CD038 48 03 65 31 */ bl __dt__16CLightParametersFv /* 800D00DC 000CD03C 38 61 00 2C */ addi r3, r1, 0x2c /* 800D00E0 000CD040 48 26 DA 01 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D00E4 000CD044 7F 83 E3 78 */ mr r3, r28 @@ -12189,7 +12189,7 @@ lbl_800D0228: /* 800D0248 000CD1A8 4B FF 53 D5 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D024C 000CD1AC 38 61 01 78 */ addi r3, r1, 0x178 /* 800D0250 000CD1B0 38 80 FF FF */ li r4, -1 -/* 800D0254 000CD1B4 48 03 63 B5 */ bl __dt__16CActorParametersFv +/* 800D0254 000CD1B4 48 03 63 B5 */ bl __dt__16CLightParametersFv /* 800D0258 000CD1B8 7F 03 C3 78 */ mr r3, r24 /* 800D025C 000CD1BC 48 26 E9 CD */ bl ReadFloat__12CInputStreamFv /* 800D0260 000CD1C0 FE C0 08 90 */ fmr f22, f1 @@ -12253,7 +12253,7 @@ lbl_800D0228: /* 800D0348 000CD2A8 41 82 00 20 */ beq lbl_800D0368 /* 800D034C 000CD2AC 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 800D0350 000CD2B0 38 80 FF FF */ li r4, -1 -/* 800D0354 000CD2B4 48 03 62 B5 */ bl __dt__16CActorParametersFv +/* 800D0354 000CD2B4 48 03 62 B5 */ bl __dt__16CLightParametersFv /* 800D0358 000CD2B8 38 61 00 84 */ addi r3, r1, 0x84 /* 800D035C 000CD2BC 48 26 D7 85 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D0360 000CD2C0 38 60 00 00 */ li r3, 0 @@ -12370,7 +12370,7 @@ lbl_800D0500: lbl_800D0514: /* 800D0514 000CD474 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 800D0518 000CD478 38 80 FF FF */ li r4, -1 -/* 800D051C 000CD47C 48 03 60 ED */ bl __dt__16CActorParametersFv +/* 800D051C 000CD47C 48 03 60 ED */ bl __dt__16CLightParametersFv /* 800D0520 000CD480 38 61 00 84 */ addi r3, r1, 0x84 /* 800D0524 000CD484 48 26 D5 BD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D0528 000CD488 7F A3 EB 78 */ mr r3, r29 @@ -12463,7 +12463,7 @@ lbl_800D064C: /* 800D066C 000CD5CC 4B FF 4F B1 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D0670 000CD5D0 38 61 00 64 */ addi r3, r1, 0x64 /* 800D0674 000CD5D4 38 80 FF FF */ li r4, -1 -/* 800D0678 000CD5D8 48 03 5F 91 */ bl __dt__16CActorParametersFv +/* 800D0678 000CD5D8 48 03 5F 91 */ bl __dt__16CLightParametersFv /* 800D067C 000CD5DC 7F 84 E3 78 */ mr r4, r28 /* 800D0680 000CD5E0 7F A5 EB 78 */ mr r5, r29 /* 800D0684 000CD5E4 38 61 01 80 */ addi r3, r1, 0x180 @@ -12516,11 +12516,11 @@ lbl_800D072C: /* 800D073C 000CD69C 34 61 02 58 */ addic. r3, r1, 0x258 /* 800D0740 000CD6A0 41 82 00 0C */ beq lbl_800D074C /* 800D0744 000CD6A4 38 80 FF FF */ li r4, -1 -/* 800D0748 000CD6A8 48 03 5E C1 */ bl __dt__16CActorParametersFv +/* 800D0748 000CD6A8 48 03 5E C1 */ bl __dt__16CLightParametersFv lbl_800D074C: /* 800D074C 000CD6AC 38 61 00 CC */ addi r3, r1, 0xcc /* 800D0750 000CD6B0 38 80 FF FF */ li r4, -1 -/* 800D0754 000CD6B4 48 03 5E B5 */ bl __dt__16CActorParametersFv +/* 800D0754 000CD6B4 48 03 5E B5 */ bl __dt__16CLightParametersFv /* 800D0758 000CD6B8 38 61 01 34 */ addi r3, r1, 0x134 /* 800D075C 000CD6BC 48 26 D3 85 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D0760 000CD6C0 38 60 00 00 */ li r3, 0 @@ -12555,11 +12555,11 @@ lbl_800D07CC: /* 800D07CC 000CD72C 34 61 02 58 */ addic. r3, r1, 0x258 /* 800D07D0 000CD730 41 82 00 0C */ beq lbl_800D07DC /* 800D07D4 000CD734 38 80 FF FF */ li r4, -1 -/* 800D07D8 000CD738 48 03 5E 31 */ bl __dt__16CActorParametersFv +/* 800D07D8 000CD738 48 03 5E 31 */ bl __dt__16CLightParametersFv lbl_800D07DC: /* 800D07DC 000CD73C 38 61 00 CC */ addi r3, r1, 0xcc /* 800D07E0 000CD740 38 80 FF FF */ li r4, -1 -/* 800D07E4 000CD744 48 03 5E 25 */ bl __dt__16CActorParametersFv +/* 800D07E4 000CD744 48 03 5E 25 */ bl __dt__16CLightParametersFv /* 800D07E8 000CD748 38 61 01 34 */ addi r3, r1, 0x134 /* 800D07EC 000CD74C 48 26 D2 F5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D07F0 000CD750 7F A3 EB 78 */ mr r3, r29 @@ -12618,7 +12618,7 @@ lbl_800D088C: /* 800D08AC 000CD80C 4B FF 4D 71 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D08B0 000CD810 38 61 00 B4 */ addi r3, r1, 0xb4 /* 800D08B4 000CD814 38 80 FF FF */ li r4, -1 -/* 800D08B8 000CD818 48 03 5D 51 */ bl __dt__16CActorParametersFv +/* 800D08B8 000CD818 48 03 5D 51 */ bl __dt__16CLightParametersFv /* 800D08BC 000CD81C 7F 03 C3 78 */ mr r3, r24 /* 800D08C0 000CD820 48 26 E3 69 */ bl ReadFloat__12CInputStreamFv /* 800D08C4 000CD824 FF E0 08 90 */ fmr f31, f1 @@ -12646,7 +12646,7 @@ lbl_800D088C: /* 800D091C 000CD87C 40 82 00 20 */ bne lbl_800D093C /* 800D0920 000CD880 38 61 01 1C */ addi r3, r1, 0x11c /* 800D0924 000CD884 38 80 FF FF */ li r4, -1 -/* 800D0928 000CD888 48 03 5C E1 */ bl __dt__16CActorParametersFv +/* 800D0928 000CD888 48 03 5C E1 */ bl __dt__16CLightParametersFv /* 800D092C 000CD88C 38 61 01 84 */ addi r3, r1, 0x184 /* 800D0930 000CD890 48 26 D1 B1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D0934 000CD894 38 60 00 00 */ li r3, 0 @@ -12711,7 +12711,7 @@ lbl_800D0A04: lbl_800D0A18: /* 800D0A18 000CD978 38 61 01 1C */ addi r3, r1, 0x11c /* 800D0A1C 000CD97C 38 80 FF FF */ li r4, -1 -/* 800D0A20 000CD980 48 03 5B E9 */ bl __dt__16CActorParametersFv +/* 800D0A20 000CD980 48 03 5B E9 */ bl __dt__16CLightParametersFv /* 800D0A24 000CD984 38 61 01 84 */ addi r3, r1, 0x184 /* 800D0A28 000CD988 48 26 D0 B9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D0A2C 000CD98C 7F 03 C3 78 */ mr r3, r24 @@ -12788,7 +12788,7 @@ lbl_800D0B10: /* 800D0B30 000CDA90 4B FF 4A ED */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D0B34 000CDA94 38 61 01 34 */ addi r3, r1, 0x134 /* 800D0B38 000CDA98 38 80 FF FF */ li r4, -1 -/* 800D0B3C 000CDA9C 48 03 5A CD */ bl __dt__16CActorParametersFv +/* 800D0B3C 000CDA9C 48 03 5A CD */ bl __dt__16CLightParametersFv /* 800D0B40 000CDAA0 7F A4 EB 78 */ mr r4, r29 /* 800D0B44 000CDAA4 38 61 00 6C */ addi r3, r1, 0x6c /* 800D0B48 000CDAA8 4B FF 2A 19 */ bl __ct__11CDamageInfoFR12CInputStream @@ -12813,7 +12813,7 @@ lbl_800D0B10: /* 800D0B94 000CDAF4 41 82 00 20 */ beq lbl_800D0BB4 /* 800D0B98 000CDAF8 38 61 01 9C */ addi r3, r1, 0x19c /* 800D0B9C 000CDAFC 38 80 FF FF */ li r4, -1 -/* 800D0BA0 000CDB00 48 03 5A 69 */ bl __dt__16CActorParametersFv +/* 800D0BA0 000CDB00 48 03 5A 69 */ bl __dt__16CLightParametersFv /* 800D0BA4 000CDB04 38 61 00 40 */ addi r3, r1, 0x40 /* 800D0BA8 000CDB08 48 26 CF 39 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D0BAC 000CDB0C 38 60 00 00 */ li r3, 0 @@ -12885,7 +12885,7 @@ lbl_800D0C98: lbl_800D0CAC: /* 800D0CAC 000CDC0C 38 61 01 9C */ addi r3, r1, 0x19c /* 800D0CB0 000CDC10 38 80 FF FF */ li r4, -1 -/* 800D0CB4 000CDC14 48 03 59 55 */ bl __dt__16CActorParametersFv +/* 800D0CB4 000CDC14 48 03 59 55 */ bl __dt__16CLightParametersFv /* 800D0CB8 000CDC18 38 61 00 40 */ addi r3, r1, 0x40 /* 800D0CBC 000CDC1C 48 26 CE 25 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D0CC0 000CDC20 7F A3 EB 78 */ mr r3, r29 @@ -13238,7 +13238,7 @@ lbl_800D1184: /* 800D11A4 000CE104 4B FF 44 79 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D11A8 000CE108 38 61 00 80 */ addi r3, r1, 0x80 /* 800D11AC 000CE10C 38 80 FF FF */ li r4, -1 -/* 800D11B0 000CE110 48 03 54 59 */ bl __dt__16CActorParametersFv +/* 800D11B0 000CE110 48 03 54 59 */ bl __dt__16CLightParametersFv /* 800D11B4 000CE114 7F E3 FB 78 */ mr r3, r31 /* 800D11B8 000CE118 48 26 DB 25 */ bl ReadBool__12CInputStreamFv /* 800D11BC 000CE11C 7F E3 FB 78 */ mr r3, r31 @@ -13259,7 +13259,7 @@ lbl_800D1184: /* 800D11F8 000CE158 40 82 00 20 */ bne lbl_800D1218 /* 800D11FC 000CE15C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800D1200 000CE160 38 80 FF FF */ li r4, -1 -/* 800D1204 000CE164 48 03 54 05 */ bl __dt__16CActorParametersFv +/* 800D1204 000CE164 48 03 54 05 */ bl __dt__16CLightParametersFv /* 800D1208 000CE168 38 61 01 50 */ addi r3, r1, 0x150 /* 800D120C 000CE16C 48 26 C8 D5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D1210 000CE170 38 60 00 00 */ li r3, 0 @@ -13320,7 +13320,7 @@ lbl_800D12D0: lbl_800D12E4: /* 800D12E4 000CE244 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800D12E8 000CE248 38 80 FF FF */ li r4, -1 -/* 800D12EC 000CE24C 48 03 53 1D */ bl __dt__16CActorParametersFv +/* 800D12EC 000CE24C 48 03 53 1D */ bl __dt__16CLightParametersFv /* 800D12F0 000CE250 38 61 01 50 */ addi r3, r1, 0x150 /* 800D12F4 000CE254 48 26 C7 ED */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D12F8 000CE258 7F E3 FB 78 */ mr r3, r31 @@ -13390,7 +13390,7 @@ lbl_800D13C0: /* 800D13E0 000CE340 4B FF 42 3D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D13E4 000CE344 38 61 00 80 */ addi r3, r1, 0x80 /* 800D13E8 000CE348 38 80 FF FF */ li r4, -1 -/* 800D13EC 000CE34C 48 03 52 1D */ bl __dt__16CActorParametersFv +/* 800D13EC 000CE34C 48 03 52 1D */ bl __dt__16CLightParametersFv /* 800D13F0 000CE350 7F E3 FB 78 */ mr r3, r31 /* 800D13F4 000CE354 48 26 D8 E9 */ bl ReadBool__12CInputStreamFv /* 800D13F8 000CE358 7F E3 FB 78 */ mr r3, r31 @@ -13404,7 +13404,7 @@ lbl_800D13C0: /* 800D1418 000CE378 40 82 00 20 */ bne lbl_800D1438 /* 800D141C 000CE37C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800D1420 000CE380 38 80 FF FF */ li r4, -1 -/* 800D1424 000CE384 48 03 51 E5 */ bl __dt__16CActorParametersFv +/* 800D1424 000CE384 48 03 51 E5 */ bl __dt__16CLightParametersFv /* 800D1428 000CE388 38 61 01 50 */ addi r3, r1, 0x150 /* 800D142C 000CE38C 48 26 C6 B5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D1430 000CE390 38 60 00 00 */ li r3, 0 @@ -13462,7 +13462,7 @@ lbl_800D14E4: lbl_800D14F8: /* 800D14F8 000CE458 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800D14FC 000CE45C 38 80 FF FF */ li r4, -1 -/* 800D1500 000CE460 48 03 51 09 */ bl __dt__16CActorParametersFv +/* 800D1500 000CE460 48 03 51 09 */ bl __dt__16CLightParametersFv /* 800D1504 000CE464 38 61 01 50 */ addi r3, r1, 0x150 /* 800D1508 000CE468 48 26 C5 D9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D150C 000CE46C 7F E3 FB 78 */ mr r3, r31 @@ -13546,7 +13546,7 @@ lbl_800D160C: /* 800D162C 000CE58C 4B FF 3F F1 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D1630 000CE590 38 61 01 64 */ addi r3, r1, 0x164 /* 800D1634 000CE594 38 80 FF FF */ li r4, -1 -/* 800D1638 000CE598 48 03 4F D1 */ bl __dt__16CActorParametersFv +/* 800D1638 000CE598 48 03 4F D1 */ bl __dt__16CLightParametersFv /* 800D163C 000CE59C 7F A3 EB 78 */ mr r3, r29 /* 800D1640 000CE5A0 48 26 D5 E9 */ bl ReadFloat__12CInputStreamFv /* 800D1644 000CE5A4 FF E0 08 90 */ fmr f31, f1 @@ -13649,7 +13649,7 @@ lbl_800D17B0: lbl_800D17C4: /* 800D17C4 000CE724 38 61 01 CC */ addi r3, r1, 0x1cc /* 800D17C8 000CE728 38 80 FF FF */ li r4, -1 -/* 800D17CC 000CE72C 48 03 4E 3D */ bl __dt__16CActorParametersFv +/* 800D17CC 000CE72C 48 03 4E 3D */ bl __dt__16CLightParametersFv /* 800D17D0 000CE730 38 61 00 54 */ addi r3, r1, 0x54 /* 800D17D4 000CE734 48 26 C3 0D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D17D8 000CE738 7F A3 EB 78 */ mr r3, r29 @@ -13855,7 +13855,7 @@ lbl_800D1A90: /* 800D1AB0 000CEA10 4B FF 3B 6D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D1AB4 000CEA14 38 61 01 30 */ addi r3, r1, 0x130 /* 800D1AB8 000CEA18 38 80 FF FF */ li r4, -1 -/* 800D1ABC 000CEA1C 48 03 4B 4D */ bl __dt__16CActorParametersFv +/* 800D1ABC 000CEA1C 48 03 4B 4D */ bl __dt__16CLightParametersFv /* 800D1AC0 000CEA20 7F 83 E3 78 */ mr r3, r28 /* 800D1AC4 000CEA24 48 26 D2 19 */ bl ReadBool__12CInputStreamFv /* 800D1AC8 000CEA28 7C 79 1B 78 */ mr r25, r3 @@ -13892,7 +13892,7 @@ lbl_800D1A90: /* 800D1B44 000CEAA4 41 82 00 20 */ beq lbl_800D1B64 /* 800D1B48 000CEAA8 38 61 01 98 */ addi r3, r1, 0x198 /* 800D1B4C 000CEAAC 38 80 FF FF */ li r4, -1 -/* 800D1B50 000CEAB0 48 03 4A B9 */ bl __dt__16CActorParametersFv +/* 800D1B50 000CEAB0 48 03 4A B9 */ bl __dt__16CLightParametersFv /* 800D1B54 000CEAB4 38 61 00 3C */ addi r3, r1, 0x3c /* 800D1B58 000CEAB8 48 26 BF 89 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D1B5C 000CEABC 38 60 00 00 */ li r3, 0 @@ -13965,7 +13965,7 @@ lbl_800D1C4C: lbl_800D1C60: /* 800D1C60 000CEBC0 38 61 01 98 */ addi r3, r1, 0x198 /* 800D1C64 000CEBC4 38 80 FF FF */ li r4, -1 -/* 800D1C68 000CEBC8 48 03 49 A1 */ bl __dt__16CActorParametersFv +/* 800D1C68 000CEBC8 48 03 49 A1 */ bl __dt__16CLightParametersFv /* 800D1C6C 000CEBCC 38 61 00 3C */ addi r3, r1, 0x3c /* 800D1C70 000CEBD0 48 26 BE 71 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D1C74 000CEBD4 7F 83 E3 78 */ mr r3, r28 @@ -14047,7 +14047,7 @@ lbl_800D1D6C: /* 800D1D8C 000CECEC 4B FF 38 91 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D1D90 000CECF0 38 61 01 60 */ addi r3, r1, 0x160 /* 800D1D94 000CECF4 38 80 FF FF */ li r4, -1 -/* 800D1D98 000CECF8 48 03 48 71 */ bl __dt__16CActorParametersFv +/* 800D1D98 000CECF8 48 03 48 71 */ bl __dt__16CLightParametersFv /* 800D1D9C 000CECFC 7E 23 8B 78 */ mr r3, r17 /* 800D1DA0 000CED00 48 26 CE 89 */ bl ReadFloat__12CInputStreamFv /* 800D1DA4 000CED04 FF C0 08 90 */ fmr f30, f1 @@ -14140,7 +14140,7 @@ lbl_800D1D6C: /* 800D1F00 000CEE60 41 82 00 20 */ beq lbl_800D1F20 /* 800D1F04 000CEE64 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 800D1F08 000CEE68 38 80 FF FF */ li r4, -1 -/* 800D1F0C 000CEE6C 48 03 46 FD */ bl __dt__16CActorParametersFv +/* 800D1F0C 000CEE6C 48 03 46 FD */ bl __dt__16CLightParametersFv /* 800D1F10 000CEE70 38 61 02 30 */ addi r3, r1, 0x230 /* 800D1F14 000CEE74 48 26 BB CD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D1F18 000CEE78 38 60 00 00 */ li r3, 0 @@ -14227,7 +14227,7 @@ lbl_800D2040: lbl_800D2054: /* 800D2054 000CEFB4 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 800D2058 000CEFB8 38 80 FF FF */ li r4, -1 -/* 800D205C 000CEFBC 48 03 45 AD */ bl __dt__16CActorParametersFv +/* 800D205C 000CEFBC 48 03 45 AD */ bl __dt__16CLightParametersFv /* 800D2060 000CEFC0 38 61 02 30 */ addi r3, r1, 0x230 /* 800D2064 000CEFC4 48 26 BA 7D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D2068 000CEFC8 7E 83 A3 78 */ mr r3, r20 @@ -14312,7 +14312,7 @@ lbl_800D216C: /* 800D218C 000CF0EC 4B FF 34 91 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D2190 000CF0F0 38 61 01 0C */ addi r3, r1, 0x10c /* 800D2194 000CF0F4 38 80 FF FF */ li r4, -1 -/* 800D2198 000CF0F8 48 03 44 71 */ bl __dt__16CActorParametersFv +/* 800D2198 000CF0F8 48 03 44 71 */ bl __dt__16CLightParametersFv /* 800D219C 000CF0FC 7F 83 E3 78 */ mr r3, r28 /* 800D21A0 000CF100 48 26 CB 3D */ bl ReadBool__12CInputStreamFv /* 800D21A4 000CF104 7C 79 1B 78 */ mr r25, r3 @@ -14331,7 +14331,7 @@ lbl_800D216C: /* 800D21D8 000CF138 41 82 00 20 */ beq lbl_800D21F8 /* 800D21DC 000CF13C 38 61 01 74 */ addi r3, r1, 0x174 /* 800D21E0 000CF140 38 80 FF FF */ li r4, -1 -/* 800D21E4 000CF144 48 03 44 25 */ bl __dt__16CActorParametersFv +/* 800D21E4 000CF144 48 03 44 25 */ bl __dt__16CLightParametersFv /* 800D21E8 000CF148 38 61 00 34 */ addi r3, r1, 0x34 /* 800D21EC 000CF14C 48 26 B8 F5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D21F0 000CF150 38 60 00 00 */ li r3, 0 @@ -14399,7 +14399,7 @@ lbl_800D22CC: lbl_800D22E0: /* 800D22E0 000CF240 38 61 01 74 */ addi r3, r1, 0x174 /* 800D22E4 000CF244 38 80 FF FF */ li r4, -1 -/* 800D22E8 000CF248 48 03 43 21 */ bl __dt__16CActorParametersFv +/* 800D22E8 000CF248 48 03 43 21 */ bl __dt__16CLightParametersFv /* 800D22EC 000CF24C 38 61 00 34 */ addi r3, r1, 0x34 /* 800D22F0 000CF250 48 26 B7 F1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D22F4 000CF254 7F 83 E3 78 */ mr r3, r28 @@ -14558,7 +14558,7 @@ lbl_800D2504: /* 800D2524 000CF484 4B FF 30 F9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D2528 000CF488 38 61 01 04 */ addi r3, r1, 0x104 /* 800D252C 000CF48C 38 80 FF FF */ li r4, -1 -/* 800D2530 000CF490 48 03 40 D9 */ bl __dt__16CActorParametersFv +/* 800D2530 000CF490 48 03 40 D9 */ bl __dt__16CLightParametersFv /* 800D2534 000CF494 7E 83 A3 78 */ mr r3, r20 /* 800D2538 000CF498 48 26 C7 4D */ bl ReadLong__12CInputStreamFv /* 800D253C 000CF49C 7C 78 1B 78 */ mr r24, r3 @@ -14604,7 +14604,7 @@ lbl_800D2504: /* 800D25DC 000CF53C 41 82 00 20 */ beq lbl_800D25FC /* 800D25E0 000CF540 38 61 01 6C */ addi r3, r1, 0x16c /* 800D25E4 000CF544 38 80 FF FF */ li r4, -1 -/* 800D25E8 000CF548 48 03 40 21 */ bl __dt__16CActorParametersFv +/* 800D25E8 000CF548 48 03 40 21 */ bl __dt__16CLightParametersFv /* 800D25EC 000CF54C 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 800D25F0 000CF550 48 26 B4 F1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D25F4 000CF554 38 60 00 00 */ li r3, 0 @@ -14677,7 +14677,7 @@ lbl_800D26E4: lbl_800D26F8: /* 800D26F8 000CF658 38 61 01 6C */ addi r3, r1, 0x16c /* 800D26FC 000CF65C 38 80 FF FF */ li r4, -1 -/* 800D2700 000CF660 48 03 3F 09 */ bl __dt__16CActorParametersFv +/* 800D2700 000CF660 48 03 3F 09 */ bl __dt__16CLightParametersFv /* 800D2704 000CF664 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 800D2708 000CF668 48 26 B3 D9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D270C 000CF66C 7E E3 BB 78 */ mr r3, r23 @@ -14933,7 +14933,7 @@ lbl_800D2A74: /* 800D2A94 000CF9F4 4B FF 2B 89 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D2A98 000CF9F8 38 61 00 88 */ addi r3, r1, 0x88 /* 800D2A9C 000CF9FC 38 80 FF FF */ li r4, -1 -/* 800D2AA0 000CFA00 48 03 3B 69 */ bl __dt__16CActorParametersFv +/* 800D2AA0 000CFA00 48 03 3B 69 */ bl __dt__16CLightParametersFv /* 800D2AA4 000CFA04 80 6D A0 60 */ lwz r3, gpResourceFactory@sda21(r13) /* 800D2AA8 000CFA08 80 81 02 90 */ lwz r4, 0x290(r1) /* 800D2AAC 000CFA0C 38 63 00 04 */ addi r3, r3, 4 @@ -14943,7 +14943,7 @@ lbl_800D2A74: /* 800D2ABC 000CFA1C 41 82 00 20 */ beq lbl_800D2ADC /* 800D2AC0 000CFA20 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800D2AC4 000CFA24 38 80 FF FF */ li r4, -1 -/* 800D2AC8 000CFA28 48 03 3B 41 */ bl __dt__16CActorParametersFv +/* 800D2AC8 000CFA28 48 03 3B 41 */ bl __dt__16CLightParametersFv /* 800D2ACC 000CFA2C 38 61 01 58 */ addi r3, r1, 0x158 /* 800D2AD0 000CFA30 48 26 B0 11 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D2AD4 000CFA34 38 60 00 00 */ li r3, 0 @@ -15002,7 +15002,7 @@ lbl_800D2B8C: lbl_800D2BA0: /* 800D2BA0 000CFB00 38 61 00 F0 */ addi r3, r1, 0xf0 /* 800D2BA4 000CFB04 38 80 FF FF */ li r4, -1 -/* 800D2BA8 000CFB08 48 03 3A 61 */ bl __dt__16CActorParametersFv +/* 800D2BA8 000CFB08 48 03 3A 61 */ bl __dt__16CLightParametersFv /* 800D2BAC 000CFB0C 38 61 01 58 */ addi r3, r1, 0x158 /* 800D2BB0 000CFB10 48 26 AF 31 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D2BB4 000CFB14 7F 63 DB 78 */ mr r3, r27 @@ -15058,7 +15058,7 @@ lbl_800D2C44: /* 800D2C64 000CFBC4 4B FF 29 B9 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D2C68 000CFBC8 38 61 00 D8 */ addi r3, r1, 0xd8 /* 800D2C6C 000CFBCC 38 80 FF FF */ li r4, -1 -/* 800D2C70 000CFBD0 48 03 39 99 */ bl __dt__16CActorParametersFv +/* 800D2C70 000CFBD0 48 03 39 99 */ bl __dt__16CLightParametersFv /* 800D2C74 000CFBD4 80 6D A0 60 */ lwz r3, gpResourceFactory@sda21(r13) /* 800D2C78 000CFBD8 80 81 02 E0 */ lwz r4, 0x2e0(r1) /* 800D2C7C 000CFBDC 38 63 00 04 */ addi r3, r3, 4 @@ -15068,7 +15068,7 @@ lbl_800D2C44: /* 800D2C8C 000CFBEC 41 82 00 20 */ beq lbl_800D2CAC /* 800D2C90 000CFBF0 38 61 01 40 */ addi r3, r1, 0x140 /* 800D2C94 000CFBF4 38 80 FF FF */ li r4, -1 -/* 800D2C98 000CFBF8 48 03 39 71 */ bl __dt__16CActorParametersFv +/* 800D2C98 000CFBF8 48 03 39 71 */ bl __dt__16CLightParametersFv /* 800D2C9C 000CFBFC 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 800D2CA0 000CFC00 48 26 AE 41 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D2CA4 000CFC04 38 60 00 00 */ li r3, 0 @@ -15164,7 +15164,7 @@ lbl_800D2DEC: lbl_800D2E00: /* 800D2E00 000CFD60 38 61 01 40 */ addi r3, r1, 0x140 /* 800D2E04 000CFD64 38 80 FF FF */ li r4, -1 -/* 800D2E08 000CFD68 48 03 38 01 */ bl __dt__16CActorParametersFv +/* 800D2E08 000CFD68 48 03 38 01 */ bl __dt__16CLightParametersFv /* 800D2E0C 000CFD6C 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 800D2E10 000CFD70 48 26 AC D1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D2E14 000CFD74 7F 63 DB 78 */ mr r3, r27 @@ -16230,7 +16230,7 @@ lbl_800D3C94: /* 800D3D80 000D0CE0 4B FF 18 9D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D3D84 000D0CE4 38 61 01 68 */ addi r3, r1, 0x168 /* 800D3D88 000D0CE8 38 80 FF FF */ li r4, -1 -/* 800D3D8C 000D0CEC 48 03 28 7D */ bl __dt__16CActorParametersFv +/* 800D3D8C 000D0CEC 48 03 28 7D */ bl __dt__16CLightParametersFv /* 800D3D90 000D0CF0 7D C3 73 78 */ mr r3, r14 /* 800D3D94 000D0CF4 48 26 AE F1 */ bl ReadLong__12CInputStreamFv /* 800D3D98 000D0CF8 7C 74 1B 78 */ mr r20, r3 @@ -16389,7 +16389,7 @@ lbl_800D3FD8: lbl_800D3FEC: /* 800D3FEC 000D0F4C 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 800D3FF0 000D0F50 38 80 FF FF */ li r4, -1 -/* 800D3FF4 000D0F54 48 03 26 15 */ bl __dt__16CActorParametersFv +/* 800D3FF4 000D0F54 48 03 26 15 */ bl __dt__16CLightParametersFv /* 800D3FF8 000D0F58 38 61 02 38 */ addi r3, r1, 0x238 /* 800D3FFC 000D0F5C 48 26 9A E5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D4000 000D0F60 7E 43 93 78 */ mr r3, r18 @@ -16484,7 +16484,7 @@ lbl_800D40C4: /* 800D4150 000D10B0 4B FF 14 CD */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D4154 000D10B4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 800D4158 000D10B8 38 80 FF FF */ li r4, -1 -/* 800D415C 000D10BC 48 03 24 AD */ bl __dt__16CActorParametersFv +/* 800D415C 000D10BC 48 03 24 AD */ bl __dt__16CLightParametersFv /* 800D4160 000D10C0 7E E3 BB 78 */ mr r3, r23 /* 800D4164 000D10C4 48 26 AB 21 */ bl ReadLong__12CInputStreamFv /* 800D4168 000D10C8 7C 78 1B 78 */ mr r24, r3 @@ -16505,7 +16505,7 @@ lbl_800D40C4: /* 800D41A4 000D1104 40 82 00 20 */ bne lbl_800D41C4 /* 800D41A8 000D1108 38 61 01 10 */ addi r3, r1, 0x110 /* 800D41AC 000D110C 38 80 FF FF */ li r4, -1 -/* 800D41B0 000D1110 48 03 24 59 */ bl __dt__16CActorParametersFv +/* 800D41B0 000D1110 48 03 24 59 */ bl __dt__16CLightParametersFv /* 800D41B4 000D1114 38 61 01 78 */ addi r3, r1, 0x178 /* 800D41B8 000D1118 48 26 99 29 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D41BC 000D111C 38 60 00 00 */ li r3, 0 @@ -16569,7 +16569,7 @@ lbl_800D4288: lbl_800D429C: /* 800D429C 000D11FC 38 61 01 10 */ addi r3, r1, 0x110 /* 800D42A0 000D1200 38 80 FF FF */ li r4, -1 -/* 800D42A4 000D1204 48 03 23 65 */ bl __dt__16CActorParametersFv +/* 800D42A4 000D1204 48 03 23 65 */ bl __dt__16CLightParametersFv /* 800D42A8 000D1208 38 61 01 78 */ addi r3, r1, 0x178 /* 800D42AC 000D120C 48 26 98 35 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D42B0 000D1210 7E E3 BB 78 */ mr r3, r23 @@ -18059,7 +18059,7 @@ lbl_800D585C: /* 800D58B4 000D2814 4B FE FD 69 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D58B8 000D2818 38 61 02 18 */ addi r3, r1, 0x218 /* 800D58BC 000D281C 38 80 FF FF */ li r4, -1 -/* 800D58C0 000D2820 48 03 0D 49 */ bl __dt__16CActorParametersFv +/* 800D58C0 000D2820 48 03 0D 49 */ bl __dt__16CLightParametersFv /* 800D58C4 000D2824 7E A3 AB 78 */ mr r3, r21 /* 800D58C8 000D2828 48 26 93 61 */ bl ReadFloat__12CInputStreamFv /* 800D58CC 000D282C FF E0 08 90 */ fmr f31, f1 @@ -18106,7 +18106,7 @@ lbl_800D585C: /* 800D5970 000D28D0 40 82 00 20 */ bne lbl_800D5990 /* 800D5974 000D28D4 38 61 03 34 */ addi r3, r1, 0x334 /* 800D5978 000D28D8 38 80 FF FF */ li r4, -1 -/* 800D597C 000D28DC 48 03 0C 8D */ bl __dt__16CActorParametersFv +/* 800D597C 000D28DC 48 03 0C 8D */ bl __dt__16CLightParametersFv /* 800D5980 000D28E0 38 61 03 9C */ addi r3, r1, 0x39c /* 800D5984 000D28E4 48 26 81 5D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D5988 000D28E8 38 60 00 00 */ li r3, 0 @@ -18334,7 +18334,7 @@ lbl_800D5CD0: /* 800D5CD4 000D2C34 38 61 03 34 */ addi r3, r1, 0x334 /* 800D5CD8 000D2C38 98 01 00 84 */ stb r0, 0x84(r1) /* 800D5CDC 000D2C3C 38 80 FF FF */ li r4, -1 -/* 800D5CE0 000D2C40 48 03 09 29 */ bl __dt__16CActorParametersFv +/* 800D5CE0 000D2C40 48 03 09 29 */ bl __dt__16CLightParametersFv /* 800D5CE4 000D2C44 38 61 03 9C */ addi r3, r1, 0x39c /* 800D5CE8 000D2C48 48 26 7D F9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D5CEC 000D2C4C 7E C3 B3 78 */ mr r3, r22 @@ -19036,7 +19036,7 @@ lbl_800D65CC: /* 800D66FC 000D365C D0 01 00 B4 */ stfs f0, 0xb4(r1) /* 800D6700 000D3660 90 A1 00 B8 */ stw r5, 0xb8(r1) /* 800D6704 000D3664 90 01 00 BC */ stw r0, 0xbc(r1) -/* 800D6708 000D3668 48 02 FF 01 */ bl __dt__16CActorParametersFv +/* 800D6708 000D3668 48 02 FF 01 */ bl __dt__16CLightParametersFv /* 800D670C 000D366C 3C 80 80 3D */ lis r4, lbl_803CE07C@ha /* 800D6710 000D3670 38 60 01 48 */ li r3, 0x148 /* 800D6714 000D3674 38 84 E0 7C */ addi r4, r4, lbl_803CE07C@l @@ -19082,7 +19082,7 @@ lbl_800D65CC: lbl_800D67B4: /* 800D67B4 000D3714 38 61 00 80 */ addi r3, r1, 0x80 /* 800D67B8 000D3718 38 80 FF FF */ li r4, -1 -/* 800D67BC 000D371C 48 02 FE 4D */ bl __dt__16CActorParametersFv +/* 800D67BC 000D371C 48 02 FE 4D */ bl __dt__16CLightParametersFv /* 800D67C0 000D3720 38 61 00 C0 */ addi r3, r1, 0xc0 /* 800D67C4 000D3724 48 26 73 1D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D67C8 000D3728 7E 03 83 78 */ mr r3, r16 @@ -19147,7 +19147,7 @@ lbl_800D6868: /* 800D689C 000D37FC 4B FE ED 81 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D68A0 000D3800 38 61 00 F4 */ addi r3, r1, 0xf4 /* 800D68A4 000D3804 38 80 FF FF */ li r4, -1 -/* 800D68A8 000D3808 48 02 FD 61 */ bl __dt__16CActorParametersFv +/* 800D68A8 000D3808 48 02 FD 61 */ bl __dt__16CLightParametersFv /* 800D68AC 000D380C 7F 04 C3 78 */ mr r4, r24 /* 800D68B0 000D3810 38 61 00 54 */ addi r3, r1, 0x54 /* 800D68B4 000D3814 48 23 E2 D9 */ bl __ct__9CVector3fFR12CInputStream @@ -19199,7 +19199,7 @@ lbl_800D6868: /* 800D696C 000D38CC 40 82 00 20 */ bne lbl_800D698C /* 800D6970 000D38D0 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 800D6974 000D38D4 38 80 FF FF */ li r4, -1 -/* 800D6978 000D38D8 48 02 FC 91 */ bl __dt__16CActorParametersFv +/* 800D6978 000D38D8 48 02 FC 91 */ bl __dt__16CLightParametersFv /* 800D697C 000D38DC 38 61 02 10 */ addi r3, r1, 0x210 /* 800D6980 000D38E0 48 26 71 61 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D6984 000D38E4 38 60 00 00 */ li r3, 0 @@ -19314,7 +19314,7 @@ lbl_800D6B18: /* 800D6B20 000D3A80 48 03 FF 2D */ bl __dt__10CModelDataFv /* 800D6B24 000D3A84 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 800D6B28 000D3A88 38 80 FF FF */ li r4, -1 -/* 800D6B2C 000D3A8C 48 02 FA DD */ bl __dt__16CActorParametersFv +/* 800D6B2C 000D3A8C 48 02 FA DD */ bl __dt__16CLightParametersFv /* 800D6B30 000D3A90 38 61 02 10 */ addi r3, r1, 0x210 /* 800D6B34 000D3A94 48 26 6F AD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D6B38 000D3A98 7F 03 C3 78 */ mr r3, r24 @@ -19476,7 +19476,7 @@ lbl_800D6D58: /* 800D6D78 000D3CD8 4B FE E8 A5 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D6D7C 000D3CDC 38 61 01 70 */ addi r3, r1, 0x170 /* 800D6D80 000D3CE0 38 80 FF FF */ li r4, -1 -/* 800D6D84 000D3CE4 48 02 F8 85 */ bl __dt__16CActorParametersFv +/* 800D6D84 000D3CE4 48 02 F8 85 */ bl __dt__16CLightParametersFv /* 800D6D88 000D3CE8 7E C3 B3 78 */ mr r3, r22 /* 800D6D8C 000D3CEC 48 26 7F 51 */ bl ReadBool__12CInputStreamFv /* 800D6D90 000D3CF0 7C 75 1B 78 */ mr r21, r3 @@ -19504,7 +19504,7 @@ lbl_800D6D58: /* 800D6DE8 000D3D48 41 82 00 20 */ beq lbl_800D6E08 /* 800D6DEC 000D3D4C 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 800D6DF0 000D3D50 38 80 FF FF */ li r4, -1 -/* 800D6DF4 000D3D54 48 02 F8 15 */ bl __dt__16CActorParametersFv +/* 800D6DF4 000D3D54 48 02 F8 15 */ bl __dt__16CLightParametersFv /* 800D6DF8 000D3D58 38 61 00 44 */ addi r3, r1, 0x44 /* 800D6DFC 000D3D5C 48 26 6C E5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D6E00 000D3D60 38 60 00 00 */ li r3, 0 @@ -19589,7 +19589,7 @@ lbl_800D6F20: lbl_800D6F34: /* 800D6F34 000D3E94 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 800D6F38 000D3E98 38 80 FF FF */ li r4, -1 -/* 800D6F3C 000D3E9C 48 02 F6 CD */ bl __dt__16CActorParametersFv +/* 800D6F3C 000D3E9C 48 02 F6 CD */ bl __dt__16CLightParametersFv /* 800D6F40 000D3EA0 38 61 00 44 */ addi r3, r1, 0x44 /* 800D6F44 000D3EA4 48 26 6B 9D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D6F48 000D3EA8 7F 83 E3 78 */ mr r3, r28 @@ -19663,7 +19663,7 @@ lbl_800D7020: /* 800D7040 000D3FA0 4B FE E5 DD */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D7044 000D3FA4 38 61 01 74 */ addi r3, r1, 0x174 /* 800D7048 000D3FA8 38 80 FF FF */ li r4, -1 -/* 800D704C 000D3FAC 48 02 F5 BD */ bl __dt__16CActorParametersFv +/* 800D704C 000D3FAC 48 02 F5 BD */ bl __dt__16CLightParametersFv /* 800D7050 000D3FB0 7F 44 D3 78 */ mr r4, r26 /* 800D7054 000D3FB4 38 61 00 AC */ addi r3, r1, 0xac /* 800D7058 000D3FB8 4B FE C5 09 */ bl __ct__11CDamageInfoFR12CInputStream @@ -19706,7 +19706,7 @@ lbl_800D7020: /* 800D70EC 000D404C 41 82 00 20 */ beq lbl_800D710C /* 800D70F0 000D4050 38 61 02 AC */ addi r3, r1, 0x2ac /* 800D70F4 000D4054 38 80 FF FF */ li r4, -1 -/* 800D70F8 000D4058 48 02 F5 11 */ bl __dt__16CActorParametersFv +/* 800D70F8 000D4058 48 02 F5 11 */ bl __dt__16CLightParametersFv /* 800D70FC 000D405C 38 61 00 6C */ addi r3, r1, 0x6c /* 800D7100 000D4060 48 26 69 E1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D7104 000D4064 38 60 00 00 */ li r3, 0 @@ -19726,7 +19726,7 @@ lbl_800D710C: /* 800D7138 000D4098 38 61 02 AC */ addi r3, r1, 0x2ac /* 800D713C 000D409C 98 01 00 A8 */ stb r0, 0xa8(r1) /* 800D7140 000D40A0 38 80 FF FF */ li r4, -1 -/* 800D7144 000D40A4 48 02 F4 C5 */ bl __dt__16CActorParametersFv +/* 800D7144 000D40A4 48 02 F4 C5 */ bl __dt__16CLightParametersFv /* 800D7148 000D40A8 38 61 00 6C */ addi r3, r1, 0x6c /* 800D714C 000D40AC 48 26 69 95 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D7150 000D40B0 38 60 00 00 */ li r3, 0 @@ -19830,7 +19830,7 @@ lbl_800D72BC: /* 800D72C0 000D4220 38 61 02 AC */ addi r3, r1, 0x2ac /* 800D72C4 000D4224 98 01 00 A8 */ stb r0, 0xa8(r1) /* 800D72C8 000D4228 38 80 FF FF */ li r4, -1 -/* 800D72CC 000D422C 48 02 F3 3D */ bl __dt__16CActorParametersFv +/* 800D72CC 000D422C 48 02 F3 3D */ bl __dt__16CLightParametersFv /* 800D72D0 000D4230 38 61 00 6C */ addi r3, r1, 0x6c /* 800D72D4 000D4234 48 26 68 0D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D72D8 000D4238 7F C3 F3 78 */ mr r3, r30 @@ -19918,7 +19918,7 @@ lbl_800D735C: /* 800D7400 000D4360 4B FE E2 1D */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D7404 000D4364 38 61 01 DC */ addi r3, r1, 0x1dc /* 800D7408 000D4368 38 80 FF FF */ li r4, -1 -/* 800D740C 000D436C 48 02 F1 FD */ bl __dt__16CActorParametersFv +/* 800D740C 000D436C 48 02 F1 FD */ bl __dt__16CLightParametersFv /* 800D7410 000D4370 7E 43 93 78 */ mr r3, r18 /* 800D7414 000D4374 48 26 78 C9 */ bl ReadBool__12CInputStreamFv /* 800D7418 000D4378 7C 7E 1B 78 */ mr r30, r3 @@ -19944,7 +19944,7 @@ lbl_800D735C: /* 800D7468 000D43C8 40 82 00 20 */ bne lbl_800D7488 /* 800D746C 000D43CC 38 61 02 90 */ addi r3, r1, 0x290 /* 800D7470 000D43D0 38 80 FF FF */ li r4, -1 -/* 800D7474 000D43D4 48 02 F1 95 */ bl __dt__16CActorParametersFv +/* 800D7474 000D43D4 48 02 F1 95 */ bl __dt__16CLightParametersFv /* 800D7478 000D43D8 38 61 02 F8 */ addi r3, r1, 0x2f8 /* 800D747C 000D43DC 48 26 66 65 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D7480 000D43E0 38 60 00 00 */ li r3, 0 @@ -20123,7 +20123,7 @@ lbl_800D7700: /* 800D7708 000D4668 48 03 F3 45 */ bl __dt__10CModelDataFv /* 800D770C 000D466C 38 61 02 90 */ addi r3, r1, 0x290 /* 800D7710 000D4670 38 80 FF FF */ li r4, -1 -/* 800D7714 000D4674 48 02 EE F5 */ bl __dt__16CActorParametersFv +/* 800D7714 000D4674 48 02 EE F5 */ bl __dt__16CLightParametersFv /* 800D7718 000D4678 38 61 02 F8 */ addi r3, r1, 0x2f8 /* 800D771C 000D467C 48 26 63 C5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D7720 000D4680 7E 43 93 78 */ mr r3, r18 @@ -20200,7 +20200,7 @@ lbl_800D779C: /* 800D7828 000D4788 4B FE DD F5 */ bl __ct__16CActorParametersFRC16CActorParameters /* 800D782C 000D478C 38 61 01 FC */ addi r3, r1, 0x1fc /* 800D7830 000D4790 38 80 FF FF */ li r4, -1 -/* 800D7834 000D4794 48 02 ED D5 */ bl __dt__16CActorParametersFv +/* 800D7834 000D4794 48 02 ED D5 */ bl __dt__16CLightParametersFv /* 800D7838 000D4798 7D C3 73 78 */ mr r3, r14 /* 800D783C 000D479C 48 26 74 A1 */ bl ReadBool__12CInputStreamFv /* 800D7840 000D47A0 7C 74 1B 78 */ mr r20, r3 @@ -20250,7 +20250,7 @@ lbl_800D779C: /* 800D78F0 000D4850 40 82 00 20 */ bne lbl_800D7910 /* 800D78F4 000D4854 38 61 02 B0 */ addi r3, r1, 0x2b0 /* 800D78F8 000D4858 38 80 FF FF */ li r4, -1 -/* 800D78FC 000D485C 48 02 ED 0D */ bl __dt__16CActorParametersFv +/* 800D78FC 000D485C 48 02 ED 0D */ bl __dt__16CLightParametersFv /* 800D7900 000D4860 38 61 03 80 */ addi r3, r1, 0x380 /* 800D7904 000D4864 48 26 61 DD */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D7908 000D4868 38 60 00 00 */ li r3, 0 @@ -20466,7 +20466,7 @@ lbl_800D7C10: /* 800D7C18 000D4B78 48 03 EE 35 */ bl __dt__10CModelDataFv /* 800D7C1C 000D4B7C 38 61 02 B0 */ addi r3, r1, 0x2b0 /* 800D7C20 000D4B80 38 80 FF FF */ li r4, -1 -/* 800D7C24 000D4B84 48 02 E9 E5 */ bl __dt__16CActorParametersFv +/* 800D7C24 000D4B84 48 02 E9 E5 */ bl __dt__16CLightParametersFv /* 800D7C28 000D4B88 38 61 03 80 */ addi r3, r1, 0x380 /* 800D7C2C 000D4B8C 48 26 5E B5 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800D7C30 000D4B90 7E 03 83 78 */ mr r3, r16 @@ -22821,7 +22821,7 @@ lbl_800D9DDC: /* 800D9E70 000D6DD0 D0 01 00 CC */ stfs f0, 0xcc(r1) /* 800D9E74 000D6DD4 90 A1 00 D0 */ stw r5, 0xd0(r1) /* 800D9E78 000D6DD8 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 800D9E7C 000D6DDC 48 02 C7 8D */ bl __dt__16CActorParametersFv +/* 800D9E7C 000D6DDC 48 02 C7 8D */ bl __dt__16CLightParametersFv /* 800D9E80 000D6DE0 2C 1B 00 05 */ cmpwi r27, 5 /* 800D9E84 000D6DE4 40 81 00 18 */ ble lbl_800D9E9C /* 800D9E88 000D6DE8 7F E4 FB 78 */ mr r4, r31 @@ -23000,7 +23000,7 @@ lbl_800DA098: /* 800DA0DC 000D703C 48 02 C7 ED */ bl sub_801068c8 /* 800DA0E0 000D7040 38 61 00 98 */ addi r3, r1, 0x98 /* 800DA0E4 000D7044 38 80 FF FF */ li r4, -1 -/* 800DA0E8 000D7048 48 02 C5 21 */ bl __dt__16CActorParametersFv +/* 800DA0E8 000D7048 48 02 C5 21 */ bl __dt__16CLightParametersFv lbl_800DA0EC: /* 800DA0EC 000D704C E3 E1 01 38 */ psq_l f31, 312(r1), 0, qr0 /* 800DA0F0 000D7050 CB E1 01 30 */ lfd f31, 0x130(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index 36d2e34c..139b14f6 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -544,7 +544,7 @@ __ct__5CFire: /* 8025D320 0025A280 4B DF 85 01 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index 011d1a29..b35922cf 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -4656,10 +4656,10 @@ lbl_801D2090: /* 801D22D8 001CF238 4B E8 35 49 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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,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 diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s index 6355f5b1..4441eb15 100644 --- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s +++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s @@ -159,7 +159,7 @@ Accept__9CRepulsorFR8IVisitor: /* 8020FDCC 0020CD2C 4B E4 5A 55 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s index e9ff5a73..9f6f2e99 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s @@ -286,7 +286,7 @@ Accept__18CScriptAiJumpPointFR8IVisitor: /* 801EF514 001EC474 4B E6 63 0D */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s index f137f6b3..2684e36a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s @@ -340,7 +340,7 @@ lbl_8027C950: /* 8027CA10 00279970 4B DD 8E 11 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index d86e0317..42020f3e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -784,7 +784,7 @@ lbl_800C4EF4: /* 800C5070 000C1FD0 4B F9 07 B1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index a8ddd362..615b698a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -332,7 +332,7 @@ Accept__24CScriptCameraHintTriggerFR8IVisitor: /* 8024B7A0 00248700 4B E0 A0 81 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index d9a8e28d..3685d35b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -333,7 +333,7 @@ Accept__24CScriptCameraPitchVolumeFR8IVisitor: /* 802268AC 0022380C 4B E2 EF 75 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s index 102db4a4..096bbd20 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s @@ -312,7 +312,7 @@ lbl_800B5480: /* 800B5554 000B24B4 4B FA 02 CD */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s index 2a7f692a..d8ffb5fa 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s @@ -449,7 +449,7 @@ Accept__17CScriptCoverPointFR8IVisitor: /* 8012D7EC 0012A74C 4B F2 80 35 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index fe14a895..aa88eb72 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -1177,10 +1177,10 @@ lbl_800FB468: /* 800FB4A8 000F8408 4B F5 A3 79 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s index 2befe515..73dffa15 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s @@ -138,7 +138,7 @@ Accept__26CScriptDebugCameraWaypointFR8IVisitor: /* 8014AD28 00147C88 4B F0 AA F9 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index 85837aec..146bdef5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -1203,7 +1203,7 @@ lbl_800C4410: /* 800C460C 000C156C 48 05 7E A5 */ bl "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s index ccbdaae4..41c9a82f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s @@ -531,10 +531,10 @@ lbl_8018F18C: /* 8018F290 0018C1F0 4B EC 65 91 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 3c9fea9e..dc4dbd04 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -1816,10 +1816,10 @@ lbl_8008F11C: /* 8008F280 0008C1E0 4B FC 65 A1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s index 96adb9e1..89d00ada 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s @@ -236,7 +236,7 @@ lbl_8012F904: /* 8012F9D0 0012C930 4B F2 5E 51 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 08039a8e..9fecdfa1 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -1102,7 +1102,7 @@ Accept__15CScriptMazeNodeFR8IVisitor: /* 80289708 00286668 4B DC C1 19 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s index 8a39a99d..e6c6ea11 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s @@ -429,7 +429,7 @@ lbl_8015BCB0: /* 8015BD70 00158CD0 4B EF 9A B1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s index a0bff490..d174e994 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s @@ -282,10 +282,10 @@ lbl_8015ED18: /* 8015EDFC 0015BD5C 4B EF 6A 25 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s index a77bc2bd..0b99cb22 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s @@ -429,7 +429,7 @@ lbl_8029F164: /* 8029F240 0029C1A0 4B DB 65 E1 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 54c0b62d..00992356 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -1097,7 +1097,7 @@ PreThink__12CScriptSoundFfR13CStateManager: /* 800B0AA4 000ADA04 4B FA 4D 7D */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index 02532670..55e21a02 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -4392,7 +4392,7 @@ lbl_80152BA8: /* 80152CA0 0014FC00 4B F0 2B 81 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s index 928b0caf..7efa8797 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s @@ -225,7 +225,7 @@ lbl_8014AF00: /* 8014AFCC 00147F2C 4B F0 A8 55 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index ee71b96e..9aec1add 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -1124,7 +1124,7 @@ lbl_80118ABC: /* 80118B88 00115AE8 4B F3 CC 99 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s index 4a53b7cb..9273486f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s @@ -202,7 +202,7 @@ Accept__21CScriptTargetingPointFR8IVisitor: /* 8018D45C 0018A3BC 4B EC 83 C5 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index e0803cce..fdce48ec 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -1331,7 +1331,7 @@ lbl_80076D34: /* 80076E28 00073D88 4B FD E9 F9 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s index e10ef17c..da897244 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s @@ -303,7 +303,7 @@ lbl_801D6710: /* 801D6810 001D3770 4B E7 F0 11 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index 0ecbabca..a23f2db7 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -566,7 +566,7 @@ lbl_801D7614: /* 801D76F0 001D4650 4B E7 E1 31 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s index d876c9b9..1a0c971e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s @@ -395,7 +395,7 @@ lbl_800773F8: /* 800774EC 0007444C 4B FD E3 35 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index 62ef35b4..b7464be3 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -2357,7 +2357,7 @@ lbl_801F39D4: /* 801F3B44 001F0AA4 4B E6 1C DD */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index 56144ff2..9bee6efa 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -1011,7 +1011,7 @@ __ct__10CShockWaveFv: /* 80232420 0022F380 4B E2 34 01 */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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 diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index 7002b8d5..db63226c 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -417,10 +417,10 @@ lbl_80102278: /* 80102354 000FF2B4 4B F5 34 CD */ bl "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,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