PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-16 02:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

CScriptPickup progress

Browse Source
This commit is contained in:
Luke Street
2022-10-08 00:53:28 -04:00
parent dae67b71f2
commit 27fedfee46
61 changed files with 231 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,7 +307,7 @@ sub_8029f318:
lbl_8029F3F4:
/* 8029F3F4 0029C354 7F 83 E3 78 */ mr r3, r28
/* 8029F3F8 0029C358 7F A4 EB 78 */ mr r4, r29
/* 8029F3FC 0029C35C 4B DA D8 F9 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8029F3FC 0029C35C 4B DA D8 F9 */ bl AddObject__13CStateManagerFP7CEntity
/* 8029F400 0029C360 BB 21 00 44 */ lmw r25, 0x44(r1)
/* 8029F404 0029C364 80 01 00 64 */ lwz r0, 0x64(r1)
/* 8029F408 0029C368 7C 08 03 A6 */ mtlr r0
@@ -534,7 +534,7 @@ lbl_8029F694:
lbl_8029F740:
/* 8029F740 0029C6A0 7F C3 F3 78 */ mr r3, r30
/* 8029F744 0029C6A4 7F 84 E3 78 */ mr r4, r28
/* 8029F748 0029C6A8 4B DA D5 AD */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8029F748 0029C6A8 4B DA D5 AD */ bl AddObject__13CStateManagerFP7CEntity
/* 8029F74C 0029C6AC 7F 40 07 75 */ extsb. r0, r26
/* 8029F750 0029C6B0 41 82 00 44 */ beq lbl_8029F794
/* 8029F754 0029C6B4 80 01 00 D0 */ lwz r0, 0xd0(r1)

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

@@ -227,7 +227,7 @@ lbl_8027C764:
lbl_8027C870:
/* 8027C870 002797D0 7F C3 F3 78 */ mr r3, r30
/* 8027C874 002797D4 7F E4 FB 78 */ mr r4, r31
/* 8027C878 002797D8 4B DD 04 7D */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8027C878 002797D8 4B DD 04 7D */ bl AddObject__13CStateManagerFP7CEntity
/* 8027C87C 002797DC 7F 20 07 75 */ extsb. r0, r25
/* 8027C880 002797E0 41 82 00 0C */ beq lbl_8027C88C
/* 8027C884 002797E4 38 61 00 48 */ addi r3, r1, 0x48

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

@@ -993,7 +993,7 @@ lbl_8008E580:
lbl_8008E688:
/* 8008E688 0008B5E8 7F C3 F3 78 */ mr r3, r30
/* 8008E68C 0008B5EC 7F 24 CB 78 */ mr r4, r25
/* 8008E690 0008B5F0 4B FB E6 65 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8008E690 0008B5F0 4B FB E6 65 */ bl AddObject__13CStateManagerFP7CEntity
/* 8008E694 0008B5F4 7E E0 07 75 */ extsb. r0, r23
/* 8008E698 0008B5F8 41 82 00 0C */ beq lbl_8008E6A4
/* 8008E69C 0008B5FC 38 61 00 A4 */ addi r3, r1, 0xa4

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

@@ -2312,7 +2312,7 @@ lbl_80217790:
/* 80217794 002146F4 41 82 01 84 */ beq lbl_80217918
/* 80217798 002146F8 7F E3 FB 78 */ mr r3, r31
/* 8021779C 002146FC 7F A4 EB 78 */ mr r4, r29
/* 802177A0 00214700 4B E3 55 55 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 802177A0 00214700 4B E3 55 55 */ bl AddObject__13CStateManagerFP7CEntity
/* 802177A4 00214704 38 61 00 60 */ addi r3, r1, 0x60
/* 802177A8 00214708 48 0C B8 D5 */ bl NoParameter__12CPASAnimParmFv
/* 802177AC 0021470C 38 61 00 68 */ addi r3, r1, 0x68
@@ -5387,7 +5387,7 @@ lbl_8021A2B0:
lbl_8021A3C0:
/* 8021A3C0 00217320 7F E3 FB 78 */ mr r3, r31
/* 8021A3C4 00217324 7F A4 EB 78 */ mr r4, r29
/* 8021A3C8 00217328 4B E3 29 2D */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8021A3C8 00217328 4B E3 29 2D */ bl AddObject__13CStateManagerFP7CEntity
/* 8021A3CC 0021732C 7F 40 07 75 */ extsb. r0, r26
/* 8021A3D0 00217330 41 82 00 0C */ beq lbl_8021A3DC
/* 8021A3D4 00217334 38 61 00 7C */ addi r3, r1, 0x7c

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

@@ -97,7 +97,7 @@ lbl_800E83D4:
/* 800E83FC 000E535C 48 25 53 C1 */ bl "__ct__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>FPCwiRCQ24rstl17rmemory_allocator"
/* 800E8400 000E5360 38 61 00 38 */ addi r3, r1, 0x38
/* 800E8404 000E5364 38 9C 00 34 */ addi r4, r28, 0x34
/* 800E8408 000E5368 4B F8 38 61 */ bl DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo
/* 800E8408 000E5368 4B F8 38 61 */ bl "DisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>RC13CHUDMemoParms"
/* 800E840C 000E536C 38 61 00 38 */ addi r3, r1, 0x38
/* 800E8410 000E5370 48 25 4D 25 */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv"
/* 800E8414 000E5374 48 00 00 7C */ b lbl_800E8490
@@ -107,7 +107,7 @@ lbl_800E8418:
/* 800E8420 000E5380 4B F2 D5 D1 */ bl wstring_l__4rstlFPCw
/* 800E8424 000E5384 38 61 00 28 */ addi r3, r1, 0x28
/* 800E8428 000E5388 38 9C 00 34 */ addi r4, r28, 0x34
/* 800E842C 000E538C 4B F8 38 3D */ bl DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo
/* 800E842C 000E538C 4B F8 38 3D */ bl "DisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>RC13CHUDMemoParms"
/* 800E8430 000E5390 38 61 00 28 */ addi r3, r1, 0x28
/* 800E8434 000E5394 48 25 4D 01 */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv"
/* 800E8438 000E5398 48 00 00 58 */ b lbl_800E8490
@@ -130,7 +130,7 @@ lbl_800E843C:
/* 800E8478 000E53D8 D0 01 00 10 */ stfs f0, 0x10(r1)
/* 800E847C 000E53DC 98 01 00 15 */ stb r0, 0x15(r1)
/* 800E8480 000E53E0 98 A1 00 16 */ stb r5, 0x16(r1)
/* 800E8484 000E53E4 4B F8 37 E5 */ bl DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo
/* 800E8484 000E53E4 4B F8 37 E5 */ bl "DisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>RC13CHUDMemoParms"
/* 800E8488 000E53E8 38 61 00 18 */ addi r3, r1, 0x18
/* 800E848C 000E53EC 48 25 4C A9 */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv"
lbl_800E8490:

12
asm/MetroidPrime/ScriptObjects/CScriptPickup.s
View File

@@ -243,7 +243,7 @@ Touch__13CScriptPickupFR6CActorR13CStateManager:
/* 800C2760 000BF6C0 2C 1F 00 28 */ cmpwi r31, 0x28
/* 800C2764 000BF6C4 41 81 00 2C */ bgt lbl_800C2790
/* 800C2768 000BF6C8 7F E3 FB 78 */ mr r3, r31
/* 800C276C 000BF6CC 48 1D A1 CD */ bl GetArtifactHeadScanFromItemType__13CArtifactDollF9EItemType
/* 800C276C 000BF6CC 48 1D A1 CD */ bl GetArtifactHeadScanFromItemType__13CArtifactDollFQ212CPlayerState9EItemType
/* 800C2770 000BF6D0 3C 03 00 01 */ addis r0, r3, 1
/* 800C2774 000BF6D4 28 00 FF FF */ cmplwi r0, 0xffff
/* 800C2778 000BF6D8 41 82 00 18 */ beq lbl_800C2790
@@ -325,7 +325,7 @@ lbl_800C2790:
lbl_800C28A4:
/* 800C28A4 000BF804 7F C3 F3 78 */ mr r3, r30
/* 800C28A8 000BF808 7F 44 D3 78 */ mr r4, r26
/* 800C28AC 000BF80C 4B F8 A4 49 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 800C28AC 000BF80C 4B F8 A4 49 */ bl AddObject__13CStateManagerFP7CEntity
/* 800C28B0 000BF810 7F 60 07 75 */ extsb. r0, r27
/* 800C28B4 000BF814 41 82 00 10 */ beq lbl_800C28C4
/* 800C28B8 000BF818 38 61 00 5C */ addi r3, r1, 0x5c
@@ -411,7 +411,7 @@ lbl_800C29C8:
/* 800C29E0 000BF940 7F C3 F3 78 */ mr r3, r30
/* 800C29E4 000BF944 C0 22 8D C8 */ lfs f1, lbl_805AAAE8@sda21(r2)
/* 800C29E8 000BF948 38 84 00 01 */ addi r4, r4, 1
/* 800C29EC 000BF94C 4B F8 15 41 */ bl sub_80043f2c
/* 800C29EC 000BF94C 4B F8 15 41 */ bl QueueMessage__13CStateManagerFiUif
/* 800C29F0 000BF950 7F 43 D3 78 */ mr r3, r26
/* 800C29F4 000BF954 38 80 00 01 */ li r4, 1
/* 800C29F8 000BF958 48 11 27 B9 */ bl SetAllItemsCollected__14CSystemOptionsFb
@@ -421,11 +421,11 @@ lbl_800C29FC:
/* 800C2A04 000BF964 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13)
/* 800C2A08 000BF968 3B 43 00 A8 */ addi r26, r3, 0xa8
/* 800C2A0C 000BF96C 7F 43 D3 78 */ mr r3, r26
/* 800C2A10 000BF970 48 11 28 45 */ bl sub_801d5254
/* 800C2A10 000BF970 48 11 28 45 */ bl GetShowPowerBombAmmoMessage__14CSystemOptionsCFv
/* 800C2A14 000BF974 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800C2A18 000BF978 41 82 00 54 */ beq lbl_800C2A6C
/* 800C2A1C 000BF97C 7F 43 D3 78 */ mr r3, r26
/* 800C2A20 000BF980 48 11 28 01 */ bl sub_801d5220
/* 800C2A20 000BF980 48 11 28 01 */ bl IncrementPowerBombAmmoCount__14CSystemOptionsFv
/* 800C2A24 000BF984 80 6D A0 74 */ lwz r3, gpStringTable@sda21(r13)
/* 800C2A28 000BF988 38 80 00 6D */ li r4, 0x6d
/* 800C2A2C 000BF98C 48 29 3C D1 */ bl GetString__12CStringTableCFi
@@ -441,7 +441,7 @@ lbl_800C29FC:
/* 800C2A54 000BF9B4 D0 01 00 3C */ stfs f0, 0x3c(r1)
/* 800C2A58 000BF9B8 98 A1 00 40 */ stb r5, 0x40(r1)
/* 800C2A5C 000BF9BC 98 01 00 42 */ stb r0, 0x42(r1)
/* 800C2A60 000BF9C0 4B FA 92 09 */ bl DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo
/* 800C2A60 000BF9C0 4B FA 92 09 */ bl "DisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>RC13CHUDMemoParms"
/* 800C2A64 000BF9C4 38 61 00 4C */ addi r3, r1, 0x4c
/* 800C2A68 000BF9C8 48 27 A6 CD */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv"
lbl_800C2A6C:

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

@@ -383,7 +383,7 @@ lbl_801D73D0:
lbl_801D7468:
/* 801D7468 001D43C8 7F A3 EB 78 */ mr r3, r29
/* 801D746C 001D43CC 7F E4 FB 78 */ mr r4, r31
/* 801D7470 001D43D0 4B E7 58 85 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 801D7470 001D43D0 4B E7 58 85 */ bl AddObject__13CStateManagerFP7CEntity
/* 801D7474 001D43D4 7E E0 07 75 */ extsb. r0, r23
/* 801D7478 001D43D8 41 82 00 28 */ beq lbl_801D74A0
/* 801D747C 001D43DC 88 01 00 30 */ lbz r0, 0x30(r1)