PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-14 14:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Header merge & CScriptPickup progress

Browse Source
This commit is contained in:
Luke Street
2022-10-05 19:06:15 -04:00
parent 24acd9863f
commit 45c5450376
55 changed files with 542 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4713,7 +4713,7 @@ lbl_801D2090:
/* 801D23BC 001CF31C 90 8F 01 F8 */ stw r4, 0x1f8(r15)
/* 801D23C0 001CF320 90 8F 02 1C */ stw r4, 0x21c(r15)
/* 801D23C4 001CF324 40 82 00 08 */ bne lbl_801D23CC
/* 801D23C8 001CF328 A0 02 C5 FC */ lhz r0, lbl_805AE31C@sda21(r2)
/* 801D23C8 001CF328 A0 02 C5 FC */ lhz r0, kInternalInvalidSfxId__11CSfxManager@sda21(r2)
lbl_801D23CC:
/* 801D23CC 001CF32C 54 03 04 3E */ clrlwi r3, r0, 0x10
/* 801D23D0 001CF330 48 11 65 E1 */ bl TranslateSFXID__11CSfxManagerFUs

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

@@ -6979,7 +6979,7 @@ lbl_8021BA7C:
/* 8021BAF8 00218A58 48 0C CE B9 */ bl TranslateSFXID__11CSfxManagerFUs
/* 8021BAFC 00218A5C 48 00 00 08 */ b lbl_8021BB04
lbl_8021BB00:
/* 8021BB00 00218A60 A0 62 C5 FC */ lhz r3, lbl_805AE31C@sda21(r2)
/* 8021BB00 00218A60 A0 62 C5 FC */ lhz r3, kInternalInvalidSfxId__11CSfxManager@sda21(r2)
lbl_8021BB04:
/* 8021BB04 00218A64 B0 7D 00 86 */ sth r3, 0x86(r29)
/* 8021BB08 00218A68 7F C3 F3 78 */ mr r3, r30

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

@@ -8,7 +8,7 @@ lbl_803DF4F8:
# ROM: 0x3DC4F8
.4byte 0
.4byte 0
.4byte __dt__13CScriptPickup
.4byte __dt__13CScriptPickupFv
.4byte Accept__13CScriptPickupFR8IVisitor
.4byte PreThink__7CEntityFfR13CStateManager
.4byte Think__13CScriptPickupFfR13CStateManager
@@ -851,8 +851,8 @@ lbl_800C3028:
/* 800C3054 000BFFB4 38 21 00 F0 */ addi r1, r1, 0xf0
/* 800C3058 000BFFB8 4E 80 00 20 */ blr
.global __dt__13CScriptPickup
__dt__13CScriptPickup:
.global __dt__13CScriptPickupFv
__dt__13CScriptPickupFv:
/* 800C305C 000BFFBC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800C3060 000BFFC0 7C 08 02 A6 */ mflr r0
/* 800C3064 000BFFC4 90 01 00 14 */ stw r0, 0x14(r1)
@@ -895,8 +895,8 @@ lbl_800C30D8:
/* 800C30EC 000C004C 38 21 00 10 */ addi r1, r1, 0x10
/* 800C30F0 000C0050 4E 80 00 20 */ blr
.global "__ct__13CScriptPickupF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxiiiiffffb"
"__ct__13CScriptPickupF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxiiiiffffb":
.global "__ct__13CScriptPickupF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxQ212CPlayerState9EItemTypeiiUiffffb"
"__ct__13CScriptPickupF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxQ212CPlayerState9EItemTypeiiUiffffb":
/* 800C30F4 000C0054 94 21 FE E0 */ stwu r1, -0x120(r1)
/* 800C30F8 000C0058 7C 08 02 A6 */ mflr r0
/* 800C30FC 000C005C 90 01 01 24 */ stw r0, 0x124(r1)

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

@@ -1625,7 +1625,7 @@ lbl_80150638:
/* 80150660 0014D5C0 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f
/* 80150664 0014D5C4 40 82 00 60 */ bne lbl_801506C4
/* 80150668 0014D5C8 A0 98 01 74 */ lhz r4, 0x174(r24)
/* 8015066C 0014D5CC A0 02 C5 FC */ lhz r0, lbl_805AE31C@sda21(r2)
/* 8015066C 0014D5CC A0 02 C5 FC */ lhz r0, kInternalInvalidSfxId__11CSfxManager@sda21(r2)
/* 80150670 0014D5D0 7C 04 00 40 */ cmplw r4, r0
/* 80150674 0014D5D4 41 82 00 40 */ beq lbl_801506B4
/* 80150678 0014D5D8 C0 58 00 60 */ lfs f2, 0x60(r24)
@@ -1673,7 +1673,7 @@ lbl_801506F0:
/* 80150710 0014D670 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f
/* 80150714 0014D674 40 82 00 60 */ bne lbl_80150774
/* 80150718 0014D678 A0 98 01 72 */ lhz r4, 0x172(r24)
/* 8015071C 0014D67C A0 02 C5 FC */ lhz r0, lbl_805AE31C@sda21(r2)
/* 8015071C 0014D67C A0 02 C5 FC */ lhz r0, kInternalInvalidSfxId__11CSfxManager@sda21(r2)
/* 80150720 0014D680 7C 04 00 40 */ cmplw r4, r0
/* 80150724 0014D684 41 82 00 40 */ beq lbl_80150764
/* 80150728 0014D688 C0 58 00 60 */ lfs f2, 0x60(r24)
@@ -1727,7 +1727,7 @@ lbl_801507CC:
/* 801507D4 0014D734 98 01 00 28 */ stb r0, 0x28(r1)
/* 801507D8 0014D738 41 82 00 FC */ beq lbl_801508D4
/* 801507DC 0014D73C A0 78 01 70 */ lhz r3, 0x170(r24)
/* 801507E0 0014D740 A0 02 C5 FC */ lhz r0, lbl_805AE31C@sda21(r2)
/* 801507E0 0014D740 A0 02 C5 FC */ lhz r0, kInternalInvalidSfxId__11CSfxManager@sda21(r2)
/* 801507E4 0014D744 7C 03 00 40 */ cmplw r3, r0
/* 801507E8 0014D748 41 82 00 F8 */ beq lbl_801508E0
/* 801507EC 0014D74C C0 02 9D 9C */ lfs f0, lbl_805ABABC@sda21(r2)

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

@@ -459,7 +459,7 @@ lbl_801D6BA8:
/* 801D6F00 001D3E60 93 FD 00 38 */ stw r31, 0x38(r29)
/* 801D6F04 001D3E64 C0 02 AC 48 */ lfs f0, lbl_805AC968@sda21(r2)
/* 801D6F08 001D3E68 90 FD 00 3C */ stw r7, 0x3c(r29)
/* 801D6F0C 001D3E6C A0 02 C5 FC */ lhz r0, lbl_805AE31C@sda21(r2)
/* 801D6F0C 001D3E6C A0 02 C5 FC */ lhz r0, kInternalInvalidSfxId__11CSfxManager@sda21(r2)
/* 801D6F10 001D3E70 88 DD 00 40 */ lbz r6, 0x40(r29)
/* 801D6F14 001D3E74 50 E6 3E 30 */ rlwimi r6, r7, 7, 0x18, 0x18
/* 801D6F18 001D3E78 98 DD 00 40 */ stb r6, 0x40(r29)
@@ -523,4 +523,3 @@ lbl_805AC968:
# ROM: 0x3F9208
.4byte 0
.4byte 0