From ebec11fb4596e078bd3c56a6aba3f788e8622d22 Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Thu, 6 Oct 2022 11:54:50 +0300 Subject: [PATCH] Update CActorLights constructor symbol --- asm/MetroidPrime/CActor.s | 2 +- asm/MetroidPrime/CActorLights.s | 5 ++--- asm/MetroidPrime/CActorParameters.s | 3 +-- asm/MetroidPrime/CArtifactDoll.s | 3 +-- asm/MetroidPrime/CGameCubeDoll.s | 3 +-- asm/MetroidPrime/CSamusDoll.s | 2 +- asm/MetroidPrime/CWorldTransManager.s | 2 +- asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s | 4 ++-- asm/MetroidPrime/HUD/CSamusHud.s | 2 +- asm/MetroidPrime/Player/CMorphBall.s | 2 +- asm/MetroidPrime/Player/CPlayerGun.s | 2 +- asm/MetroidPrime/Player/CSamusFaceReflection.s | 2 +- asm/MetroidPrime/Weapons/CIceProjectile.s | 2 +- 13 files changed, 15 insertions(+), 19 deletions(-) diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index a905e550..b428381b 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -1188,7 +1188,7 @@ SetCalculateLighting__6CActorFb: /* 8005399C 000508FC 39 40 00 00 */ li r10, 0 /* 800539A0 00050900 91 61 00 0C */ stw r11, 0xc(r1) /* 800539A4 00050904 90 01 00 10 */ stw r0, 0x10(r1) -/* 800539A8 00050908 48 0B 18 25 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 800539A8 00050908 48 0B 18 25 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 800539AC 0005090C 7C 7F 1B 78 */ mr r31, r3 lbl_800539B0: /* 800539B0 00050910 80 7D 00 90 */ lwz r3, 0x90(r29) diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s index fe872059..d3d2395d 100644 --- a/asm/MetroidPrime/CActorLights.s +++ b/asm/MetroidPrime/CActorLights.s @@ -2485,8 +2485,8 @@ lbl_801051B4: /* 801051C4 00102124 38 21 00 10 */ addi r1, r1, 0x10 /* 801051C8 00102128 4E 80 00 20 */ blr -.global __ct__12CActorLightsFUi9CVector3fiif -__ct__12CActorLightsFUi9CVector3fiif: +.global __ct__12CActorLightsFUiRC9CVector3fiibbbf +__ct__12CActorLightsFUiRC9CVector3fiibbbf: /* 801051CC 0010212C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801051D0 00102130 3D 60 80 5A */ lis r11, sZeroVector__9CVector3f@ha /* 801051D4 00102134 55 40 06 3F */ clrlwi. r0, r10, 0x18 @@ -2935,4 +2935,3 @@ lbl_803CEE40: .float -1.0 .float -1.0 .float -1.0 - diff --git a/asm/MetroidPrime/CActorParameters.s b/asm/MetroidPrime/CActorParameters.s index 1a48958d..ab52797f 100644 --- a/asm/MetroidPrime/CActorParameters.s +++ b/asm/MetroidPrime/CActorParameters.s @@ -91,7 +91,7 @@ MakeActorLights__16CLightParametersCFv: /* 801064B4 00103414 38 A1 00 18 */ addi r5, r1, 0x18 /* 801064B8 00103418 55 29 D9 7E */ srwi r9, r9, 5 /* 801064BC 0010341C 54 0A D9 7E */ srwi r10, r0, 5 -/* 801064C0 00103420 4B FF ED 0D */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 801064C0 00103420 4B FF ED 0D */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 801064C4 00103424 7C 7D 1B 78 */ mr r29, r3 lbl_801064C8: /* 801064C8 00103428 7C 1D 00 D0 */ neg r0, r29 @@ -555,4 +555,3 @@ lbl_803CEE50: # ROM: 0x3CBE50 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/CArtifactDoll.s b/asm/MetroidPrime/CArtifactDoll.s index 9ef06166..68cfebca 100644 --- a/asm/MetroidPrime/CArtifactDoll.s +++ b/asm/MetroidPrime/CArtifactDoll.s @@ -943,7 +943,7 @@ __ct__13CArtifactDollFv: /* 8029D570 0029A4D0 39 40 00 00 */ li r10, 0 /* 8029D574 0029A4D4 91 61 00 24 */ stw r11, 0x24(r1) /* 8029D578 0029A4D8 90 01 00 28 */ stw r0, 0x28(r1) -/* 8029D57C 0029A4DC 4B E6 7C 51 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 8029D57C 0029A4DC 4B E6 7C 51 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 8029D580 0029A4E0 7C 60 1B 78 */ mr r0, r3 lbl_8029D584: /* 8029D584 0029A4E4 90 1F 00 20 */ stw r0, 0x20(r31) @@ -1240,4 +1240,3 @@ lbl_803D5E36: .asciz "?(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/CGameCubeDoll.s b/asm/MetroidPrime/CGameCubeDoll.s index 86b6313c..d0f8d27d 100644 --- a/asm/MetroidPrime/CGameCubeDoll.s +++ b/asm/MetroidPrime/CGameCubeDoll.s @@ -442,7 +442,7 @@ __ct__13CGameCubeDollFv: /* 8029EC88 0029BBE8 39 40 00 00 */ li r10, 0 /* 8029EC8C 0029BBEC 91 61 00 1C */ stw r11, 0x1c(r1) /* 8029EC90 0029BBF0 90 01 00 20 */ stw r0, 0x20(r1) -/* 8029EC94 0029BBF4 4B E6 65 39 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 8029EC94 0029BBF4 4B E6 65 39 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 8029EC98 0029BBF8 7C 60 1B 78 */ mr r0, r3 lbl_8029EC9C: /* 8029EC9C 0029BBFC 90 1F 00 18 */ stw r0, 0x18(r31) @@ -533,4 +533,3 @@ lbl_803D5E98: .asciz "CMDL_GameCube" .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index 5b2ac349..24d87870 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -4338,7 +4338,7 @@ lbl_800DE350: /* 800DE418 000DB378 39 40 00 00 */ li r10, 0 /* 800DE41C 000DB37C 91 61 00 8C */ stw r11, 0x8c(r1) /* 800DE420 000DB380 90 01 00 90 */ stw r0, 0x90(r1) -/* 800DE424 000DB384 48 02 6D A9 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 800DE424 000DB384 48 02 6D A9 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 800DE428 000DB388 7C 60 1B 78 */ mr r0, r3 lbl_800DE42C: /* 800DE42C 000DB38C 90 1F 02 4C */ stw r0, 0x24c(r31) diff --git a/asm/MetroidPrime/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s index 5314d573..eb0b0557 100644 --- a/asm/MetroidPrime/CWorldTransManager.s +++ b/asm/MetroidPrime/CWorldTransManager.s @@ -1472,7 +1472,7 @@ DrawAllModels__18CWorldTransManagerCFv: /* 8020A224 00207184 91 01 00 40 */ stw r8, 0x40(r1) /* 8020A228 00207188 39 00 00 00 */ li r8, 0 /* 8020A22C 0020718C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8020A230 00207190 4B EF AF 9D */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 8020A230 00207190 4B EF AF 9D */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 8020A234 00207194 C0 22 B1 80 */ lfs f1, lbl_805ACEA0@sda21(r2) /* 8020A238 00207198 38 61 00 08 */ addi r3, r1, 8 /* 8020A23C 0020719C C0 82 B1 30 */ lfs f4, lbl_805ACE50@sda21(r2) diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index bc88f0d4..41ad7a0f 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -2819,7 +2819,7 @@ SoftwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: /* 801E9BE4 001E6B44 90 01 00 44 */ stw r0, 0x44(r1) /* 801E9BE8 001E6B48 39 20 00 00 */ li r9, 0 /* 801E9BEC 001E6B4C 39 40 00 00 */ li r10, 0 -/* 801E9BF0 001E6B50 4B F1 B5 DD */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 801E9BF0 001E6B50 4B F1 B5 DD */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 801E9BF4 001E6B54 88 01 02 E0 */ lbz r0, 0x2e0(r1) /* 801E9BF8 001E6B58 38 60 00 01 */ li r3, 1 /* 801E9BFC 001E6B5C 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 @@ -2967,7 +2967,7 @@ HardwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: /* 801E9E18 001E6D78 90 E1 00 14 */ stw r7, 0x14(r1) /* 801E9E1C 001E6D7C 38 E0 00 04 */ li r7, 4 /* 801E9E20 001E6D80 90 01 00 18 */ stw r0, 0x18(r1) -/* 801E9E24 001E6D84 4B F1 B3 A9 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 801E9E24 001E6D84 4B F1 B3 A9 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 801E9E28 001E6D88 88 01 02 B4 */ lbz r0, 0x2b4(r1) /* 801E9E2C 001E6D8C 38 60 00 01 */ li r3, 1 /* 801E9E30 001E6D90 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index 14b6c41a..013a0108 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -7617,7 +7617,7 @@ __ct__9CSamusHudFRC13CStateManager: /* 8006ABDC 00067B3C 39 40 00 00 */ li r10, 0 /* 8006ABE0 00067B40 91 61 00 38 */ stw r11, 0x38(r1) /* 8006ABE4 00067B44 90 01 00 3C */ stw r0, 0x3c(r1) -/* 8006ABE8 00067B48 48 09 A5 E5 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 8006ABE8 00067B48 48 09 A5 E5 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 8006ABEC 00067B4C 7C 60 1B 78 */ mr r0, r3 lbl_8006ABF0: /* 8006ABF0 00067B50 90 1F 03 3C */ stw r0, 0x33c(r31) diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index 33c3fa21..83627540 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -14641,7 +14641,7 @@ lbl_800F9EAC: /* 800F9F04 000F6E64 39 40 00 00 */ li r10, 0 /* 800F9F08 000F6E68 91 61 00 E4 */ stw r11, 0xe4(r1) /* 800F9F0C 000F6E6C 90 01 00 E8 */ stw r0, 0xe8(r1) -/* 800F9F10 000F6E70 48 00 B2 BD */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 800F9F10 000F6E70 48 00 B2 BD */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 800F9F14 000F6E74 7C 60 1B 78 */ mr r0, r3 lbl_800F9F18: /* 800F9F18 000F6E78 3C 60 80 3D */ lis r3, lbl_803CEBF4@ha diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index eb67c3d6..f752a866 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -10218,7 +10218,7 @@ __ct__10CPlayerGunF9TUniqueId: /* 80043218 00040178 90 E1 00 5C */ stw r7, 0x5c(r1) /* 8004321C 0004017C 38 E0 00 04 */ li r7, 4 /* 80043220 00040180 90 01 00 60 */ stw r0, 0x60(r1) -/* 80043224 00040184 48 0C 1F A9 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 80043224 00040184 48 0C 1F A9 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 80043228 00040188 38 E0 00 00 */ li r7, 0 /* 8004322C 0004018C 38 C0 00 01 */ li r6, 1 /* 80043230 00040190 90 FF 02 E0 */ stw r7, 0x2e0(r31) diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s index ac9975bb..e9ff01b5 100644 --- a/asm/MetroidPrime/Player/CSamusFaceReflection.s +++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s @@ -651,7 +651,7 @@ __ct__20CSamusFaceReflectionFRC13CStateManager: /* 8015B724 00158684 39 40 00 00 */ li r10, 0 /* 8015B728 00158688 91 61 00 0C */ stw r11, 0xc(r1) /* 8015B72C 0015868C 90 01 00 10 */ stw r0, 0x10(r1) -/* 8015B730 00158690 4B FA 9A 9D */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 8015B730 00158690 4B FA 9A 9D */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 8015B734 00158694 7C 60 1B 78 */ mr r0, r3 lbl_8015B738: /* 8015B738 00158698 3C 60 80 5A */ lis r3, sNoRotation__11CQuaternion@ha diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index c5e20aaf..c16ef654 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -644,7 +644,7 @@ __ct__Q220CIceAttackProjectile12CTrailObjectFP11CElementGen9TUniqueIdRC9CVector3 /* 801F226C 001EF1CC 91 81 00 14 */ stw r12, 0x14(r1) /* 801F2270 001EF1D0 91 61 00 18 */ stw r11, 0x18(r1) /* 801F2274 001EF1D4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801F2278 001EF1D8 4B F1 2F 55 */ bl __ct__12CActorLightsFUi9CVector3fiif +/* 801F2278 001EF1D8 4B F1 2F 55 */ bl __ct__12CActorLightsFUiRC9CVector3fiibbbf /* 801F227C 001EF1DC C0 1D 00 00 */ lfs f0, 0(r29) /* 801F2280 001EF1E0 38 00 00 00 */ li r0, 0 /* 801F2284 001EF1E4 7F 83 E3 78 */ mr r3, r28