primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

CScriptPickup progress

Browse Source 
Former-commit-id: 27fedfee46
This commit is contained in:
Luke Street
2022-10-08 00:53:34 -04:00
parent 63c664a76f
commit 3cbf350f85
61 changed files with 231 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/MetroidPrime/CArtifactDoll.s
+2 -2
View File
@@ -94,8 +94,8 @@ lbl_8029C924:
/* 8029C930 00299890 38 60 FF FF */ li r3, -1
/* 8029C934 00299894 4E 80 00 20 */ blr
.global GetArtifactHeadScanFromItemType__13CArtifactDollF9EItemType
GetArtifactHeadScanFromItemType__13CArtifactDollF9EItemType:
.global GetArtifactHeadScanFromItemType__13CArtifactDollFQ212CPlayerState9EItemType
GetArtifactHeadScanFromItemType__13CArtifactDollFQ212CPlayerState9EItemType:
/* 8029C938 00299898 2C 03 00 1D */ cmpwi r3, 0x1d
/* 8029C93C 0029989C 41 80 00 24 */ blt lbl_8029C960
/* 8029C940 002998A0 2C 03 00 28 */ cmpwi r3, 0x28
asm/MetroidPrime/CEnvFxManager.s
+1 -1
View File
@@ -3085,7 +3085,7 @@ lbl_80212954:
/* 80212960 0020F8C0 7F C3 F3 78 */ mr r3, r30
/* 80212964 0020F8C4 98 1F 01 04 */ stb r0, 0x104(r31)
/* 80212968 0020F8C8 7F E4 FB 78 */ mr r4, r31
/* 8021296C 0020F8CC 4B E3 A3 89 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8021296C 0020F8CC 4B E3 A3 89 */ bl AddObject__13CStateManagerFP7CEntity
/* 80212970 0020F8D0 BB 21 00 64 */ lmw r25, 0x64(r1)
/* 80212974 0020F8D4 80 01 00 84 */ lwz r0, 0x84(r1)
/* 80212978 0020F8D8 7C 08 03 A6 */ mtlr r0
asm/MetroidPrime/CExplosion.s
+1 -1
View File
@@ -291,7 +291,7 @@ lbl_8005A378:
lbl_8005A478:
/* 8005A478 000573D8 7F E3 FB 78 */ mr r3, r31
/* 8005A47C 000573DC 7F 44 D3 78 */ mr r4, r26
/* 8005A480 000573E0 4B FF 28 75 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8005A480 000573E0 4B FF 28 75 */ bl AddObject__13CStateManagerFP7CEntity
/* 8005A484 000573E4 7E E0 07 75 */ extsb. r0, r23
/* 8005A488 000573E8 41 82 00 0C */ beq lbl_8005A494
/* 8005A48C 000573EC 38 61 00 38 */ addi r3, r1, 0x38
asm/MetroidPrime/CGameProjectile.s
+2 -2
View File
@@ -413,7 +413,7 @@ lbl_800376A8:
lbl_80037768:
/* 80037768 000346C8 7F E3 FB 78 */ mr r3, r31
/* 8003776C 000346CC 7F 24 CB 78 */ mr r4, r25
/* 80037770 000346D0 48 01 55 85 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80037770 000346D0 48 01 55 85 */ bl AddObject__13CStateManagerFP7CEntity
/* 80037774 000346D4 7F 00 07 75 */ extsb. r0, r24
/* 80037778 000346D8 41 82 00 28 */ beq lbl_800377A0
/* 8003777C 000346DC 88 01 00 38 */ lbz r0, 0x38(r1)
@@ -589,7 +589,7 @@ lbl_800378E8:
lbl_800379C0:
/* 800379C0 00034920 7F 83 E3 78 */ mr r3, r28
/* 800379C4 00034924 7F E4 FB 78 */ mr r4, r31
/* 800379C8 00034928 48 01 53 2D */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 800379C8 00034928 48 01 53 2D */ bl AddObject__13CStateManagerFP7CEntity
/* 800379CC 0003492C BB 21 00 34 */ lmw r25, 0x34(r1)
/* 800379D0 00034930 80 01 00 54 */ lwz r0, 0x54(r1)
/* 800379D4 00034934 7C 08 03 A6 */ mtlr r0
asm/MetroidPrime/CParticleGenInfo.s
+1 -2
View File
@@ -166,7 +166,7 @@ lbl_800B776C:
lbl_800B78D4:
/* 800B78D4 000B4834 7F A3 EB 78 */ mr r3, r29
/* 800B78D8 000B4838 7F 44 D3 78 */ mr r4, r26
/* 800B78DC 000B483C 4B F9 54 19 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 800B78DC 000B483C 4B F9 54 19 */ bl AddObject__13CStateManagerFP7CEntity
/* 800B78E0 000B4840 7F 60 07 75 */ extsb. r0, r27
/* 800B78E4 000B4844 41 82 00 0C */ beq lbl_800B78F0
/* 800B78E8 000B4848 38 61 00 24 */ addi r3, r1, 0x24
@@ -288,4 +288,3 @@ lbl_803CDE88:
.byte 0x50
.asciz "articleLight"
.balign 4
asm/MetroidPrime/CStateManager.s
+7 -7
View File
@@ -540,8 +540,8 @@ lbl_80043F1C:
/* 80043F24 00040E84 38 21 00 10 */ addi r1, r1, 0x10
/* 80043F28 00040E88 4E 80 00 20 */ blr
.global sub_80043f2c
sub_80043f2c:
.global QueueMessage__13CStateManagerFiUif
QueueMessage__13CStateManagerFiUif:
/* 80043F2C 00040E8C 90 83 0F 84 */ stw r4, 0xf84(r3)
/* 80043F30 00040E90 90 A3 0F 88 */ stw r5, 0xf88(r3)
/* 80043F34 00040E94 D0 23 0F 8C */ stfs f1, 0xf8c(r3)
@@ -854,7 +854,7 @@ lbl_80044354:
lbl_80044364:
/* 80044364 000412C4 7F A3 EB 78 */ mr r3, r29
/* 80044368 000412C8 7E E4 BB 78 */ mr r4, r23
/* 8004436C 000412CC 48 00 89 89 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8004436C 000412CC 48 00 89 89 */ bl AddObject__13CStateManagerFP7CEntity
lbl_80044370:
/* 80044370 000412D0 7F C3 F3 78 */ mr r3, r30
/* 80044374 000412D4 7F 24 CB 78 */ mr r4, r25
@@ -1660,7 +1660,7 @@ lbl_80044E54:
/* 80044E7C 00041DDC D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 80044E80 00041DE0 98 01 00 21 */ stb r0, 0x21(r1)
/* 80044E84 00041DE4 98 01 00 22 */ stb r0, 0x22(r1)
/* 80044E88 00041DE8 48 02 6D E1 */ bl DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo
/* 80044E88 00041DE8 48 02 6D E1 */ bl "DisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>RC13CHUDMemoParms"
/* 80044E8C 00041DEC 38 61 00 24 */ addi r3, r1, 0x24
/* 80044E90 00041DF0 48 2F 82 A5 */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv"
/* 80044E94 00041DF4 48 00 00 44 */ b lbl_80044ED8
@@ -6245,7 +6245,7 @@ lbl_80048DC0:
/* 80048E80 00045DE0 D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 80048E84 00045DE4 98 01 00 21 */ stb r0, 0x21(r1)
/* 80048E88 00045DE8 98 01 00 22 */ stb r0, 0x22(r1)
/* 80048E8C 00045DEC 48 02 2D DD */ bl DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo
/* 80048E8C 00045DEC 48 02 2D DD */ bl "DisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>RC13CHUDMemoParms"
/* 80048E90 00045DF0 38 61 00 54 */ addi r3, r1, 0x54
/* 80048E94 00045DF4 48 2F 42 A1 */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv"
/* 80048E98 00045DF8 7F 43 D3 78 */ mr r3, r26
@@ -10668,8 +10668,8 @@ lbl_8004CCD4:
/* 8004CCEC 00049C4C 38 21 00 60 */ addi r1, r1, 0x60
/* 8004CCF0 00049C50 4E 80 00 20 */ blr
.global AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence:
.global AddObject__13CStateManagerFP7CEntity
AddObject__13CStateManagerFP7CEntity:
/* 8004CCF4 00049C54 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8004CCF8 00049C58 7C 08 02 A6 */ mflr r0
/* 8004CCFC 00049C5C 28 04 00 00 */ cmplwi r4, 0
asm/MetroidPrime/Cameras/CBallCamera.s
+1 -1
View File
@@ -2448,7 +2448,7 @@ lbl_80082814:
/* 80082914 0007F874 4B FD 05 79 */ bl SetTranslation__6CActorFRC9CVector3f
/* 80082918 0007F878 7F C3 F3 78 */ mr r3, r30
/* 8008291C 0007F87C 7F A4 EB 78 */ mr r4, r29
/* 80082920 0007F880 4B FC A3 D5 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80082920 0007F880 4B FC A3 D5 */ bl AddObject__13CStateManagerFP7CEntity
/* 80082924 0007F884 88 1D 00 F8 */ lbz r0, 0xf8(r29)
/* 80082928 0007F888 38 60 00 00 */ li r3, 0
/* 8008292C 0007F88C 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18
asm/MetroidPrime/Cameras/CCameraManager.s
+3 -3
View File
@@ -3446,7 +3446,7 @@ lbl_8000BF60:
/* 8000BF60 00008EC0 93 BE 00 7C */ stw r29, 0x7c(r30)
/* 8000BF64 00008EC4 7F E3 FB 78 */ mr r3, r31
/* 8000BF68 00008EC8 80 9E 00 7C */ lwz r4, 0x7c(r30)
/* 8000BF6C 00008ECC 48 04 0D 89 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8000BF6C 00008ECC 48 04 0D 89 */ bl AddObject__13CStateManagerFP7CEntity
/* 8000BF70 00008ED0 80 7F 08 4C */ lwz r3, 0x84c(r31)
/* 8000BF74 00008ED4 7F E5 FB 78 */ mr r5, r31
/* 8000BF78 00008ED8 38 80 00 00 */ li r4, 0
@@ -3492,7 +3492,7 @@ lbl_8000C014:
/* 8000C014 00008F74 93 BE 00 80 */ stw r29, 0x80(r30)
/* 8000C018 00008F78 7F E3 FB 78 */ mr r3, r31
/* 8000C01C 00008F7C 80 9E 00 80 */ lwz r4, 0x80(r30)
/* 8000C020 00008F80 48 04 0C D5 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8000C020 00008F80 48 04 0C D5 */ bl AddObject__13CStateManagerFP7CEntity
/* 8000C024 00008F84 7F E4 FB 78 */ mr r4, r31
/* 8000C028 00008F88 38 61 00 0C */ addi r3, r1, 0xc
/* 8000C02C 00008F8C 48 04 10 B1 */ bl AllocateUniqueId__13CStateManagerFv
@@ -3515,7 +3515,7 @@ lbl_8000C06C:
/* 8000C06C 00008FCC 90 1E 00 88 */ stw r0, 0x88(r30)
/* 8000C070 00008FD0 7F E3 FB 78 */ mr r3, r31
/* 8000C074 00008FD4 80 9E 00 88 */ lwz r4, 0x88(r30)
/* 8000C078 00008FD8 48 04 0C 7D */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8000C078 00008FD8 48 04 0C 7D */ bl AddObject__13CStateManagerFP7CEntity
/* 8000C07C 00008FDC E3 E1 00 C8 */ psq_l f31, 200(r1), 0, qr0
/* 8000C080 00008FE0 CB E1 00 C0 */ lfd f31, 0xc0(r1)
/* 8000C084 00008FE4 E3 C1 00 B8 */ psq_l f30, 184(r1), 0, qr0
asm/MetroidPrime/Enemies/CAtomicBeta.s
+1 -1
View File
@@ -994,7 +994,7 @@ lbl_80251538:
/* 802515B8 0024E518 7C 64 1B 78 */ mr r4, r3
lbl_802515BC:
/* 802515BC 0024E51C 7F A3 EB 78 */ mr r3, r29
/* 802515C0 0024E520 4B DF B7 35 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 802515C0 0024E520 4B DF B7 35 */ bl AddObject__13CStateManagerFP7CEntity
/* 802515C4 0024E524 3B DE 00 01 */ addi r30, r30, 1
/* 802515C8 0024E528 2C 1E 00 03 */ cmpwi r30, 3
/* 802515CC 0024E52C 41 80 FF 44 */ blt lbl_80251510
asm/MetroidPrime/Enemies/CBabygoth.s
+1 -1
View File
@@ -689,7 +689,7 @@ lbl_8021D938:
/* 8021D93C 0021A89C 41 82 00 80 */ beq lbl_8021D9BC
/* 8021D940 0021A8A0 7F 43 D3 78 */ mr r3, r26
/* 8021D944 0021A8A4 7F E4 FB 78 */ mr r4, r31
/* 8021D948 0021A8A8 4B E2 F3 AD */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8021D948 0021A8A8 4B E2 F3 AD */ bl AddObject__13CStateManagerFP7CEntity
/* 8021D94C 0021A8AC 57 C0 06 3F */ clrlwi. r0, r30, 0x18
/* 8021D950 0021A8B0 41 82 00 2C */ beq lbl_8021D97C
/* 8021D954 0021A8B4 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
asm/MetroidPrime/Enemies/CElitePirate.s
+3 -3
View File
@@ -1457,7 +1457,7 @@ lbl_80228338:
/* 8022833C 0022529C 41 82 00 58 */ beq lbl_80228394
/* 80228340 002252A0 7F C3 F3 78 */ mr r3, r30
/* 80228344 002252A4 7F E4 FB 78 */ mr r4, r31
/* 80228348 002252A8 4B E2 49 AD */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80228348 002252A8 4B E2 49 AD */ bl AddObject__13CStateManagerFP7CEntity
/* 8022834C 002252AC 81 5D 00 04 */ lwz r10, 4(r29)
/* 80228350 002252B0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha
/* 80228354 002252B4 C0 5D 00 60 */ lfs f2, 0x60(r29)
@@ -2164,7 +2164,7 @@ lbl_80228D6C:
/* 80228D70 00225CD0 41 82 00 10 */ beq lbl_80228D80
/* 80228D74 00225CD4 7F C3 F3 78 */ mr r3, r30
/* 80228D78 00225CD8 7F 64 DB 78 */ mr r4, r27
/* 80228D7C 00225CDC 4B E2 3F 79 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80228D7C 00225CDC 4B E2 3F 79 */ bl AddObject__13CStateManagerFP7CEntity
lbl_80228D80:
/* 80228D80 00225CE0 38 61 01 A0 */ addi r3, r1, 0x1a0
/* 80228D84 00225CE4 38 80 FF FF */ li r4, -1
@@ -6155,7 +6155,7 @@ lbl_8022C6D0:
/* 8022C6D4 00229634 41 82 00 10 */ beq lbl_8022C6E4
/* 8022C6D8 00229638 7F A3 EB 78 */ mr r3, r29
/* 8022C6DC 0022963C 7F 64 DB 78 */ mr r4, r27
/* 8022C6E0 00229640 4B E2 06 15 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8022C6E0 00229640 4B E2 06 15 */ bl AddObject__13CStateManagerFP7CEntity
lbl_8022C6E4:
/* 8022C6E4 00229644 38 C0 00 01 */ li r6, 1
/* 8022C6E8 00229648 48 00 00 C0 */ b lbl_8022C7A8
asm/MetroidPrime/Enemies/CFireFlea.s
+1 -1
View File
@@ -604,7 +604,7 @@ lbl_80142D70:
lbl_80142DF4:
/* 80142DF4 0013FD54 7F C3 F3 78 */ mr r3, r30
/* 80142DF8 0013FD58 7F E4 FB 78 */ mr r4, r31
/* 80142DFC 0013FD5C 4B F0 9E F9 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80142DFC 0013FD5C 4B F0 9E F9 */ bl AddObject__13CStateManagerFP7CEntity
/* 80142E00 0013FD60 38 61 00 1C */ addi r3, r1, 0x1c
/* 80142E04 0013FD64 48 1F AC DD */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv"
lbl_80142E08:
asm/MetroidPrime/Enemies/CFlaahgra.s
+3 -3
View File
@@ -1085,7 +1085,7 @@ lbl_801ADE50:
/* 801ADE58 001AADB8 41 82 00 10 */ beq lbl_801ADE68
/* 801ADE5C 001AADBC 7F E3 FB 78 */ mr r3, r31
/* 801ADE60 001AADC0 7F 84 E3 78 */ mr r4, r28
/* 801ADE64 001AADC4 4B E9 EE 91 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 801ADE64 001AADC4 4B E9 EE 91 */ bl AddObject__13CStateManagerFP7CEntity
lbl_801ADE68:
/* 801ADE68 001AADC8 7F 63 DB 78 */ mr r3, r27
/* 801ADE6C 001AADCC BB 61 00 4C */ lmw r27, 0x4c(r1)
@@ -6415,7 +6415,7 @@ lbl_801B2A90:
lbl_801B2AA4:
/* 801B2AA4 001AFA04 7F 83 E3 78 */ mr r3, r28
/* 801B2AA8 001AFA08 7F 44 D3 78 */ mr r4, r26
/* 801B2AAC 001AFA0C 4B E9 A2 49 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 801B2AAC 001AFA0C 4B E9 A2 49 */ bl AddObject__13CStateManagerFP7CEntity
/* 801B2AB0 001AFA10 80 1B 00 04 */ lwz r0, 4(r27)
/* 801B2AB4 001AFA14 7F 83 E3 78 */ mr r3, r28
/* 801B2AB8 001AFA18 7F 44 D3 78 */ mr r4, r26
@@ -6644,7 +6644,7 @@ lbl_801B2CE4:
lbl_801B2DBC:
/* 801B2DBC 001AFD1C 7F C3 F3 78 */ mr r3, r30
/* 801B2DC0 001AFD20 7F 64 DB 78 */ mr r4, r27
/* 801B2DC4 001AFD24 4B E9 9F 31 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 801B2DC4 001AFD24 4B E9 9F 31 */ bl AddObject__13CStateManagerFP7CEntity
/* 801B2DC8 001AFD28 7F 20 07 75 */ extsb. r0, r25
/* 801B2DCC 001AFD2C 41 82 00 0C */ beq lbl_801B2DD8
/* 801B2DD0 001AFD30 38 61 00 B4 */ addi r3, r1, 0xb4
asm/MetroidPrime/Enemies/CFlaahgraPlants.s
+1 -1
View File
@@ -216,7 +216,7 @@ lbl_8020853C:
/* 80208624 00205584 80 DF 00 6C */ lwz r6, 0x6c(r31)
/* 80208628 00205588 7C C0 03 78 */ or r0, r6, r0
/* 8020862C 0020558C 90 1F 00 6C */ stw r0, 0x6c(r31)
/* 80208630 00205590 4B E4 46 C5 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80208630 00205590 4B E4 46 C5 */ bl AddObject__13CStateManagerFP7CEntity
/* 80208634 00205594 80 1D 00 04 */ lwz r0, 4(r29)
/* 80208638 00205598 7F C3 F3 78 */ mr r3, r30
/* 8020863C 0020559C 7F E4 FB 78 */ mr r4, r31
asm/MetroidPrime/Enemies/CFlyingPirate.s
+1 -1
View File
@@ -5561,7 +5561,7 @@ lbl_801F89A4:
/* 801F89A8 001F5908 41 82 00 C0 */ beq lbl_801F8A68
/* 801F89AC 001F590C 7F 23 CB 78 */ mr r3, r25
/* 801F89B0 001F5910 7F C4 F3 78 */ mr r4, r30
/* 801F89B4 001F5914 4B E5 43 41 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 801F89B4 001F5914 4B E5 43 41 */ bl AddObject__13CStateManagerFP7CEntity
/* 801F89B8 001F5918 88 18 06 A1 */ lbz r0, 0x6a1(r24)
/* 801F89BC 001F591C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f
/* 801F89C0 001F5920 40 82 00 A8 */ bne lbl_801F8A68
asm/MetroidPrime/Enemies/CGrenadeLauncher.s
+2 -2
View File
@@ -333,7 +333,7 @@ lbl_8022F8D0:
/* 8022F8D4 0022C834 41 82 00 34 */ beq lbl_8022F908
/* 8022F8D8 0022C838 7F E3 FB 78 */ mr r3, r31
/* 8022F8DC 0022C83C 7F A4 EB 78 */ mr r4, r29
/* 8022F8E0 0022C840 4B E1 D4 15 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8022F8E0 0022C840 4B E1 D4 15 */ bl AddObject__13CStateManagerFP7CEntity
/* 8022F8E4 0022C844 A0 9E 03 14 */ lhz r4, 0x314(r30)
/* 8022F8E8 0022C848 38 61 00 28 */ addi r3, r1, 0x28
/* 8022F8EC 0022C84C 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
@@ -1074,7 +1074,7 @@ lbl_802303B4:
/* 802303B8 0022D318 41 82 00 10 */ beq lbl_802303C8
/* 802303BC 0022D31C 7F E3 FB 78 */ mr r3, r31
/* 802303C0 0022D320 7F 84 E3 78 */ mr r4, r28
/* 802303C4 0022D324 4B E1 C9 31 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 802303C4 0022D324 4B E1 C9 31 */ bl AddObject__13CStateManagerFP7CEntity
lbl_802303C8:
/* 802303C8 0022D328 34 A1 02 84 */ addic. r5, r1, 0x284
/* 802303CC 0022D32C 41 82 00 58 */ beq lbl_80230424
asm/MetroidPrime/Enemies/CMetroid.s
+1 -1
View File
@@ -2022,7 +2022,7 @@ lbl_8016B760:
/* 8016B764 001686C4 41 82 00 88 */ beq lbl_8016B7EC
/* 8016B768 001686C8 7F A3 EB 78 */ mr r3, r29
/* 8016B76C 001686CC 7F E4 FB 78 */ mr r4, r31
/* 8016B770 001686D0 4B EE 15 85 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8016B770 001686D0 4B EE 15 85 */ bl AddObject__13CStateManagerFP7CEntity
/* 8016B774 001686D4 7F 83 E3 78 */ mr r3, r28
/* 8016B778 001686D8 7F E4 FB 78 */ mr r4, r31
/* 8016B77C 001686DC 48 00 0C 2D */ bl sub_8016c3a8
asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s
+1 -1
View File
@@ -1228,7 +1228,7 @@ lbl_8027D6DC:
/* 8027D6E0 0027A640 41 82 00 10 */ beq lbl_8027D6F0
/* 8027D6E4 0027A644 7F A3 EB 78 */ mr r3, r29
/* 8027D6E8 0027A648 7F 84 E3 78 */ mr r4, r28
/* 8027D6EC 0027A64C 4B DC F6 09 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8027D6EC 0027A64C 4B DC F6 09 */ bl AddObject__13CStateManagerFP7CEntity
lbl_8027D6F0:
/* 8027D6F0 0027A650 BB 21 00 F4 */ lmw r25, 0xf4(r1)
/* 8027D6F4 0027A654 80 01 01 14 */ lwz r0, 0x114(r1)
asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
+5 -5
View File
@@ -4198,7 +4198,7 @@ lbl_802741FC:
lbl_80274210:
/* 80274210 00271170 7F E3 FB 78 */ mr r3, r31
/* 80274214 00271174 7F C4 F3 78 */ mr r4, r30
/* 80274218 00271178 4B DD 8A DD */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80274218 00271178 4B DD 8A DD */ bl AddObject__13CStateManagerFP7CEntity
/* 8027421C 0027117C BB 61 00 5C */ lmw r27, 0x5c(r1)
/* 80274220 00271180 80 01 00 74 */ lwz r0, 0x74(r1)
/* 80274224 00271184 7C 08 03 A6 */ mtlr r0
@@ -4471,7 +4471,7 @@ lbl_802745F4:
lbl_80274604:
/* 80274604 00271564 7F C3 F3 78 */ mr r3, r30
/* 80274608 00271568 7F E4 FB 78 */ mr r4, r31
/* 8027460C 0027156C 4B DD 86 E9 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8027460C 0027156C 4B DD 86 E9 */ bl AddObject__13CStateManagerFP7CEntity
/* 80274610 00271570 88 1F 01 04 */ lbz r0, 0x104(r31)
/* 80274614 00271574 38 60 00 01 */ li r3, 1
/* 80274618 00271578 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b
@@ -10491,7 +10491,7 @@ lbl_80279CDC:
/* 80279CE0 00276C40 7F C3 F3 78 */ mr r3, r30
/* 80279CE4 00276C44 98 1B 01 92 */ stb r0, 0x192(r27)
/* 80279CE8 00276C48 7F 64 DB 78 */ mr r4, r27
/* 80279CEC 00276C4C 4B DD 30 09 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80279CEC 00276C4C 4B DD 30 09 */ bl AddObject__13CStateManagerFP7CEntity
/* 80279CF0 00276C50 48 00 05 C4 */ b lbl_8027A2B4
lbl_80279CF4:
/* 80279CF4 00276C54 80 7F 0E B0 */ lwz r3, 0xeb0(r31)
@@ -10659,7 +10659,7 @@ lbl_80279F6C:
/* 80279F70 00276ED0 41 82 03 44 */ beq lbl_8027A2B4
/* 80279F74 00276ED4 7F C3 F3 78 */ mr r3, r30
/* 80279F78 00276ED8 7E C4 B3 78 */ mr r4, r22
/* 80279F7C 00276EDC 4B DD 2D 79 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 80279F7C 00276EDC 4B DD 2D 79 */ bl AddObject__13CStateManagerFP7CEntity
/* 80279F80 00276EE0 80 7E 09 00 */ lwz r3, 0x900(r30)
/* 80279F84 00276EE4 3A B6 01 70 */ addi r21, r22, 0x170
/* 80279F88 00276EE8 C0 22 BC E8 */ lfs f1, lbl_805ADA08@sda21(r2)
@@ -10843,7 +10843,7 @@ lbl_8027A23C:
/* 8027A240 002771A0 41 82 00 74 */ beq lbl_8027A2B4
/* 8027A244 002771A4 7F C3 F3 78 */ mr r3, r30
/* 8027A248 002771A8 7F 44 D3 78 */ mr r4, r26
/* 8027A24C 002771AC 4B DD 2A A9 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 8027A24C 002771AC 4B DD 2A A9 */ bl AddObject__13CStateManagerFP7CEntity
/* 8027A250 002771B0 80 7E 09 00 */ lwz r3, 0x900(r30)
/* 8027A254 002771B4 3A BA 01 70 */ addi r21, r26, 0x170
/* 8027A258 002771B8 C0 22 BC E8 */ lfs f1, lbl_805ADA08@sda21(r2)
asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s
+1 -1
View File
@@ -256,7 +256,7 @@ lbl_802A0664:
/* 802A0664 0029D5C4 28 04 00 00 */ cmplwi r4, 0
/* 802A0668 0029D5C8 41 82 00 0C */ beq lbl_802A0674
/* 802A066C 0029D5CC 7F A3 EB 78 */ mr r3, r29
/* 802A0670 0029D5D0 4B DA C6 85 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence
/* 802A0670 0029D5D0 4B DA C6 85 */ bl AddObject__13CStateManagerFP7CEntity
lbl_802A0674:
/* 802A0674 0029D5D4 7F C3 F3 78 */ mr r3, r30
/* 802A0678 0029D5D8 BA E1 01 1C */ lmw r23, 0x11c(r1)

Some files were not shown because too many files have changed in this diff Show More