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

Fix CCameraManager::GetCurrentCamera symbols 

Former-commit-id: c10ddd017e
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-04 17:08:26 +03:00
parent 8e4b169dc7
commit 05c93724a3
32 changed files with 73 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/MetroidPrime/CActor.s
View File

@ -1280,7 +1280,7 @@ GetScanObjectIndicatorPosition__6CActorCFRC13CStateManager:
/* 80053AD4 00050A34 80 65 08 70 */ lwz r3, 0x870(r5)
/* 80053AD8 00050A38 7C 9D 23 78 */ mr r29, r4
/* 80053ADC 00050A3C 7F C4 F3 78 */ mr r4, r30
/* 80053AE0 00050A40 4B FB 80 39 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80053AE0 00050A40 4B FB 80 39 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80053AE4 00050A44 7F A4 EB 78 */ mr r4, r29
/* 80053AE8 00050A48 7C 7F 1B 78 */ mr r31, r3
/* 80053AEC 00050A4C 81 9D 00 00 */ lwz r12, 0(r29)
@ -3042,7 +3042,7 @@ lbl_80055384:
/* 80055390 000522F0 7F 84 E3 78 */ mr r4, r28
/* 80055394 000522F4 83 FB 00 04 */ lwz r31, 4(r27)
/* 80055398 000522F8 80 7C 08 70 */ lwz r3, 0x870(r28)
/* 8005539C 000522FC 4B FB 67 7D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8005539C 000522FC 4B FB 67 7D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800553A0 00052300 C0 BB 00 60 */ lfs f5, 0x60(r27)
/* 800553A4 00052304 3B A0 00 00 */ li r29, 0
/* 800553A8 00052308 C0 9B 00 50 */ lfs f4, 0x50(r27)

4
asm/MetroidPrime/CAutoMapper.s
View File

@ -1765,7 +1765,7 @@ GetMiniMapCameraOrientation__11CAutoMapperFRC13CStateManager:
/* 80096A0C 0009396C 7C 7F 1B 78 */ mr r31, r3
/* 80096A10 00093970 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80096A14 00093974 C3 E5 00 2C */ lfs f31, 0x2c(r5)
/* 80096A18 00093978 4B F7 51 01 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80096A18 00093978 4B F7 51 01 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80096A1C 0009397C 7C 64 1B 78 */ mr r4, r3
/* 80096A20 00093980 38 61 00 30 */ addi r3, r1, 0x30
/* 80096A24 00093984 38 84 00 34 */ addi r4, r4, 0x34
@ -9289,7 +9289,7 @@ __ct__11CAutoMapperFR13CStateManager:
/* 8009D62C 0009A58C 80 1F 00 A0 */ lwz r0, 0xa0(r31)
/* 8009D630 0009A590 90 1F 00 A4 */ stw r0, 0xa4(r31)
/* 8009D634 0009A594 80 79 08 70 */ lwz r3, 0x870(r25)
/* 8009D638 0009A598 4B F6 E4 E1 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8009D638 0009A598 4B F6 E4 E1 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8009D63C 0009A59C 7C 64 1B 78 */ mr r4, r3
/* 8009D640 0009A5A0 38 61 00 C4 */ addi r3, r1, 0xc4
/* 8009D644 0009A5A4 38 84 00 34 */ addi r4, r4, 0x34

2
asm/MetroidPrime/CCollisionActor.s
View File

@ -667,7 +667,7 @@ GetScanObjectIndicatorPosition__15CCollisionActorCFRC13CStateManager:
/* 801A8F64 001A5EC4 80 65 08 70 */ lwz r3, 0x870(r5)
/* 801A8F68 001A5EC8 7C 9D 23 78 */ mr r29, r4
/* 801A8F6C 001A5ECC 7F C4 F3 78 */ mr r4, r30
/* 801A8F70 001A5ED0 4B E6 2B A9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 801A8F70 001A5ED0 4B E6 2B A9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 801A8F74 001A5ED4 80 1D 02 58 */ lwz r0, 0x258(r29)
/* 801A8F78 001A5ED8 7C 7F 1B 78 */ mr r31, r3
/* 801A8F7C 001A5EDC 2C 00 00 02 */ cmpwi r0, 2

2
asm/MetroidPrime/CEnvFxManager.s
View File

@ -815,7 +815,7 @@ SetupSnowTevs__13CEnvFxManagerFR13CStateManager:
/* 802108B0 0020D810 7C 7E 1B 78 */ mr r30, r3
/* 802108B4 0020D814 83 E4 08 70 */ lwz r31, 0x870(r4)
/* 802108B8 0020D818 7F E3 FB 78 */ mr r3, r31
/* 802108BC 0020D81C 4B DF B2 5D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 802108BC 0020D81C 4B DF B2 5D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 802108C0 0020D820 48 13 96 ED */ bl White__6CColorFv
/* 802108C4 0020D824 80 03 00 00 */ lwz r0, 0(r3)
/* 802108C8 0020D828 90 01 00 0C */ stw r0, 0xc(r1)

3
asm/MetroidPrime/CFluidPlaneCPU.s
View File

@ -387,7 +387,7 @@ lbl_80199D50:
/* 80199D54 00196CB4 41 82 00 B4 */ beq lbl_80199E08
/* 80199D58 00196CB8 80 78 08 70 */ lwz r3, 0x870(r24)
/* 80199D5C 00196CBC 7F 04 C3 78 */ mr r4, r24
/* 80199D60 00196CC0 4B E7 1D B9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80199D60 00196CC0 4B E7 1D B9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80199D64 00196CC4 C3 83 00 60 */ lfs f28, 0x60(r3)
/* 80199D68 00196CC8 C3 A3 00 50 */ lfs f29, 0x50(r3)
/* 80199D6C 00196CCC C3 C3 00 40 */ lfs f30, 0x40(r3)
@ -4223,4 +4223,3 @@ lbl_803D12F8:
# ROM: 0x3CE2F8
.asciz "??(??)"
.balign 4

2
asm/MetroidPrime/CInGameGuiManager.s
View File

@ -1856,7 +1856,7 @@ lbl_801082E4:
/* 801082FC 0010525C 41 82 00 A8 */ beq lbl_801083A4
/* 80108300 00105260 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 80108304 00105264 7F A4 EB 78 */ mr r4, r29
/* 80108308 00105268 4B F0 38 11 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80108308 00105268 4B F0 38 11 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8010830C 0010526C 7C 64 1B 78 */ mr r4, r3
/* 80108310 00105270 38 61 00 28 */ addi r3, r1, 0x28
/* 80108314 00105274 4B FA 61 61 */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"

4
asm/MetroidPrime/CMFGame.s
View File

@ -1080,7 +1080,7 @@ lbl_8002474C:
/* 80024760 000216C0 80 7D 00 14 */ lwz r3, 0x14(r29)
/* 80024764 000216C4 80 83 00 00 */ lwz r4, 0(r3)
/* 80024768 000216C8 80 64 08 70 */ lwz r3, 0x870(r4)
/* 8002476C 000216CC 4B FE 73 AD */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8002476C 000216CC 4B FE 73 AD */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80024770 000216D0 7C 60 1B 78 */ mr r0, r3
/* 80024774 000216D4 38 61 00 10 */ addi r3, r1, 0x10
/* 80024778 000216D8 7C 04 03 78 */ mr r4, r0
@ -1385,7 +1385,7 @@ lbl_80024A74:
/* 80024BCC 00021B2C 80 7D 00 14 */ lwz r3, 0x14(r29)
/* 80024BD0 00021B30 80 83 00 00 */ lwz r4, 0(r3)
/* 80024BD4 00021B34 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80024BD8 00021B38 4B FE 6F 41 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80024BD8 00021B38 4B FE 6F 41 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80024BDC 00021B3C 7C 60 1B 78 */ mr r0, r3
/* 80024BE0 00021B40 38 61 00 08 */ addi r3, r1, 8
/* 80024BE4 00021B44 7C 04 03 78 */ mr r4, r0

16
asm/MetroidPrime/CStateManager.s
View File

@ -1380,7 +1380,7 @@ GetVisAreaId__13CStateManagerCFv:
/* 80044A90 000419F0 7C 7D 1B 78 */ mr r29, r3
/* 80044A94 000419F4 7C 9E 23 78 */ mr r30, r4
/* 80044A98 000419F8 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80044A9C 000419FC 4B FC 70 7D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80044A9C 000419FC 4B FC 70 7D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80044AA0 00041A00 80 BE 08 70 */ lwz r5, 0x870(r30)
/* 80044AA4 00041A04 80 9E 08 50 */ lwz r4, 0x850(r30)
/* 80044AA8 00041A08 80 C5 00 80 */ lwz r6, 0x80(r5)
@ -2091,7 +2091,7 @@ lbl_80045448:
lbl_80045454:
/* 80045454 000423B4 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 80045458 000423B8 7F C4 F3 78 */ mr r4, r30
/* 8004545C 000423BC 4B FC 66 BD */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8004545C 000423BC 4B FC 66 BD */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80045460 000423C0 7C 64 1B 78 */ mr r4, r3
/* 80045464 000423C4 7F E5 FB 78 */ mr r5, r31
/* 80045468 000423C8 38 61 00 08 */ addi r3, r1, 8
@ -2195,7 +2195,7 @@ DrawReflection__13CStateManagerFRC9CVector3f:
/* 800455E0 00042540 48 2C 71 6D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f
/* 800455E4 00042544 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 800455E8 00042548 7F A4 EB 78 */ mr r4, r29
/* 800455EC 0004254C 4B FC 65 2D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800455EC 0004254C 4B FC 65 2D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800455F0 00042550 7C 7F 1B 78 */ mr r31, r3
/* 800455F4 00042554 48 2C 48 69 */ bl GetProjectionState__9CGraphicsFv
/* 800455F8 00042558 88 03 00 00 */ lbz r0, 0(r3)
@ -2811,7 +2811,7 @@ ResetViewAfterDraw__13CStateManagerCFRCQ29CGraphics9CViewportRC12CTransform4f:
/* 80045E5C 00042DBC 4E 80 04 21 */ bctrl
/* 80045E60 00042DC0 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 80045E64 00042DC4 7F E4 FB 78 */ mr r4, r31
/* 80045E68 00042DC8 4B FC 5C B1 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80045E68 00042DC8 4B FC 5C B1 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80045E6C 00042DCC 7C 7F 1B 78 */ mr r31, r3
/* 80045E70 00042DD0 C0 22 85 BC */ lfs f1, lbl_805AA2DC@sda21(r2)
/* 80045E74 00042DD4 C0 03 01 5C */ lfs f0, 0x15c(r3)
@ -4072,7 +4072,7 @@ SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport:
/* 80047018 00043F78 7C 7D 1B 78 */ mr r29, r3
/* 8004701C 00043F7C 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80047020 00043F80 7C B9 2B 78 */ mr r25, r5
/* 80047024 00043F84 4B FC 4A F5 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80047024 00043F84 4B FC 4A F5 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80047028 00043F88 80 9E 08 70 */ lwz r4, 0x870(r30)
/* 8004702C 00043F8C 7C 7F 1B 78 */ mr r31, r3
/* 80047030 00043F90 7F C5 F3 78 */ mr r5, r30
@ -4353,7 +4353,7 @@ lbl_8004741C:
/* 80047434 00044394 4B FF E3 4D */ bl BuildDynamicLightListForWorld__13CStateManagerFv
/* 80047438 00044398 80 7C 08 70 */ lwz r3, 0x870(r28)
/* 8004743C 0004439C 7F 84 E3 78 */ mr r4, r28
/* 80047440 000443A0 4B FC 46 D9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80047440 000443A0 4B FC 46 D9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80047444 000443A4 80 9C 08 70 */ lwz r4, 0x870(r28)
/* 80047448 000443A8 7C 7D 1B 78 */ mr r29, r3
/* 8004744C 000443AC 7F 85 E3 78 */ mr r5, r28
@ -7899,7 +7899,7 @@ lbl_8004A648:
/* 8004A650 000475B0 40 82 01 54 */ bne lbl_8004A7A4
/* 8004A654 000475B4 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 8004A658 000475B8 7F C4 F3 78 */ mr r4, r30
/* 8004A65C 000475BC 4B FC 14 BD */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8004A65C 000475BC 4B FC 14 BD */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8004A660 000475C0 80 9E 08 4C */ lwz r4, 0x84c(r30)
/* 8004A664 000475C4 88 63 01 70 */ lbz r3, 0x170(r3)
/* 8004A668 000475C8 88 04 09 C6 */ lbz r0, 0x9c6(r4)
@ -8044,7 +8044,7 @@ lbl_8004A834:
/* 8004A878 000477D8 40 82 00 7C */ bne lbl_8004A8F4
/* 8004A87C 000477DC 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 8004A880 000477E0 7F C4 F3 78 */ mr r4, r30
/* 8004A884 000477E4 4B FC 12 95 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8004A884 000477E4 4B FC 12 95 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8004A888 000477E8 7C 64 1B 78 */ mr r4, r3
/* 8004A88C 000477EC 38 61 00 10 */ addi r3, r1, 0x10
/* 8004A890 000477F0 48 06 4E A1 */ bl "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity"

14
asm/MetroidPrime/CTargetReticles.s
View File

@ -334,7 +334,7 @@ lbl_800BC34C:
/* 800BC354 000B92B4 41 82 02 48 */ beq lbl_800BC59C
/* 800BC358 000B92B8 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 800BC35C 000B92BC 7F A4 EB 78 */ mr r4, r29
/* 800BC360 000B92C0 4B F4 F7 B9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800BC360 000B92C0 4B F4 F7 B9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800BC364 000B92C4 80 9D 08 70 */ lwz r4, 0x870(r29)
/* 800BC368 000B92C8 7C 7E 1B 78 */ mr r30, r3
/* 800BC36C 000B92CC 7F A5 EB 78 */ mr r5, r29
@ -517,7 +517,7 @@ Update__17COrbitPointMarkerFfRC13CStateManager:
/* 800BC608 000B9568 83 C4 08 4C */ lwz r30, 0x84c(r4)
/* 800BC60C 000B956C 80 64 08 70 */ lwz r3, 0x870(r4)
/* 800BC610 000B9570 83 7E 03 04 */ lwz r27, 0x304(r30)
/* 800BC614 000B9574 4B F4 F5 05 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800BC614 000B9574 4B F4 F5 05 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800BC618 000B9578 38 9B FF FE */ addi r4, r27, -2
/* 800BC61C 000B957C 38 A0 00 01 */ li r5, 1
/* 800BC620 000B9580 20 04 00 01 */ subfic r0, r4, 1
@ -951,7 +951,7 @@ Draw__17CTargetingManagerCFRC13CStateManager:
/* 800BCC08 000B9B68 4B FF F6 B1 */ bl Draw__17COrbitPointMarkerCFRC13CStateManager
/* 800BCC0C 000B9B6C 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 800BCC10 000B9B70 7F A4 EB 78 */ mr r4, r29
/* 800BCC14 000B9B74 4B F4 EF 05 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800BCC14 000B9B74 4B F4 EF 05 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800BCC18 000B9B78 80 9D 08 70 */ lwz r4, 0x870(r29)
/* 800BCC1C 000B9B7C 7C 7F 1B 78 */ mr r31, r3
/* 800BCC20 000B9B80 7F A5 EB 78 */ mr r5, r29
@ -1219,7 +1219,7 @@ CalculateClampedScale__22CCompoundTargetReticleF9CVector3ffffRC13CStateManager:
/* 800BCFD0 000B9F30 D0 41 00 08 */ stfs f2, 8(r1)
/* 800BCFD4 000B9F34 80 64 08 70 */ lwz r3, 0x870(r4)
/* 800BCFD8 000B9F38 D0 61 00 0C */ stfs f3, 0xc(r1)
/* 800BCFDC 000B9F3C 4B F4 EB 3D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800BCFDC 000B9F3C 4B F4 EB 3D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800BCFE0 000B9F40 80 9E 08 70 */ lwz r4, 0x870(r30)
/* 800BCFE4 000B9F44 7C 7F 1B 78 */ mr r31, r3
/* 800BCFE8 000B9F48 7F C5 F3 78 */ mr r5, r30
@ -1347,7 +1347,7 @@ CalculateOrbitZoneReticlePosition__22CCompoundTargetReticleCFRC13CStateManagerb:
/* 800BD1B8 000BA118 7C 9D 23 78 */ mr r29, r4
/* 800BD1BC 000BA11C 7C DF 33 78 */ mr r31, r6
/* 800BD1C0 000BA120 7F C4 F3 78 */ mr r4, r30
/* 800BD1C4 000BA124 4B F4 E9 55 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800BD1C4 000BA124 4B F4 E9 55 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800BD1C8 000BA128 80 8D A1 18 */ lwz r4, gpTweakPlayer@sda21(r13)
/* 800BD1CC 000BA12C 3C 00 43 30 */ lis r0, 0x4330
/* 800BD1D0 000BA130 90 01 00 80 */ stw r0, 0x80(r1)
@ -5866,7 +5866,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager:
/* 800C1344 000BE2A4 7C 9E 23 78 */ mr r30, r4
/* 800C1348 000BE2A8 3B E5 DE E8 */ addi r31, r5, lbl_803CDEE8@l
/* 800C134C 000BE2AC 80 64 08 70 */ lwz r3, 0x870(r4)
/* 800C1350 000BE2B0 4B F4 A7 C9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800C1350 000BE2B0 4B F4 A7 C9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800C1354 000BE2B4 7C 64 1B 78 */ mr r4, r3
/* 800C1358 000BE2B8 38 61 00 90 */ addi r3, r1, 0x90
/* 800C135C 000BE2BC 38 84 00 34 */ addi r4, r4, 0x34
@ -5881,7 +5881,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager:
/* 800C1380 000BE2E0 C0 01 00 9C */ lfs f0, 0x9c(r1)
/* 800C1384 000BE2E4 D0 1D 00 0C */ stfs f0, 0xc(r29)
/* 800C1388 000BE2E8 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 800C138C 000BE2EC 4B F4 A7 8D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800C138C 000BE2EC 4B F4 A7 8D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800C1390 000BE2F0 7C 64 1B 78 */ mr r4, r3
/* 800C1394 000BE2F4 38 61 00 80 */ addi r3, r1, 0x80
/* 800C1398 000BE2F8 38 84 00 34 */ addi r4, r4, 0x34

7
asm/MetroidPrime/CVisorFlare.s
View File

@ -417,7 +417,7 @@ lbl_80207B60:
/* 80207B7C 00204ADC 4E 80 04 21 */ bctrl
/* 80207B80 00204AE0 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 80207B84 00204AE4 7F E4 FB 78 */ mr r4, r31
/* 80207B88 00204AE8 4B E0 3F 91 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80207B88 00204AE8 4B E0 3F 91 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80207B8C 00204AEC 7C 7D 1B 78 */ mr r29, r3
/* 80207B90 00204AF0 3C 60 80 5A */ lis r3, mViewMatrix__9CGraphics@ha
/* 80207B94 00204AF4 C0 BD 00 60 */ lfs f5, 0x60(r29)
@ -707,7 +707,7 @@ lbl_80207FBC:
/* 80207FC8 00204F28 40 82 02 E4 */ bne lbl_802082AC
/* 80207FCC 00204F2C 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 80207FD0 00204F30 7F E4 FB 78 */ mr r4, r31
/* 80207FD4 00204F34 4B E0 3B 45 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80207FD4 00204F34 4B E0 3B 45 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80207FD8 00204F38 C0 A3 00 60 */ lfs f5, 0x60(r3)
/* 80207FDC 00204F3C C0 1E 00 08 */ lfs f0, 8(r30)
/* 80207FE0 00204F40 C0 83 00 50 */ lfs f4, 0x50(r3)
@ -844,7 +844,7 @@ lbl_802081C0:
/* 802081C4 00205124 7F E4 FB 78 */ mr r4, r31
/* 802081C8 00205128 D0 1D 00 28 */ stfs f0, 0x28(r29)
/* 802081CC 0020512C 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 802081D0 00205130 4B E0 39 49 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 802081D0 00205130 4B E0 39 49 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 802081D4 00205134 C0 3E 00 04 */ lfs f1, 4(r30)
/* 802081D8 00205138 38 81 00 1C */ addi r4, r1, 0x1c
/* 802081DC 0020513C C0 03 00 50 */ lfs f0, 0x50(r3)
@ -1056,4 +1056,3 @@ lbl_803D2720:
.4byte 0x00000001
.4byte 0x000000FF
.4byte 0

16
asm/MetroidPrime/Cameras/CCameraManager.s
View File

@ -1846,7 +1846,7 @@ GetGlobalCameraTranslation__14CCameraManagerCFRC13CStateManager:
/* 8000A92C 0000788C 93 C1 00 08 */ stw r30, 8(r1)
/* 8000A930 00007890 7C 7E 1B 78 */ mr r30, r3
/* 8000A934 00007894 7F E3 FB 78 */ mr r3, r31
/* 8000A938 00007898 48 00 11 E1 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8000A938 00007898 48 00 11 E1 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8000A93C 0000789C 7C 64 1B 78 */ mr r4, r3
/* 8000A940 000078A0 7F C3 F3 78 */ mr r3, r30
/* 8000A944 000078A4 38 84 00 34 */ addi r4, r4, 0x34
@ -1871,7 +1871,7 @@ GetCurrentCameraTransform__14CCameraManagerCFRC13CStateManager:
/* 8000A984 000078E4 93 A1 00 44 */ stw r29, 0x44(r1)
/* 8000A988 000078E8 7C 7D 1B 78 */ mr r29, r3
/* 8000A98C 000078EC 7F C3 F3 78 */ mr r3, r30
/* 8000A990 000078F0 48 00 11 89 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8000A990 000078F0 48 00 11 89 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8000A994 000078F4 7C 7F 1B 78 */ mr r31, r3
/* 8000A998 000078F8 38 61 00 08 */ addi r3, r1, 8
/* 8000A99C 000078FC 38 9E 00 30 */ addi r4, r30, 0x30
@ -2334,7 +2334,7 @@ lbl_8000AFE0:
/* 8000B000 00007F60 48 08 92 E9 */ bl WasDeactivated__16CCinematicCameraFR13CStateManager
/* 8000B004 00007F64 7F A3 EB 78 */ mr r3, r29
/* 8000B008 00007F68 7F C4 F3 78 */ mr r4, r30
/* 8000B00C 00007F6C 48 00 0B 55 */ bl GetCurrentCamera__14CCameraManagerFR13CStateManager
/* 8000B00C 00007F6C 48 00 0B 55 */ bl CurrentCamera__14CCameraManagerFR13CStateManager
/* 8000B010 00007F70 7C 64 1B 78 */ mr r4, r3
/* 8000B014 00007F74 38 61 00 10 */ addi r3, r1, 0x10
/* 8000B018 00007F78 48 0A 47 19 */ bl "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity"
@ -2870,7 +2870,7 @@ lbl_8000B724:
/* 8000B758 000086B8 83 A3 00 04 */ lwz r29, 4(r3)
/* 8000B75C 000086BC 7F E3 FB 78 */ mr r3, r31
/* 8000B760 000086C0 7F 84 E3 78 */ mr r4, r28
/* 8000B764 000086C4 48 00 03 B5 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8000B764 000086C4 48 00 03 B5 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8000B768 000086C8 28 1D 00 00 */ cmplwi r29, 0
/* 8000B76C 000086CC 41 82 00 88 */ beq lbl_8000B7F4
/* 8000B770 000086D0 C3 E3 01 60 */ lfs f31, 0x160(r3)
@ -3131,8 +3131,8 @@ GetLastCineCamera__14CCameraManagerCFR13CStateManager:
/* 8000BB10 00008A70 38 21 00 20 */ addi r1, r1, 0x20
/* 8000BB14 00008A74 4E 80 00 20 */ blr
.global GetCurrentCamera__14CCameraManagerCFR13CStateManager
GetCurrentCamera__14CCameraManagerCFR13CStateManager:
.global GetCurrentCamera__14CCameraManagerCFRC13CStateManager
GetCurrentCamera__14CCameraManagerCFRC13CStateManager:
/* 8000BB18 00008A78 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8000BB1C 00008A7C 7C 08 02 A6 */ mflr r0
/* 8000BB20 00008A80 90 01 00 24 */ stw r0, 0x24(r1)
@ -3152,8 +3152,8 @@ GetCurrentCamera__14CCameraManagerCFR13CStateManager:
/* 8000BB58 00008AB8 38 21 00 20 */ addi r1, r1, 0x20
/* 8000BB5C 00008ABC 4E 80 00 20 */ blr
.global GetCurrentCamera__14CCameraManagerFR13CStateManager
GetCurrentCamera__14CCameraManagerFR13CStateManager:
.global CurrentCamera__14CCameraManagerFR13CStateManager
CurrentCamera__14CCameraManagerFR13CStateManager:
/* 8000BB60 00008AC0 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8000BB64 00008AC4 7C 08 02 A6 */ mflr r0
/* 8000BB68 00008AC8 90 01 00 24 */ stw r0, 0x24(r1)

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

@ -982,7 +982,7 @@ sub_80130da0:
/* 80130DDC 0012DD3C 48 00 00 F8 */ b lbl_80130ED4
lbl_80130DE0:
/* 80130DE0 0012DD40 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 80130DE4 0012DD44 4B ED AD 35 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80130DE4 0012DD44 4B ED AD 35 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80130DE8 0012DD48 C0 43 00 60 */ lfs f2, 0x60(r3)
/* 80130DEC 0012DD4C 7F C4 F3 78 */ mr r4, r30
/* 80130DF0 0012DD50 C0 23 00 50 */ lfs f1, 0x50(r3)

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

@ -674,7 +674,7 @@ lbl_8028B838:
lbl_8028B83C:
/* 8028B83C 0028879C 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 8028B840 002887A0 7F E4 FB 78 */ mr r4, r31
/* 8028B844 002887A4 4B D8 02 D5 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8028B844 002887A4 4B D8 02 D5 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8028B848 002887A8 C0 3E 00 50 */ lfs f1, 0x50(r30)
/* 8028B84C 002887AC 38 81 00 1C */ addi r4, r1, 0x1c
/* 8028B850 002887B0 C0 03 00 50 */ lfs f0, 0x50(r3)

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

@ -2339,7 +2339,7 @@ lbl_801DC004:
/* 801DC00C 001D8F6C 40 82 00 88 */ bne lbl_801DC094
/* 801DC010 001D8F70 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 801DC014 001D8F74 7F C4 F3 78 */ mr r4, r30
/* 801DC018 001D8F78 4B E2 FB 01 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 801DC018 001D8F78 4B E2 FB 01 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 801DC01C 001D8F7C C0 3D 09 30 */ lfs f1, 0x930(r29)
/* 801DC020 001D8F80 38 81 00 38 */ addi r4, r1, 0x38
/* 801DC024 001D8F84 C0 03 00 50 */ lfs f0, 0x50(r3)

2
asm/MetroidPrime/HUD/CHudDecoInterface.s
View File

@ -3737,7 +3737,7 @@ lbl_801922D8:
/* 801922E4 0018F244 EE D7 D8 24 */ fdivs f22, f23, f27
/* 801922E8 0018F248 C2 85 00 F0 */ lfs f20, 0xf0(r5)
/* 801922EC 0018F24C 80 79 08 70 */ lwz r3, 0x870(r25)
/* 801922F0 0018F250 4B E7 98 29 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 801922F0 0018F250 4B E7 98 29 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 801922F4 0018F254 7C 64 1B 78 */ mr r4, r3
/* 801922F8 0018F258 38 61 00 5C */ addi r3, r1, 0x5c
/* 801922FC 0018F25C 38 84 00 34 */ addi r4, r4, 0x34

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

@ -1112,7 +1112,7 @@ lbl_80065000:
/* 80065014 00061F74 D0 01 00 B4 */ stfs f0, 0xb4(r1)
/* 80065018 00061F78 C0 1E 03 00 */ lfs f0, 0x300(r30)
/* 8006501C 00061F7C D0 01 00 B8 */ stfs f0, 0xb8(r1)
/* 80065020 00061F80 4B FA 6A F9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80065020 00061F80 4B FA 6A F9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80065024 00061F84 7C 64 1B 78 */ mr r4, r3
/* 80065028 00061F88 38 61 00 0C */ addi r3, r1, 0xc
/* 8006502C 00061F8C 48 04 94 49 */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -1330,7 +1330,7 @@ ShowDamage__9CSamusHudF9CVector3fffRC13CStateManager:
/* 80065348 000622A8 7C 7D 1B 78 */ mr r29, r3
/* 8006534C 000622AC 80 7A 08 70 */ lwz r3, 0x870(r26)
/* 80065350 000622B0 7F 44 D3 78 */ mr r4, r26
/* 80065354 000622B4 4B FA 67 C5 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80065354 000622B4 4B FA 67 C5 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80065358 000622B8 7C 64 1B 78 */ mr r4, r3
/* 8006535C 000622BC 38 61 00 10 */ addi r3, r1, 0x10
/* 80065360 000622C0 48 04 91 15 */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -1484,7 +1484,7 @@ GetRelativeDirection__9CSamusHudCFRC9CVector3fRC13CStateManager:
/* 80065590 000624F0 80 65 08 70 */ lwz r3, 0x870(r5)
/* 80065594 000624F4 7C 9E 23 78 */ mr r30, r4
/* 80065598 000624F8 7C A4 2B 78 */ mr r4, r5
/* 8006559C 000624FC 4B FA 65 7D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8006559C 000624FC 4B FA 65 7D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800655A0 00062500 7C 64 1B 78 */ mr r4, r3
/* 800655A4 00062504 38 61 00 0C */ addi r3, r1, 0xc
/* 800655A8 00062508 48 04 8E CD */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -4663,7 +4663,7 @@ UpdateHudDynamicLights__9CSamusHudFfRC13CStateManager:
/* 8006825C 000651BC 7C 9F 23 78 */ mr r31, r4
/* 80068260 000651C0 7C 7E 1B 78 */ mr r30, r3
/* 80068264 000651C4 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80068268 000651C8 4B FA 38 B1 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80068268 000651C8 4B FA 38 B1 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8006826C 000651CC 7C 64 1B 78 */ mr r4, r3
/* 80068270 000651D0 38 61 00 98 */ addi r3, r1, 0x98
/* 80068274 000651D4 48 04 62 01 */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -6144,7 +6144,7 @@ UpdateFreeLook__9CSamusHudFfRC13CStateManager:
/* 80069790 000666F0 7C 9C 23 78 */ mr r28, r4
/* 80069794 000666F4 7C 7B 1B 78 */ mr r27, r3
/* 80069798 000666F8 80 64 08 70 */ lwz r3, 0x870(r4)
/* 8006979C 000666FC 4B FA 23 7D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8006979C 000666FC 4B FA 23 7D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800697A0 00066700 7C 64 1B 78 */ mr r4, r3
/* 800697A4 00066704 38 61 00 20 */ addi r3, r1, 0x20
/* 800697A8 00066708 48 04 4C CD */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -7393,7 +7393,7 @@ UpdateEnergyLow__9CSamusHudFfRC13CStateManager:
/* 8006A874 000677D4 FF C0 08 90 */ fmr f30, f1
/* 8006A878 000677D8 7C 7E 1B 78 */ mr r30, r3
/* 8006A87C 000677DC 80 64 08 70 */ lwz r3, 0x870(r4)
/* 8006A880 000677E0 4B FA 12 99 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8006A880 000677E0 4B FA 12 99 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8006A884 000677E4 7C 64 1B 78 */ mr r4, r3
/* 8006A888 000677E8 38 61 00 0C */ addi r3, r1, 0xc
/* 8006A88C 000677EC 48 04 4E A5 */ bl "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity"

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

@ -1265,7 +1265,7 @@ DoUserAnimEvents__11CGrappleArmFR13CStateManager:
/* 8011E398 0011B2F8 80 A4 08 4C */ lwz r5, 0x84c(r4)
/* 8011E39C 0011B2FC 80 64 08 70 */ lwz r3, 0x870(r4)
/* 8011E3A0 0011B300 83 A5 00 04 */ lwz r29, 4(r5)
/* 8011E3A4 0011B304 4B EE D7 75 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8011E3A4 0011B304 4B EE D7 75 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8011E3A8 0011B308 C0 BE 02 4C */ lfs f5, 0x24c(r30)
/* 8011E3AC 0011B30C 3C 80 80 57 */ lis r4, mSoundPOINodes__9CAnimData@ha
/* 8011E3B0 0011B310 C0 9E 02 3C */ lfs f4, 0x23c(r30)
@ -3663,4 +3663,3 @@ lbl_803CF413:
.asciz "??(??)"
.asciz "Whole Body"
.balign 4

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

@ -8213,7 +8213,7 @@ lbl_800F4190:
/* 800F41BC 000F111C 40 80 00 CC */ bge lbl_800F4288
/* 800F41C0 000F1120 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 800F41C4 000F1124 7F E4 FB 78 */ mr r4, r31
/* 800F41C8 000F1128 4B F1 79 51 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800F41C8 000F1128 4B F1 79 51 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800F41CC 000F112C C3 C3 00 48 */ lfs f30, 0x48(r3)
/* 800F41D0 000F1130 C3 E3 00 38 */ lfs f31, 0x38(r3)
/* 800F41D4 000F1134 EC 1E 07 B2 */ fmuls f0, f30, f30
@ -12347,7 +12347,7 @@ ApplySpiderBallRollForces__10CMorphBallFRC11CFinalInputR13CStateManagerf:
/* 800F7DFC 000F4D5C C3 E1 00 BC */ lfs f31, 0xbc(r1)
/* 800F7E00 000F4D60 C3 A1 00 C0 */ lfs f29, 0xc0(r1)
/* 800F7E04 000F4D64 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 800F7E08 000F4D68 4B F1 3D 11 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800F7E08 000F4D68 4B F1 3D 11 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800F7E0C 000F4D6C 7C 64 1B 78 */ mr r4, r3
/* 800F7E10 000F4D70 38 61 01 3C */ addi r3, r1, 0x13c
/* 800F7E14 000F4D74 38 84 00 34 */ addi r4, r4, 0x34
@ -12976,7 +12976,7 @@ TransformSpiderBallForcesXY__10CMorphBallFR9CVector2fR13CStateManager:
/* 800F8728 000F5688 93 C1 00 38 */ stw r30, 0x38(r1)
/* 800F872C 000F568C 7C 7E 1B 78 */ mr r30, r3
/* 800F8730 000F5690 80 65 08 70 */ lwz r3, 0x870(r5)
/* 800F8734 000F5694 4B F1 33 E5 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800F8734 000F5694 4B F1 33 E5 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800F8738 000F5698 7C 64 1B 78 */ mr r4, r3
/* 800F873C 000F569C 38 61 00 08 */ addi r3, r1, 8
/* 800F8740 000F56A0 38 84 00 34 */ addi r4, r4, 0x34
@ -13019,7 +13019,7 @@ TransformSpiderBallForcesXZ__10CMorphBallFR9CVector2fR13CStateManager:
/* 800F87C8 000F5728 93 C1 00 38 */ stw r30, 0x38(r1)
/* 800F87CC 000F572C 7C 7E 1B 78 */ mr r30, r3
/* 800F87D0 000F5730 80 65 08 70 */ lwz r3, 0x870(r5)
/* 800F87D4 000F5734 4B F1 33 45 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800F87D4 000F5734 4B F1 33 45 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800F87D8 000F5738 7C 64 1B 78 */ mr r4, r3
/* 800F87DC 000F573C 38 61 00 08 */ addi r3, r1, 8
/* 800F87E0 000F5740 38 84 00 34 */ addi r4, r4, 0x34

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

@ -5003,7 +5003,7 @@ Render__7CPlayerCFRC13CStateManager:
/* 80013A20 00010980 54 15 0F FF */ rlwinm. r21, r0, 1, 0x1f, 0x1f
/* 80013A24 00010984 40 82 00 48 */ bne lbl_80013A6C
/* 80013A28 00010988 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 80013A2C 0001098C 4B FF 80 ED */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80013A2C 0001098C 4B FF 80 ED */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80013A30 00010990 7C 64 1B 78 */ mr r4, r3
/* 80013A34 00010994 38 61 00 10 */ addi r3, r1, 0x10
/* 80013A38 00010998 48 09 BC F9 */ bl "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity"
@ -9036,7 +9036,7 @@ lbl_80017354:
lbl_80017380:
/* 80017380 000142E0 7F E4 FB 78 */ mr r4, r31
/* 80017384 000142E4 3B A0 00 00 */ li r29, 0
/* 80017388 000142E8 4B FF 47 91 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80017388 000142E8 4B FF 47 91 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8001738C 000142EC 7C 64 1B 78 */ mr r4, r3
/* 80017390 000142F0 38 61 00 20 */ addi r3, r1, 0x20
/* 80017394 000142F4 48 09 83 9D */ bl "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity"
@ -10411,7 +10411,7 @@ ShouldSampleFailsafe__7CPlayerCFv:
/* 800186F8 00015658 93 C1 00 18 */ stw r30, 0x18(r1)
/* 800186FC 0001565C 7C 7E 1B 78 */ mr r30, r3
/* 80018700 00015660 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80018704 00015664 4B FF 34 15 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80018704 00015664 4B FF 34 15 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80018708 00015668 7C 64 1B 78 */ mr r4, r3
/* 8001870C 0001566C 38 61 00 08 */ addi r3, r1, 8
/* 80018710 00015670 48 09 70 21 */ bl "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity"

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

@ -430,7 +430,7 @@ lbl_802821D4:
/* 802821DC 0027F13C 41 80 FF C4 */ blt lbl_802821A0
/* 802821E0 0027F140 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 802821E4 0027F144 7F A4 EB 78 */ mr r4, r29
/* 802821E8 0027F148 4B D8 99 31 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 802821E8 0027F148 4B D8 99 31 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 802821EC 0027F14C C0 23 01 60 */ lfs f1, 0x160(r3)
/* 802821F0 0027F150 38 81 00 80 */ addi r4, r1, 0x80
/* 802821F4 0027F154 C0 63 00 60 */ lfs f3, 0x60(r3)
@ -4507,7 +4507,7 @@ lbl_80285BD0:
/* 80285BF0 00282B50 48 00 02 8C */ b lbl_80285E7C
lbl_80285BF4:
/* 80285BF4 00282B54 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80285BF8 00282B58 4B D8 5F 21 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80285BF8 00282B58 4B D8 5F 21 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80285BFC 00282B5C C0 3F 00 50 */ lfs f1, 0x50(r31)
/* 80285C00 00282B60 C0 03 00 50 */ lfs f0, 0x50(r3)
/* 80285C04 00282B64 C0 7F 00 60 */ lfs f3, 0x60(r31)

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

@ -2284,7 +2284,7 @@ DoUserAnimEvents__10CPlayerGunFfR13CStateManager:
/* 8003C12C 0003908C 83 A5 00 04 */ lwz r29, 4(r5)
/* 8003C130 00039090 83 83 00 20 */ lwz r28, 0x20(r3)
/* 8003C134 00039094 80 64 08 70 */ lwz r3, 0x870(r4)
/* 8003C138 00039098 4B FC F9 E1 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8003C138 00039098 4B FC F9 E1 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8003C13C 0003909C C0 BE 04 14 */ lfs f5, 0x414(r30)
/* 8003C140 000390A0 3C 80 80 57 */ lis r4, mSoundPOINodes__9CAnimData@ha
/* 8003C144 000390A4 C0 9E 04 04 */ lfs f4, 0x404(r30)
@ -8605,7 +8605,7 @@ lbl_80041B60:
lbl_80041B64:
/* 80041B64 0003EAC4 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 80041B68 0003EAC8 7F A4 EB 78 */ mr r4, r29
/* 80041B6C 0003EACC 4B FC 9F AD */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80041B6C 0003EACC 4B FC 9F AD */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80041B70 0003EAD0 C0 22 85 08 */ lfs f1, lbl_805AA228@sda21(r2)
/* 80041B74 0003EAD4 7C 77 1B 78 */ mr r23, r3
/* 80041B78 0003EAD8 C0 42 85 0C */ lfs f2, lbl_805AA22C@sda21(r2)

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

@ -369,7 +369,7 @@ GetActiveVisor__12CPlayerStateCFRC13CStateManager:
/* 80091564 0008E4C4 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80091568 0008E4C8 7C 7F 1B 78 */ mr r31, r3
/* 8009156C 0008E4CC 80 64 08 70 */ lwz r3, 0x870(r4)
/* 80091570 0008E4D0 4B F7 A5 A9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80091570 0008E4D0 4B F7 A5 A9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80091574 0008E4D4 7C 64 1B 78 */ mr r4, r3
/* 80091578 0008E4D8 38 61 00 08 */ addi r3, r1, 8
/* 8009157C 0008E4DC 48 01 CE F9 */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"

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

@ -376,7 +376,7 @@ lbl_80111FC4:
/* 80112050 0010EFB0 48 24 3B 85 */ bl Draw__6CModelCFRC11CModelFlags
/* 80112054 0010EFB4 80 7B 08 70 */ lwz r3, 0x870(r27)
/* 80112058 0010EFB8 7F 64 DB 78 */ mr r4, r27
/* 8011205C 0010EFBC 4B EF 9A BD */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8011205C 0010EFBC 4B EF 9A BD */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80112060 0010EFC0 80 9B 08 70 */ lwz r4, 0x870(r27)
/* 80112064 0010EFC4 7C 79 1B 78 */ mr r25, r3
/* 80112068 0010EFC8 7F 65 DB 78 */ mr r5, r27
@ -780,7 +780,7 @@ lbl_801125FC:
/* 80112624 0010F584 41 82 01 28 */ beq lbl_8011274C
/* 80112628 0010F588 80 7B 08 70 */ lwz r3, 0x870(r27)
/* 8011262C 0010F58C 7F 64 DB 78 */ mr r4, r27
/* 80112630 0010F590 4B EF 94 E9 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80112630 0010F590 4B EF 94 E9 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80112634 0010F594 81 99 00 00 */ lwz r12, 0(r25)
/* 80112638 0010F598 7F 24 CB 78 */ mr r4, r25
/* 8011263C 0010F59C 7C 79 1B 78 */ mr r25, r3

7
asm/MetroidPrime/Player/CSamusFaceReflection.s
View File

@ -64,7 +64,7 @@ Draw__20CSamusFaceReflectionCFRC13CStateManager:
/* 8015AE50 00157DB0 28 00 00 00 */ cmplwi r0, 0
/* 8015AE54 00157DB4 40 82 03 00 */ bne lbl_8015B154
/* 8015AE58 00157DB8 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 8015AE5C 00157DBC 4B EB 0C BD */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8015AE5C 00157DBC 4B EB 0C BD */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8015AE60 00157DC0 7C 64 1B 78 */ mr r4, r3
/* 8015AE64 00157DC4 38 61 00 08 */ addi r3, r1, 8
/* 8015AE68 00157DC8 4B F5 36 0D */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -318,7 +318,7 @@ PreDraw__20CSamusFaceReflectionFRC13CStateManager:
lbl_8015B224:
/* 8015B224 00158184 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 8015B228 00158188 7F E4 FB 78 */ mr r4, r31
/* 8015B22C 0015818C 4B EB 08 ED */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8015B22C 0015818C 4B EB 08 ED */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8015B230 00158190 7C 64 1B 78 */ mr r4, r3
/* 8015B234 00158194 38 61 00 08 */ addi r3, r1, 8
/* 8015B238 00158198 4B F5 32 3D */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -364,7 +364,7 @@ Update__20CSamusFaceReflectionFfRC13CStateManagerR9CRandom16:
/* 8015B2C0 00158220 7C 7F 1B 78 */ mr r31, r3
/* 8015B2C4 00158224 80 64 08 70 */ lwz r3, 0x870(r4)
/* 8015B2C8 00158228 7C BE 2B 78 */ mr r30, r5
/* 8015B2CC 0015822C 4B EB 08 4D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8015B2CC 0015822C 4B EB 08 4D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8015B2D0 00158230 7C 64 1B 78 */ mr r4, r3
/* 8015B2D4 00158234 38 61 00 1C */ addi r3, r1, 0x1c
/* 8015B2D8 00158238 4B F5 31 9D */ bl "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity"
@ -802,4 +802,3 @@ lbl_803D0340:
.byte 0x3F, 0x3F
.asciz "(??)"
.balign 4

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

@ -619,7 +619,7 @@ GetNearClipDistance__19CHUDBillboardEffectFRC13CStateManager:
/* 80130200 0012D160 7C 64 1B 78 */ mr r4, r3
/* 80130204 0012D164 90 01 00 14 */ stw r0, 0x14(r1)
/* 80130208 0012D168 80 63 08 70 */ lwz r3, 0x870(r3)
/* 8013020C 0012D16C 4B ED B9 0D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8013020C 0012D16C 4B ED B9 0D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 80130210 0012D170 C0 22 99 44 */ lfs f1, lbl_805AB664@sda21(r2)
/* 80130214 0012D174 C0 03 01 60 */ lfs f0, 0x160(r3)
/* 80130218 0012D178 EC 21 00 2A */ fadds f1, f1, f0

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

@ -192,7 +192,7 @@ PreRender__12CScriptActorFR13CStateManagerRC14CFrustumPlanes:
/* 800750E0 00072040 41 82 00 38 */ beq lbl_80075118
/* 800750E4 00072044 80 7D 08 70 */ lwz r3, 0x870(r29)
/* 800750E8 00072048 7F A4 EB 78 */ mr r4, r29
/* 800750EC 0007204C 4B F9 6A 2D */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 800750EC 0007204C 4B F9 6A 2D */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 800750F0 00072050 7C 64 1B 78 */ mr r4, r3
/* 800750F4 00072054 38 61 00 0C */ addi r3, r1, 0xc
/* 800750F8 00072058 48 03 A6 39 */ bl "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity"

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

@ -547,7 +547,7 @@ lbl_8008E044:
/* 8008E050 0008AFB0 C3 BE 00 50 */ lfs f29, 0x50(r30)
/* 8008E054 0008AFB4 C3 DE 00 40 */ lfs f30, 0x40(r30)
/* 8008E058 0008AFB8 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 8008E05C 0008AFBC 4B F7 DA BD */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 8008E05C 0008AFBC 4B F7 DA BD */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8008E060 0008AFC0 C0 63 00 50 */ lfs f3, 0x50(r3)
/* 8008E064 0008AFC4 C0 23 00 40 */ lfs f1, 0x40(r3)
/* 8008E068 0008AFC8 EC C3 E8 28 */ fsubs f6, f3, f29

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

@ -1448,7 +1448,7 @@ lbl_801AB508:
/* 801AB52C 001A848C 48 10 BE 21 */ bl CopyTex__13CCubeRendererFibPv8GXTexFmtb
/* 801AB530 001A8490 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 801AB534 001A8494 7F C4 F3 78 */ mr r4, r30
/* 801AB538 001A8498 4B E6 05 E1 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 801AB538 001A8498 4B E6 05 E1 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 801AB53C 001A849C C0 43 00 60 */ lfs f2, 0x60(r3)
/* 801AB540 001A84A0 7F A4 EB 78 */ mr r4, r29
/* 801AB544 001A84A4 C0 23 00 50 */ lfs f1, 0x50(r3)

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

@ -561,7 +561,7 @@ lbl_800762E0:
lbl_80076304:
/* 80076304 00073264 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 80076308 00073268 7F C4 F3 78 */ mr r4, r30
/* 8007630C 0007326C 4B F9 58 55 */ bl GetCurrentCamera__14CCameraManagerFR13CStateManager
/* 8007630C 0007326C 4B F9 58 55 */ bl CurrentCamera__14CCameraManagerFR13CStateManager
/* 80076310 00073270 7C 78 1B 78 */ mr r24, r3
/* 80076314 00073274 7F A4 EB 78 */ mr r4, r29
/* 80076318 00073278 C0 58 00 60 */ lfs f2, 0x60(r24)

3
asm/MetroidPrime/ScriptObjects/CScriptWater.s
View File

@ -1644,7 +1644,7 @@ Think__12CScriptWaterFfR13CStateManager:
/* 801001E4 000FD144 4B F7 62 E9 */ bl Think__14CScriptTriggerFfR13CStateManager
/* 801001E8 000FD148 80 7F 08 70 */ lwz r3, 0x870(r31)
/* 801001EC 000FD14C 7F E4 FB 78 */ mr r4, r31
/* 801001F0 000FD150 4B F0 B9 71 */ bl GetCurrentCamera__14CCameraManagerFR13CStateManager
/* 801001F0 000FD150 4B F0 B9 71 */ bl CurrentCamera__14CCameraManagerFR13CStateManager
/* 801001F4 000FD154 88 1E 01 48 */ lbz r0, 0x148(r30)
/* 801001F8 000FD158 7C 64 1B 78 */ mr r4, r3
/* 801001FC 000FD15C 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f
@ -3672,4 +3672,3 @@ lbl_803CEE38:
# ROM: 0x3CBE38
.asciz "??(??)"
.balign 4

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

@ -1568,7 +1568,7 @@ lbl_802150EC:
/* 8021510C 0021206C 40 82 00 80 */ bne lbl_8021518C
/* 80215110 00212070 80 7E 08 70 */ lwz r3, 0x870(r30)
/* 80215114 00212074 7F C4 F3 78 */ mr r4, r30
/* 80215118 00212078 4B DF 6A 01 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager
/* 80215118 00212078 4B DF 6A 01 */ bl GetCurrentCamera__14CCameraManagerCFRC13CStateManager
/* 8021511C 0021207C C0 21 01 D4 */ lfs f1, 0x1d4(r1)
/* 80215120 00212080 C0 03 00 50 */ lfs f0, 0x50(r3)
/* 80215124 00212084 C0 61 01 E4 */ lfs f3, 0x1e4(r1)

3
include/MetroidPrime/Cameras/CCameraManager.hpp
View File

@ -22,7 +22,8 @@ class CStateManager;
class CCameraManager {
public:
CGameCamera* GetCurrentCamera(CStateManager& mgr) const;
CGameCamera* CurrentCamera(CStateManager& mgr);
const CGameCamera* GetCurrentCamera(const CStateManager& mgr) const;
void SetPlayerCamera(CStateManager& mgr, TUniqueId newCamId);
void SetFogDensity(float fogDensityTarget, float fogDensitySpeed);