mirror of https://github.com/PrimeDecomp/prime.git
Add CScriptStreamedAudio
This commit is contained in:
parent
f8e02c251c
commit
2f5676d2e0
|
@ -831,7 +831,7 @@ Start__19CStreamAudioManagerFiRCQ24rstl6stringib:
|
||||||
/* 80365E6C 00362DCC 4B FD 7C 75 */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv"
|
/* 80365E6C 00362DCC 4B FD 7C 75 */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv"
|
||||||
/* 80365E70 00362DD0 7F 63 DB 78 */ mr r3, r27
|
/* 80365E70 00362DD0 7F 63 DB 78 */ mr r3, r27
|
||||||
/* 80365E74 00362DD4 7F E4 FB 78 */ mr r4, r31
|
/* 80365E74 00362DD4 7F E4 FB 78 */ mr r4, r31
|
||||||
/* 80365E78 00362DD8 48 00 01 4D */ bl Stop__19CStreamAudioManagerFiRCQ24rstl6string
|
/* 80365E78 00362DD8 48 00 01 4D */ bl "Stop__19CStreamAudioManagerFiRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 80365E7C 00362DDC 48 00 01 24 */ b lbl_80365FA0
|
/* 80365E7C 00362DDC 48 00 01 24 */ b lbl_80365FA0
|
||||||
lbl_80365E80:
|
lbl_80365E80:
|
||||||
/* 80365E80 00362DE0 28 04 00 00 */ cmplwi r4, 0
|
/* 80365E80 00362DE0 28 04 00 00 */ cmplwi r4, 0
|
||||||
|
@ -921,8 +921,8 @@ lbl_80365FA0:
|
||||||
/* 80365FBC 00362F1C 38 21 00 A0 */ addi r1, r1, 0xa0
|
/* 80365FBC 00362F1C 38 21 00 A0 */ addi r1, r1, 0xa0
|
||||||
/* 80365FC0 00362F20 4E 80 00 20 */ blr
|
/* 80365FC0 00362F20 4E 80 00 20 */ blr
|
||||||
|
|
||||||
.global Stop__19CStreamAudioManagerFiRCQ24rstl6string
|
.global "Stop__19CStreamAudioManagerFiRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
Stop__19CStreamAudioManagerFiRCQ24rstl6string:
|
"Stop__19CStreamAudioManagerFiRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>":
|
||||||
/* 80365FC4 00362F24 94 21 FF B0 */ stwu r1, -0x50(r1)
|
/* 80365FC4 00362F24 94 21 FF B0 */ stwu r1, -0x50(r1)
|
||||||
/* 80365FC8 00362F28 7C 08 02 A6 */ mflr r0
|
/* 80365FC8 00362F28 7C 08 02 A6 */ mflr r0
|
||||||
/* 80365FCC 00362F2C 3C A0 80 54 */ lis r5, lbl_80540580@ha
|
/* 80365FCC 00362F2C 3C A0 80 54 */ lis r5, lbl_80540580@ha
|
||||||
|
|
|
@ -729,8 +729,8 @@ lbl_8021CB2C:
|
||||||
/* 8021CB30 00219A90 38 21 00 60 */ addi r1, r1, 0x60
|
/* 8021CB30 00219A90 38 21 00 60 */ addi r1, r1, 0x60
|
||||||
/* 8021CB34 00219A94 4E 80 00 20 */ blr
|
/* 8021CB34 00219A94 4E 80 00 20 */ blr
|
||||||
|
|
||||||
.global sub_8021cb38
|
.global sub_8021cb38__19CInGameTweakManagerFv
|
||||||
sub_8021cb38:
|
sub_8021cb38__19CInGameTweakManagerFv:
|
||||||
/* 8021CB38 00219A98 94 21 FF E0 */ stwu r1, -0x20(r1)
|
/* 8021CB38 00219A98 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||||
/* 8021CB3C 00219A9C 7C 08 02 A6 */ mflr r0
|
/* 8021CB3C 00219A9C 7C 08 02 A6 */ mflr r0
|
||||||
/* 8021CB40 00219AA0 3C C0 80 3D */ lis r6, lbl_803D3038@ha
|
/* 8021CB40 00219AA0 3C C0 80 3D */ lis r6, lbl_803D3038@ha
|
||||||
|
@ -1466,4 +1466,3 @@ lbl_803D3038:
|
||||||
.asciz "alue:"
|
.asciz "alue:"
|
||||||
.byte 0x20, 0x09
|
.byte 0x20, 0x09
|
||||||
.4byte 0x0A0D2200
|
.4byte 0x0A0D2200
|
||||||
|
|
||||||
|
|
|
@ -3450,7 +3450,7 @@ lbl_8005897C:
|
||||||
/* 80058A18 00055978 8B 21 00 08 */ lbz r25, 8(r1)
|
/* 80058A18 00055978 8B 21 00 08 */ lbz r25, 8(r1)
|
||||||
lbl_80058A1C:
|
lbl_80058A1C:
|
||||||
/* 80058A1C 0005597C 38 7F 00 84 */ addi r3, r31, 0x84
|
/* 80058A1C 0005597C 38 7F 00 84 */ addi r3, r31, 0x84
|
||||||
/* 80058A20 00055980 48 1B 3C 51 */ bl IsDSPFile__20CScriptStreamedMusicFRCQ24rstl6string
|
/* 80058A20 00055980 48 1B 3C 51 */ bl "IsDSPFile__20CScriptStreamedMusicFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 80058A24 00055984 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
/* 80058A24 00055984 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||||
/* 80058A28 00055988 40 82 00 18 */ bne lbl_80058A40
|
/* 80058A28 00055988 40 82 00 18 */ bne lbl_80058A40
|
||||||
/* 80058A2C 0005598C C0 22 86 A0 */ lfs f1, lbl_805AA3C0@sda21(r2)
|
/* 80058A2C 0005598C C0 22 86 A0 */ lfs f1, lbl_805AA3C0@sda21(r2)
|
||||||
|
|
|
@ -6637,7 +6637,7 @@ lbl_800CB070:
|
||||||
/* 800CB140 000C80A0 38 81 00 18 */ addi r4, r1, 0x18
|
/* 800CB140 000C80A0 38 81 00 18 */ addi r4, r1, 0x18
|
||||||
/* 800CB144 000C80A4 38 C1 00 2C */ addi r6, r1, 0x2c
|
/* 800CB144 000C80A4 38 C1 00 2C */ addi r6, r1, 0x2c
|
||||||
/* 800CB148 000C80A8 39 01 00 1C */ addi r8, r1, 0x1c
|
/* 800CB148 000C80A8 39 01 00 1C */ addi r8, r1, 0x1c
|
||||||
/* 800CB14C 000C80AC 48 14 15 DD */ bl "__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bffi"
|
/* 800CB14C 000C80AC 48 14 15 DD */ bl "__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bffUibb"
|
||||||
/* 800CB150 000C80B0 7C 7B 1B 78 */ mr r27, r3
|
/* 800CB150 000C80B0 7C 7B 1B 78 */ mr r27, r3
|
||||||
lbl_800CB154:
|
lbl_800CB154:
|
||||||
/* 800CB154 000C80B4 38 61 00 1C */ addi r3, r1, 0x1c
|
/* 800CB154 000C80B4 38 61 00 1C */ addi r3, r1, 0x1c
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
.section .data
|
.section .data
|
||||||
.balign 8
|
.balign 8
|
||||||
|
|
||||||
.global lbl_803E7068
|
.global __vt__20CScriptStreamedMusic
|
||||||
lbl_803E7068:
|
__vt__20CScriptStreamedMusic:
|
||||||
# ROM: 0x3E4068
|
# ROM: 0x3E4068
|
||||||
.4byte 0
|
.4byte 0
|
||||||
.4byte 0
|
.4byte 0
|
||||||
|
@ -49,9 +49,9 @@ __dt__20CScriptStreamedMusicFv:
|
||||||
/* 8020BE30 00208D90 93 C1 00 08 */ stw r30, 8(r1)
|
/* 8020BE30 00208D90 93 C1 00 08 */ stw r30, 8(r1)
|
||||||
/* 8020BE34 00208D94 7C 7E 1B 79 */ or. r30, r3, r3
|
/* 8020BE34 00208D94 7C 7E 1B 79 */ or. r30, r3, r3
|
||||||
/* 8020BE38 00208D98 41 82 00 3C */ beq lbl_8020BE74
|
/* 8020BE38 00208D98 41 82 00 3C */ beq lbl_8020BE74
|
||||||
/* 8020BE3C 00208D9C 3C 60 80 3E */ lis r3, lbl_803E7068@ha
|
/* 8020BE3C 00208D9C 3C 60 80 3E */ lis r3, __vt__20CScriptStreamedMusic@ha
|
||||||
/* 8020BE40 00208DA0 34 1E 00 34 */ addic. r0, r30, 0x34
|
/* 8020BE40 00208DA0 34 1E 00 34 */ addic. r0, r30, 0x34
|
||||||
/* 8020BE44 00208DA4 38 03 70 68 */ addi r0, r3, lbl_803E7068@l
|
/* 8020BE44 00208DA4 38 03 70 68 */ addi r0, r3, __vt__20CScriptStreamedMusic@l
|
||||||
/* 8020BE48 00208DA8 90 1E 00 00 */ stw r0, 0(r30)
|
/* 8020BE48 00208DA8 90 1E 00 00 */ stw r0, 0(r30)
|
||||||
/* 8020BE4C 00208DAC 41 82 00 0C */ beq lbl_8020BE58
|
/* 8020BE4C 00208DAC 41 82 00 0C */ beq lbl_8020BE58
|
||||||
/* 8020BE50 00208DB0 38 7E 00 34 */ addi r3, r30, 0x34
|
/* 8020BE50 00208DB0 38 7E 00 34 */ addi r3, r30, 0x34
|
||||||
|
@ -339,8 +339,8 @@ lbl_8020C23C:
|
||||||
/* 8020C23C 0020919C 38 21 00 40 */ addi r1, r1, 0x40
|
/* 8020C23C 0020919C 38 21 00 40 */ addi r1, r1, 0x40
|
||||||
/* 8020C240 002091A0 4E 80 00 20 */ blr
|
/* 8020C240 002091A0 4E 80 00 20 */ blr
|
||||||
|
|
||||||
.global sub_8020c244
|
.global TweakOverride__20CScriptStreamedMusicFR13CStateManager
|
||||||
sub_8020c244:
|
TweakOverride__20CScriptStreamedMusicFR13CStateManager:
|
||||||
/* 8020C244 002091A4 94 21 FF 90 */ stwu r1, -0x70(r1)
|
/* 8020C244 002091A4 94 21 FF 90 */ stwu r1, -0x70(r1)
|
||||||
/* 8020C248 002091A8 7C 08 02 A6 */ mflr r0
|
/* 8020C248 002091A8 7C 08 02 A6 */ mflr r0
|
||||||
/* 8020C24C 002091AC 90 01 00 74 */ stw r0, 0x74(r1)
|
/* 8020C24C 002091AC 90 01 00 74 */ stw r0, 0x74(r1)
|
||||||
|
@ -362,7 +362,7 @@ sub_8020c244:
|
||||||
/* 8020C28C 002091EC 7C 86 00 2E */ lwzx r4, r6, r0
|
/* 8020C28C 002091EC 7C 86 00 2E */ lwzx r4, r6, r0
|
||||||
/* 8020C290 002091F0 90 E1 00 10 */ stw r7, 0x10(r1)
|
/* 8020C290 002091F0 90 E1 00 10 */ stw r7, 0x10(r1)
|
||||||
/* 8020C294 002091F4 80 84 00 84 */ lwz r4, 0x84(r4)
|
/* 8020C294 002091F4 80 84 00 84 */ lwz r4, 0x84(r4)
|
||||||
/* 8020C298 002091F8 48 01 08 A1 */ bl sub_8021cb38
|
/* 8020C298 002091F8 48 01 08 A1 */ bl sub_8021cb38__19CInGameTweakManagerFv
|
||||||
/* 8020C29C 002091FC 38 61 00 34 */ addi r3, r1, 0x34
|
/* 8020C29C 002091FC 38 61 00 34 */ addi r3, r1, 0x34
|
||||||
/* 8020C2A0 00209200 38 81 00 14 */ addi r4, r1, 0x14
|
/* 8020C2A0 00209200 38 81 00 14 */ addi r4, r1, 0x14
|
||||||
/* 8020C2A4 00209204 48 13 1E BD */ bl "__ct__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
/* 8020C2A4 00209204 48 13 1E BD */ bl "__ct__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
|
@ -391,7 +391,7 @@ sub_8020c244:
|
||||||
/* 8020C300 00209260 8B E1 00 08 */ lbz r31, 8(r1)
|
/* 8020C300 00209260 8B E1 00 08 */ lbz r31, 8(r1)
|
||||||
/* 8020C304 00209264 48 13 1A 59 */ bl "assign__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
/* 8020C304 00209264 48 13 1A 59 */ bl "assign__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 8020C308 00209268 38 7E 00 34 */ addi r3, r30, 0x34
|
/* 8020C308 00209268 38 7E 00 34 */ addi r3, r30, 0x34
|
||||||
/* 8020C30C 0020926C 48 00 03 65 */ bl IsDSPFile__20CScriptStreamedMusicFRCQ24rstl6string
|
/* 8020C30C 0020926C 48 00 03 65 */ bl "IsDSPFile__20CScriptStreamedMusicFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 8020C310 00209270 98 7E 00 45 */ stb r3, 0x45(r30)
|
/* 8020C310 00209270 98 7E 00 45 */ stb r3, 0x45(r30)
|
||||||
/* 8020C314 00209274 7F E0 07 74 */ extsb r0, r31
|
/* 8020C314 00209274 7F E0 07 74 */ extsb r0, r31
|
||||||
/* 8020C318 00209278 7F C3 F3 78 */ mr r3, r30
|
/* 8020C318 00209278 7F C3 F3 78 */ mr r3, r30
|
||||||
|
@ -427,7 +427,7 @@ StopStream__20CScriptStreamedMusicFR13CStateManager:
|
||||||
/* 8020C380 002092E0 88 63 00 46 */ lbz r3, 0x46(r3)
|
/* 8020C380 002092E0 88 63 00 46 */ lbz r3, 0x46(r3)
|
||||||
/* 8020C384 002092E4 48 00 04 5D */ bl IsOneShot__20CScriptStreamedMusicFb
|
/* 8020C384 002092E4 48 00 04 5D */ bl IsOneShot__20CScriptStreamedMusicFb
|
||||||
/* 8020C388 002092E8 38 9F 00 34 */ addi r4, r31, 0x34
|
/* 8020C388 002092E8 38 9F 00 34 */ addi r4, r31, 0x34
|
||||||
/* 8020C38C 002092EC 48 15 9C 39 */ bl Stop__19CStreamAudioManagerFiRCQ24rstl6string
|
/* 8020C38C 002092EC 48 15 9C 39 */ bl "Stop__19CStreamAudioManagerFiRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 8020C390 002092F0 80 01 00 14 */ lwz r0, 0x14(r1)
|
/* 8020C390 002092F0 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||||
/* 8020C394 002092F4 83 E1 00 0C */ lwz r31, 0xc(r1)
|
/* 8020C394 002092F4 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||||
/* 8020C398 002092F8 7C 08 03 A6 */ mtlr r0
|
/* 8020C398 002092F8 7C 08 03 A6 */ mtlr r0
|
||||||
|
@ -524,7 +524,7 @@ Play__20CScriptStreamedMusicFR13CStateManager:
|
||||||
/* 8020C4B8 00209418 7C 9F 23 78 */ mr r31, r4
|
/* 8020C4B8 00209418 7C 9F 23 78 */ mr r31, r4
|
||||||
/* 8020C4BC 0020941C 93 C1 00 08 */ stw r30, 8(r1)
|
/* 8020C4BC 0020941C 93 C1 00 08 */ stw r30, 8(r1)
|
||||||
/* 8020C4C0 00209420 7C 7E 1B 78 */ mr r30, r3
|
/* 8020C4C0 00209420 7C 7E 1B 78 */ mr r30, r3
|
||||||
/* 8020C4C4 00209424 4B FF FD 81 */ bl sub_8020c244
|
/* 8020C4C4 00209424 4B FF FD 81 */ bl TweakOverride__20CScriptStreamedMusicFR13CStateManager
|
||||||
/* 8020C4C8 00209428 88 1E 00 45 */ lbz r0, 0x45(r30)
|
/* 8020C4C8 00209428 88 1E 00 45 */ lbz r0, 0x45(r30)
|
||||||
/* 8020C4CC 0020942C 28 00 00 00 */ cmplwi r0, 0
|
/* 8020C4CC 0020942C 28 00 00 00 */ cmplwi r0, 0
|
||||||
/* 8020C4D0 00209430 41 82 00 14 */ beq lbl_8020C4E4
|
/* 8020C4D0 00209430 41 82 00 14 */ beq lbl_8020C4E4
|
||||||
|
@ -585,7 +585,6 @@ AcceptScriptMsg__20CScriptStreamedMusicF20EScriptObjectMessage9TUniqueIdR13CStat
|
||||||
/* 8020C58C 002094EC 7C 03 00 2E */ lwzx r0, r3, r0
|
/* 8020C58C 002094EC 7C 03 00 2E */ lwzx r0, r3, r0
|
||||||
/* 8020C590 002094F0 7C 09 03 A6 */ mtctr r0
|
/* 8020C590 002094F0 7C 09 03 A6 */ mtctr r0
|
||||||
/* 8020C594 002094F4 4E 80 04 20 */ bctr
|
/* 8020C594 002094F4 4E 80 04 20 */ bctr
|
||||||
.global lbl_8020C598
|
|
||||||
lbl_8020C598:
|
lbl_8020C598:
|
||||||
/* 8020C598 002094F8 88 1D 00 30 */ lbz r0, 0x30(r29)
|
/* 8020C598 002094F8 88 1D 00 30 */ lbz r0, 0x30(r29)
|
||||||
/* 8020C59C 002094FC 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f
|
/* 8020C59C 002094FC 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f
|
||||||
|
@ -594,7 +593,6 @@ lbl_8020C598:
|
||||||
/* 8020C5A8 00209508 7F E4 FB 78 */ mr r4, r31
|
/* 8020C5A8 00209508 7F E4 FB 78 */ mr r4, r31
|
||||||
/* 8020C5AC 0020950C 4B FF FE FD */ bl Play__20CScriptStreamedMusicFR13CStateManager
|
/* 8020C5AC 0020950C 4B FF FE FD */ bl Play__20CScriptStreamedMusicFR13CStateManager
|
||||||
/* 8020C5B0 00209510 48 00 00 A4 */ b lbl_8020C654
|
/* 8020C5B0 00209510 48 00 00 A4 */ b lbl_8020C654
|
||||||
.global lbl_8020C5B4
|
|
||||||
lbl_8020C5B4:
|
lbl_8020C5B4:
|
||||||
/* 8020C5B4 00209514 88 1D 00 30 */ lbz r0, 0x30(r29)
|
/* 8020C5B4 00209514 88 1D 00 30 */ lbz r0, 0x30(r29)
|
||||||
/* 8020C5B8 00209518 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f
|
/* 8020C5B8 00209518 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f
|
||||||
|
@ -603,7 +601,6 @@ lbl_8020C5B4:
|
||||||
/* 8020C5C4 00209524 7F E4 FB 78 */ mr r4, r31
|
/* 8020C5C4 00209524 7F E4 FB 78 */ mr r4, r31
|
||||||
/* 8020C5C8 00209528 4B FF FE AD */ bl Stop__20CScriptStreamedMusicFR13CStateManager
|
/* 8020C5C8 00209528 4B FF FE AD */ bl Stop__20CScriptStreamedMusicFR13CStateManager
|
||||||
/* 8020C5CC 0020952C 48 00 00 88 */ b lbl_8020C654
|
/* 8020C5CC 0020952C 48 00 00 88 */ b lbl_8020C654
|
||||||
.global lbl_8020C5D0
|
|
||||||
lbl_8020C5D0:
|
lbl_8020C5D0:
|
||||||
/* 8020C5D0 00209530 88 7D 00 45 */ lbz r3, 0x45(r29)
|
/* 8020C5D0 00209530 88 7D 00 45 */ lbz r3, 0x45(r29)
|
||||||
/* 8020C5D4 00209534 28 03 00 00 */ cmplwi r3, 0
|
/* 8020C5D4 00209534 28 03 00 00 */ cmplwi r3, 0
|
||||||
|
@ -619,7 +616,6 @@ lbl_8020C5F0:
|
||||||
/* 8020C5F4 00209554 7F E4 FB 78 */ mr r4, r31
|
/* 8020C5F4 00209554 7F E4 FB 78 */ mr r4, r31
|
||||||
/* 8020C5F8 00209558 4B FF FE 7D */ bl Stop__20CScriptStreamedMusicFR13CStateManager
|
/* 8020C5F8 00209558 4B FF FE 7D */ bl Stop__20CScriptStreamedMusicFR13CStateManager
|
||||||
/* 8020C5FC 0020955C 48 00 00 58 */ b lbl_8020C654
|
/* 8020C5FC 0020955C 48 00 00 58 */ b lbl_8020C654
|
||||||
.global lbl_8020C600
|
|
||||||
lbl_8020C600:
|
lbl_8020C600:
|
||||||
/* 8020C600 00209560 88 1D 00 45 */ lbz r0, 0x45(r29)
|
/* 8020C600 00209560 88 1D 00 45 */ lbz r0, 0x45(r29)
|
||||||
/* 8020C604 00209564 28 00 00 00 */ cmplwi r0, 0
|
/* 8020C604 00209564 28 00 00 00 */ cmplwi r0, 0
|
||||||
|
@ -633,7 +629,6 @@ lbl_8020C620:
|
||||||
/* 8020C620 00209580 C0 3D 00 48 */ lfs f1, 0x48(r29)
|
/* 8020C620 00209580 C0 3D 00 48 */ lfs f1, 0x48(r29)
|
||||||
/* 8020C624 00209584 48 15 8D D5 */ bl sub_803653f8
|
/* 8020C624 00209584 48 15 8D D5 */ bl sub_803653f8
|
||||||
/* 8020C628 00209588 48 00 00 2C */ b lbl_8020C654
|
/* 8020C628 00209588 48 00 00 2C */ b lbl_8020C654
|
||||||
.global lbl_8020C62C
|
|
||||||
lbl_8020C62C:
|
lbl_8020C62C:
|
||||||
/* 8020C62C 0020958C 88 1D 00 45 */ lbz r0, 0x45(r29)
|
/* 8020C62C 0020958C 88 1D 00 45 */ lbz r0, 0x45(r29)
|
||||||
/* 8020C630 00209590 28 00 00 00 */ cmplwi r0, 0
|
/* 8020C630 00209590 28 00 00 00 */ cmplwi r0, 0
|
||||||
|
@ -646,7 +641,6 @@ lbl_8020C62C:
|
||||||
lbl_8020C64C:
|
lbl_8020C64C:
|
||||||
/* 8020C64C 002095AC C0 3D 00 4C */ lfs f1, 0x4c(r29)
|
/* 8020C64C 002095AC C0 3D 00 4C */ lfs f1, 0x4c(r29)
|
||||||
/* 8020C650 002095B0 48 15 8D D5 */ bl sub_80365424
|
/* 8020C650 002095B0 48 15 8D D5 */ bl sub_80365424
|
||||||
.global lbl_8020C654
|
|
||||||
lbl_8020C654:
|
lbl_8020C654:
|
||||||
/* 8020C654 002095B4 80 01 00 24 */ lwz r0, 0x24(r1)
|
/* 8020C654 002095B4 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||||
/* 8020C658 002095B8 83 E1 00 1C */ lwz r31, 0x1c(r1)
|
/* 8020C658 002095B8 83 E1 00 1C */ lwz r31, 0x1c(r1)
|
||||||
|
@ -656,8 +650,8 @@ lbl_8020C654:
|
||||||
/* 8020C668 002095C8 38 21 00 20 */ addi r1, r1, 0x20
|
/* 8020C668 002095C8 38 21 00 20 */ addi r1, r1, 0x20
|
||||||
/* 8020C66C 002095CC 4E 80 00 20 */ blr
|
/* 8020C66C 002095CC 4E 80 00 20 */ blr
|
||||||
|
|
||||||
.global IsDSPFile__20CScriptStreamedMusicFRCQ24rstl6string
|
.global "IsDSPFile__20CScriptStreamedMusicFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
IsDSPFile__20CScriptStreamedMusicFRCQ24rstl6string:
|
"IsDSPFile__20CScriptStreamedMusicFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>":
|
||||||
/* 8020C670 002095D0 94 21 FF C0 */ stwu r1, -0x40(r1)
|
/* 8020C670 002095D0 94 21 FF C0 */ stwu r1, -0x40(r1)
|
||||||
/* 8020C674 002095D4 7C 08 02 A6 */ mflr r0
|
/* 8020C674 002095D4 7C 08 02 A6 */ mflr r0
|
||||||
/* 8020C678 002095D8 3C 80 80 3D */ lis r4, lbl_803D2778@ha
|
/* 8020C678 002095D8 3C 80 80 3D */ lis r4, lbl_803D2778@ha
|
||||||
|
@ -710,8 +704,8 @@ lbl_8020C6FC:
|
||||||
nullsub_42:
|
nullsub_42:
|
||||||
/* 8020C724 00209684 4E 80 00 20 */ blr
|
/* 8020C724 00209684 4E 80 00 20 */ blr
|
||||||
|
|
||||||
.global "__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bffi"
|
.global "__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bffUibb"
|
||||||
"__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bffi":
|
"__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bffUibb":
|
||||||
/* 8020C728 00209688 94 21 FF C0 */ stwu r1, -0x40(r1)
|
/* 8020C728 00209688 94 21 FF C0 */ stwu r1, -0x40(r1)
|
||||||
/* 8020C72C 0020968C 7C 08 02 A6 */ mflr r0
|
/* 8020C72C 0020968C 7C 08 02 A6 */ mflr r0
|
||||||
/* 8020C730 00209690 90 01 00 44 */ stw r0, 0x44(r1)
|
/* 8020C730 00209690 90 01 00 44 */ stw r0, 0x44(r1)
|
||||||
|
@ -733,15 +727,15 @@ nullsub_42:
|
||||||
/* 8020C770 002096D0 7C 87 23 78 */ mr r7, r4
|
/* 8020C770 002096D0 7C 87 23 78 */ mr r7, r4
|
||||||
/* 8020C774 002096D4 38 81 00 08 */ addi r4, r1, 8
|
/* 8020C774 002096D4 38 81 00 08 */ addi r4, r1, 8
|
||||||
/* 8020C778 002096D8 4B E4 4B AD */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
/* 8020C778 002096D8 4B E4 4B AD */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 8020C77C 002096DC 3C 60 80 3E */ lis r3, lbl_803E7068@ha
|
/* 8020C77C 002096DC 3C 60 80 3E */ lis r3, __vt__20CScriptStreamedMusic@ha
|
||||||
/* 8020C780 002096E0 7F 64 DB 78 */ mr r4, r27
|
/* 8020C780 002096E0 7F 64 DB 78 */ mr r4, r27
|
||||||
/* 8020C784 002096E4 38 03 70 68 */ addi r0, r3, lbl_803E7068@l
|
/* 8020C784 002096E4 38 03 70 68 */ addi r0, r3, __vt__20CScriptStreamedMusic@l
|
||||||
/* 8020C788 002096E8 38 7A 00 34 */ addi r3, r26, 0x34
|
/* 8020C788 002096E8 38 7A 00 34 */ addi r3, r26, 0x34
|
||||||
/* 8020C78C 002096EC 90 1A 00 00 */ stw r0, 0(r26)
|
/* 8020C78C 002096EC 90 1A 00 00 */ stw r0, 0(r26)
|
||||||
/* 8020C790 002096F0 48 13 19 D1 */ bl "__ct__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
/* 8020C790 002096F0 48 13 19 D1 */ bl "__ct__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 8020C794 002096F4 9B 9A 00 44 */ stb r28, 0x44(r26)
|
/* 8020C794 002096F4 9B 9A 00 44 */ stb r28, 0x44(r26)
|
||||||
/* 8020C798 002096F8 7F 63 DB 78 */ mr r3, r27
|
/* 8020C798 002096F8 7F 63 DB 78 */ mr r3, r27
|
||||||
/* 8020C79C 002096FC 4B FF FE D5 */ bl IsDSPFile__20CScriptStreamedMusicFRCQ24rstl6string
|
/* 8020C79C 002096FC 4B FF FE D5 */ bl "IsDSPFile__20CScriptStreamedMusicFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
|
||||||
/* 8020C7A0 00209700 98 7A 00 45 */ stb r3, 0x45(r26)
|
/* 8020C7A0 00209700 98 7A 00 45 */ stb r3, 0x45(r26)
|
||||||
/* 8020C7A4 00209704 7F 43 D3 78 */ mr r3, r26
|
/* 8020C7A4 00209704 7F 43 D3 78 */ mr r3, r26
|
||||||
/* 8020C7A8 00209708 9B DA 00 46 */ stb r30, 0x46(r26)
|
/* 8020C7A8 00209708 9B DA 00 46 */ stb r30, 0x46(r26)
|
||||||
|
|
|
@ -291,7 +291,7 @@ LIBS = [
|
||||||
["MetroidPrime/Enemies/CFlaahgraPlants", True],
|
["MetroidPrime/Enemies/CFlaahgraPlants", True],
|
||||||
"MetroidPrime/CWorldTransManager",
|
"MetroidPrime/CWorldTransManager",
|
||||||
["MetroidPrime/ScriptObjects/CScriptMidi", False],
|
["MetroidPrime/ScriptObjects/CScriptMidi", False],
|
||||||
"MetroidPrime/ScriptObjects/CScriptStreamedAudio",
|
["MetroidPrime/ScriptObjects/CScriptStreamedAudio", False],
|
||||||
"MetroidPrime/CRagDoll",
|
"MetroidPrime/CRagDoll",
|
||||||
["MetroidPrime/Player/CGameOptions", False],
|
["MetroidPrime/Player/CGameOptions", False],
|
||||||
["MetroidPrime/ScriptObjects/CRepulsor", True],
|
["MetroidPrime/ScriptObjects/CRepulsor", True],
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
|
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
||||||
|
#include "rstl/string.hpp"
|
||||||
|
|
||||||
class CStreamAudioManager {
|
class CStreamAudioManager {
|
||||||
public:
|
public:
|
||||||
static void Update(float dt);
|
static void Update(float dt);
|
||||||
|
@ -10,6 +12,12 @@ public:
|
||||||
static void SetMusicVolume(uint);
|
static void SetMusicVolume(uint);
|
||||||
static void SetSfxVolume(uint);
|
static void SetSfxVolume(uint);
|
||||||
|
|
||||||
|
static void FadeBackIn(int, float);
|
||||||
|
static void TemporaryFadeOut(int, float);
|
||||||
|
|
||||||
|
static void Start(int, const rstl::string&, int, bool, float, float);
|
||||||
|
static void Stop(int, const rstl::string&);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
#ifndef _STRINGEXTRAS
|
||||||
|
#define _STRINGEXTRAS
|
||||||
|
|
||||||
|
#include "rstl/string.hpp"
|
||||||
|
|
||||||
|
class CStringExtras {
|
||||||
|
public:
|
||||||
|
static bool CompareCaseInsensitive(const rstl::string&, const rstl::string&);
|
||||||
|
static int IndexOfSubstring(const rstl::string&, const rstl::string&);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // _STRINGEXTRAS
|
|
@ -62,6 +62,8 @@ public:
|
||||||
const CTweakValue* GetTweakValue(const rstl::string& name) const;
|
const CTweakValue* GetTweakValue(const rstl::string& name) const;
|
||||||
bool ReadFromMemoryCard(const rstl::string&);
|
bool ReadFromMemoryCard(const rstl::string&);
|
||||||
|
|
||||||
|
static rstl::string sub_8021cb38();
|
||||||
|
|
||||||
static rstl::string GetIdentifierForMidiEvent(CAssetId world, CAssetId area, const rstl::string& midiObj);
|
static rstl::string GetIdentifierForMidiEvent(CAssetId world, CAssetId area, const rstl::string& midiObj);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
#ifndef _CSCRIPTSTREAMEDAUDIO
|
||||||
|
#define _CSCRIPTSTREAMEDAUDIO
|
||||||
|
|
||||||
|
#include "MetroidPrime/CEntity.hpp"
|
||||||
|
|
||||||
|
class CScriptStreamedMusic : public CEntity {
|
||||||
|
public:
|
||||||
|
CScriptStreamedMusic(TUniqueId id, const CEntityInfo& info, const rstl::string& name, bool active,
|
||||||
|
const rstl::string& fileName, bool noStopOnDeactivate, float fadeIn,
|
||||||
|
float fadeOut, uint volume, bool loop, bool music);
|
||||||
|
~CScriptStreamedMusic() {}
|
||||||
|
|
||||||
|
void Stop(CStateManager& mgr);
|
||||||
|
void Play(CStateManager& mgr);
|
||||||
|
void Accept(IVisitor& visitor) override;
|
||||||
|
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
rstl::string x34_fileName;
|
||||||
|
bool x44_noStopOnDeactivate;
|
||||||
|
bool x45_fileIsDsp; // As opposed to .adp for DTK streaming
|
||||||
|
bool x46_loop;
|
||||||
|
bool x47_music;
|
||||||
|
float x48_fadeIn;
|
||||||
|
float x4c_fadeOut;
|
||||||
|
uint x50_volume;
|
||||||
|
|
||||||
|
static bool IsDSPFile(const rstl::string& fileName);
|
||||||
|
static int IsOneShot(bool);
|
||||||
|
void StopStream(CStateManager& mgr);
|
||||||
|
void StartStream(CStateManager& mgr);
|
||||||
|
void TweakOverride(CStateManager& mgr);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // _CSCRIPTSTREAMEDAUDIO
|
|
@ -0,0 +1,126 @@
|
||||||
|
#include "MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp"
|
||||||
|
|
||||||
|
#include "MetroidPrime/CGameArea.hpp"
|
||||||
|
#include "MetroidPrime/CWorld.hpp"
|
||||||
|
#include "MetroidPrime/CInGameTweakManager.hpp"
|
||||||
|
|
||||||
|
#include "Kyoto/Audio/CStreamAudioManager.hpp"
|
||||||
|
#include "Kyoto/rstl/StringExtras.hpp"
|
||||||
|
|
||||||
|
extern "C" void nullsub_42();
|
||||||
|
extern "C" void sub_8020c414(CScriptStreamedMusic*, CStateManager& mgr);
|
||||||
|
extern "C" void sub_8020c3f0();
|
||||||
|
extern "C" void sub_8020c154();
|
||||||
|
extern "C" rstl::string sub_8020be90();
|
||||||
|
|
||||||
|
int CScriptStreamedMusic::IsOneShot(bool b) { return b == false; }
|
||||||
|
|
||||||
|
CScriptStreamedMusic::CScriptStreamedMusic(TUniqueId id, const CEntityInfo& info,
|
||||||
|
const rstl::string& name, bool active,
|
||||||
|
const rstl::string& fileName, bool noStopOnDeactivate,
|
||||||
|
float fadeIn, float fadeOut, uint volume, bool loop,
|
||||||
|
bool music)
|
||||||
|
: CEntity(id, info, active, name)
|
||||||
|
, x34_fileName(fileName)
|
||||||
|
, x44_noStopOnDeactivate(noStopOnDeactivate)
|
||||||
|
, x45_fileIsDsp(IsDSPFile(fileName))
|
||||||
|
, x46_loop(loop)
|
||||||
|
, x47_music(music)
|
||||||
|
, x48_fadeIn(fadeIn)
|
||||||
|
, x4c_fadeOut(fadeOut)
|
||||||
|
, x50_volume(volume) {
|
||||||
|
nullsub_42();
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "C" void nullsub_42() {}
|
||||||
|
|
||||||
|
bool CScriptStreamedMusic::IsDSPFile(const rstl::string& fileName) {
|
||||||
|
if (CStringExtras::CompareCaseInsensitive(fileName, rstl::string_l("sw"))) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return CStringExtras::IndexOfSubstring(fileName, rstl::string_l(".dsp")) != -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptStreamedMusic::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
|
||||||
|
CStateManager& stateMgr) {
|
||||||
|
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
|
||||||
|
switch (msg) {
|
||||||
|
case kSM_Play:
|
||||||
|
if (GetActive()) {
|
||||||
|
Play(stateMgr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case kSM_Stop:
|
||||||
|
if (GetActive()) {
|
||||||
|
Stop(stateMgr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case kSM_Increment:
|
||||||
|
if (IsOneShot(x45_fileIsDsp)) {
|
||||||
|
CStreamAudioManager::FadeBackIn(!x46_loop, x48_fadeIn);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case kSM_Decrement:
|
||||||
|
if (IsOneShot(x45_fileIsDsp)) {
|
||||||
|
CStreamAudioManager::TemporaryFadeOut(!x46_loop, x4c_fadeOut);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptStreamedMusic::Accept(IVisitor& visitor) { visitor.Visit(*this); }
|
||||||
|
|
||||||
|
void CScriptStreamedMusic::Play(CStateManager& mgr) {
|
||||||
|
TweakOverride(mgr);
|
||||||
|
if (x45_fileIsDsp) {
|
||||||
|
StartStream(mgr);
|
||||||
|
} else {
|
||||||
|
sub_8020c414(this, mgr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptStreamedMusic::Stop(CStateManager& mgr) {
|
||||||
|
if (x45_fileIsDsp) {
|
||||||
|
StopStream(mgr);
|
||||||
|
} else {
|
||||||
|
sub_8020c3f0();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "C" void sub_8020c414(CScriptStreamedMusic*, CStateManager& mgr) {}
|
||||||
|
|
||||||
|
extern "C" void sub_8020c3f0() {}
|
||||||
|
|
||||||
|
void CScriptStreamedMusic::StartStream(CStateManager& mgr) {
|
||||||
|
CStreamAudioManager::Start(IsOneShot(x46_loop), x34_fileName, x50_volume, x47_music, x48_fadeIn,
|
||||||
|
x4c_fadeOut);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptStreamedMusic::StopStream(CStateManager& mgr) {
|
||||||
|
CStreamAudioManager::Stop(IsOneShot(x46_loop), x34_fileName);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptStreamedMusic::TweakOverride(CStateManager& mgr) {
|
||||||
|
const CWorld* wld = mgr.GetWorld();
|
||||||
|
const CGameArea& area = wld->GetAreaAlways(GetCurrentAreaId());
|
||||||
|
rstl::string twkName = CInGameTweakManager::sub_8021cb38();
|
||||||
|
if (gpTweakManager->HasTweakValue(twkName)) {
|
||||||
|
const CTweakValue::Audio& audio = gpTweakManager->GetTweakValue(twkName)->GetAudio();
|
||||||
|
x34_fileName = audio.GetFileName();
|
||||||
|
x45_fileIsDsp = IsDSPFile(x34_fileName);
|
||||||
|
x48_fadeIn = audio.GetFadeIn();
|
||||||
|
x4c_fadeOut = audio.GetFadeOut();
|
||||||
|
x50_volume = audio.GetVolume() * 127.f;
|
||||||
|
sub_8020be90();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "C" void sub_8020c154() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "C" rstl::string sub_8020be90() {
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue