PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-15 09:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPlayer header, more CScriptPlatform, renaming

Browse Source
This commit is contained in:
Luke Street
2022-09-19 00:19:46 -04:00
parent 7608f27ed2
commit 5d9f7afa3b
33 changed files with 674 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -721,7 +721,7 @@ lbl_80201584:
/* 802015A8 001FE508 A0 1E 00 34 */ lhz r0, 0x34(r30)
/* 802015AC 001FE50C B0 E1 00 10 */ sth r7, 0x10(r1)
/* 802015B0 001FE510 B0 01 00 18 */ sth r0, 0x18(r1)
/* 802015B4 001FE514 4B E4 28 A1 */ bl SendScriptMsgAlways__13CStateManagerF9TUniqueId
/* 802015B4 001FE514 4B E4 28 A1 */ bl SendScriptMsgAlways__13CStateManagerF9TUniqueId9TUniqueId20EScriptObjectMessage
lbl_802015B8:
/* 802015B8 001FE518 7F C3 F3 78 */ mr r3, r30
/* 802015BC 001FE51C 7F E5 FB 78 */ mr r5, r31

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

@@ -236,7 +236,7 @@ lbl_800B47C4:
/* 800B47D8 000B1738 B0 C1 00 30 */ sth r6, 0x30(r1)
/* 800B47DC 000B173C B0 01 00 28 */ sth r0, 0x28(r1)
/* 800B47E0 000B1740 80 DB 00 04 */ lwz r6, 4(r27)
/* 800B47E4 000B1744 4B F8 F6 71 */ bl SendScriptMsgAlways__13CStateManagerF9TUniqueId
/* 800B47E4 000B1744 4B F8 F6 71 */ bl SendScriptMsgAlways__13CStateManagerF9TUniqueId9TUniqueId20EScriptObjectMessage
lbl_800B47E8:
/* 800B47E8 000B1748 3B 7B 00 0C */ addi r27, r27, 0xc
lbl_800B47EC:

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

@@ -1455,8 +1455,8 @@ lbl_800B1DDC:
/* 800B1DFC 000AED5C 38 21 00 60 */ addi r1, r1, 0x60
/* 800B1E00 000AED60 4E 80 00 20 */ blr
.global sub_800b1e04
sub_800b1e04:
.global "erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>"
"erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>":
/* 800B1E04 000AED64 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800B1E08 000AED68 7C 08 02 A6 */ mflr r0
/* 800B1E0C 000AED6C 90 01 00 24 */ stw r0, 0x24(r1)
@@ -2242,7 +2242,7 @@ lbl_800B28D0:
/* 800B28D8 000AF838 38 9C 03 38 */ addi r4, r28, 0x338
/* 800B28DC 000AF83C 38 A1 00 10 */ addi r5, r1, 0x10
/* 800B28E0 000AF840 90 01 00 10 */ stw r0, 0x10(r1)
/* 800B28E4 000AF844 4B FF F5 21 */ bl sub_800b1e04
/* 800B28E4 000AF844 4B FF F5 21 */ bl "erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>"
/* 800B28E8 000AF848 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800B28EC 000AF84C 90 01 00 18 */ stw r0, 0x18(r1)
lbl_800B28F0:
@@ -2992,7 +2992,7 @@ lbl_800B3274:
/* 800B33C8 000B0328 38 61 00 18 */ addi r3, r1, 0x18
/* 800B33CC 000B032C 38 A1 00 14 */ addi r5, r1, 0x14
/* 800B33D0 000B0330 90 01 00 14 */ stw r0, 0x14(r1)
/* 800B33D4 000B0334 4B FF EA 31 */ bl sub_800b1e04
/* 800B33D4 000B0334 4B FF EA 31 */ bl "erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>"
/* 800B33D8 000B0338 48 00 00 B8 */ b lbl_800B3490
lbl_800B33DC:
/* 800B33DC 000B033C 7F C3 F3 78 */ mr r3, r30
@@ -3151,13 +3151,13 @@ lbl_800B35E4:
/* 800B3618 000B0578 38 C0 00 1F */ li r6, 0x1f
/* 800B361C 000B057C A0 07 00 00 */ lhz r0, 0(r7)
/* 800B3620 000B0580 B0 01 00 0C */ sth r0, 0xc(r1)
/* 800B3624 000B0584 4B F9 08 31 */ bl SendScriptMsgAlways__13CStateManagerF9TUniqueId
/* 800B3624 000B0584 4B F9 08 31 */ bl SendScriptMsgAlways__13CStateManagerF9TUniqueId9TUniqueId20EScriptObjectMessage
/* 800B3628 000B0588 80 01 00 18 */ lwz r0, 0x18(r1)
/* 800B362C 000B058C 7F C4 F3 78 */ mr r4, r30
/* 800B3630 000B0590 38 61 00 14 */ addi r3, r1, 0x14
/* 800B3634 000B0594 38 A1 00 10 */ addi r5, r1, 0x10
/* 800B3638 000B0598 90 01 00 10 */ stw r0, 0x10(r1)
/* 800B363C 000B059C 4B FF E7 C9 */ bl sub_800b1e04
/* 800B363C 000B059C 4B FF E7 C9 */ bl "erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>"
/* 800B3640 000B05A0 48 00 00 10 */ b lbl_800B3650
lbl_800B3644:
/* 800B3644 000B05A4 80 61 00 18 */ lwz r3, 0x18(r1)