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

Rename static vulnerabilities in CDamageVulnerability.s

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-02 00:55:31 +03:00
parent 893a0ce9f6
commit c261ee7bb9
No known key found for this signature in database
GPG Key ID: E224F951761145F8
24 changed files with 103 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/MetroidPrime/CActor.s
View File

@ -1949,8 +1949,8 @@ GetDamageVulnerability__6CActorCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
.global GetDamageVulnerability__6CActorCFv
GetDamageVulnerability__6CActorCFv:
/* 80054444 000513A4 3C 60 80 57 */ lis r3, lbl_8056D578@ha
/* 80054448 000513A8 38 63 D5 78 */ addi r3, r3, lbl_8056D578@l
/* 80054444 000513A4 3C 60 80 57 */ lis r3, sNormalVulnerability__20CDamageVulnerability@ha
/* 80054448 000513A8 38 63 D5 78 */ addi r3, r3, sNormalVulnerability__20CDamageVulnerability@l
/* 8005444C 000513AC 4E 80 00 20 */ blr
.global HealthInfo__6CActorFR13CStateManager

12
asm/MetroidPrime/CCollisionActor.s
View File

@ -1189,13 +1189,13 @@ lbl_801A9708:
/* 801A9710 001A6670 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l
/* 801A9714 001A6674 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2)
/* 801A9718 001A6678 D3 FB 02 88 */ stfs f31, 0x288(r27)
/* 801A971C 001A667C 3C 80 80 57 */ lis r4, lbl_8056D578@ha
/* 801A971C 001A667C 3C 80 80 57 */ lis r4, sNormalVulnerability__20CDamageVulnerability@ha
/* 801A9720 001A6680 38 00 00 10 */ li r0, 0x10
/* 801A9724 001A6684 C0 22 A8 20 */ lfs f1, lbl_805AC540@sda21(r2)
/* 801A9728 001A6688 D0 1B 02 8C */ stfs f0, 0x28c(r27)
/* 801A972C 001A668C 7F 63 DB 78 */ mr r3, r27
/* 801A9730 001A6690 D0 1B 02 90 */ stfs f0, 0x290(r27)
/* 801A9734 001A6694 84 E4 D5 78 */ lwzu r7, lbl_8056D578@l(r4)
/* 801A9734 001A6694 84 E4 D5 78 */ lwzu r7, sNormalVulnerability__20CDamageVulnerability@l(r4)
/* 801A9738 001A6698 80 C4 00 04 */ lwz r6, 4(r4)
/* 801A973C 001A669C 90 FB 02 94 */ stw r7, 0x294(r27)
/* 801A9740 001A66A0 90 DB 02 98 */ stw r6, 0x298(r27)
@ -1510,14 +1510,14 @@ lbl_801A9BEC:
/* 801A9BF8 001A6B58 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2)
/* 801A9BFC 001A6B5C 90 1A 02 84 */ stw r0, 0x284(r26)
/* 801A9C00 001A6B60 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l
/* 801A9C04 001A6B64 3C 80 80 57 */ lis r4, lbl_8056D578@ha
/* 801A9C04 001A6B64 3C 80 80 57 */ lis r4, sNormalVulnerability__20CDamageVulnerability@ha
/* 801A9C08 001A6B68 38 00 00 10 */ li r0, 0x10
/* 801A9C0C 001A6B6C D0 1A 02 88 */ stfs f0, 0x288(r26)
/* 801A9C10 001A6B70 7F 43 D3 78 */ mr r3, r26
/* 801A9C14 001A6B74 C0 22 A8 20 */ lfs f1, lbl_805AC540@sda21(r2)
/* 801A9C18 001A6B78 D0 1A 02 8C */ stfs f0, 0x28c(r26)
/* 801A9C1C 001A6B7C D0 1A 02 90 */ stfs f0, 0x290(r26)
/* 801A9C20 001A6B80 84 E4 D5 78 */ lwzu r7, lbl_8056D578@l(r4)
/* 801A9C20 001A6B80 84 E4 D5 78 */ lwzu r7, sNormalVulnerability__20CDamageVulnerability@l(r4)
/* 801A9C24 001A6B84 80 C4 00 04 */ lwz r6, 4(r4)
/* 801A9C28 001A6B88 90 FA 02 94 */ stw r7, 0x294(r26)
/* 801A9C2C 001A6B8C 90 DA 02 98 */ stw r6, 0x298(r26)
@ -1775,7 +1775,7 @@ lbl_801A9FFC:
/* 801A9FFC 001A6F5C 90 1F 02 7C */ stw r0, 0x27c(r31)
/* 801AA000 001A6F60 38 A0 00 00 */ li r5, 0
/* 801AA004 001A6F64 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2)
/* 801AA008 001A6F68 3C 80 80 57 */ lis r4, lbl_8056D578@ha
/* 801AA008 001A6F68 3C 80 80 57 */ lis r4, sNormalVulnerability__20CDamageVulnerability@ha
/* 801AA00C 001A6F6C 90 BF 02 80 */ stw r5, 0x280(r31)
/* 801AA010 001A6F70 38 00 00 10 */ li r0, 0x10
/* 801AA014 001A6F74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
@ -1786,7 +1786,7 @@ lbl_801A9FFC:
/* 801AA028 001A6F88 D0 1F 02 88 */ stfs f0, 0x288(r31)
/* 801AA02C 001A6F8C D0 1F 02 8C */ stfs f0, 0x28c(r31)
/* 801AA030 001A6F90 D0 1F 02 90 */ stfs f0, 0x290(r31)
/* 801AA034 001A6F94 84 E4 D5 78 */ lwzu r7, lbl_8056D578@l(r4)
/* 801AA034 001A6F94 84 E4 D5 78 */ lwzu r7, sNormalVulnerability__20CDamageVulnerability@l(r4)
/* 801AA038 001A6F98 80 C4 00 04 */ lwz r6, 4(r4)
/* 801AA03C 001A6F9C 90 FF 02 94 */ stw r7, 0x294(r31)
/* 801AA040 001A6FA0 90 DF 02 98 */ stw r6, 0x298(r31)

28
asm/MetroidPrime/CDamageVulnerability.s
View File

@ -7,10 +7,10 @@ lbl_ctor:
.section .bss, "wa"
.balign 8
.comm lbl_8056D578, 0x1A0, 4
.comm lbl_8056D718, 0x68, 4
.comm lbl_8056D780, 0x68, 4
.comm lbl_8056D7E8, 0x68, 4
.comm sNormalVulnerability__20CDamageVulnerability, 0x1A0, 4
.comm sImmuneVulnerability__20CDamageVulnerability, 0x68, 4
.comm sReflectVulnerability__20CDamageVulnerability, 0x68, 4
.comm sPassThroughVulnerability__20CDamageVulnerability, 0x68, 4
.section .text, "ax"
@ -534,13 +534,13 @@ lbl_80102B1C:
__ct__20CDamageVulnerabilityFR12CInputStream:
/* 80102B58 000FFAB8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80102B5C 000FFABC 7C 08 02 A6 */ mflr r0
/* 80102B60 000FFAC0 3C A0 80 57 */ lis r5, lbl_8056D718@ha
/* 80102B60 000FFAC0 3C A0 80 57 */ lis r5, sImmuneVulnerability__20CDamageVulnerability@ha
/* 80102B64 000FFAC4 90 01 00 24 */ stw r0, 0x24(r1)
/* 80102B68 000FFAC8 BF 61 00 0C */ stmw r27, 0xc(r1)
/* 80102B6C 000FFACC 7C 9F 23 78 */ mr r31, r4
/* 80102B70 000FFAD0 7C 7E 1B 78 */ mr r30, r3
/* 80102B74 000FFAD4 7F E3 FB 78 */ mr r3, r31
/* 80102B78 000FFAD8 84 85 D7 18 */ lwzu r4, lbl_8056D718@l(r5)
/* 80102B78 000FFAD8 84 85 D7 18 */ lwzu r4, sImmuneVulnerability__20CDamageVulnerability@l(r5)
/* 80102B7C 000FFADC 80 05 00 04 */ lwz r0, 4(r5)
/* 80102B80 000FFAE0 90 9E 00 00 */ stw r4, 0(r30)
/* 80102B84 000FFAE4 90 1E 00 04 */ stw r0, 4(r30)
@ -648,11 +648,11 @@ lbl_80102CF0:
.global __sinit_CDamageVulnerability_cpp
__sinit_CDamageVulnerability_cpp:
/* 80102D08 000FFC68 3C 60 80 57 */ lis r3, lbl_8056D578@ha
/* 80102D08 000FFC68 3C 60 80 57 */ lis r3, sNormalVulnerability__20CDamageVulnerability@ha
/* 80102D0C 000FFC6C 94 21 FE 50 */ stwu r1, -0x1b0(r1)
/* 80102D10 000FFC70 39 60 00 01 */ li r11, 1
/* 80102D14 000FFC74 39 40 00 00 */ li r10, 0
/* 80102D18 000FFC78 38 C3 D5 78 */ addi r6, r3, lbl_8056D578@l
/* 80102D18 000FFC78 38 C3 D5 78 */ addi r6, r3, sNormalVulnerability__20CDamageVulnerability@l
/* 80102D1C 000FFC7C 91 61 01 40 */ stw r11, 0x140(r1)
/* 80102D20 000FFC80 91 61 01 44 */ stw r11, 0x144(r1)
/* 80102D24 000FFC84 91 61 01 48 */ stw r11, 0x148(r1)
@ -701,10 +701,10 @@ __sinit_CDamageVulnerability_cpp:
/* 80102DD0 000FFD30 91 66 00 54 */ stw r11, 0x54(r6)
/* 80102DD4 000FFD34 91 66 00 58 */ stw r11, 0x58(r6)
/* 80102DD8 000FFD38 80 81 01 A0 */ lwz r4, 0x1a0(r1)
/* 80102DDC 000FFD3C 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 80102DDC 000FFD3C 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 80102DE0 000FFD40 39 20 00 02 */ li r9, 2
/* 80102DE4 000FFD44 80 01 01 A4 */ lwz r0, 0x1a4(r1)
/* 80102DE8 000FFD48 38 A3 D7 18 */ addi r5, r3, lbl_8056D718@l
/* 80102DE8 000FFD48 38 A3 D7 18 */ addi r5, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 80102DEC 000FFD4C 91 46 00 5C */ stw r10, 0x5c(r6)
/* 80102DF0 000FFD50 90 86 00 60 */ stw r4, 0x60(r6)
/* 80102DF4 000FFD54 90 06 00 64 */ stw r0, 0x64(r6)
@ -752,8 +752,8 @@ __sinit_CDamageVulnerability_cpp:
/* 80102E9C 000FFDFC 91 25 00 44 */ stw r9, 0x44(r5)
/* 80102EA0 000FFE00 91 25 00 48 */ stw r9, 0x48(r5)
/* 80102EA4 000FFE04 80 81 01 38 */ lwz r4, 0x138(r1)
/* 80102EA8 000FFE08 3C 60 80 57 */ lis r3, lbl_8056D780@ha
/* 80102EAC 000FFE0C 39 03 D7 80 */ addi r8, r3, lbl_8056D780@l
/* 80102EA8 000FFE08 3C 60 80 57 */ lis r3, sReflectVulnerability__20CDamageVulnerability@ha
/* 80102EAC 000FFE0C 39 03 D7 80 */ addi r8, r3, sReflectVulnerability__20CDamageVulnerability@l
/* 80102EB0 000FFE10 80 01 01 3C */ lwz r0, 0x13c(r1)
/* 80102EB4 000FFE14 91 25 00 4C */ stw r9, 0x4c(r5)
/* 80102EB8 000FFE18 91 25 00 50 */ stw r9, 0x50(r5)
@ -802,10 +802,10 @@ __sinit_CDamageVulnerability_cpp:
/* 80102F64 000FFEC4 91 28 00 34 */ stw r9, 0x34(r8)
/* 80102F68 000FFEC8 91 28 00 38 */ stw r9, 0x38(r8)
/* 80102F6C 000FFECC 80 E1 00 D0 */ lwz r7, 0xd0(r1)
/* 80102F70 000FFED0 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 80102F70 000FFED0 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 80102F74 000FFED4 38 A0 00 04 */ li r5, 4
/* 80102F78 000FFED8 80 C1 00 D4 */ lwz r6, 0xd4(r1)
/* 80102F7C 000FFEDC 38 83 D7 E8 */ addi r4, r3, lbl_8056D7E8@l
/* 80102F7C 000FFEDC 38 83 D7 E8 */ addi r4, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 80102F80 000FFEE0 80 61 00 68 */ lwz r3, 0x68(r1)
/* 80102F84 000FFEE4 80 01 00 6C */ lwz r0, 0x6c(r1)
/* 80102F88 000FFEE8 91 28 00 3C */ stw r9, 0x3c(r8)

8
asm/MetroidPrime/Enemies/CBabygoth.s
View File

@ -6295,14 +6295,14 @@ lbl_802229EC:
.global GetDamageVulnerability__9CBabygothCFRC9CVector3fRC9CVector3fRC11CDamageInfo
GetDamageVulnerability__9CBabygothCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
/* 802229F4 0021F954 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 802229F8 0021F958 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 802229F4 0021F954 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 802229F8 0021F958 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 802229FC 0021F95C 4E 80 00 20 */ blr
.global GetDamageVulnerability__9CBabygothCFv
GetDamageVulnerability__9CBabygothCFv:
/* 80222A00 0021F960 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 80222A04 0021F964 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 80222A00 0021F960 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 80222A04 0021F964 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 80222A08 0021F968 4E 80 00 20 */ blr
.global TakeDamage__9CBabygothFRC9CVector3ff

8
asm/MetroidPrime/Enemies/CBeetle.s
View File

@ -1476,8 +1476,8 @@ GetDamageVulnerability__7CBeetleCFv:
/* 800E3DFC 000E0D5C 88 03 08 38 */ lbz r0, 0x838(r3)
/* 800E3E00 000E0D60 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f
/* 800E3E04 000E0D64 41 82 00 10 */ beq lbl_800E3E14
/* 800E3E08 000E0D68 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 800E3E0C 000E0D6C 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 800E3E08 000E0D68 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 800E3E0C 000E0D6C 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 800E3E10 000E0D70 48 00 00 38 */ b lbl_800E3E48
lbl_800E3E14:
/* 800E3E14 000E0D74 80 03 03 FC */ lwz r0, 0x3fc(r3)
@ -1515,8 +1515,8 @@ GetDamageVulnerability__7CBeetleCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
/* 800E3E7C 000E0DDC 88 03 08 38 */ lbz r0, 0x838(r3)
/* 800E3E80 000E0DE0 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f
/* 800E3E84 000E0DE4 41 82 00 10 */ beq lbl_800E3E94
/* 800E3E88 000E0DE8 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 800E3E8C 000E0DEC 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 800E3E88 000E0DE8 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 800E3E8C 000E0DEC 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 800E3E90 000E0DF0 48 00 00 F8 */ b lbl_800E3F88
lbl_800E3E94:
/* 800E3E94 000E0DF4 80 1D 03 FC */ lwz r0, 0x3fc(r29)

4
asm/MetroidPrime/Enemies/CChozoGhost.s
View File

@ -3175,8 +3175,8 @@ GetDamageVulnerability__11CChozoGhostCFv:
/* 80141B50 0013EAB0 88 03 06 65 */ lbz r0, 0x665(r3)
/* 80141B54 0013EAB4 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f
/* 80141B58 0013EAB8 41 82 00 10 */ beq lbl_80141B68
/* 80141B5C 0013EABC 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 80141B60 0013EAC0 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 80141B5C 0013EABC 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 80141B60 0013EAC0 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 80141B64 0013EAC4 48 00 00 08 */ b lbl_80141B6C
lbl_80141B68:
/* 80141B68 0013EAC8 4B F6 12 09 */ bl GetDamageVulnerability__3CAiCFv

4
asm/MetroidPrime/Enemies/CDrone.s
View File

@ -7593,8 +7593,8 @@ GetDamageVulnerability__6CDroneCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
/* 80165530 00162490 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80165534 00162494 41 82 00 18 */ beq lbl_8016554C
/* 80165538 00162498 C0 02 9F 7C */ lfs f0, lbl_805ABC9C@sda21(r2)
/* 8016553C 0016249C 3C 60 80 57 */ lis r3, lbl_8056D780@ha
/* 80165540 001624A0 38 63 D7 80 */ addi r3, r3, lbl_8056D780@l
/* 8016553C 0016249C 3C 60 80 57 */ lis r3, sReflectVulnerability__20CDamageVulnerability@ha
/* 80165540 001624A0 38 63 D7 80 */ addi r3, r3, sReflectVulnerability__20CDamageVulnerability@l
/* 80165544 001624A4 D0 1F 05 E8 */ stfs f0, 0x5e8(r31)
/* 80165548 001624A8 48 00 00 0C */ b lbl_80165554
lbl_8016554C:

16
asm/MetroidPrime/Enemies/CElitePirate.s
View File

@ -2913,12 +2913,12 @@ lbl_802297FC:
sub_80229818:
/* 80229818 00226778 94 21 FF 00 */ stwu r1, -0x100(r1)
/* 8022981C 0022677C 7C 08 02 A6 */ mflr r0
/* 80229820 00226780 3C A0 80 57 */ lis r5, lbl_8056D780@ha
/* 80229820 00226780 3C A0 80 57 */ lis r5, sReflectVulnerability__20CDamageVulnerability@ha
/* 80229824 00226784 90 01 01 04 */ stw r0, 0x104(r1)
/* 80229828 00226788 BD C1 00 B8 */ stmw r14, 0xb8(r1)
/* 8022982C 0022678C 7C 9F 23 78 */ mr r31, r4
/* 80229830 00226790 7C 7E 1B 78 */ mr r30, r3
/* 80229834 00226794 85 E5 D7 80 */ lwzu r15, lbl_8056D780@l(r5)
/* 80229834 00226794 85 E5 D7 80 */ lwzu r15, sReflectVulnerability__20CDamageVulnerability@l(r5)
/* 80229838 00226798 82 05 00 04 */ lwz r16, 4(r5)
/* 8022983C 0022679C 82 25 00 08 */ lwz r17, 8(r5)
/* 80229840 002267A0 82 45 00 0C */ lwz r18, 0xc(r5)
@ -3623,8 +3623,8 @@ lbl_8022A22C:
/* 8022A274 002271D4 80 63 00 04 */ lwz r3, 4(r3)
/* 8022A278 002271D8 28 03 00 00 */ cmplwi r3, 0
/* 8022A27C 002271DC 41 82 00 10 */ beq lbl_8022A28C
/* 8022A280 002271E0 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 8022A284 002271E4 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 8022A280 002271E0 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 8022A284 002271E4 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 8022A288 002271E8 4B F7 E9 11 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
lbl_8022A28C:
/* 8022A28C 002271EC 80 7D 05 D4 */ lwz r3, 0x5d4(r29)
@ -6243,14 +6243,14 @@ lbl_8022C7C8:
.global GetDamageVulnerability__12CElitePirateCFRC9CVector3fRC9CVector3fRC11CDamageInfo
GetDamageVulnerability__12CElitePirateCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
/* 8022C7F4 00229754 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 8022C7F8 00229758 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 8022C7F4 00229754 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 8022C7F8 00229758 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 8022C7FC 0022975C 4E 80 00 20 */ blr
.global GetDamageVulnerability__12CElitePirateCFv
GetDamageVulnerability__12CElitePirateCFv:
/* 8022C800 00229760 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 8022C804 00229764 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 8022C800 00229760 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 8022C804 00229764 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 8022C808 00229768 4E 80 00 20 */ blr
.global TakeDamage__12CElitePirateFRC9CVector3ff

20
asm/MetroidPrime/Enemies/CIceSheegoth.s
View File

@ -881,8 +881,8 @@ sub_8019e9cc:
/* 8019E9F8 0019B958 38 7C 05 84 */ addi r3, r28, 0x584
/* 8019E9FC 0019B95C 48 00 00 0C */ b lbl_8019EA08
lbl_8019EA00:
/* 8019EA00 0019B960 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 8019EA04 0019B964 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l
/* 8019EA00 0019B960 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 8019EA04 0019B964 38 63 D7 18 */ addi r3, r3, sImmuneVulnerability__20CDamageVulnerability@l
lbl_8019EA08:
/* 8019EA08 0019B968 80 83 00 00 */ lwz r4, 0(r3)
/* 8019EA0C 0019B96C 3B FC 0B 00 */ addi r31, r28, 0xb00
@ -2554,9 +2554,9 @@ lbl_801A01D4:
/* 801A0208 0019D168 83 03 00 04 */ lwz r24, 4(r3)
/* 801A020C 0019D16C 28 18 00 00 */ cmplwi r24, 0
/* 801A0210 0019D170 41 82 01 88 */ beq lbl_801A0398
/* 801A0214 0019D174 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 801A0214 0019D174 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 801A0218 0019D178 7F 03 C3 78 */ mr r3, r24
/* 801A021C 0019D17C 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 801A021C 0019D17C 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 801A0220 0019D180 48 00 89 79 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
/* 801A0224 0019D184 80 82 A7 40 */ lwz r4, lbl_805AC460@sda21(r2)
/* 801A0228 0019D188 38 61 00 78 */ addi r3, r1, 0x78
@ -2587,9 +2587,9 @@ lbl_801A0268:
/* 801A0288 0019D1E8 48 19 D8 59 */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv"
/* 801A028C 0019D1EC 56 E0 06 3F */ clrlwi. r0, r23, 0x18
/* 801A0290 0019D1F0 41 82 00 18 */ beq lbl_801A02A8
/* 801A0294 0019D1F4 3C 80 80 57 */ lis r4, lbl_8056D7E8@ha
/* 801A0294 0019D1F4 3C 80 80 57 */ lis r4, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 801A0298 0019D1F8 7F 03 C3 78 */ mr r3, r24
/* 801A029C 0019D1FC 38 84 D7 E8 */ addi r4, r4, lbl_8056D7E8@l
/* 801A029C 0019D1FC 38 84 D7 E8 */ addi r4, r4, sPassThroughVulnerability__20CDamageVulnerability@l
/* 801A02A0 0019D200 48 00 88 F9 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
/* 801A02A4 0019D204 48 00 00 F4 */ b lbl_801A0398
lbl_801A02A8:
@ -7024,14 +7024,14 @@ lbl_801A4288:
.global GetDamageVulnerability__12CIceSheegothCFRC9CVector3fRC9CVector3fRC11CDamageInfo
GetDamageVulnerability__12CIceSheegothCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
/* 801A4298 001A11F8 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 801A429C 001A11FC 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 801A4298 001A11F8 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 801A429C 001A11FC 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 801A42A0 001A1200 4E 80 00 20 */ blr
.global GetDamageVulnerability__12CIceSheegothCFv
GetDamageVulnerability__12CIceSheegothCFv:
/* 801A42A4 001A1204 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha
/* 801A42A8 001A1208 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l
/* 801A42A4 001A1204 3C 60 80 57 */ lis r3, sPassThroughVulnerability__20CDamageVulnerability@ha
/* 801A42A8 001A1208 38 63 D7 E8 */ addi r3, r3, sPassThroughVulnerability__20CDamageVulnerability@l
/* 801A42AC 001A120C 4E 80 00 20 */ blr
.global GetAimPosition__12CIceSheegothCFRC13CStateManagerf

4
asm/MetroidPrime/Enemies/CJellyZap.s
View File

@ -815,8 +815,8 @@ GetDamageVulnerability__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
/* 801D8120 001D5080 48 00 00 71 */ bl sub801d8190__9CJellyZapFv
/* 801D8124 001D5084 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D8128 001D5088 41 82 00 10 */ beq lbl_801D8138
/* 801D812C 001D508C 3C 60 80 57 */ lis r3, lbl_8056D780@ha
/* 801D8130 001D5090 38 63 D7 80 */ addi r3, r3, lbl_8056D780@l
/* 801D812C 001D508C 3C 60 80 57 */ lis r3, sReflectVulnerability__20CDamageVulnerability@ha
/* 801D8130 001D5090 38 63 D7 80 */ addi r3, r3, sReflectVulnerability__20CDamageVulnerability@l
/* 801D8134 001D5094 48 00 00 0C */ b lbl_801D8140
lbl_801D8138:
/* 801D8138 001D5098 7F E3 FB 78 */ mr r3, r31

4
asm/MetroidPrime/Enemies/CMagdolite.s
View File

@ -2553,8 +2553,8 @@ GetDamageVulnerability__10CMagdoliteCFv:
/* 802365A0 00233500 4B E6 C7 D1 */ bl GetDamageVulnerability__3CAiCFv
/* 802365A4 00233504 48 00 00 0C */ b lbl_802365B0
lbl_802365A8:
/* 802365A8 00233508 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 802365AC 0023350C 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l
/* 802365A8 00233508 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 802365AC 0023350C 38 63 D7 18 */ addi r3, r3, sImmuneVulnerability__20CDamageVulnerability@l
lbl_802365B0:
/* 802365B0 00233510 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802365B4 00233514 7C 08 03 A6 */ mtlr r0

4
asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
View File

@ -8957,9 +8957,9 @@ lbl_8027861C:
/* 8027869C 002755FC 4B DD BC 19 */ bl AddMaterial__6CActorF14EMaterialTypes14EMaterialTypesR13CStateManager
/* 802786A0 00275600 48 00 00 48 */ b lbl_802786E8
lbl_802786A4:
/* 802786A4 00275604 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 802786A4 00275604 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 802786A8 00275608 7F 63 DB 78 */ mr r3, r27
/* 802786AC 0027560C 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 802786AC 0027560C 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 802786B0 00275610 4B F3 04 E9 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
/* 802786B4 00275614 A0 1D 00 08 */ lhz r0, 8(r29)
/* 802786B8 00275618 7F C6 F3 78 */ mr r6, r30

5
asm/MetroidPrime/Enemies/CNewIntroBoss.s
View File

@ -1153,8 +1153,8 @@ lbl_8018AB20:
/* 8018AB90 00187AF0 7D 89 03 A6 */ mtctr r12
/* 8018AB94 00187AF4 4E 80 04 21 */ bctrl
/* 8018AB98 00187AF8 C0 18 00 00 */ lfs f0, 0(r24)
/* 8018AB9C 00187AFC 3C 80 80 57 */ lis r4, lbl_8056D578@ha
/* 8018ABA0 00187B00 38 84 D5 78 */ addi r4, r4, lbl_8056D578@l
/* 8018AB9C 00187AFC 3C 80 80 57 */ lis r4, sNormalVulnerability__20CDamageVulnerability@ha
/* 8018ABA0 00187B00 38 84 D5 78 */ addi r4, r4, sNormalVulnerability__20CDamageVulnerability@l
/* 8018ABA4 00187B04 D0 03 00 00 */ stfs f0, 0(r3)
/* 8018ABA8 00187B08 C0 18 00 04 */ lfs f0, 4(r24)
/* 8018ABAC 00187B0C D0 03 00 04 */ stfs f0, 4(r3)
@ -3080,4 +3080,3 @@ lbl_803D08C4:
.byte 0x49, 0x6E, 0x74
.asciz "roBoss_Beam_Stage2"
.balign 4

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

@ -2588,9 +2588,9 @@ lbl_8028D1E0:
/* 8028D2DC 0028A23C 7F 65 DB 78 */ mr r5, r27
/* 8028D2E0 0028A240 38 80 00 12 */ li r4, 0x12
/* 8028D2E4 0028A244 4B DC 6C 9D */ bl RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager
/* 8028D2E8 0028A248 3C 80 80 57 */ lis r4, lbl_8056D780@ha
/* 8028D2E8 0028A248 3C 80 80 57 */ lis r4, sReflectVulnerability__20CDamageVulnerability@ha
/* 8028D2EC 0028A24C 7F 83 E3 78 */ mr r3, r28
/* 8028D2F0 0028A250 38 84 D7 80 */ addi r4, r4, lbl_8056D780@l
/* 8028D2F0 0028A250 38 84 D7 80 */ addi r4, r4, sReflectVulnerability__20CDamageVulnerability@l
/* 8028D2F4 0028A254 4B F1 B8 A5 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
lbl_8028D2F8:
/* 8028D2F8 0028A258 3B BD 00 01 */ addi r29, r29, 1
@ -4499,8 +4499,8 @@ lbl_8028ED78:
/* 8028ED8C 0028BCEC 4B DB D7 E9 */ bl ObjectById__13CStateManagerF9TUniqueId
/* 8028ED90 0028BCF0 7C 7A 1B 79 */ or. r26, r3, r3
/* 8028ED94 0028BCF4 41 82 00 9C */ beq lbl_8028EE30
/* 8028ED98 0028BCF8 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 8028ED9C 0028BCFC 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 8028ED98 0028BCF8 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 8028ED9C 0028BCFC 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 8028EDA0 0028BD00 4B E2 20 B5 */ bl sub_800b0e54
/* 8028EDA4 0028BD04 7F 43 D3 78 */ mr r3, r26
/* 8028EDA8 0028BD08 7F A5 EB 78 */ mr r5, r29
@ -8722,7 +8722,7 @@ lbl_8029186C:
/* 80291B64 0028EAC4 98 1F 0A DE */ stb r0, 0xade(r31)
/* 80291B68 0028EAC8 98 9F 0A DF */ stb r4, 0xadf(r31)
/* 80291B6C 0028EACC 98 9F 0A E0 */ stb r4, 0xae0(r31)
/* 80291B70 0028EAD0 84 A3 D5 78 */ lwzu r5, lbl_8056D578@l(r3)
/* 80291B70 0028EAD0 84 A3 D5 78 */ lwzu r5, sNormalVulnerability__20CDamageVulnerability@l(r3)
/* 80291B74 0028EAD4 80 83 00 04 */ lwz r4, 4(r3)
/* 80291B78 0028EAD8 90 BF 0A E4 */ stw r5, 0xae4(r31)
/* 80291B7C 0028EADC 90 9F 0A E8 */ stw r4, 0xae8(r31)

4
asm/MetroidPrime/Enemies/CParasite.s
View File

@ -764,8 +764,8 @@ lbl_8015702C:
/* 8015702C 00153F8C 88 03 07 43 */ lbz r0, 0x743(r3)
/* 80157030 00153F90 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f
/* 80157034 00153F94 40 82 00 10 */ bne lbl_80157044
/* 80157038 00153F98 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 8015703C 00153F9C 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l
/* 80157038 00153F98 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 8015703C 00153F9C 38 63 D7 18 */ addi r3, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 80157040 00153FA0 48 00 00 08 */ b lbl_80157048
lbl_80157044:
/* 80157044 00153FA4 4B F4 BD 2D */ bl GetDamageVulnerability__3CAiCFv

4
asm/MetroidPrime/Enemies/CPhazonHealingNodule.s
View File

@ -937,8 +937,8 @@ lbl_802956C4:
/* 802956CC 0029262C 81 8C 00 8C */ lwz r12, 0x8c(r12)
/* 802956D0 00292630 7D 89 03 A6 */ mtctr r12
/* 802956D4 00292634 4E 80 04 21 */ bctrl
/* 802956D8 00292638 3C A0 80 57 */ lis r5, lbl_8056D718@ha
/* 802956DC 0029263C 84 C5 D7 18 */ lwzu r6, lbl_8056D718@l(r5)
/* 802956D8 00292638 3C A0 80 57 */ lis r5, sImmuneVulnerability__20CDamageVulnerability@ha
/* 802956DC 0029263C 84 C5 D7 18 */ lwzu r6, sImmuneVulnerability__20CDamageVulnerability@l(r5)
/* 802956E0 00292640 38 80 00 00 */ li r4, 0
/* 802956E4 00292644 80 05 00 04 */ lwz r0, 4(r5)
/* 802956E8 00292648 90 C3 00 00 */ stw r6, 0(r3)

8
asm/MetroidPrime/Enemies/CPuddleToadGamma.s
View File

@ -1608,8 +1608,8 @@ GetDamageVulnerability__16CPuddleToadGammaCFRC9CVector3fRC9CVector3fRC11CDamageI
/* 8014C74C 001496AC 4B F5 66 25 */ bl GetDamageVulnerability__3CAiCFv
/* 8014C750 001496B0 48 00 00 0C */ b lbl_8014C75C
lbl_8014C754:
/* 8014C754 001496B4 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 8014C758 001496B8 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l
/* 8014C754 001496B4 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 8014C758 001496B8 38 63 D7 18 */ addi r3, r3, sImmuneVulnerability__20CDamageVulnerability@l
lbl_8014C75C:
/* 8014C75C 001496BC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8014C760 001496C0 7C 08 03 A6 */ mtlr r0
@ -1618,8 +1618,8 @@ lbl_8014C75C:
.global GetDamageVulnerability__16CPuddleToadGammaCFv
GetDamageVulnerability__16CPuddleToadGammaCFv:
/* 8014C76C 001496CC 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 8014C770 001496D0 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l
/* 8014C76C 001496CC 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 8014C770 001496D0 38 63 D7 18 */ addi r3, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 8014C774 001496D4 4E 80 00 20 */ blr
.global sub_8014c778

20
asm/MetroidPrime/Enemies/CRidley.s
View File

@ -6278,9 +6278,9 @@ lbl_8025767C:
/* 802576AC 0025460C 83 E3 00 04 */ lwz r31, 4(r3)
/* 802576B0 00254610 28 1F 00 00 */ cmplwi r31, 0
/* 802576B4 00254614 41 82 00 40 */ beq lbl_802576F4
/* 802576B8 00254618 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 802576B8 00254618 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 802576BC 0025461C 7F E3 FB 78 */ mr r3, r31
/* 802576C0 00254620 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 802576C0 00254620 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 802576C4 00254624 4B F5 14 D5 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
/* 802576C8 00254628 7F E3 FB 78 */ mr r3, r31
/* 802576CC 0025462C 7F A4 EB 78 */ mr r4, r29
@ -6346,8 +6346,8 @@ lbl_80257770:
/* 802577A4 00254704 28 1F 00 00 */ cmplwi r31, 0
/* 802577A8 00254708 41 82 00 50 */ beq lbl_802577F8
/* 802577AC 0025470C 28 1E 00 02 */ cmplwi r30, 2
/* 802577B0 00254710 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 802577B4 00254714 38 83 D7 18 */ addi r4, r3, lbl_8056D718@l
/* 802577B0 00254710 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 802577B4 00254714 38 83 D7 18 */ addi r4, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 802577B8 00254718 7F E3 FB 78 */ mr r3, r31
/* 802577BC 0025471C 40 82 00 0C */ bne lbl_802577C8
/* 802577C0 00254720 3C 80 80 57 */ lis r4, lbl_80572544@ha
@ -6419,8 +6419,8 @@ lbl_80257878:
/* 802578AC 0025480C 28 1F 00 00 */ cmplwi r31, 0
/* 802578B0 00254810 41 82 00 50 */ beq lbl_80257900
/* 802578B4 00254814 28 1E 00 03 */ cmplwi r30, 3
/* 802578B8 00254818 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 802578BC 0025481C 38 83 D7 18 */ addi r4, r3, lbl_8056D718@l
/* 802578B8 00254818 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 802578BC 0025481C 38 83 D7 18 */ addi r4, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 802578C0 00254820 7F E3 FB 78 */ mr r3, r31
/* 802578C4 00254824 40 82 00 0C */ bne lbl_802578D0
/* 802578C8 00254828 3C 80 80 57 */ lis r4, lbl_805725AC@ha
@ -6488,9 +6488,9 @@ lbl_80257974:
/* 802579A4 00254904 83 A3 00 04 */ lwz r29, 4(r3)
/* 802579A8 00254908 28 1D 00 00 */ cmplwi r29, 0
/* 802579AC 0025490C 41 82 00 94 */ beq lbl_80257A40
/* 802579B0 00254910 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 802579B0 00254910 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 802579B4 00254914 7F A3 EB 78 */ mr r3, r29
/* 802579B8 00254918 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 802579B8 00254918 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 802579BC 0025491C 4B F5 11 DD */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
/* 802579C0 00254920 7F A3 EB 78 */ mr r3, r29
/* 802579C4 00254924 7F E4 FB 78 */ mr r4, r31
@ -7058,8 +7058,8 @@ GetSortingBounds__7CRidleyCFRC13CStateManager:
.global GetDamageVulnerability__7CRidleyCFv
GetDamageVulnerability__7CRidleyCFv:
/* 80258204 00255164 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 80258208 00255168 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l
/* 80258204 00255164 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 80258208 00255168 38 63 D7 18 */ addi r3, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 8025820C 0025516C 4E 80 00 20 */ blr
.global DoUserAnimEvent__7CRidleyFR13CStateManagerRC13CInt32POINode14EUserEventType

4
asm/MetroidPrime/Enemies/CRipperControlledPlatform.s
View File

@ -334,13 +334,13 @@ lbl_80232B78:
/* 80232BD4 0022FB34 38 61 00 34 */ addi r3, r1, 0x34
/* 80232BD8 0022FB38 4B DE 82 61 */ bl None__16CActorParametersFv
/* 80232BDC 0022FB3C C0 22 B6 E0 */ lfs f1, lbl_805AD400@sda21(r2)
/* 80232BE0 0022FB40 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 80232BE0 0022FB40 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 80232BE4 0022FB44 C0 02 B6 E4 */ lfs f0, lbl_805AD404@sda21(r2)
/* 80232BE8 0022FB48 3B C0 00 00 */ li r30, 0
/* 80232BEC 0022FB4C A0 96 00 00 */ lhz r4, 0(r22)
/* 80232BF0 0022FB50 39 81 00 2C */ addi r12, r1, 0x2c
/* 80232BF4 0022FB54 D0 21 00 2C */ stfs f1, 0x2c(r1)
/* 80232BF8 0022FB58 39 63 D7 18 */ addi r11, r3, lbl_8056D718@l
/* 80232BF8 0022FB58 39 63 D7 18 */ addi r11, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 80232BFC 0022FB5C 38 00 00 01 */ li r0, 1
/* 80232C00 0022FB60 C0 22 B6 D0 */ lfs f1, lbl_805AD3F0@sda21(r2)
/* 80232C04 0022FB64 D0 01 00 30 */ stfs f0, 0x30(r1)

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

@ -3514,9 +3514,9 @@ lbl_801DD084:
/* 801DD094 001D9FF4 28 00 00 00 */ cmplwi r0, 0
/* 801DD098 001D9FF8 41 82 00 20 */ beq lbl_801DD0B8
lbl_801DD09C:
/* 801DD09C 001D9FFC 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 801DD09C 001D9FFC 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 801DD0A0 001DA000 7F C3 F3 78 */ mr r3, r30
/* 801DD0A4 001DA004 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 801DD0A4 001DA004 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 801DD0A8 001DA008 4B FC BA F1 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
/* 801DD0AC 001DA00C C0 02 AC DC */ lfs f0, lbl_805AC9FC@sda21(r2)
/* 801DD0B0 001DA010 D0 1C 03 2C */ stfs f0, 0x32c(r28)
@ -4492,9 +4492,9 @@ lbl_801DDE50:
/* 801DDEB4 001DAE14 41 82 00 90 */ beq lbl_801DDF44
/* 801DDEB8 001DAE18 28 19 00 00 */ cmplwi r25, 0
/* 801DDEBC 001DAE1C 41 82 00 20 */ beq lbl_801DDEDC
/* 801DDEC0 001DAE20 3C 80 80 57 */ lis r4, lbl_8056D718@ha
/* 801DDEC0 001DAE20 3C 80 80 57 */ lis r4, sImmuneVulnerability__20CDamageVulnerability@ha
/* 801DDEC4 001DAE24 7F 43 D3 78 */ mr r3, r26
/* 801DDEC8 001DAE28 38 84 D7 18 */ addi r4, r4, lbl_8056D718@l
/* 801DDEC8 001DAE28 38 84 D7 18 */ addi r4, r4, sImmuneVulnerability__20CDamageVulnerability@l
/* 801DDECC 001DAE2C 4B FC AC CD */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability
/* 801DDED0 001DAE30 C0 02 AC DC */ lfs f0, lbl_805AC9FC@sda21(r2)
/* 801DDED4 001DAE34 D0 1C 03 2C */ stfs f0, 0x32c(r28)

4
asm/MetroidPrime/Enemies/CThardusRockProjectile.s
View File

@ -2314,9 +2314,9 @@ lbl_80205314:
/* 802054C4 00202424 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha
/* 802054C8 00202428 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l
/* 802054CC 0020242C 7E 29 8B 78 */ mr r9, r17
/* 802054D0 00202430 3C A0 80 57 */ lis r5, lbl_8056D578@ha
/* 802054D0 00202430 3C A0 80 57 */ lis r5, sNormalVulnerability__20CDamageVulnerability@ha
/* 802054D4 00202434 B0 01 00 64 */ sth r0, 0x64(r1)
/* 802054D8 00202438 38 05 D5 78 */ addi r0, r5, lbl_8056D578@l
/* 802054D8 00202438 38 05 D5 78 */ addi r0, r5, sNormalVulnerability__20CDamageVulnerability@l
/* 802054DC 0020243C 38 9F 00 68 */ addi r4, r31, 0x68
/* 802054E0 00202440 90 01 00 08 */ stw r0, 8(r1)
/* 802054E4 00202444 39 61 01 D0 */ addi r11, r1, 0x1d0

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

@ -2934,12 +2934,12 @@ GetDamageVulnerability__7CPlayerCFRC9CVector3fRC9CVector3fRC11CDamageInfo:
/* 80011D2C 0000EC8C 88 06 00 18 */ lbz r0, 0x18(r6)
/* 80011D30 0000EC90 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f
/* 80011D34 0000EC94 40 82 00 10 */ bne lbl_80011D44
/* 80011D38 0000EC98 3C 60 80 57 */ lis r3, lbl_8056D718@ha
/* 80011D3C 0000EC9C 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l
/* 80011D38 0000EC98 3C 60 80 57 */ lis r3, sImmuneVulnerability__20CDamageVulnerability@ha
/* 80011D3C 0000EC9C 38 63 D7 18 */ addi r3, r3, sImmuneVulnerability__20CDamageVulnerability@l
/* 80011D40 0000ECA0 4E 80 00 20 */ blr
lbl_80011D44:
/* 80011D44 0000ECA4 3C 60 80 57 */ lis r3, lbl_8056D578@ha
/* 80011D48 0000ECA8 38 63 D5 78 */ addi r3, r3, lbl_8056D578@l
/* 80011D44 0000ECA4 3C 60 80 57 */ lis r3, sNormalVulnerability__20CDamageVulnerability@ha
/* 80011D48 0000ECA8 38 63 D5 78 */ addi r3, r3, sNormalVulnerability__20CDamageVulnerability@l
/* 80011D4C 0000ECAC 4E 80 00 20 */ blr
.global GetDamageVulnerability__7CPlayerCFv

8
asm/MetroidPrime/ScriptLoader.s
View File

@ -4295,9 +4295,9 @@ lbl_800C8D80:
/* 800C8EBC 000C5E1C 3B 20 00 01 */ li r25, 1
/* 800C8EC0 000C5E20 4B F8 42 1D */ bl AllocateUniqueId__13CStateManagerFv
/* 800C8EC4 000C5E24 A0 81 00 60 */ lhz r4, 0x60(r1)
/* 800C8EC8 000C5E28 3C 60 80 57 */ lis r3, lbl_8056D578@ha
/* 800C8EC8 000C5E28 3C 60 80 57 */ lis r3, sNormalVulnerability__20CDamageVulnerability@ha
/* 800C8ECC 000C5E2C C0 22 8E 28 */ lfs f1, lbl_805AAB48@sda21(r2)
/* 800C8ED0 000C5E30 3B 43 D5 78 */ addi r26, r3, lbl_8056D578@l
/* 800C8ED0 000C5E30 3B 43 D5 78 */ addi r26, r3, sNormalVulnerability__20CDamageVulnerability@l
/* 800C8ED4 000C5E34 B0 81 00 64 */ sth r4, 0x64(r1)
/* 800C8ED8 000C5E38 38 00 00 06 */ li r0, 6
/* 800C8EDC 000C5E3C C0 02 8E 38 */ lfs f0, lbl_805AAB58@sda21(r2)
@ -12311,12 +12311,12 @@ lbl_800D0368:
/* 800D042C 000CD38C 3B 40 00 01 */ li r26, 1
/* 800D0430 000CD390 4B F7 CC AD */ bl AllocateUniqueId__13CStateManagerFv
/* 800D0434 000CD394 A0 81 00 60 */ lhz r4, 0x60(r1)
/* 800D0438 000CD398 3C 60 80 57 */ lis r3, lbl_8056D578@ha
/* 800D0438 000CD398 3C 60 80 57 */ lis r3, sNormalVulnerability__20CDamageVulnerability@ha
/* 800D043C 000CD39C 38 00 00 06 */ li r0, 6
/* 800D0440 000CD3A0 C0 02 8E 28 */ lfs f0, lbl_805AAB48@sda21(r2)
/* 800D0444 000CD3A4 B0 81 00 64 */ sth r4, 0x64(r1)
/* 800D0448 000CD3A8 3B 20 00 00 */ li r25, 0
/* 800D044C 000CD3AC 3B 63 D5 78 */ addi r27, r3, lbl_8056D578@l
/* 800D044C 000CD3AC 3B 63 D5 78 */ addi r27, r3, sNormalVulnerability__20CDamageVulnerability@l
/* 800D0450 000CD3B0 39 81 00 B0 */ addi r12, r1, 0xb0
/* 800D0454 000CD3B4 90 01 00 08 */ stw r0, 8(r1)
/* 800D0458 000CD3B8 39 60 FF FF */ li r11, -1

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

@ -593,8 +593,8 @@ ResolveCollisionWithWorld__17CEnergyProjectileFRC14CRayCastResultR13CStateManage
/* 802142C4 00211224 2C 00 00 90 */ cmpwi r0, 0x90
/* 802142C8 00211228 41 82 00 9C */ beq lbl_80214364
/* 802142CC 0021122C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
/* 802142D0 00211230 3C 60 80 57 */ lis r3, lbl_8056D578@ha
/* 802142D4 00211234 39 03 D5 78 */ addi r8, r3, lbl_8056D578@l
/* 802142D0 00211230 3C 60 80 57 */ lis r3, sNormalVulnerability__20CDamageVulnerability@ha
/* 802142D4 00211234 39 03 D5 78 */ addi r8, r3, sNormalVulnerability__20CDamageVulnerability@l
/* 802142D8 00211238 7F E7 FB 78 */ mr r7, r31
/* 802142DC 0021123C B0 01 00 14 */ sth r0, 0x14(r1)
/* 802142E0 00211240 7F A3 EB 78 */ mr r3, r29
@ -878,10 +878,10 @@ lbl_802146E0:
/* 80214700 00211660 41 82 00 58 */ beq lbl_80214758
/* 80214704 00211664 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
/* 80214708 00211668 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha
/* 8021470C 0021166C 3C 80 80 57 */ lis r4, lbl_8056D578@ha
/* 8021470C 0021166C 3C 80 80 57 */ lis r4, sNormalVulnerability__20CDamageVulnerability@ha
/* 80214710 00211670 7F A3 EB 78 */ mr r3, r29
/* 80214714 00211674 B0 01 00 20 */ sth r0, 0x20(r1)
/* 80214718 00211678 39 04 D5 78 */ addi r8, r4, lbl_8056D578@l
/* 80214718 00211678 39 04 D5 78 */ addi r8, r4, sNormalVulnerability__20CDamageVulnerability@l
/* 8021471C 0021167C 38 A5 66 F4 */ addi r5, r5, sUpVector__9CVector3f@l
/* 80214720 00211680 7F C7 F3 78 */ mr r7, r30
/* 80214724 00211684 C0 5D 00 60 */ lfs f2, 0x60(r29)