summaryrefslogtreecommitdiff
path: root/asm/nw4r
diff options
context:
space:
mode:
Diffstat (limited to 'asm/nw4r')
-rw-r--r--asm/nw4r/snd/detail/snd_Channel.s42
-rw-r--r--asm/nw4r/snd/detail/snd_DisposeCallbackManager.s26
-rw-r--r--asm/nw4r/snd/detail/snd_SeqPlayer.s40
-rw-r--r--asm/nw4r/snd/detail/snd_SeqSound.s12
-rw-r--r--asm/nw4r/snd/detail/snd_SeqTrack.s90
-rw-r--r--asm/nw4r/snd/detail/snd_SoundArchiveLoader.s28
-rw-r--r--asm/nw4r/snd/detail/snd_SoundThread.s30
-rw-r--r--asm/nw4r/snd/detail/snd_StrmPlayer.s38
-rw-r--r--asm/nw4r/snd/detail/snd_StrmSound.s10
-rw-r--r--asm/nw4r/snd/detail/snd_TaskManager.s14
-rw-r--r--asm/nw4r/snd/detail/snd_TaskThread.s8
-rw-r--r--asm/nw4r/snd/detail/snd_WaveSound.s10
-rw-r--r--asm/nw4r/snd/detail/snd_WsdPlayer.s46
-rw-r--r--asm/nw4r/snd/snd_SoundArchivePlayer.s46
-rw-r--r--asm/nw4r/snd/snd_SoundHeap.s6
-rw-r--r--asm/nw4r/snd/snd_SoundPlayer.s158
-rw-r--r--asm/nw4r/ut/ut_DvdLockedFileStream.s12
17 files changed, 308 insertions, 308 deletions
diff --git a/asm/nw4r/snd/detail/snd_Channel.s b/asm/nw4r/snd/detail/snd_Channel.s
index d6009c3..3a12927 100644
--- a/asm/nw4r/snd/detail/snd_Channel.s
+++ b/asm/nw4r/snd/detail/snd_Channel.s
@@ -24,7 +24,7 @@ GetInstance__Q44nw4r3snd6detail14ChannelManagerFv:
/* 8036E1DC 00369E3C 90 9F 00 0C */ stw r4, 0xc(r31)
/* 8036E1E0 00369E40 98 1F 00 10 */ stb r0, 0x10(r31)
/* 8036E1E4 00369E44 90 1F 00 14 */ stw r0, 0x14(r31)
-/* 8036E1E8 00369E48 4B F0 17 29 */ bl func_8026F910
+/* 8036E1E8 00369E48 4B F0 17 29 */ bl OSInitMutex
/* 8036E1EC 00369E4C 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail14ChannelManagerFv@ha
/* 8036E1F0 00369E50 3C A0 80 62 */ lis r5, lbl_80621978@ha
/* 8036E1F4 00369E54 7F E3 FB 78 */ mr r3, r31
@@ -137,7 +137,7 @@ __ct__Q44nw4r3snd6detail7ChannelFv:
/* 8036E35C 00369FBC 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8036E360 00369FC0 3B A3 00 20 */ addi r29, r3, 0x20
/* 8036E364 00369FC4 7F A3 EB 78 */ mr r3, r29
-/* 8036E368 00369FC8 4B F0 15 E1 */ bl func_8026F948
+/* 8036E368 00369FC8 4B F0 15 E1 */ bl OSLockMutex
/* 8036E36C 00369FCC 87 FE 00 08 */ lwzu r31, 8(r30)
/* 8036E370 00369FD0 48 00 00 18 */ b lbl_8036E388
lbl_8036E374:
@@ -150,7 +150,7 @@ lbl_8036E388:
/* 8036E388 00369FE8 7C 1F F0 40 */ cmplw r31, r30
/* 8036E38C 00369FEC 40 82 FF E8 */ bne lbl_8036E374
/* 8036E390 00369FF0 7F A3 EB 78 */ mr r3, r29
-/* 8036E394 00369FF4 4B F0 16 91 */ bl func_8026FA24
+/* 8036E394 00369FF4 4B F0 16 91 */ bl OSUnlockMutex
/* 8036E398 00369FF8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8036E39C 00369FFC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8036E3A0 0036A000 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -366,7 +366,7 @@ lbl_8036E630:
/* 8036E6BC 0036A31C 90 BF 00 0C */ stw r5, 0xc(r31)
/* 8036E6C0 0036A320 98 9F 00 10 */ stb r4, 0x10(r31)
/* 8036E6C4 0036A324 90 9F 00 14 */ stw r4, 0x14(r31)
-/* 8036E6C8 0036A328 4B F0 12 49 */ bl func_8026F910
+/* 8036E6C8 0036A328 4B F0 12 49 */ bl OSInitMutex
/* 8036E6CC 0036A32C 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail14ChannelManagerFv@ha
/* 8036E6D0 0036A330 3C A0 80 62 */ lis r5, lbl_80621978@ha
/* 8036E6D4 0036A334 7F E3 FB 78 */ mr r3, r31
@@ -380,7 +380,7 @@ lbl_8036E6EC:
/* 8036E6F0 0036A350 3B BD 19 88 */ addi r29, r29, lbl_80621988@l
/* 8036E6F4 0036A354 3B FD 00 20 */ addi r31, r29, 0x20
/* 8036E6F8 0036A358 7F E3 FB 78 */ mr r3, r31
-/* 8036E6FC 0036A35C 4B F0 12 4D */ bl func_8026F948
+/* 8036E6FC 0036A35C 4B F0 12 4D */ bl OSLockMutex
/* 8036E700 0036A360 38 7D 00 04 */ addi r3, r29, 4
/* 8036E704 0036A364 38 9E 00 E4 */ addi r4, r30, 0xe4
/* 8036E708 0036A368 4B FF 45 6D */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
@@ -391,7 +391,7 @@ lbl_8036E6EC:
/* 8036E71C 0036A37C 48 00 34 99 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
lbl_8036E720:
/* 8036E720 0036A380 7F E3 FB 78 */ mr r3, r31
-/* 8036E724 0036A384 4B F0 13 01 */ bl func_8026FA24
+/* 8036E724 0036A384 4B F0 13 01 */ bl OSUnlockMutex
lbl_8036E728:
/* 8036E728 0036A388 81 9E 00 D4 */ lwz r12, 0xd4(r30)
/* 8036E72C 0036A38C 2C 0C 00 00 */ cmpwi r12, 0
@@ -436,7 +436,7 @@ lbl_8036E74C:
/* 8036E7C4 0036A424 90 BF 00 0C */ stw r5, 0xc(r31)
/* 8036E7C8 0036A428 98 9F 00 10 */ stb r4, 0x10(r31)
/* 8036E7CC 0036A42C 90 9F 00 14 */ stw r4, 0x14(r31)
-/* 8036E7D0 0036A430 4B F0 11 41 */ bl func_8026F910
+/* 8036E7D0 0036A430 4B F0 11 41 */ bl OSInitMutex
/* 8036E7D4 0036A434 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail14ChannelManagerFv@ha
/* 8036E7D8 0036A438 3C A0 80 62 */ lis r5, lbl_80621978@ha
/* 8036E7DC 0036A43C 7F E3 FB 78 */ mr r3, r31
@@ -450,7 +450,7 @@ lbl_8036E7F4:
/* 8036E7F8 0036A458 3B BD 19 88 */ addi r29, r29, lbl_80621988@l
/* 8036E7FC 0036A45C 3B FD 00 20 */ addi r31, r29, 0x20
/* 8036E800 0036A460 7F E3 FB 78 */ mr r3, r31
-/* 8036E804 0036A464 4B F0 11 45 */ bl func_8026F948
+/* 8036E804 0036A464 4B F0 11 45 */ bl OSLockMutex
/* 8036E808 0036A468 38 7D 00 04 */ addi r3, r29, 4
/* 8036E80C 0036A46C 38 9E 00 E4 */ addi r4, r30, 0xe4
/* 8036E810 0036A470 4B FF 44 65 */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
@@ -461,7 +461,7 @@ lbl_8036E7F4:
/* 8036E824 0036A484 48 00 33 91 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
lbl_8036E828:
/* 8036E828 0036A488 7F E3 FB 78 */ mr r3, r31
-/* 8036E82C 0036A48C 4B F0 11 F9 */ bl func_8026FA24
+/* 8036E82C 0036A48C 4B F0 11 F9 */ bl OSUnlockMutex
lbl_8036E830:
/* 8036E830 0036A490 81 9E 00 D4 */ lwz r12, 0xd4(r30)
/* 8036E834 0036A494 2C 0C 00 00 */ cmpwi r12, 0
@@ -849,7 +849,7 @@ Stop__Q44nw4r3snd6detail7ChannelFv:
/* 8036EDD0 0036AA30 90 BF 00 0C */ stw r5, 0xc(r31)
/* 8036EDD4 0036AA34 98 9F 00 10 */ stb r4, 0x10(r31)
/* 8036EDD8 0036AA38 90 9F 00 14 */ stw r4, 0x14(r31)
-/* 8036EDDC 0036AA3C 4B F0 0B 35 */ bl func_8026F910
+/* 8036EDDC 0036AA3C 4B F0 0B 35 */ bl OSInitMutex
/* 8036EDE0 0036AA40 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail14ChannelManagerFv@ha
/* 8036EDE4 0036AA44 3C A0 80 62 */ lis r5, lbl_80621978@ha
/* 8036EDE8 0036AA48 7F E3 FB 78 */ mr r3, r31
@@ -863,7 +863,7 @@ lbl_8036EE00:
/* 8036EE04 0036AA64 3B DE 19 88 */ addi r30, r30, lbl_80621988@l
/* 8036EE08 0036AA68 3B FE 00 20 */ addi r31, r30, 0x20
/* 8036EE0C 0036AA6C 7F E3 FB 78 */ mr r3, r31
-/* 8036EE10 0036AA70 4B F0 0B 39 */ bl func_8026F948
+/* 8036EE10 0036AA70 4B F0 0B 39 */ bl OSLockMutex
/* 8036EE14 0036AA74 38 7E 00 04 */ addi r3, r30, 4
/* 8036EE18 0036AA78 38 9D 00 E4 */ addi r4, r29, 0xe4
/* 8036EE1C 0036AA7C 4B FF 3E 59 */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
@@ -874,7 +874,7 @@ lbl_8036EE00:
/* 8036EE30 0036AA90 48 00 2D 85 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
lbl_8036EE34:
/* 8036EE34 0036AA94 7F E3 FB 78 */ mr r3, r31
-/* 8036EE38 0036AA98 4B F0 0B ED */ bl func_8026FA24
+/* 8036EE38 0036AA98 4B F0 0B ED */ bl OSUnlockMutex
lbl_8036EE3C:
/* 8036EE3C 0036AA9C 81 9D 00 D4 */ lwz r12, 0xd4(r29)
/* 8036EE40 0036AAA0 2C 0C 00 00 */ cmpwi r12, 0
@@ -976,7 +976,7 @@ lbl_8036EF38:
/* 8036EF7C 0036ABDC 90 BF 00 0C */ stw r5, 0xc(r31)
/* 8036EF80 0036ABE0 98 9F 00 10 */ stb r4, 0x10(r31)
/* 8036EF84 0036ABE4 90 9F 00 14 */ stw r4, 0x14(r31)
-/* 8036EF88 0036ABE8 4B F0 09 89 */ bl func_8026F910
+/* 8036EF88 0036ABE8 4B F0 09 89 */ bl OSInitMutex
/* 8036EF8C 0036ABEC 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail14ChannelManagerFv@ha
/* 8036EF90 0036ABF0 3C A0 80 62 */ lis r5, lbl_80621978@ha
/* 8036EF94 0036ABF4 7F E3 FB 78 */ mr r3, r31
@@ -990,7 +990,7 @@ lbl_8036EFAC:
/* 8036EFB0 0036AC10 3B DE 19 88 */ addi r30, r30, lbl_80621988@l
/* 8036EFB4 0036AC14 3B FE 00 20 */ addi r31, r30, 0x20
/* 8036EFB8 0036AC18 7F E3 FB 78 */ mr r3, r31
-/* 8036EFBC 0036AC1C 4B F0 09 8D */ bl func_8026F948
+/* 8036EFBC 0036AC1C 4B F0 09 8D */ bl OSLockMutex
/* 8036EFC0 0036AC20 38 7E 00 04 */ addi r3, r30, 4
/* 8036EFC4 0036AC24 38 9D 00 E4 */ addi r4, r29, 0xe4
/* 8036EFC8 0036AC28 4B FF 3C AD */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
@@ -1001,7 +1001,7 @@ lbl_8036EFAC:
/* 8036EFDC 0036AC3C 48 00 2B D9 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
lbl_8036EFE0:
/* 8036EFE0 0036AC40 7F E3 FB 78 */ mr r3, r31
-/* 8036EFE4 0036AC44 4B F0 0A 41 */ bl func_8026FA24
+/* 8036EFE4 0036AC44 4B F0 0A 41 */ bl OSUnlockMutex
/* 8036EFE8 0036AC48 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8036EFEC 0036AC4C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8036EFF0 0036AC50 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -1038,7 +1038,7 @@ AllocChannel__Q44nw4r3snd6detail7ChannelFiiiPFPQ44nw4r3snd6detail7ChannelQ54nw4r
/* 8036F060 0036ACC0 90 9C 00 0C */ stw r4, 0xc(r28)
/* 8036F064 0036ACC4 98 1C 00 10 */ stb r0, 0x10(r28)
/* 8036F068 0036ACC8 90 1C 00 14 */ stw r0, 0x14(r28)
-/* 8036F06C 0036ACCC 4B F0 08 A5 */ bl func_8026F910
+/* 8036F06C 0036ACCC 4B F0 08 A5 */ bl OSInitMutex
/* 8036F070 0036ACD0 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail14ChannelManagerFv@ha
/* 8036F074 0036ACD4 3C A0 80 62 */ lis r5, lbl_80621978@ha
/* 8036F078 0036ACD8 7F 83 E3 78 */ mr r3, r28
@@ -1052,7 +1052,7 @@ lbl_8036F090:
/* 8036F094 0036ACF4 3B 7B 19 88 */ addi r27, r27, lbl_80621988@l
/* 8036F098 0036ACF8 3B 9B 00 20 */ addi r28, r27, 0x20
/* 8036F09C 0036ACFC 7F 83 E3 78 */ mr r3, r28
-/* 8036F0A0 0036AD00 4B F0 08 A9 */ bl func_8026F948
+/* 8036F0A0 0036AD00 4B F0 08 A9 */ bl OSLockMutex
/* 8036F0A4 0036AD04 7F 63 DB 78 */ mr r3, r27
/* 8036F0A8 0036AD08 48 00 2A B1 */ bl AllocImpl__Q44nw4r3snd6detail8PoolImplFv
/* 8036F0AC 0036AD0C 2C 03 00 00 */ cmpwi r3, 0
@@ -1088,7 +1088,7 @@ lbl_8036F108:
/* 8036F11C 0036AD7C 38 81 00 08 */ addi r4, r1, 8
/* 8036F120 0036AD80 4B FF 3B 29 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8036F124 0036AD84 7F 83 E3 78 */ mr r3, r28
-/* 8036F128 0036AD88 4B F0 08 FD */ bl func_8026FA24
+/* 8036F128 0036AD88 4B F0 08 FD */ bl OSUnlockMutex
/* 8036F12C 0036AD8C 2C 1A 00 00 */ cmpwi r26, 0
/* 8036F130 0036AD90 40 82 00 0C */ bne lbl_8036F13C
/* 8036F134 0036AD94 38 60 00 00 */ li r3, 0
@@ -1122,7 +1122,7 @@ lbl_8036F13C:
/* 8036F1A0 0036AE00 90 9D 00 0C */ stw r4, 0xc(r29)
/* 8036F1A4 0036AE04 98 1D 00 10 */ stb r0, 0x10(r29)
/* 8036F1A8 0036AE08 90 1D 00 14 */ stw r0, 0x14(r29)
-/* 8036F1AC 0036AE0C 4B F0 07 65 */ bl func_8026F910
+/* 8036F1AC 0036AE0C 4B F0 07 65 */ bl OSInitMutex
/* 8036F1B0 0036AE10 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail14ChannelManagerFv@ha
/* 8036F1B4 0036AE14 3C A0 80 62 */ lis r5, lbl_80621978@ha
/* 8036F1B8 0036AE18 7F A3 EB 78 */ mr r3, r29
@@ -1135,7 +1135,7 @@ lbl_8036F1CC:
/* 8036F1D0 0036AE30 3B 7B 19 88 */ addi r27, r27, lbl_80621988@l
/* 8036F1D4 0036AE34 3B BB 00 20 */ addi r29, r27, 0x20
/* 8036F1D8 0036AE38 7F A3 EB 78 */ mr r3, r29
-/* 8036F1DC 0036AE3C 4B F0 07 6D */ bl func_8026F948
+/* 8036F1DC 0036AE3C 4B F0 07 6D */ bl OSLockMutex
/* 8036F1E0 0036AE40 7F 24 CB 78 */ mr r4, r25
/* 8036F1E4 0036AE44 38 7B 00 04 */ addi r3, r27, 4
/* 8036F1E8 0036AE48 4B FF 3A 8D */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
@@ -1146,7 +1146,7 @@ lbl_8036F1CC:
/* 8036F1FC 0036AE5C 48 00 29 B9 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
lbl_8036F200:
/* 8036F200 0036AE60 7F A3 EB 78 */ mr r3, r29
-/* 8036F204 0036AE64 4B F0 08 21 */ bl func_8026FA24
+/* 8036F204 0036AE64 4B F0 08 21 */ bl OSUnlockMutex
/* 8036F208 0036AE68 38 60 00 00 */ li r3, 0
/* 8036F20C 0036AE6C 48 00 00 1C */ b lbl_8036F228
lbl_8036F210:
diff --git a/asm/nw4r/snd/detail/snd_DisposeCallbackManager.s b/asm/nw4r/snd/detail/snd_DisposeCallbackManager.s
index 9b4b81b..6610547 100644
--- a/asm/nw4r/snd/detail/snd_DisposeCallbackManager.s
+++ b/asm/nw4r/snd/detail/snd_DisposeCallbackManager.s
@@ -24,7 +24,7 @@ GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv:
/* 8036F29C 0036AEFC 90 1E 00 18 */ stw r0, 0x18(r30)
/* 8036F2A0 0036AF00 90 9E 00 1C */ stw r4, 0x1c(r30)
/* 8036F2A4 0036AF04 90 9E 00 20 */ stw r4, 0x20(r30)
-/* 8036F2A8 0036AF08 4B F0 06 69 */ bl func_8026F910
+/* 8036F2A8 0036AF08 4B F0 06 69 */ bl OSInitMutex
/* 8036F2AC 0036AF0C 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail22DisposeCallbackManagerFv@ha
/* 8036F2B0 0036AF10 3C A0 80 62 */ lis r5, lbl_806219C0@ha
/* 8036F2B4 0036AF14 7F C3 F3 78 */ mr r3, r30
@@ -83,7 +83,7 @@ __dt__Q34nw4r2ut47LinkList$0Q44nw4r3snd6detail15DisposeCallback$40$1Fv:
/* 8036F364 0036AFC4 7C 9F 23 78 */ mr r31, r4
/* 8036F368 0036AFC8 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8036F36C 0036AFCC 7C 7E 1B 78 */ mr r30, r3
-/* 8036F370 0036AFD0 4B F0 05 D9 */ bl func_8026F948
+/* 8036F370 0036AFD0 4B F0 05 D9 */ bl OSLockMutex
/* 8036F374 0036AFD4 38 1E 00 1C */ addi r0, r30, 0x1c
/* 8036F378 0036AFD8 7F E5 FB 78 */ mr r5, r31
/* 8036F37C 0036AFDC 90 01 00 08 */ stw r0, 8(r1)
@@ -91,7 +91,7 @@ __dt__Q34nw4r2ut47LinkList$0Q44nw4r3snd6detail15DisposeCallback$40$1Fv:
/* 8036F384 0036AFE4 38 81 00 08 */ addi r4, r1, 8
/* 8036F388 0036AFE8 4B FF 38 C1 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8036F38C 0036AFEC 7F C3 F3 78 */ mr r3, r30
-/* 8036F390 0036AFF0 4B F0 06 95 */ bl func_8026FA24
+/* 8036F390 0036AFF0 4B F0 06 95 */ bl OSUnlockMutex
/* 8036F394 0036AFF4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8036F398 0036AFF8 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8036F39C 0036AFFC 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -108,12 +108,12 @@ __ct__Q44nw4r3snd6detail22DisposeCallbackManagerFv:
/* 8036F3BC 0036B01C 7C 9F 23 78 */ mr r31, r4
/* 8036F3C0 0036B020 93 C1 00 08 */ stw r30, 8(r1)
/* 8036F3C4 0036B024 7C 7E 1B 78 */ mr r30, r3
-/* 8036F3C8 0036B028 4B F0 05 81 */ bl func_8026F948
+/* 8036F3C8 0036B028 4B F0 05 81 */ bl OSLockMutex
/* 8036F3CC 0036B02C 7F E4 FB 78 */ mr r4, r31
/* 8036F3D0 0036B030 38 7E 00 18 */ addi r3, r30, 0x18
/* 8036F3D4 0036B034 4B FF 38 A1 */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
/* 8036F3D8 0036B038 7F C3 F3 78 */ mr r3, r30
-/* 8036F3DC 0036B03C 4B F0 06 49 */ bl func_8026FA24
+/* 8036F3DC 0036B03C 4B F0 06 49 */ bl OSUnlockMutex
/* 8036F3E0 0036B040 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8036F3E4 0036B044 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8036F3E8 0036B048 83 C1 00 08 */ lwz r30, 8(r1)
@@ -131,7 +131,7 @@ Dispose__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv:
/* 8036F40C 0036B06C 7C 9F 23 78 */ mr r31, r4
/* 8036F410 0036B070 7C 7D 1B 78 */ mr r29, r3
/* 8036F414 0036B074 7F C4 2A 14 */ add r30, r4, r5
-/* 8036F418 0036B078 4B F0 05 31 */ bl func_8026F948
+/* 8036F418 0036B078 4B F0 05 31 */ bl OSLockMutex
/* 8036F41C 0036B07C 4B EF F3 41 */ bl OSDisableInterrupts
/* 8036F420 0036B080 88 0D B2 00 */ lbz r0, lbl_806404C0-_SDA_BASE_(r13)
/* 8036F424 0036B084 7C 7C 1B 78 */ mr r28, r3
@@ -147,7 +147,7 @@ Dispose__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv:
/* 8036F44C 0036B0AC 90 15 00 18 */ stw r0, 0x18(r21)
/* 8036F450 0036B0B0 90 95 00 1C */ stw r4, 0x1c(r21)
/* 8036F454 0036B0B4 90 95 00 20 */ stw r4, 0x20(r21)
-/* 8036F458 0036B0B8 4B F0 04 B9 */ bl func_8026F910
+/* 8036F458 0036B0B8 4B F0 04 B9 */ bl OSInitMutex
/* 8036F45C 0036B0BC 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail22DisposeCallbackManagerFv@ha
/* 8036F460 0036B0C0 3C A0 80 62 */ lis r5, lbl_806219C0@ha
/* 8036F464 0036B0C4 7E A3 AB 78 */ mr r3, r21
@@ -190,7 +190,7 @@ lbl_8036F4C8:
/* 8036F4EC 0036B14C 92 D5 00 18 */ stw r22, 0x18(r21)
/* 8036F4F0 0036B150 90 95 00 1C */ stw r4, 0x1c(r21)
/* 8036F4F4 0036B154 90 95 00 20 */ stw r4, 0x20(r21)
-/* 8036F4F8 0036B158 4B F0 04 19 */ bl func_8026F910
+/* 8036F4F8 0036B158 4B F0 04 19 */ bl OSInitMutex
/* 8036F4FC 0036B15C 7E A3 AB 78 */ mr r3, r21
/* 8036F500 0036B160 38 97 F2 F4 */ addi r4, r23, -3340
/* 8036F504 0036B164 38 B8 19 C0 */ addi r5, r24, 0x19c0
@@ -202,7 +202,7 @@ lbl_8036F510:
/* 8036F518 0036B178 7C 1C D0 40 */ cmplw r28, r26
/* 8036F51C 0036B17C 40 82 FF 8C */ bne lbl_8036F4A8
/* 8036F520 0036B180 7F A3 EB 78 */ mr r3, r29
-/* 8036F524 0036B184 4B F0 05 01 */ bl func_8026FA24
+/* 8036F524 0036B184 4B F0 05 01 */ bl OSUnlockMutex
/* 8036F528 0036B188 39 61 00 40 */ addi r11, r1, 0x40
/* 8036F52C 0036B18C 4B E5 7C 31 */ bl _restgpr_21
/* 8036F530 0036B190 80 01 00 44 */ lwz r0, 0x44(r1)
@@ -220,7 +220,7 @@ DisposeWave__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv:
/* 8036F554 0036B1B4 7C 9F 23 78 */ mr r31, r4
/* 8036F558 0036B1B8 7C 7D 1B 78 */ mr r29, r3
/* 8036F55C 0036B1BC 7F C4 2A 14 */ add r30, r4, r5
-/* 8036F560 0036B1C0 4B F0 03 E9 */ bl func_8026F948
+/* 8036F560 0036B1C0 4B F0 03 E9 */ bl OSLockMutex
/* 8036F564 0036B1C4 4B EF F1 F9 */ bl OSDisableInterrupts
/* 8036F568 0036B1C8 88 0D B2 00 */ lbz r0, lbl_806404C0-_SDA_BASE_(r13)
/* 8036F56C 0036B1CC 7C 7C 1B 78 */ mr r28, r3
@@ -236,7 +236,7 @@ DisposeWave__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv:
/* 8036F594 0036B1F4 90 15 00 18 */ stw r0, 0x18(r21)
/* 8036F598 0036B1F8 90 95 00 1C */ stw r4, 0x1c(r21)
/* 8036F59C 0036B1FC 90 95 00 20 */ stw r4, 0x20(r21)
-/* 8036F5A0 0036B200 4B F0 03 71 */ bl func_8026F910
+/* 8036F5A0 0036B200 4B F0 03 71 */ bl OSInitMutex
/* 8036F5A4 0036B204 3C 80 80 37 */ lis r4, __dt__Q44nw4r3snd6detail22DisposeCallbackManagerFv@ha
/* 8036F5A8 0036B208 3C A0 80 62 */ lis r5, lbl_806219C0@ha
/* 8036F5AC 0036B20C 7E A3 AB 78 */ mr r3, r21
@@ -279,7 +279,7 @@ lbl_8036F610:
/* 8036F634 0036B294 92 D5 00 18 */ stw r22, 0x18(r21)
/* 8036F638 0036B298 90 95 00 1C */ stw r4, 0x1c(r21)
/* 8036F63C 0036B29C 90 95 00 20 */ stw r4, 0x20(r21)
-/* 8036F640 0036B2A0 4B F0 02 D1 */ bl func_8026F910
+/* 8036F640 0036B2A0 4B F0 02 D1 */ bl OSInitMutex
/* 8036F644 0036B2A4 7E A3 AB 78 */ mr r3, r21
/* 8036F648 0036B2A8 38 97 F2 F4 */ addi r4, r23, -3340
/* 8036F64C 0036B2AC 38 B8 19 C0 */ addi r5, r24, 0x19c0
@@ -291,7 +291,7 @@ lbl_8036F658:
/* 8036F660 0036B2C0 7C 1C D0 40 */ cmplw r28, r26
/* 8036F664 0036B2C4 40 82 FF 8C */ bne lbl_8036F5F0
/* 8036F668 0036B2C8 7F A3 EB 78 */ mr r3, r29
-/* 8036F66C 0036B2CC 4B F0 03 B9 */ bl func_8026FA24
+/* 8036F66C 0036B2CC 4B F0 03 B9 */ bl OSUnlockMutex
/* 8036F670 0036B2D0 39 61 00 40 */ addi r11, r1, 0x40
/* 8036F674 0036B2D4 4B E5 7A E9 */ bl _restgpr_21
/* 8036F678 0036B2D8 80 01 00 44 */ lwz r0, 0x44(r1)
diff --git a/asm/nw4r/snd/detail/snd_SeqPlayer.s b/asm/nw4r/snd/detail/snd_SeqPlayer.s
index 796f9ef..1956c04 100644
--- a/asm/nw4r/snd/detail/snd_SeqPlayer.s
+++ b/asm/nw4r/snd/detail/snd_SeqPlayer.s
@@ -25,7 +25,7 @@ __ct__Q44nw4r3snd6detail9SeqPlayerFv:
/* 80373AA8 0036F708 90 9E 00 7C */ stw r4, 0x7c(r30)
/* 80373AAC 0036F70C 90 1E 00 88 */ stw r0, 0x88(r30)
/* 80373AB0 0036F710 9B FE 00 8C */ stb r31, 0x8c(r30)
-/* 80373AB4 0036F714 4B EF BE 5D */ bl func_8026F910
+/* 80373AB4 0036F714 4B EF BE 5D */ bl OSInitMutex
/* 80373AB8 0036F718 C0 22 A6 A8 */ lfs f1, lbl_80642CA8-_SDA2_BASE_(r2)
/* 80373ABC 0036F71C 38 C0 00 78 */ li r6, 0x78
/* 80373AC0 0036F720 C0 02 A6 AC */ lfs f0, lbl_80642CAC-_SDA2_BASE_(r2)
@@ -270,7 +270,7 @@ Setup__Q44nw4r3snd6detail9SeqPlayerFPQ44nw4r3snd6detail17SeqTrackAllocatorUliPQ4
/* 80373E34 0036FA94 7C D7 33 78 */ mr r23, r6
/* 80373E38 0036FA98 7C F8 3B 78 */ mr r24, r7
/* 80373E3C 0036FA9C 7F 63 DB 78 */ mr r3, r27
-/* 80373E40 0036FAA0 4B EF BB 09 */ bl func_8026F948
+/* 80373E40 0036FAA0 4B EF BB 09 */ bl OSLockMutex
/* 80373E44 0036FAA4 88 1D 00 8D */ lbz r0, 0x8d(r29)
/* 80373E48 0036FAA8 2C 00 00 00 */ cmpwi r0, 0
/* 80373E4C 0036FAAC 41 82 00 28 */ beq lbl_80373E74
@@ -353,7 +353,7 @@ lbl_80373F30:
/* 80373F54 0036FBB4 7F 83 E3 78 */ mr r3, r28
/* 80373F58 0036FBB8 4B EF A8 2D */ bl OSRestoreInterrupts
/* 80373F5C 0036FBBC 7F 63 DB 78 */ mr r3, r27
-/* 80373F60 0036FBC0 4B EF BA C5 */ bl func_8026FA24
+/* 80373F60 0036FBC0 4B EF BA C5 */ bl OSUnlockMutex
/* 80373F64 0036FBC4 38 60 00 01 */ li r3, 1
/* 80373F68 0036FBC8 48 00 00 94 */ b lbl_80373FFC
lbl_80373F6C:
@@ -395,7 +395,7 @@ lbl_80373FD8:
/* 80373FE8 0036FC48 93 DD 00 B4 */ stw r30, 0xb4(r29)
/* 80373FEC 0036FC4C 7F 63 DB 78 */ mr r3, r27
/* 80373FF0 0036FC50 98 1D 00 8C */ stb r0, 0x8c(r29)
-/* 80373FF4 0036FC54 4B EF BA 31 */ bl func_8026FA24
+/* 80373FF4 0036FC54 4B EF BA 31 */ bl OSUnlockMutex
/* 80373FF8 0036FC58 38 60 00 00 */ li r3, 0
lbl_80373FFC:
/* 80373FFC 0036FC5C 39 61 00 30 */ addi r11, r1, 0x30
@@ -419,7 +419,7 @@ SetSeqData__Q44nw4r3snd6detail9SeqPlayerFPCvl:
/* 80374038 0036FC98 7C BD 2B 78 */ mr r29, r5
/* 8037403C 0036FC9C 93 81 00 10 */ stw r28, 0x10(r1)
/* 80374040 0036FCA0 7C 9C 23 78 */ mr r28, r4
-/* 80374044 0036FCA4 4B EF B9 05 */ bl func_8026F948
+/* 80374044 0036FCA4 4B EF B9 05 */ bl OSLockMutex
/* 80374048 0036FCA8 2C 1C 00 00 */ cmpwi r28, 0
/* 8037404C 0036FCAC 83 DE 00 B8 */ lwz r30, 0xb8(r30)
/* 80374050 0036FCB0 41 82 00 1C */ beq lbl_8037406C
@@ -431,7 +431,7 @@ SetSeqData__Q44nw4r3snd6detail9SeqPlayerFPCvl:
/* 80374068 0036FCC8 48 00 16 09 */ bl Open__Q44nw4r3snd6detail8SeqTrackFv
lbl_8037406C:
/* 8037406C 0036FCCC 7F E3 FB 78 */ mr r3, r31
-/* 80374070 0036FCD0 4B EF B9 B5 */ bl func_8026FA24
+/* 80374070 0036FCD0 4B EF B9 B5 */ bl OSUnlockMutex
/* 80374074 0036FCD4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80374078 0036FCD8 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037407C 0036FCDC 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -452,7 +452,7 @@ Start__Q44nw4r3snd6detail9SeqPlayerFv:
/* 803740AC 0036FD0C 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803740B0 0036FD10 7C 7D 1B 78 */ mr r29, r3
/* 803740B4 0036FD14 7F E3 FB 78 */ mr r3, r31
-/* 803740B8 0036FD18 4B EF B8 91 */ bl func_8026F948
+/* 803740B8 0036FD18 4B EF B8 91 */ bl OSLockMutex
/* 803740BC 0036FD1C 2C 1D 00 00 */ cmpwi r29, 0
/* 803740C0 0036FD20 7F BE EB 78 */ mr r30, r29
/* 803740C4 0036FD24 41 82 00 08 */ beq lbl_803740CC
@@ -464,7 +464,7 @@ lbl_803740CC:
/* 803740D8 0036FD38 38 00 00 01 */ li r0, 1
/* 803740DC 0036FD3C 7F E3 FB 78 */ mr r3, r31
/* 803740E0 0036FD40 98 1D 00 8D */ stb r0, 0x8d(r29)
-/* 803740E4 0036FD44 4B EF B9 41 */ bl func_8026FA24
+/* 803740E4 0036FD44 4B EF B9 41 */ bl OSUnlockMutex
/* 803740E8 0036FD48 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803740EC 0036FD4C 38 60 00 01 */ li r3, 1
/* 803740F0 0036FD50 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -484,7 +484,7 @@ Stop__Q44nw4r3snd6detail9SeqPlayerFv:
/* 8037411C 0036FD7C 3B C3 01 1C */ addi r30, r3, 0x11c
/* 80374120 0036FD80 7C 7B 1B 78 */ mr r27, r3
/* 80374124 0036FD84 7F C3 F3 78 */ mr r3, r30
-/* 80374128 0036FD88 4B EF B8 21 */ bl func_8026F948
+/* 80374128 0036FD88 4B EF B8 21 */ bl OSLockMutex
/* 8037412C 0036FD8C 88 1B 00 8D */ lbz r0, 0x8d(r27)
/* 80374130 0036FD90 2C 00 00 00 */ cmpwi r0, 0
/* 80374134 0036FD94 41 82 00 28 */ beq lbl_8037415C
@@ -540,7 +540,7 @@ lbl_803741D4:
/* 803741DC 0036FE3C 2C 1D 00 10 */ cmpwi r29, 0x10
/* 803741E0 0036FE40 41 80 FF B8 */ blt lbl_80374198
/* 803741E4 0036FE44 7F C3 F3 78 */ mr r3, r30
-/* 803741E8 0036FE48 4B EF B8 3D */ bl func_8026FA24
+/* 803741E8 0036FE48 4B EF B8 3D */ bl OSUnlockMutex
/* 803741EC 0036FE4C 39 61 00 20 */ addi r11, r1, 0x20
/* 803741F0 0036FE50 4B E5 2F 85 */ bl _restgpr_27
/* 803741F4 0036FE54 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -561,7 +561,7 @@ Pause__Q44nw4r3snd6detail9SeqPlayerFb:
/* 80374224 0036FE84 93 81 00 10 */ stw r28, 0x10(r1)
/* 80374228 0036FE88 7C 7C 1B 78 */ mr r28, r3
/* 8037422C 0036FE8C 7F E3 FB 78 */ mr r3, r31
-/* 80374230 0036FE90 4B EF B7 19 */ bl func_8026F948
+/* 80374230 0036FE90 4B EF B7 19 */ bl OSLockMutex
/* 80374234 0036FE94 57 A3 06 3E */ clrlwi r3, r29, 0x18
/* 80374238 0036FE98 3B C0 00 00 */ li r30, 0
/* 8037423C 0036FE9C 7C 03 00 D0 */ neg r0, r3
@@ -586,7 +586,7 @@ lbl_80374270:
/* 80374278 0036FED8 2C 1E 00 10 */ cmpwi r30, 0x10
/* 8037427C 0036FEDC 41 80 FF D0 */ blt lbl_8037424C
/* 80374280 0036FEE0 7F E3 FB 78 */ mr r3, r31
-/* 80374284 0036FEE4 4B EF B7 A1 */ bl func_8026FA24
+/* 80374284 0036FEE4 4B EF B7 A1 */ bl OSUnlockMutex
/* 80374288 0036FEE8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037428C 0036FEEC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80374290 0036FEF0 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -613,7 +613,7 @@ Skip__Q44nw4r3snd6detail9SeqPlayerFQ54nw4r3snd6detail9SeqPlayer10OffsetTypei:
/* 803742D8 0036FF38 41 82 00 68 */ beq lbl_80374340
/* 803742DC 0036FF3C 3B E3 01 1C */ addi r31, r3, 0x11c
/* 803742E0 0036FF40 7F E3 FB 78 */ mr r3, r31
-/* 803742E4 0036FF44 4B EF B6 65 */ bl func_8026F948
+/* 803742E4 0036FF44 4B EF B6 65 */ bl OSLockMutex
/* 803742E8 0036FF48 2C 1D 00 01 */ cmpwi r29, 1
/* 803742EC 0036FF4C 41 82 00 24 */ beq lbl_80374310
/* 803742F0 0036FF50 40 80 00 48 */ bge lbl_80374338
@@ -638,7 +638,7 @@ lbl_80374310:
/* 80374334 0036FF94 D0 1C 00 A0 */ stfs f0, 0xa0(r28)
lbl_80374338:
/* 80374338 0036FF98 7F E3 FB 78 */ mr r3, r31
-/* 8037433C 0036FF9C 4B EF B6 E9 */ bl func_8026FA24
+/* 8037433C 0036FF9C 4B EF B6 E9 */ bl OSUnlockMutex
lbl_80374340:
/* 80374340 0036FFA0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80374344 0036FFA4 83 E1 00 1C */ lwz r31, 0x1c(r1)
@@ -661,10 +661,10 @@ SetPanRange__Q44nw4r3snd6detail9SeqPlayerFf:
/* 8037437C 0036FFDC 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80374380 0036FFE0 7C 7D 1B 78 */ mr r29, r3
/* 80374384 0036FFE4 7F E3 FB 78 */ mr r3, r31
-/* 80374388 0036FFE8 4B EF B5 C1 */ bl func_8026F948
+/* 80374388 0036FFE8 4B EF B5 C1 */ bl OSLockMutex
/* 8037438C 0036FFEC 9B DD 00 A9 */ stb r30, 0xa9(r29)
/* 80374390 0036FFF0 7F E3 FB 78 */ mr r3, r31
-/* 80374394 0036FFF4 4B EF B6 91 */ bl func_8026FA24
+/* 80374394 0036FFF4 4B EF B6 91 */ bl OSUnlockMutex
/* 80374398 0036FFF8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037439C 0036FFFC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803743A0 00370000 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -685,10 +685,10 @@ SetReleasePriorityFix__Q44nw4r3snd6detail9SeqPlayerFb:
/* 803743D0 00370030 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803743D4 00370034 7C 7D 1B 78 */ mr r29, r3
/* 803743D8 00370038 7F E3 FB 78 */ mr r3, r31
-/* 803743DC 0037003C 4B EF B5 6D */ bl func_8026F948
+/* 803743DC 0037003C 4B EF B5 6D */ bl OSLockMutex
/* 803743E0 00370040 9B DD 00 8F */ stb r30, 0x8f(r29)
/* 803743E4 00370044 7F E3 FB 78 */ mr r3, r31
-/* 803743E8 00370048 4B EF B6 3D */ bl func_8026FA24
+/* 803743E8 00370048 4B EF B6 3D */ bl OSUnlockMutex
/* 803743EC 0037004C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803743F0 00370050 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803743F4 00370054 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -709,7 +709,7 @@ InvalidateData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv:
/* 80374424 00370084 7C 9C 23 78 */ mr r28, r4
/* 80374428 00370088 7C BB 2B 78 */ mr r27, r5
/* 8037442C 0037008C 7F A3 EB 78 */ mr r3, r29
-/* 80374430 00370090 4B EF B5 19 */ bl func_8026F948
+/* 80374430 00370090 4B EF B5 19 */ bl OSLockMutex
/* 80374434 00370094 88 1F 00 8C */ lbz r0, 0x8c(r31)
/* 80374438 00370098 2C 00 00 00 */ cmpwi r0, 0
/* 8037443C 0037009C 41 82 01 0C */ beq lbl_80374548
@@ -793,7 +793,7 @@ lbl_8037453C:
/* 80374544 003701A4 42 00 FF 0C */ bdnz lbl_80374450
lbl_80374548:
/* 80374548 003701A8 7F A3 EB 78 */ mr r3, r29
-/* 8037454C 003701AC 4B EF B4 D9 */ bl func_8026FA24
+/* 8037454C 003701AC 4B EF B4 D9 */ bl OSUnlockMutex
/* 80374550 003701B0 39 61 00 20 */ addi r11, r1, 0x20
/* 80374554 003701B4 4B E5 2C 21 */ bl _restgpr_27
/* 80374558 003701B8 80 01 00 24 */ lwz r0, 0x24(r1)
diff --git a/asm/nw4r/snd/detail/snd_SeqSound.s b/asm/nw4r/snd/detail/snd_SeqSound.s
index 187c31e..a1c546b 100644
--- a/asm/nw4r/snd/detail/snd_SeqSound.s
+++ b/asm/nw4r/snd/detail/snd_SeqSound.s
@@ -35,7 +35,7 @@ __ct__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail49SoundInstanceManager$0Q44
/* 80374CA0 00370900 90 1E 04 3C */ stw r0, 0x43c(r30)
/* 80374CA4 00370904 90 1E 04 44 */ stw r0, 0x444(r30)
/* 80374CA8 00370908 90 1E 04 48 */ stw r0, 0x448(r30)
-/* 80374CAC 0037090C 4B EF AC 65 */ bl func_8026F910
+/* 80374CAC 0037090C 4B EF AC 65 */ bl OSInitMutex
/* 80374CB0 00370910 7F C3 F3 78 */ mr r3, r30
/* 80374CB4 00370914 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80374CB8 00370918 83 C1 00 08 */ lwz r30, 8(r1)
@@ -282,12 +282,12 @@ lbl_80374FF4:
/* 80374FFC 00370C5C 83 DD 02 10 */ lwz r30, 0x210(r29)
/* 80375000 00370C60 3B FE 00 10 */ addi r31, r30, 0x10
/* 80375004 00370C64 7F E3 FB 78 */ mr r3, r31
-/* 80375008 00370C68 4B EF A9 41 */ bl func_8026F948
+/* 80375008 00370C68 4B EF A9 41 */ bl OSLockMutex
/* 8037500C 00370C6C 80 1E 00 04 */ lwz r0, 4(r30)
/* 80375010 00370C70 2C 00 00 00 */ cmpwi r0, 0
/* 80375014 00370C74 40 82 00 10 */ bne lbl_80375024
/* 80375018 00370C78 7F E3 FB 78 */ mr r3, r31
-/* 8037501C 00370C7C 4B EF AA 09 */ bl func_8026FA24
+/* 8037501C 00370C7C 4B EF AA 09 */ bl OSUnlockMutex
/* 80375020 00370C80 48 00 00 3C */ b lbl_8037505C
lbl_80375024:
/* 80375024 00370C84 38 7E 00 04 */ addi r3, r30, 4
@@ -303,7 +303,7 @@ lbl_80375024:
/* 8037504C 00370CAC 7F A4 EB 78 */ mr r4, r29
/* 80375050 00370CB0 4B FF CB 65 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
/* 80375054 00370CB4 7F E3 FB 78 */ mr r3, r31
-/* 80375058 00370CB8 4B EF A9 CD */ bl func_8026FA24
+/* 80375058 00370CB8 4B EF A9 CD */ bl OSUnlockMutex
lbl_8037505C:
/* 8037505C 00370CBC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80375060 00370CC0 83 E1 00 1C */ lwz r31, 0x1c(r1)
@@ -380,7 +380,7 @@ lbl_8037513C:
/* 8037513C 00370D9C 83 DC 02 10 */ lwz r30, 0x210(r28)
/* 80375140 00370DA0 3B FE 00 10 */ addi r31, r30, 0x10
/* 80375144 00370DA4 7F E3 FB 78 */ mr r3, r31
-/* 80375148 00370DA8 4B EF A8 01 */ bl func_8026F948
+/* 80375148 00370DA8 4B EF A8 01 */ bl OSLockMutex
/* 8037514C 00370DAC 3B 9C 00 B8 */ addi r28, r28, 0xb8
/* 80375150 00370DB0 38 7E 00 04 */ addi r3, r30, 4
/* 80375154 00370DB4 7F 84 E3 78 */ mr r4, r28
@@ -413,7 +413,7 @@ lbl_803751A0:
/* 803751AC 00370E0C 38 81 00 08 */ addi r4, r1, 8
/* 803751B0 00370E10 4B FE DA 99 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 803751B4 00370E14 7F E3 FB 78 */ mr r3, r31
-/* 803751B8 00370E18 4B EF A8 6D */ bl func_8026FA24
+/* 803751B8 00370E18 4B EF A8 6D */ bl OSUnlockMutex
/* 803751BC 00370E1C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803751C0 00370E20 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803751C4 00370E24 83 C1 00 18 */ lwz r30, 0x18(r1)
diff --git a/asm/nw4r/snd/detail/snd_SeqTrack.s b/asm/nw4r/snd/detail/snd_SeqTrack.s
index 5e59ce5..cf728a5 100644
--- a/asm/nw4r/snd/detail/snd_SeqTrack.s
+++ b/asm/nw4r/snd/detail/snd_SeqTrack.s
@@ -25,7 +25,7 @@ __ct__Q44nw4r3snd6detail8SeqTrackFv:
/* 803753E0 00371040 93 FE 00 B8 */ stw r31, 0xb8(r30)
/* 803753E4 00371044 38 7E 00 C0 */ addi r3, r30, 0xc0
/* 803753E8 00371048 93 FE 00 BC */ stw r31, 0xbc(r30)
-/* 803753EC 0037104C 4B EF A5 25 */ bl func_8026F910
+/* 803753EC 0037104C 4B EF A5 25 */ bl OSInitMutex
/* 803753F0 00371050 7F C3 F3 78 */ mr r3, r30
/* 803753F4 00371054 48 00 01 09 */ bl InitParam__Q44nw4r3snd6detail8SeqTrackFv
/* 803753F8 00371058 7F C3 F3 78 */ mr r3, r30
@@ -55,7 +55,7 @@ __dt__Q44nw4r3snd6detail8SeqTrackFv:
/* 8037544C 003710AC 48 00 05 FD */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv
/* 80375450 003710B0 3B DC 00 C0 */ addi r30, r28, 0xc0
/* 80375454 003710B4 7F C3 F3 78 */ mr r3, r30
-/* 80375458 003710B8 4B EF A4 F1 */ bl func_8026F948
+/* 80375458 003710B8 4B EF A4 F1 */ bl OSLockMutex
/* 8037545C 003710BC 83 FC 00 BC */ lwz r31, 0xbc(r28)
/* 80375460 003710C0 48 00 00 1C */ b lbl_8037547C
lbl_80375464:
@@ -70,10 +70,10 @@ lbl_8037547C:
/* 8037547C 003710DC 2C 1F 00 00 */ cmpwi r31, 0
/* 80375480 003710E0 40 82 FF E4 */ bne lbl_80375464
/* 80375484 003710E4 7F C3 F3 78 */ mr r3, r30
-/* 80375488 003710E8 4B EF A5 9D */ bl func_8026FA24
+/* 80375488 003710E8 4B EF A5 9D */ bl OSUnlockMutex
/* 8037548C 003710EC 3B DC 00 C0 */ addi r30, r28, 0xc0
/* 80375490 003710F0 7F C3 F3 78 */ mr r3, r30
-/* 80375494 003710F4 4B EF A4 B5 */ bl func_8026F948
+/* 80375494 003710F4 4B EF A4 B5 */ bl OSLockMutex
/* 80375498 003710F8 83 FC 00 BC */ lwz r31, 0xbc(r28)
/* 8037549C 003710FC 48 00 00 10 */ b lbl_803754AC
lbl_803754A0:
@@ -86,7 +86,7 @@ lbl_803754AC:
/* 803754B4 00371114 3B E0 00 00 */ li r31, 0
/* 803754B8 00371118 7F C3 F3 78 */ mr r3, r30
/* 803754BC 0037111C 93 FC 00 BC */ stw r31, 0xbc(r28)
-/* 803754C0 00371120 4B EF A5 65 */ bl func_8026FA24
+/* 803754C0 00371120 4B EF A5 65 */ bl OSUnlockMutex
/* 803754C4 00371124 2C 1D 00 00 */ cmpwi r29, 0
/* 803754C8 00371128 9B FC 00 05 */ stb r31, 5(r28)
/* 803754CC 0037112C 40 81 00 0C */ ble lbl_803754D8
@@ -220,7 +220,7 @@ Close__Q44nw4r3snd6detail8SeqTrackFv:
/* 80375698 003712F8 48 00 03 B1 */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv
/* 8037569C 003712FC 3B DD 00 C0 */ addi r30, r29, 0xc0
/* 803756A0 00371300 7F C3 F3 78 */ mr r3, r30
-/* 803756A4 00371304 4B EF A2 A5 */ bl func_8026F948
+/* 803756A4 00371304 4B EF A2 A5 */ bl OSLockMutex
/* 803756A8 00371308 83 FD 00 BC */ lwz r31, 0xbc(r29)
/* 803756AC 0037130C 48 00 00 1C */ b lbl_803756C8
lbl_803756B0:
@@ -235,10 +235,10 @@ lbl_803756C8:
/* 803756C8 00371328 2C 1F 00 00 */ cmpwi r31, 0
/* 803756CC 0037132C 40 82 FF E4 */ bne lbl_803756B0
/* 803756D0 00371330 7F C3 F3 78 */ mr r3, r30
-/* 803756D4 00371334 4B EF A3 51 */ bl func_8026FA24
+/* 803756D4 00371334 4B EF A3 51 */ bl OSUnlockMutex
/* 803756D8 00371338 3B DD 00 C0 */ addi r30, r29, 0xc0
/* 803756DC 0037133C 7F C3 F3 78 */ mr r3, r30
-/* 803756E0 00371340 4B EF A2 69 */ bl func_8026F948
+/* 803756E0 00371340 4B EF A2 69 */ bl OSLockMutex
/* 803756E4 00371344 83 FD 00 BC */ lwz r31, 0xbc(r29)
/* 803756E8 00371348 48 00 00 10 */ b lbl_803756F8
lbl_803756EC:
@@ -251,7 +251,7 @@ lbl_803756F8:
/* 80375700 00371360 3B E0 00 00 */ li r31, 0
/* 80375704 00371364 7F C3 F3 78 */ mr r3, r30
/* 80375708 00371368 93 FD 00 BC */ stw r31, 0xbc(r29)
-/* 8037570C 0037136C 4B EF A3 19 */ bl func_8026FA24
+/* 8037570C 0037136C 4B EF A3 19 */ bl OSUnlockMutex
/* 80375710 00371370 9B FD 00 05 */ stb r31, 5(r29)
/* 80375714 00371374 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80375718 00371378 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -272,12 +272,12 @@ UpdateChannelLength__Q44nw4r3snd6detail8SeqTrackFv:
/* 80375748 003713A8 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8037574C 003713AC 7C 7D 1B 78 */ mr r29, r3
/* 80375750 003713B0 7F E3 FB 78 */ mr r3, r31
-/* 80375754 003713B4 4B EF A1 F5 */ bl func_8026F948
+/* 80375754 003713B4 4B EF A1 F5 */ bl OSLockMutex
/* 80375758 003713B8 88 1D 00 05 */ lbz r0, 5(r29)
/* 8037575C 003713BC 2C 00 00 00 */ cmpwi r0, 0
/* 80375760 003713C0 40 82 00 10 */ bne lbl_80375770
/* 80375764 003713C4 7F E3 FB 78 */ mr r3, r31
-/* 80375768 003713C8 4B EF A2 BD */ bl func_8026FA24
+/* 80375768 003713C8 4B EF A2 BD */ bl OSUnlockMutex
/* 8037576C 003713CC 48 00 00 78 */ b lbl_803757E4
lbl_80375770:
/* 80375770 003713D0 83 DD 00 BC */ lwz r30, 0xbc(r29)
@@ -313,7 +313,7 @@ lbl_803757D4:
/* 803757D4 00371434 2C 1E 00 00 */ cmpwi r30, 0
/* 803757D8 00371438 40 82 FF A0 */ bne lbl_80375778
/* 803757DC 0037143C 7F E3 FB 78 */ mr r3, r31
-/* 803757E0 00371440 4B EF A2 45 */ bl func_8026FA24
+/* 803757E0 00371440 4B EF A2 45 */ bl OSUnlockMutex
lbl_803757E4:
/* 803757E4 00371444 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803757E8 00371448 83 E1 00 1C */ lwz r31, 0x1c(r1)
@@ -335,12 +335,12 @@ ParseNextTick__Q44nw4r3snd6detail8SeqTrackFb:
/* 8037581C 0037147C 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80375820 00371480 7C 7D 1B 78 */ mr r29, r3
/* 80375824 00371484 7F E3 FB 78 */ mr r3, r31
-/* 80375828 00371488 4B EF A1 21 */ bl func_8026F948
+/* 80375828 00371488 4B EF A1 21 */ bl OSLockMutex
/* 8037582C 0037148C 88 1D 00 05 */ lbz r0, 5(r29)
/* 80375830 00371490 2C 00 00 00 */ cmpwi r0, 0
/* 80375834 00371494 40 82 00 14 */ bne lbl_80375848
/* 80375838 00371498 7F E3 FB 78 */ mr r3, r31
-/* 8037583C 0037149C 4B EF A1 E9 */ bl func_8026FA24
+/* 8037583C 0037149C 4B EF A1 E9 */ bl OSUnlockMutex
/* 80375840 003714A0 38 60 00 00 */ li r3, 0
/* 80375844 003714A4 48 00 00 C0 */ b lbl_80375904
lbl_80375848:
@@ -351,7 +351,7 @@ lbl_80375848:
/* 80375858 003714B8 2C 00 00 00 */ cmpwi r0, 0
/* 8037585C 003714BC 41 82 00 14 */ beq lbl_80375870
/* 80375860 003714C0 7F E3 FB 78 */ mr r3, r31
-/* 80375864 003714C4 4B EF A1 C1 */ bl func_8026FA24
+/* 80375864 003714C4 4B EF A1 C1 */ bl OSUnlockMutex
/* 80375868 003714C8 38 60 00 01 */ li r3, 1
/* 8037586C 003714CC 48 00 00 98 */ b lbl_80375904
lbl_80375870:
@@ -365,7 +365,7 @@ lbl_80375878:
/* 80375888 003714E8 90 1D 00 58 */ stw r0, 0x58(r29)
/* 8037588C 003714EC 40 81 00 14 */ ble lbl_803758A0
/* 80375890 003714F0 7F E3 FB 78 */ mr r3, r31
-/* 80375894 003714F4 4B EF A1 91 */ bl func_8026FA24
+/* 80375894 003714F4 4B EF A1 91 */ bl OSUnlockMutex
/* 80375898 003714F8 38 60 00 01 */ li r3, 1
/* 8037589C 003714FC 48 00 00 68 */ b lbl_80375904
lbl_803758A0:
@@ -383,7 +383,7 @@ lbl_803758B0:
/* 803758C8 00371528 2C 03 00 01 */ cmpwi r3, 1
/* 803758CC 0037152C 40 82 00 14 */ bne lbl_803758E0
/* 803758D0 00371530 7F E3 FB 78 */ mr r3, r31
-/* 803758D4 00371534 4B EF A1 51 */ bl func_8026FA24
+/* 803758D4 00371534 4B EF A1 51 */ bl OSUnlockMutex
/* 803758D8 00371538 38 60 FF FF */ li r3, -1
/* 803758DC 0037153C 48 00 00 28 */ b lbl_80375904
lbl_803758E0:
@@ -395,7 +395,7 @@ lbl_803758E0:
/* 803758F4 00371554 41 82 FF BC */ beq lbl_803758B0
lbl_803758F8:
/* 803758F8 00371558 7F E3 FB 78 */ mr r3, r31
-/* 803758FC 0037155C 4B EF A1 29 */ bl func_8026FA24
+/* 803758FC 0037155C 4B EF A1 29 */ bl OSUnlockMutex
/* 80375900 00371560 38 60 00 01 */ li r3, 1
lbl_80375904:
/* 80375904 00371564 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -419,7 +419,7 @@ ReleaseAllChannel__Q44nw4r3snd6detail8SeqTrackFi:
/* 80375940 003715A0 48 00 01 09 */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv
/* 80375944 003715A4 3B FE 00 C0 */ addi r31, r30, 0xc0
/* 80375948 003715A8 7F E3 FB 78 */ mr r3, r31
-/* 8037594C 003715AC 4B EF 9F FD */ bl func_8026F948
+/* 8037594C 003715AC 4B EF 9F FD */ bl OSLockMutex
/* 80375950 003715B0 83 DE 00 BC */ lwz r30, 0xbc(r30)
/* 80375954 003715B4 48 00 00 30 */ b lbl_80375984
lbl_80375958:
@@ -440,7 +440,7 @@ lbl_80375984:
/* 80375984 003715E4 2C 1E 00 00 */ cmpwi r30, 0
/* 80375988 003715E8 40 82 FF D0 */ bne lbl_80375958
/* 8037598C 003715EC 7F E3 FB 78 */ mr r3, r31
-/* 80375990 003715F0 4B EF A0 95 */ bl func_8026FA24
+/* 80375990 003715F0 4B EF A0 95 */ bl OSUnlockMutex
/* 80375994 003715F4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80375998 003715F8 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037599C 003715FC 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -461,7 +461,7 @@ PauseAllChannel__Q44nw4r3snd6detail8SeqTrackFb:
/* 803759CC 0037162C 7F E3 FB 78 */ mr r3, r31
/* 803759D0 00371630 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803759D4 00371634 7C 9D 23 78 */ mr r29, r4
-/* 803759D8 00371638 4B EF 9F 71 */ bl func_8026F948
+/* 803759D8 00371638 4B EF 9F 71 */ bl OSLockMutex
/* 803759DC 0037163C 83 DE 00 BC */ lwz r30, 0xbc(r30)
/* 803759E0 00371640 48 00 00 3C */ b lbl_80375A1C
lbl_803759E4:
@@ -484,7 +484,7 @@ lbl_80375A1C:
/* 80375A1C 0037167C 2C 1E 00 00 */ cmpwi r30, 0
/* 80375A20 00371680 40 82 FF C4 */ bne lbl_803759E4
/* 80375A24 00371684 7F E3 FB 78 */ mr r3, r31
-/* 80375A28 00371688 4B EF 9F FD */ bl func_8026FA24
+/* 80375A28 00371688 4B EF 9F FD */ bl OSUnlockMutex
/* 80375A2C 0037168C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80375A30 00371690 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80375A34 00371694 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -526,19 +526,19 @@ UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv:
/* 80375AB8 00371718 7C 7E 1B 78 */ mr r30, r3
/* 80375ABC 0037171C 7F E3 FB 78 */ mr r3, r31
/* 80375AC0 00371720 90 01 00 40 */ stw r0, 0x40(r1)
-/* 80375AC4 00371724 4B EF 9E 85 */ bl func_8026F948
+/* 80375AC4 00371724 4B EF 9E 85 */ bl OSLockMutex
/* 80375AC8 00371728 88 1E 00 05 */ lbz r0, 5(r30)
/* 80375ACC 0037172C 2C 00 00 00 */ cmpwi r0, 0
/* 80375AD0 00371730 40 82 00 10 */ bne lbl_80375AE0
/* 80375AD4 00371734 7F E3 FB 78 */ mr r3, r31
-/* 80375AD8 00371738 4B EF 9F 4D */ bl func_8026FA24
+/* 80375AD8 00371738 4B EF 9F 4D */ bl OSUnlockMutex
/* 80375ADC 0037173C 48 00 03 DC */ b lbl_80375EB8
lbl_80375AE0:
/* 80375AE0 00371740 80 1E 00 BC */ lwz r0, 0xbc(r30)
/* 80375AE4 00371744 2C 00 00 00 */ cmpwi r0, 0
/* 80375AE8 00371748 40 82 00 10 */ bne lbl_80375AF8
/* 80375AEC 0037174C 7F E3 FB 78 */ mr r3, r31
-/* 80375AF0 00371750 4B EF 9F 35 */ bl func_8026FA24
+/* 80375AF0 00371750 4B EF 9F 35 */ bl OSUnlockMutex
/* 80375AF4 00371754 48 00 03 C4 */ b lbl_80375EB8
lbl_80375AF8:
/* 80375AF8 00371758 88 1E 00 84 */ lbz r0, 0x84(r30)
@@ -791,7 +791,7 @@ lbl_80375EA8:
/* 80375EA8 00371B08 2C 19 00 00 */ cmpwi r25, 0
/* 80375EAC 00371B0C 40 82 FF 2C */ bne lbl_80375DD8
/* 80375EB0 00371B10 7F E3 FB 78 */ mr r3, r31
-/* 80375EB4 00371B14 4B EF 9B 71 */ bl func_8026FA24
+/* 80375EB4 00371B14 4B EF 9B 71 */ bl OSUnlockMutex
lbl_80375EB8:
/* 80375EB8 00371B18 E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0
/* 80375EBC 00371B1C CB E1 01 00 */ lfd f31, 0x100(r1)
@@ -831,7 +831,7 @@ FreeAllChannel__Q44nw4r3snd6detail8SeqTrackFv:
/* 80375F38 00371B98 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80375F3C 00371B9C 7C 7D 1B 78 */ mr r29, r3
/* 80375F40 00371BA0 7F E3 FB 78 */ mr r3, r31
-/* 80375F44 00371BA4 4B EF 9A 05 */ bl func_8026F948
+/* 80375F44 00371BA4 4B EF 9A 05 */ bl OSLockMutex
/* 80375F48 00371BA8 83 DD 00 BC */ lwz r30, 0xbc(r29)
/* 80375F4C 00371BAC 48 00 00 10 */ b lbl_80375F5C
lbl_80375F50:
@@ -844,7 +844,7 @@ lbl_80375F5C:
/* 80375F64 00371BC4 38 00 00 00 */ li r0, 0
/* 80375F68 00371BC8 7F E3 FB 78 */ mr r3, r31
/* 80375F6C 00371BCC 90 1D 00 BC */ stw r0, 0xbc(r29)
-/* 80375F70 00371BD0 4B EF 9A B5 */ bl func_8026FA24
+/* 80375F70 00371BD0 4B EF 9A B5 */ bl OSUnlockMutex
/* 80375F74 00371BD4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80375F78 00371BD8 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80375F7C 00371BDC 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -887,14 +887,14 @@ lbl_80375FD8:
lbl_80375FF8:
/* 80375FF8 00371C58 3B FE 00 C0 */ addi r31, r30, 0xc0
/* 80375FFC 00371C5C 7F E3 FB 78 */ mr r3, r31
-/* 80376000 00371C60 4B EF 99 49 */ bl func_8026F948
+/* 80376000 00371C60 4B EF 99 49 */ bl OSLockMutex
/* 80376004 00371C64 80 9E 00 BC */ lwz r4, 0xbc(r30)
/* 80376008 00371C68 7C 04 E8 40 */ cmplw r4, r29
/* 8037600C 00371C6C 40 82 00 3C */ bne lbl_80376048
/* 80376010 00371C70 80 1D 00 E0 */ lwz r0, 0xe0(r29)
/* 80376014 00371C74 7F E3 FB 78 */ mr r3, r31
/* 80376018 00371C78 90 1E 00 BC */ stw r0, 0xbc(r30)
-/* 8037601C 00371C7C 4B EF 9A 09 */ bl func_8026FA24
+/* 8037601C 00371C7C 4B EF 9A 09 */ bl OSUnlockMutex
/* 80376020 00371C80 48 00 00 3C */ b lbl_8037605C
/* 80376024 00371C84 48 00 00 24 */ b lbl_80376048
lbl_80376028:
@@ -903,7 +903,7 @@ lbl_80376028:
/* 80376030 00371C90 80 1D 00 E0 */ lwz r0, 0xe0(r29)
/* 80376034 00371C94 7F E3 FB 78 */ mr r3, r31
/* 80376038 00371C98 90 04 00 E0 */ stw r0, 0xe0(r4)
-/* 8037603C 00371C9C 4B EF 99 E9 */ bl func_8026FA24
+/* 8037603C 00371C9C 4B EF 99 E9 */ bl OSUnlockMutex
/* 80376040 00371CA0 48 00 00 1C */ b lbl_8037605C
lbl_80376044:
/* 80376044 00371CA4 7C 04 03 78 */ mr r4, r0
@@ -912,7 +912,7 @@ lbl_80376048:
/* 8037604C 00371CAC 2C 00 00 00 */ cmpwi r0, 0
/* 80376050 00371CB0 40 82 FF D8 */ bne lbl_80376028
/* 80376054 00371CB4 7F E3 FB 78 */ mr r3, r31
-/* 80376058 00371CB8 4B EF 99 CD */ bl func_8026FA24
+/* 80376058 00371CB8 4B EF 99 CD */ bl OSUnlockMutex
lbl_8037605C:
/* 8037605C 00371CBC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80376060 00371CC0 83 E1 00 1C */ lwz r31, 0x1c(r1)
@@ -935,7 +935,7 @@ SetMute__Q44nw4r3snd6detail8SeqTrackFQ34nw4r3snd7SeqMute:
/* 80376098 00371CF8 93 81 00 10 */ stw r28, 0x10(r1)
/* 8037609C 00371CFC 7C 7C 1B 78 */ mr r28, r3
/* 803760A0 00371D00 7F C3 F3 78 */ mr r3, r30
-/* 803760A4 00371D04 4B EF 98 A5 */ bl func_8026F948
+/* 803760A4 00371D04 4B EF 98 A5 */ bl OSLockMutex
/* 803760A8 00371D08 2C 1D 00 02 */ cmpwi r29, 2
/* 803760AC 00371D0C 41 82 00 7C */ beq lbl_80376128
/* 803760B0 00371D10 40 80 00 14 */ bge lbl_803760C4
@@ -954,7 +954,7 @@ lbl_803760D0:
lbl_803760DC:
/* 803760DC 00371D3C 7F DF F3 78 */ mr r31, r30
/* 803760E0 00371D40 7F E3 FB 78 */ mr r3, r31
-/* 803760E4 00371D44 4B EF 98 65 */ bl func_8026F948
+/* 803760E4 00371D44 4B EF 98 65 */ bl OSLockMutex
/* 803760E8 00371D48 83 BC 00 BC */ lwz r29, 0xbc(r28)
/* 803760EC 00371D4C 48 00 00 18 */ b lbl_80376104
lbl_803760F0:
@@ -969,7 +969,7 @@ lbl_80376104:
/* 8037610C 00371D6C 38 00 00 00 */ li r0, 0
/* 80376110 00371D70 7F E3 FB 78 */ mr r3, r31
/* 80376114 00371D74 90 1C 00 BC */ stw r0, 0xbc(r28)
-/* 80376118 00371D78 4B EF 99 0D */ bl func_8026FA24
+/* 80376118 00371D78 4B EF 99 0D */ bl OSUnlockMutex
/* 8037611C 00371D7C 38 00 00 01 */ li r0, 1
/* 80376120 00371D80 98 1C 00 5C */ stb r0, 0x5c(r28)
/* 80376124 00371D84 48 00 00 94 */ b lbl_803761B8
@@ -978,7 +978,7 @@ lbl_80376128:
/* 8037612C 00371D8C 4B FF F9 1D */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv
/* 80376130 00371D90 7F DF F3 78 */ mr r31, r30
/* 80376134 00371D94 7F E3 FB 78 */ mr r3, r31
-/* 80376138 00371D98 4B EF 98 11 */ bl func_8026F948
+/* 80376138 00371D98 4B EF 98 11 */ bl OSLockMutex
/* 8037613C 00371D9C 83 BC 00 BC */ lwz r29, 0xbc(r28)
/* 80376140 00371DA0 48 00 00 1C */ b lbl_8037615C
lbl_80376144:
@@ -993,10 +993,10 @@ lbl_8037615C:
/* 8037615C 00371DBC 2C 1D 00 00 */ cmpwi r29, 0
/* 80376160 00371DC0 40 82 FF E4 */ bne lbl_80376144
/* 80376164 00371DC4 7F E3 FB 78 */ mr r3, r31
-/* 80376168 00371DC8 4B EF 98 BD */ bl func_8026FA24
+/* 80376168 00371DC8 4B EF 98 BD */ bl OSUnlockMutex
/* 8037616C 00371DCC 3B FC 00 C0 */ addi r31, r28, 0xc0
/* 80376170 00371DD0 7F E3 FB 78 */ mr r3, r31
-/* 80376174 00371DD4 4B EF 97 D5 */ bl func_8026F948
+/* 80376174 00371DD4 4B EF 97 D5 */ bl OSLockMutex
/* 80376178 00371DD8 83 BC 00 BC */ lwz r29, 0xbc(r28)
/* 8037617C 00371DDC 48 00 00 10 */ b lbl_8037618C
lbl_80376180:
@@ -1009,7 +1009,7 @@ lbl_8037618C:
/* 80376194 00371DF4 38 00 00 00 */ li r0, 0
/* 80376198 00371DF8 7F E3 FB 78 */ mr r3, r31
/* 8037619C 00371DFC 90 1C 00 BC */ stw r0, 0xbc(r28)
-/* 803761A0 00371E00 4B EF 98 85 */ bl func_8026FA24
+/* 803761A0 00371E00 4B EF 98 85 */ bl OSUnlockMutex
/* 803761A4 00371E04 38 00 00 01 */ li r0, 1
/* 803761A8 00371E08 98 1C 00 5C */ stb r0, 0x5c(r28)
/* 803761AC 00371E0C 48 00 00 0C */ b lbl_803761B8
@@ -1018,7 +1018,7 @@ lbl_803761B0:
/* 803761B4 00371E14 98 1C 00 5C */ stb r0, 0x5c(r28)
lbl_803761B8:
/* 803761B8 00371E18 7F C3 F3 78 */ mr r3, r30
-/* 803761BC 00371E1C 4B EF 98 69 */ bl func_8026FA24
+/* 803761BC 00371E1C 4B EF 98 69 */ bl OSUnlockMutex
/* 803761C0 00371E20 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803761C4 00371E24 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803761C8 00371E28 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -1040,18 +1040,18 @@ GetVariablePtr__Q44nw4r3snd6detail8SeqTrackFi:
/* 803761FC 00371E5C 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80376200 00371E60 7C 7D 1B 78 */ mr r29, r3
/* 80376204 00371E64 7F E3 FB 78 */ mr r3, r31
-/* 80376208 00371E68 4B EF 97 41 */ bl func_8026F948
+/* 80376208 00371E68 4B EF 97 41 */ bl OSLockMutex
/* 8037620C 00371E6C 2C 1E 00 10 */ cmpwi r30, 0x10
/* 80376210 00371E70 40 80 00 1C */ bge lbl_8037622C
/* 80376214 00371E74 7F E3 FB 78 */ mr r3, r31
-/* 80376218 00371E78 4B EF 98 0D */ bl func_8026FA24
+/* 80376218 00371E78 4B EF 98 0D */ bl OSUnlockMutex
/* 8037621C 00371E7C 57 C0 08 3C */ slwi r0, r30, 1
/* 80376220 00371E80 7C 7D 02 14 */ add r3, r29, r0
/* 80376224 00371E84 38 63 00 98 */ addi r3, r3, 0x98
/* 80376228 00371E88 48 00 00 10 */ b lbl_80376238
lbl_8037622C:
/* 8037622C 00371E8C 7F E3 FB 78 */ mr r3, r31
-/* 80376230 00371E90 4B EF 97 F5 */ bl func_8026FA24
+/* 80376230 00371E90 4B EF 97 F5 */ bl OSUnlockMutex
/* 80376234 00371E94 38 60 00 00 */ li r3, 0
lbl_80376238:
/* 80376238 00371E98 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -1147,12 +1147,12 @@ lbl_80376338:
lbl_8037638C:
/* 8037638C 00371FEC 3B 7C 00 C0 */ addi r27, r28, 0xc0
/* 80376390 00371FF0 7F 63 DB 78 */ mr r3, r27
-/* 80376394 00371FF4 4B EF 95 B5 */ bl func_8026F948
+/* 80376394 00371FF4 4B EF 95 B5 */ bl OSLockMutex
/* 80376398 00371FF8 80 1C 00 BC */ lwz r0, 0xbc(r28)
/* 8037639C 00371FFC 7F 63 DB 78 */ mr r3, r27
/* 803763A0 00372000 90 1F 00 E0 */ stw r0, 0xe0(r31)
/* 803763A4 00372004 93 FC 00 BC */ stw r31, 0xbc(r28)
-/* 803763A8 00372008 4B EF 96 7D */ bl func_8026FA24
+/* 803763A8 00372008 4B EF 96 7D */ bl OSUnlockMutex
lbl_803763AC:
/* 803763AC 0037200C 88 9C 00 8F */ lbz r4, 0x8f(r28)
/* 803763B0 00372010 28 04 00 FF */ cmplwi r4, 0xff
diff --git a/asm/nw4r/snd/detail/snd_SoundArchiveLoader.s b/asm/nw4r/snd/detail/snd_SoundArchiveLoader.s
index b7cd874..b966116 100644
--- a/asm/nw4r/snd/detail/snd_SoundArchiveLoader.s
+++ b/asm/nw4r/snd/detail/snd_SoundArchiveLoader.s
@@ -12,7 +12,7 @@ __ct__Q44nw4r3snd6detail18SoundArchiveLoaderFRCQ34nw4r3snd12SoundArchive:
/* 80378364 00373FC4 7C 7F 1B 78 */ mr r31, r3
/* 80378368 00373FC8 90 83 00 18 */ stw r4, 0x18(r3)
/* 8037836C 00373FCC 90 03 02 1C */ stw r0, 0x21c(r3)
-/* 80378370 00373FD0 4B EF 75 A1 */ bl func_8026F910
+/* 80378370 00373FD0 4B EF 75 A1 */ bl OSInitMutex
/* 80378374 00373FD4 7F E3 FB 78 */ mr r3, r31
/* 80378378 00373FD8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8037837C 00373FDC 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -52,7 +52,7 @@ LoadGroup__Q44nw4r3snd6detail18SoundArchiveLoaderFUlPQ34nw4r3snd22SoundMemoryAll
/* 803783E8 00374048 7C B9 2B 78 */ mr r25, r5
/* 803783EC 0037404C 7C D7 33 78 */ mr r23, r6
/* 803783F0 00374050 7C F8 3B 78 */ mr r24, r7
-/* 803783F4 00374054 4B EF 75 55 */ bl func_8026F948
+/* 803783F4 00374054 4B EF 75 55 */ bl OSLockMutex
/* 803783F8 00374058 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 803783FC 0037405C 7F 44 D3 78 */ mr r4, r26
/* 80378400 00374060 38 BF 00 1C */ addi r5, r31, 0x1c
@@ -68,7 +68,7 @@ LoadGroup__Q44nw4r3snd6detail18SoundArchiveLoaderFUlPQ34nw4r3snd22SoundMemoryAll
/* 80378428 00374088 4E 80 04 21 */ bctrl
lbl_8037842C:
/* 8037842C 0037408C 7F E3 FB 78 */ mr r3, r31
-/* 80378430 00374090 4B EF 75 F5 */ bl func_8026FA24
+/* 80378430 00374090 4B EF 75 F5 */ bl OSUnlockMutex
/* 80378434 00374094 38 60 00 00 */ li r3, 0
/* 80378438 00374098 48 00 05 50 */ b lbl_80378988
lbl_8037843C:
@@ -95,7 +95,7 @@ lbl_80378470:
/* 80378488 003740E8 4E 80 04 21 */ bctrl
lbl_8037848C:
/* 8037848C 003740EC 7F E3 FB 78 */ mr r3, r31
-/* 80378490 003740F0 4B EF 75 95 */ bl func_8026FA24
+/* 80378490 003740F0 4B EF 75 95 */ bl OSUnlockMutex
/* 80378494 003740F4 38 60 00 00 */ li r3, 0
/* 80378498 003740F8 48 00 04 F0 */ b lbl_80378988
lbl_8037849C:
@@ -122,7 +122,7 @@ lbl_8037849C:
/* 803784EC 0037414C 4E 80 04 21 */ bctrl
lbl_803784F0:
/* 803784F0 00374150 7F E3 FB 78 */ mr r3, r31
-/* 803784F4 00374154 4B EF 75 31 */ bl func_8026FA24
+/* 803784F4 00374154 4B EF 75 31 */ bl OSUnlockMutex
/* 803784F8 00374158 38 60 00 00 */ li r3, 0
/* 803784FC 0037415C 48 00 04 8C */ b lbl_80378988
lbl_80378500:
@@ -154,7 +154,7 @@ lbl_80378500:
/* 80378564 003741C4 4E 80 04 21 */ bctrl
lbl_80378568:
/* 80378568 003741C8 7F E3 FB 78 */ mr r3, r31
-/* 8037856C 003741CC 4B EF 74 B9 */ bl func_8026FA24
+/* 8037856C 003741CC 4B EF 74 B9 */ bl OSUnlockMutex
/* 80378570 003741D0 38 60 00 00 */ li r3, 0
/* 80378574 003741D4 48 00 04 14 */ b lbl_80378988
lbl_80378578:
@@ -191,7 +191,7 @@ lbl_803785B0:
/* 803785E8 00374248 4E 80 04 21 */ bctrl
lbl_803785EC:
/* 803785EC 0037424C 7F E3 FB 78 */ mr r3, r31
-/* 803785F0 00374250 4B EF 74 35 */ bl func_8026FA24
+/* 803785F0 00374250 4B EF 74 35 */ bl OSUnlockMutex
/* 803785F4 00374254 38 60 00 00 */ li r3, 0
/* 803785F8 00374258 48 00 03 90 */ b lbl_80378988
lbl_803785FC:
@@ -223,7 +223,7 @@ lbl_8037861C:
/* 80378654 003742B4 4E 80 04 21 */ bctrl
lbl_80378658:
/* 80378658 003742B8 7F E3 FB 78 */ mr r3, r31
-/* 8037865C 003742BC 4B EF 73 C9 */ bl func_8026FA24
+/* 8037865C 003742BC 4B EF 73 C9 */ bl OSUnlockMutex
/* 80378660 003742C0 38 60 00 00 */ li r3, 0
/* 80378664 003742C4 48 00 03 24 */ b lbl_80378988
lbl_80378668:
@@ -253,7 +253,7 @@ lbl_803786A8:
/* 803786C0 00374320 4E 80 04 21 */ bctrl
lbl_803786C4:
/* 803786C4 00374324 7F E3 FB 78 */ mr r3, r31
-/* 803786C8 00374328 4B EF 73 5D */ bl func_8026FA24
+/* 803786C8 00374328 4B EF 73 5D */ bl OSUnlockMutex
/* 803786CC 0037432C 38 60 00 00 */ li r3, 0
/* 803786D0 00374330 48 00 02 B8 */ b lbl_80378988
lbl_803786D4:
@@ -288,7 +288,7 @@ lbl_80378724:
/* 8037873C 0037439C 4E 80 04 21 */ bctrl
lbl_80378740:
/* 80378740 003743A0 7F E3 FB 78 */ mr r3, r31
-/* 80378744 003743A4 4B EF 72 E1 */ bl func_8026FA24
+/* 80378744 003743A4 4B EF 72 E1 */ bl OSUnlockMutex
/* 80378748 003743A8 38 60 00 00 */ li r3, 0
/* 8037874C 003743AC 48 00 02 3C */ b lbl_80378988
lbl_80378750:
@@ -323,7 +323,7 @@ lbl_803787A4:
/* 803787BC 0037441C 4E 80 04 21 */ bctrl
lbl_803787C0:
/* 803787C0 00374420 7F E3 FB 78 */ mr r3, r31
-/* 803787C4 00374424 4B EF 72 61 */ bl func_8026FA24
+/* 803787C4 00374424 4B EF 72 61 */ bl OSUnlockMutex
/* 803787C8 00374428 38 60 00 00 */ li r3, 0
/* 803787CC 0037442C 48 00 01 BC */ b lbl_80378988
lbl_803787D0:
@@ -362,7 +362,7 @@ lbl_80378834:
/* 8037884C 003744AC 4E 80 04 21 */ bctrl
lbl_80378850:
/* 80378850 003744B0 7F E3 FB 78 */ mr r3, r31
-/* 80378854 003744B4 4B EF 71 D1 */ bl func_8026FA24
+/* 80378854 003744B4 4B EF 71 D1 */ bl OSUnlockMutex
/* 80378858 003744B8 38 60 00 00 */ li r3, 0
/* 8037885C 003744BC 48 00 01 2C */ b lbl_80378988
lbl_80378860:
@@ -407,7 +407,7 @@ lbl_803788D4:
/* 803788EC 0037454C 4E 80 04 21 */ bctrl
lbl_803788F0:
/* 803788F0 00374550 7F E3 FB 78 */ mr r3, r31
-/* 803788F4 00374554 4B EF 71 31 */ bl func_8026FA24
+/* 803788F4 00374554 4B EF 71 31 */ bl OSUnlockMutex
/* 803788F8 00374558 38 60 00 00 */ li r3, 0
/* 803788FC 0037455C 48 00 00 8C */ b lbl_80378988
lbl_80378900:
@@ -450,7 +450,7 @@ lbl_80378960:
/* 80378978 003745D8 4E 80 04 21 */ bctrl
lbl_8037897C:
/* 8037897C 003745DC 7F E3 FB 78 */ mr r3, r31
-/* 80378980 003745E0 4B EF 70 A5 */ bl func_8026FA24
+/* 80378980 003745E0 4B EF 70 A5 */ bl OSUnlockMutex
/* 80378984 003745E4 7F 63 DB 78 */ mr r3, r27
lbl_80378988:
/* 80378988 003745E8 39 61 00 50 */ addi r11, r1, 0x50
diff --git a/asm/nw4r/snd/detail/snd_SoundThread.s b/asm/nw4r/snd/detail/snd_SoundThread.s
index aeae3f3..80631fd 100644
--- a/asm/nw4r/snd/detail/snd_SoundThread.s
+++ b/asm/nw4r/snd/detail/snd_SoundThread.s
@@ -33,11 +33,11 @@ GetInstance__Q44nw4r3snd6detail11SoundThreadFv:
/* 8037C4B8 00378118 90 DF 03 88 */ stw r6, 0x388(r31)
/* 8037C4BC 0037811C 90 DF 03 8C */ stw r6, 0x38c(r31)
/* 8037C4C0 00378120 98 1F 03 94 */ stb r0, 0x394(r31)
-/* 8037C4C4 00378124 4B EF 2A 35 */ bl func_8026EEF8
+/* 8037C4C4 00378124 4B EF 2A 35 */ bl OSInitMessageQueue
/* 8037C4C8 00378128 38 7F 03 18 */ addi r3, r31, 0x318
-/* 8037C4CC 0037812C 4B EF 4E 1D */ bl func_802712E8
+/* 8037C4CC 0037812C 4B EF 4E 1D */ bl OSInitThreadQueue
/* 8037C4D0 00378130 38 7F 03 54 */ addi r3, r31, 0x354
-/* 8037C4D4 00378134 4B EF 34 3D */ bl func_8026F910
+/* 8037C4D4 00378134 4B EF 34 3D */ bl OSInitMutex
/* 8037C4D8 00378138 3C 80 80 38 */ lis r4, __dt__Q44nw4r3snd6detail11SoundThreadFv@ha
/* 8037C4DC 0037813C 3C A0 80 64 */ lis r5, lbl_806389B0@ha
/* 8037C4E0 00378140 7F E3 FB 78 */ mr r3, r31
@@ -134,11 +134,11 @@ lbl_8037C5BC:
/* 8037C620 00378280 90 FE 03 88 */ stw r7, 0x388(r30)
/* 8037C624 00378284 90 FE 03 8C */ stw r7, 0x38c(r30)
/* 8037C628 00378288 98 1E 03 94 */ stb r0, 0x394(r30)
-/* 8037C62C 0037828C 4B EF 28 CD */ bl func_8026EEF8
+/* 8037C62C 0037828C 4B EF 28 CD */ bl OSInitMessageQueue
/* 8037C630 00378290 38 7E 03 18 */ addi r3, r30, 0x318
-/* 8037C634 00378294 4B EF 4C B5 */ bl func_802712E8
+/* 8037C634 00378294 4B EF 4C B5 */ bl OSInitThreadQueue
/* 8037C638 00378298 38 7E 03 54 */ addi r3, r30, 0x354
-/* 8037C63C 0037829C 4B EF 32 D5 */ bl func_8026F910
+/* 8037C63C 0037829C 4B EF 32 D5 */ bl OSInitMutex
/* 8037C640 003782A0 3C 80 80 38 */ lis r4, __dt__Q44nw4r3snd6detail11SoundThreadFv@ha
/* 8037C644 003782A4 3C A0 80 64 */ lis r5, lbl_806389B0@ha
/* 8037C648 003782A8 7F C3 F3 78 */ mr r3, r30
@@ -156,12 +156,12 @@ lbl_8037C65C:
/* 8037C674 003782D4 38 A5 89 C0 */ addi r5, r5, lbl_806389C0@l
/* 8037C678 003782D8 7C DC EA 14 */ add r6, r28, r29
/* 8037C67C 003782DC 39 20 00 00 */ li r9, 0
-/* 8037C680 003782E0 4B EF 52 61 */ bl func_802718E0
+/* 8037C680 003782E0 4B EF 52 61 */ bl OSCreateThread
/* 8037C684 003782E4 2C 03 00 00 */ cmpwi r3, 0
/* 8037C688 003782E8 7C 7F 1B 78 */ mr r31, r3
/* 8037C68C 003782EC 41 82 00 0C */ beq lbl_8037C698
/* 8037C690 003782F0 7F 43 D3 78 */ mr r3, r26
-/* 8037C694 003782F4 4B EF 58 B5 */ bl func_80271F48
+/* 8037C694 003782F4 4B EF 58 B5 */ bl OSResumeThread
lbl_8037C698:
/* 8037C698 003782F8 7C 1F 00 D0 */ neg r0, r31
/* 8037C69C 003782FC 7C 00 FB 78 */ or r0, r0, r31
@@ -206,11 +206,11 @@ AxCallbackFunc__Q44nw4r3snd6detail11SoundThreadFv:
/* 8037C728 00378388 90 FE 03 88 */ stw r7, 0x388(r30)
/* 8037C72C 0037838C 90 FE 03 8C */ stw r7, 0x38c(r30)
/* 8037C730 00378390 98 1E 03 94 */ stb r0, 0x394(r30)
-/* 8037C734 00378394 4B EF 27 C5 */ bl func_8026EEF8
+/* 8037C734 00378394 4B EF 27 C5 */ bl OSInitMessageQueue
/* 8037C738 00378398 38 7E 03 18 */ addi r3, r30, 0x318
-/* 8037C73C 0037839C 4B EF 4B AD */ bl func_802712E8
+/* 8037C73C 0037839C 4B EF 4B AD */ bl OSInitThreadQueue
/* 8037C740 003783A0 38 7E 03 54 */ addi r3, r30, 0x354
-/* 8037C744 003783A4 4B EF 31 CD */ bl func_8026F910
+/* 8037C744 003783A4 4B EF 31 CD */ bl OSInitMutex
/* 8037C748 003783A8 3C 80 80 38 */ lis r4, __dt__Q44nw4r3snd6detail11SoundThreadFv@ha
/* 8037C74C 003783AC 3C A0 80 64 */ lis r5, lbl_806389B0@ha
/* 8037C750 003783B0 7F C3 F3 78 */ mr r3, r30
@@ -225,7 +225,7 @@ lbl_8037C768:
/* 8037C770 003783D0 3B DE 89 C0 */ addi r30, r30, lbl_806389C0@l
/* 8037C774 003783D4 38 A0 00 00 */ li r5, 0
/* 8037C778 003783D8 38 7E 03 20 */ addi r3, r30, 0x320
-/* 8037C77C 003783DC 4B EF 27 DD */ bl func_8026EF58
+/* 8037C77C 003783DC 4B EF 27 DD */ bl OSSendMessage
/* 8037C780 003783E0 87 FE 03 88 */ lwzu r31, 0x388(r30)
/* 8037C784 003783E4 48 00 00 1C */ b lbl_8037C7A0
lbl_8037C788:
@@ -336,13 +336,13 @@ lbl_8037C8F0:
/* 8037C8F0 00378550 38 7F 03 20 */ addi r3, r31, 0x320
/* 8037C8F4 00378554 38 81 00 08 */ addi r4, r1, 8
/* 8037C8F8 00378558 38 A0 00 01 */ li r5, 1
-/* 8037C8FC 0037855C 4B EF 27 25 */ bl func_8026F020
+/* 8037C8FC 0037855C 4B EF 27 25 */ bl OSReceiveMessage
/* 8037C900 00378560 80 01 00 08 */ lwz r0, 8(r1)
/* 8037C904 00378564 28 00 00 01 */ cmplwi r0, 1
/* 8037C908 00378568 40 82 01 50 */ bne lbl_8037CA58
/* 8037C90C 0037856C 3B 5F 03 54 */ addi r26, r31, 0x354
/* 8037C910 00378570 7F 43 D3 78 */ mr r3, r26
-/* 8037C914 00378574 4B EF 30 35 */ bl func_8026F948
+/* 8037C914 00378574 4B EF 30 35 */ bl OSLockMutex
/* 8037C918 00378578 4B EF 1E 45 */ bl OSDisableInterrupts
/* 8037C91C 0037857C 7C 79 1B 78 */ mr r25, r3
/* 8037C920 00378580 4B EF 1E 3D */ bl OSDisableInterrupts
@@ -428,7 +428,7 @@ lbl_8037CA3C:
/* 8037CA44 003786A4 7F 23 CB 78 */ mr r3, r25
/* 8037CA48 003786A8 4B EF 1D 3D */ bl OSRestoreInterrupts
/* 8037CA4C 003786AC 7F 43 D3 78 */ mr r3, r26
-/* 8037CA50 003786B0 4B EF 2F D5 */ bl func_8026FA24
+/* 8037CA50 003786B0 4B EF 2F D5 */ bl OSUnlockMutex
/* 8037CA54 003786B4 4B FF FE 9C */ b lbl_8037C8F0
lbl_8037CA58:
/* 8037CA58 003786B8 28 00 00 02 */ cmplwi r0, 2
diff --git a/asm/nw4r/snd/detail/snd_StrmPlayer.s b/asm/nw4r/snd/detail/snd_StrmPlayer.s
index d74e2a7..1b062a5 100644
--- a/asm/nw4r/snd/detail/snd_StrmPlayer.s
+++ b/asm/nw4r/snd/detail/snd_StrmPlayer.s
@@ -52,12 +52,12 @@ __ct__Q44nw4r3snd6detail10StrmPlayerFv:
/* 8037D364 00378FC4 40 82 00 18 */ bne lbl_8037D37C
/* 8037D368 00378FC8 3C 60 80 64 */ lis r3, lbl_8063CD80@ha
/* 8037D36C 00378FCC 38 63 CD 80 */ addi r3, r3, lbl_8063CD80@l
-/* 8037D370 00378FD0 4B EF 25 A1 */ bl func_8026F910
+/* 8037D370 00378FD0 4B EF 25 A1 */ bl OSInitMutex
/* 8037D374 00378FD4 38 00 00 01 */ li r0, 1
/* 8037D378 00378FD8 98 0D B2 80 */ stb r0, lbl_80640540-_SDA_BASE_(r13)
lbl_8037D37C:
/* 8037D37C 00378FDC 38 7E 08 48 */ addi r3, r30, 0x848
-/* 8037D380 00378FE0 4B EF 25 91 */ bl func_8026F910
+/* 8037D380 00378FE0 4B EF 25 91 */ bl OSInitMutex
/* 8037D384 00378FE4 38 7E 01 34 */ addi r3, r30, 0x134
/* 8037D388 00378FE8 38 9E 01 38 */ addi r4, r30, 0x138
/* 8037D38C 00378FEC 38 A0 06 80 */ li r5, 0x680
@@ -270,7 +270,7 @@ Prepare__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamiQ54nw4r3snd6deta
/* 8037D660 003792C0 7C DC 33 78 */ mr r28, r6
/* 8037D664 003792C4 7C FD 3B 78 */ mr r29, r7
/* 8037D668 003792C8 7F E3 FB 78 */ mr r3, r31
-/* 8037D66C 003792CC 4B EF 22 DD */ bl func_8026F948
+/* 8037D66C 003792CC 4B EF 22 DD */ bl OSLockMutex
/* 8037D670 003792D0 38 60 00 00 */ li r3, 0
/* 8037D674 003792D4 38 00 00 01 */ li r0, 1
/* 8037D678 003792D8 93 DA 07 BC */ stw r30, 0x7bc(r26)
@@ -302,7 +302,7 @@ lbl_8037D6A8:
/* 8037D6DC 0037933C 38 A0 00 01 */ li r5, 1
/* 8037D6E0 00379340 48 00 24 19 */ bl AppendTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4TaskQ54nw4r3snd6detail11TaskManager12TaskPriority
/* 8037D6E4 00379344 7F E3 FB 78 */ mr r3, r31
-/* 8037D6E8 00379348 4B EF 23 3D */ bl func_8026FA24
+/* 8037D6E8 00379348 4B EF 23 3D */ bl OSUnlockMutex
/* 8037D6EC 0037934C 39 61 00 20 */ addi r11, r1, 0x20
/* 8037D6F0 00379350 38 60 00 01 */ li r3, 1
/* 8037D6F4 00379354 4B E4 9A 7D */ bl _restgpr_26
@@ -321,12 +321,12 @@ Start__Q44nw4r3snd6detail10StrmPlayerFv:
/* 8037D71C 0037937C 3B E3 08 48 */ addi r31, r3, 0x848
/* 8037D720 00379380 7C 7E 1B 78 */ mr r30, r3
/* 8037D724 00379384 7F E3 FB 78 */ mr r3, r31
-/* 8037D728 00379388 4B EF 22 21 */ bl func_8026F948
+/* 8037D728 00379388 4B EF 22 21 */ bl OSLockMutex
/* 8037D72C 0037938C 88 1E 00 BB */ lbz r0, 0xbb(r30)
/* 8037D730 00379390 2C 00 00 00 */ cmpwi r0, 0
/* 8037D734 00379394 40 82 00 14 */ bne lbl_8037D748
/* 8037D738 00379398 7F E3 FB 78 */ mr r3, r31
-/* 8037D73C 0037939C 4B EF 22 E9 */ bl func_8026FA24
+/* 8037D73C 0037939C 4B EF 22 E9 */ bl OSUnlockMutex
/* 8037D740 003793A0 38 60 00 00 */ li r3, 0
/* 8037D744 003793A4 48 00 02 9C */ b lbl_8037D9E0
lbl_8037D748:
@@ -345,7 +345,7 @@ lbl_8037D748:
/* 8037D778 003793D8 2C 03 00 00 */ cmpwi r3, 0
/* 8037D77C 003793DC 40 82 00 14 */ bne lbl_8037D790
/* 8037D780 003793E0 7F E3 FB 78 */ mr r3, r31
-/* 8037D784 003793E4 4B EF 22 A1 */ bl func_8026FA24
+/* 8037D784 003793E4 4B EF 22 A1 */ bl OSUnlockMutex
/* 8037D788 003793E8 38 60 00 00 */ li r3, 0
/* 8037D78C 003793EC 48 00 02 54 */ b lbl_8037D9E0
lbl_8037D790:
@@ -505,7 +505,7 @@ lbl_8037D9C4:
/* 8037D9D0 00379630 4B EF 0D B5 */ bl OSRestoreInterrupts
lbl_8037D9D4:
/* 8037D9D4 00379634 7F E3 FB 78 */ mr r3, r31
-/* 8037D9D8 00379638 4B EF 20 4D */ bl func_8026FA24
+/* 8037D9D8 00379638 4B EF 20 4D */ bl OSUnlockMutex
/* 8037D9DC 0037963C 38 60 00 01 */ li r3, 1
lbl_8037D9E0:
/* 8037D9E0 00379640 39 61 00 D0 */ addi r11, r1, 0xd0
@@ -525,7 +525,7 @@ Stop__Q44nw4r3snd6detail10StrmPlayerFv:
/* 8037DA0C 0037966C 3B 83 08 48 */ addi r28, r3, 0x848
/* 8037DA10 00379670 7C 7B 1B 78 */ mr r27, r3
/* 8037DA14 00379674 7F 83 E3 78 */ mr r3, r28
-/* 8037DA18 00379678 4B EF 1F 31 */ bl func_8026F948
+/* 8037DA18 00379678 4B EF 1F 31 */ bl OSLockMutex
/* 8037DA1C 0037967C 4B EF 0D 41 */ bl OSDisableInterrupts
/* 8037DA20 00379680 80 1B 07 C0 */ lwz r0, 0x7c0(r27)
/* 8037DA24 00379684 7C 7F 1B 78 */ mr r31, r3
@@ -587,7 +587,7 @@ lbl_8037DAE0:
/* 8037DAE8 00379748 98 1B 00 BA */ stb r0, 0xba(r27)
/* 8037DAEC 0037974C 98 1B 00 BB */ stb r0, 0xbb(r27)
/* 8037DAF0 00379750 98 1B 00 B9 */ stb r0, 0xb9(r27)
-/* 8037DAF4 00379754 4B EF 1F 31 */ bl func_8026FA24
+/* 8037DAF4 00379754 4B EF 1F 31 */ bl OSUnlockMutex
/* 8037DAF8 00379758 39 61 00 20 */ addi r11, r1, 0x20
/* 8037DAFC 0037975C 4B E4 96 79 */ bl _restgpr_27
/* 8037DB00 00379760 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -608,7 +608,7 @@ Pause__Q44nw4r3snd6detail10StrmPlayerFb:
/* 8037DB30 00379790 93 81 00 10 */ stw r28, 0x10(r1)
/* 8037DB34 00379794 7C 7C 1B 78 */ mr r28, r3
/* 8037DB38 00379798 7F C3 F3 78 */ mr r3, r30
-/* 8037DB3C 0037979C 4B EF 1E 0D */ bl func_8026F948
+/* 8037DB3C 0037979C 4B EF 1E 0D */ bl OSLockMutex
/* 8037DB40 003797A0 2C 1D 00 00 */ cmpwi r29, 0
/* 8037DB44 003797A4 9B BC 00 BF */ stb r29, 0xbf(r28)
/* 8037DB48 003797A8 41 82 00 0C */ beq lbl_8037DB54
@@ -642,7 +642,7 @@ lbl_8037DBA4:
/* 8037DBA4 00379804 7F E3 FB 78 */ mr r3, r31
/* 8037DBA8 00379808 4B EF 0B DD */ bl OSRestoreInterrupts
/* 8037DBAC 0037980C 7F C3 F3 78 */ mr r3, r30
-/* 8037DBB0 00379810 4B EF 1E 75 */ bl func_8026FA24
+/* 8037DBB0 00379810 4B EF 1E 75 */ bl OSUnlockMutex
/* 8037DBB4 00379814 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037DBB8 00379818 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037DBBC 0037981C 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -699,7 +699,7 @@ LoadHeader__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6de
/* 8037DC70 003798D0 7C BD 2B 78 */ mr r29, r5
/* 8037DC74 003798D4 7C DE 33 78 */ mr r30, r6
/* 8037DC78 003798D8 7F E3 FB 78 */ mr r3, r31
-/* 8037DC7C 003798DC 4B EF 1C CD */ bl func_8026F948
+/* 8037DC7C 003798DC 4B EF 1C CD */ bl OSLockMutex
/* 8037DC80 003798E0 93 01 00 08 */ stw r24, 8(r1)
/* 8037DC84 003798E4 38 61 00 0C */ addi r3, r1, 0xc
/* 8037DC88 003798E8 4B FF F0 5D */ bl __ct__Q44nw4r3snd6detail14StrmFileReaderFv
@@ -711,7 +711,7 @@ LoadHeader__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6de
/* 8037DCA0 00379900 2C 03 00 00 */ cmpwi r3, 0
/* 8037DCA4 00379904 40 82 00 14 */ bne lbl_8037DCB8
/* 8037DCA8 00379908 7F E3 FB 78 */ mr r3, r31
-/* 8037DCAC 0037990C 4B EF 1D 79 */ bl func_8026FA24
+/* 8037DCAC 0037990C 4B EF 1D 79 */ bl OSUnlockMutex
/* 8037DCB0 00379910 38 60 00 00 */ li r3, 0
/* 8037DCB4 00379914 48 00 01 C0 */ b lbl_8037DE74
lbl_8037DCB8:
@@ -755,7 +755,7 @@ lbl_8037DD1C:
/* 8037DD34 00379994 2C 03 00 00 */ cmpwi r3, 0
/* 8037DD38 00379998 40 82 00 14 */ bne lbl_8037DD4C
/* 8037DD3C 0037999C 7F E3 FB 78 */ mr r3, r31
-/* 8037DD40 003799A0 4B EF 1C E5 */ bl func_8026FA24
+/* 8037DD40 003799A0 4B EF 1C E5 */ bl OSUnlockMutex
/* 8037DD44 003799A4 38 60 00 00 */ li r3, 0
/* 8037DD48 003799A8 48 00 01 2C */ b lbl_8037DE74
lbl_8037DD4C:
@@ -840,7 +840,7 @@ lbl_8037DE4C:
/* 8037DE64 00379AC4 4B FF F2 A9 */ bl ReadAdpcBlockData__Q44nw4r3snd6detail14StrmFileLoaderFPUsPUsii
lbl_8037DE68:
/* 8037DE68 00379AC8 7F E3 FB 78 */ mr r3, r31
-/* 8037DE6C 00379ACC 4B EF 1B B9 */ bl func_8026FA24
+/* 8037DE6C 00379ACC 4B EF 1B B9 */ bl OSUnlockMutex
/* 8037DE70 00379AD0 38 60 00 01 */ li r3, 1
lbl_8037DE74:
/* 8037DE74 00379AD4 39 61 02 10 */ addi r11, r1, 0x210
@@ -898,7 +898,7 @@ lbl_8037DF1C:
/* 8037DF1C 00379B7C 3F E0 80 64 */ lis r31, lbl_8063CD80@ha
/* 8037DF20 00379B80 3B FF CD 80 */ addi r31, r31, lbl_8063CD80@l
/* 8037DF24 00379B84 7F E3 FB 78 */ mr r3, r31
-/* 8037DF28 00379B88 4B EF 1A 21 */ bl func_8026F948
+/* 8037DF28 00379B88 4B EF 1A 21 */ bl OSLockMutex
/* 8037DF2C 00379B8C 3E A0 80 64 */ lis r21, lbl_80638D60@ha
/* 8037DF30 00379B90 7E 84 A3 78 */ mr r4, r20
/* 8037DF34 00379B94 38 75 8D 60 */ addi r3, r21, lbl_80638D60@l
@@ -920,7 +920,7 @@ lbl_8037DF1C:
/* 8037DF74 00379BD4 7C 03 A0 40 */ cmplw r3, r20
/* 8037DF78 00379BD8 41 82 00 14 */ beq lbl_8037DF8C
/* 8037DF7C 00379BDC 7F E3 FB 78 */ mr r3, r31
-/* 8037DF80 00379BE0 4B EF 1A A5 */ bl func_8026FA24
+/* 8037DF80 00379BE0 4B EF 1A A5 */ bl OSUnlockMutex
/* 8037DF84 00379BE4 38 60 00 00 */ li r3, 0
/* 8037DF88 00379BE8 48 00 01 1C */ b lbl_8037E0A4
lbl_8037DF8C:
@@ -1000,7 +1000,7 @@ lbl_8037E074:
/* 8037E094 00379CF4 98 19 00 BB */ stb r0, 0xbb(r25)
lbl_8037E098:
/* 8037E098 00379CF8 7F E3 FB 78 */ mr r3, r31
-/* 8037E09C 00379CFC 4B EF 19 89 */ bl func_8026FA24
+/* 8037E09C 00379CFC 4B EF 19 89 */ bl OSUnlockMutex
/* 8037E0A0 00379D00 38 60 00 01 */ li r3, 1
lbl_8037E0A4:
/* 8037E0A4 00379D04 39 61 00 40 */ addi r11, r1, 0x40
diff --git a/asm/nw4r/snd/detail/snd_StrmSound.s b/asm/nw4r/snd/detail/snd_StrmSound.s
index 0a591fd..0bee736 100644
--- a/asm/nw4r/snd/detail/snd_StrmSound.s
+++ b/asm/nw4r/snd/detail/snd_StrmSound.s
@@ -93,12 +93,12 @@ Shutdown__Q44nw4r3snd6detail9StrmSoundFv:
/* 8037F700 0037B360 83 DD 09 3C */ lwz r30, 0x93c(r29)
/* 8037F704 0037B364 3B FE 00 10 */ addi r31, r30, 0x10
/* 8037F708 0037B368 7F E3 FB 78 */ mr r3, r31
-/* 8037F70C 0037B36C 4B EF 02 3D */ bl func_8026F948
+/* 8037F70C 0037B36C 4B EF 02 3D */ bl OSLockMutex
/* 8037F710 0037B370 80 1E 00 04 */ lwz r0, 4(r30)
/* 8037F714 0037B374 2C 00 00 00 */ cmpwi r0, 0
/* 8037F718 0037B378 40 82 00 10 */ bne lbl_8037F728
/* 8037F71C 0037B37C 7F E3 FB 78 */ mr r3, r31
-/* 8037F720 0037B380 4B EF 03 05 */ bl func_8026FA24
+/* 8037F720 0037B380 4B EF 03 05 */ bl OSUnlockMutex
/* 8037F724 0037B384 48 00 00 3C */ b lbl_8037F760
lbl_8037F728:
/* 8037F728 0037B388 38 7E 00 04 */ addi r3, r30, 4
@@ -114,7 +114,7 @@ lbl_8037F728:
/* 8037F750 0037B3B0 7F A4 EB 78 */ mr r4, r29
/* 8037F754 0037B3B4 4B FF 24 61 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
/* 8037F758 0037B3B8 7F E3 FB 78 */ mr r3, r31
-/* 8037F75C 0037B3BC 4B EF 02 C9 */ bl func_8026FA24
+/* 8037F75C 0037B3BC 4B EF 02 C9 */ bl OSUnlockMutex
lbl_8037F760:
/* 8037F760 0037B3C0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037F764 0037B3C4 83 E1 00 1C */ lwz r31, 0x1c(r1)
@@ -176,7 +176,7 @@ lbl_8037F820:
/* 8037F820 0037B480 83 DC 09 3C */ lwz r30, 0x93c(r28)
/* 8037F824 0037B484 3B FE 00 10 */ addi r31, r30, 0x10
/* 8037F828 0037B488 7F E3 FB 78 */ mr r3, r31
-/* 8037F82C 0037B48C 4B EF 01 1D */ bl func_8026F948
+/* 8037F82C 0037B48C 4B EF 01 1D */ bl OSLockMutex
/* 8037F830 0037B490 3B 9C 00 B8 */ addi r28, r28, 0xb8
/* 8037F834 0037B494 38 7E 00 04 */ addi r3, r30, 4
/* 8037F838 0037B498 7F 84 E3 78 */ mr r4, r28
@@ -209,7 +209,7 @@ lbl_8037F884:
/* 8037F890 0037B4F0 38 81 00 08 */ addi r4, r1, 8
/* 8037F894 0037B4F4 4B FE 33 B5 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037F898 0037B4F8 7F E3 FB 78 */ mr r3, r31
-/* 8037F89C 0037B4FC 4B EF 01 89 */ bl func_8026FA24
+/* 8037F89C 0037B4FC 4B EF 01 89 */ bl OSUnlockMutex
/* 8037F8A0 0037B500 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037F8A4 0037B504 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037F8A8 0037B508 83 C1 00 18 */ lwz r30, 0x18(r1)
diff --git a/asm/nw4r/snd/detail/snd_TaskManager.s b/asm/nw4r/snd/detail/snd_TaskManager.s
index f587379..b516467 100644
--- a/asm/nw4r/snd/detail/snd_TaskManager.s
+++ b/asm/nw4r/snd/detail/snd_TaskManager.s
@@ -25,9 +25,9 @@ GetInstance__Q44nw4r3snd6detail11TaskManagerFv:
/* 8037F9C8 0037B628 38 7F 00 2C */ addi r3, r31, 0x2c
/* 8037F9CC 0037B62C 90 1F 00 24 */ stw r0, 0x24(r31)
/* 8037F9D0 0037B630 98 1F 00 28 */ stb r0, 0x28(r31)
-/* 8037F9D4 0037B634 4B EF 19 15 */ bl func_802712E8
+/* 8037F9D4 0037B634 4B EF 19 15 */ bl OSInitThreadQueue
/* 8037F9D8 0037B638 38 7F 00 34 */ addi r3, r31, 0x34
-/* 8037F9DC 0037B63C 4B EF 19 0D */ bl func_802712E8
+/* 8037F9DC 0037B63C 4B EF 19 0D */ bl OSInitThreadQueue
/* 8037F9E0 0037B640 3C 80 80 38 */ lis r4, __dt__Q44nw4r3snd6detail11TaskManagerFv@ha
/* 8037F9E4 0037B644 3C A0 80 64 */ lis r5, lbl_8063CD98@ha
/* 8037F9E8 0037B648 7F E3 FB 78 */ mr r3, r31
@@ -134,7 +134,7 @@ AppendTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4TaskQ54nw4r3snd6
/* 8037FB40 0037B7A0 90 01 00 08 */ stw r0, 8(r1)
/* 8037FB44 0037B7A4 4B FE 31 05 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037FB48 0037B7A8 38 7D 00 2C */ addi r3, r29, 0x2c
-/* 8037FB4C 0037B7AC 4B EF 29 15 */ bl func_80272460
+/* 8037FB4C 0037B7AC 4B EF 29 15 */ bl OSWakeupThread
/* 8037FB50 0037B7B0 7F E3 FB 78 */ mr r3, r31
/* 8037FB54 0037B7B4 4B EE EC 31 */ bl OSRestoreInterrupts
/* 8037FB58 0037B7B8 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -350,7 +350,7 @@ lbl_8037FE10:
/* 8037FE28 0037BA88 4E 80 04 21 */ bctrl
/* 8037FE2C 0037BA8C 93 FD 00 24 */ stw r31, 0x24(r29)
/* 8037FE30 0037BA90 38 7D 00 34 */ addi r3, r29, 0x34
-/* 8037FE34 0037BA94 4B EF 26 2D */ bl func_80272460
+/* 8037FE34 0037BA94 4B EF 26 2D */ bl OSWakeupThread
/* 8037FE38 0037BA98 7F C3 F3 78 */ mr r3, r30
lbl_8037FE3C:
/* 8037FE3C 0037BA9C 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -383,7 +383,7 @@ CancelTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4Task:
/* 8037FE9C 0037BAFC 48 00 00 0C */ b lbl_8037FEA8
lbl_8037FEA0:
/* 8037FEA0 0037BB00 38 79 00 34 */ addi r3, r25, 0x34
-/* 8037FEA4 0037BB04 4B EF 24 D1 */ bl func_80272374
+/* 8037FEA4 0037BB04 4B EF 24 D1 */ bl OSSleepThread
lbl_8037FEA8:
/* 8037FEA8 0037BB08 80 19 00 24 */ lwz r0, 0x24(r25)
/* 8037FEAC 0037BB0C 7C 1A 00 40 */ cmplw r26, r0
@@ -447,7 +447,7 @@ WaitTask__Q44nw4r3snd6detail11TaskManagerFv:
/* 8037FF70 0037BBD0 48 00 00 0C */ b lbl_8037FF7C
lbl_8037FF74:
/* 8037FF74 0037BBD4 38 7E 00 2C */ addi r3, r30, 0x2c
-/* 8037FF78 0037BBD8 4B EF 23 FD */ bl func_80272374
+/* 8037FF78 0037BBD8 4B EF 23 FD */ bl OSSleepThread
lbl_8037FF7C:
/* 8037FF7C 0037BBDC 7F C3 F3 78 */ mr r3, r30
/* 8037FF80 0037BBE0 4B FF FD 51 */ bl GetNextTask__Q44nw4r3snd6detail11TaskManagerFv
@@ -479,7 +479,7 @@ CancelWaitTask__Q44nw4r3snd6detail11TaskManagerFv:
/* 8037FFD8 0037BC38 7C 7F 1B 78 */ mr r31, r3
/* 8037FFDC 0037BC3C 98 1E 00 28 */ stb r0, 0x28(r30)
/* 8037FFE0 0037BC40 38 7E 00 2C */ addi r3, r30, 0x2c
-/* 8037FFE4 0037BC44 4B EF 24 7D */ bl func_80272460
+/* 8037FFE4 0037BC44 4B EF 24 7D */ bl OSWakeupThread
/* 8037FFE8 0037BC48 7F E3 FB 78 */ mr r3, r31
/* 8037FFEC 0037BC4C 4B EE E7 99 */ bl OSRestoreInterrupts
/* 8037FFF0 0037BC50 80 01 00 14 */ lwz r0, 0x14(r1)
diff --git a/asm/nw4r/snd/detail/snd_TaskThread.s b/asm/nw4r/snd/detail/snd_TaskThread.s
index 6cb7d9a..4ee8103 100644
--- a/asm/nw4r/snd/detail/snd_TaskThread.s
+++ b/asm/nw4r/snd/detail/snd_TaskThread.s
@@ -31,7 +31,7 @@ __dt__Q44nw4r3snd6detail10TaskThreadFv:
/* 8038005C 0037BCBC 4B FF FF 5D */ bl CancelWaitTask__Q44nw4r3snd6detail11TaskManagerFv
/* 80380060 0037BCC0 7F C3 F3 78 */ mr r3, r30
/* 80380064 0037BCC4 38 80 00 00 */ li r4, 0
-/* 80380068 0037BCC8 4B EF 1D A1 */ bl func_80271E08
+/* 80380068 0037BCC8 4B EF 1D A1 */ bl OSJoinThread
/* 8038006C 0037BCCC 38 00 00 00 */ li r0, 0
/* 80380070 0037BCD0 98 1E 03 1D */ stb r0, 0x31d(r30)
lbl_80380074:
@@ -71,7 +71,7 @@ Create__Q44nw4r3snd6detail10TaskThreadFlPvUl:
/* 803800E8 0037BD48 4B FF FE D1 */ bl CancelWaitTask__Q44nw4r3snd6detail11TaskManagerFv
/* 803800EC 0037BD4C 7F 83 E3 78 */ mr r3, r28
/* 803800F0 0037BD50 38 80 00 00 */ li r4, 0
-/* 803800F4 0037BD54 4B EF 1D 15 */ bl func_80271E08
+/* 803800F4 0037BD54 4B EF 1D 15 */ bl OSJoinThread
/* 803800F8 0037BD58 38 00 00 00 */ li r0, 0
/* 803800FC 0037BD5C 98 1C 03 1D */ stb r0, 0x31d(r28)
lbl_80380100:
@@ -83,7 +83,7 @@ lbl_80380100:
/* 80380114 0037BD74 38 84 01 74 */ addi r4, r4, ThreadFunc__Q44nw4r3snd6detail10TaskThreadFPv@l
/* 80380118 0037BD78 7C DE FA 14 */ add r6, r30, r31
/* 8038011C 0037BD7C 39 20 00 00 */ li r9, 0
-/* 80380120 0037BD80 4B EF 17 C1 */ bl func_802718E0
+/* 80380120 0037BD80 4B EF 17 C1 */ bl OSCreateThread
/* 80380124 0037BD84 2C 03 00 00 */ cmpwi r3, 0
/* 80380128 0037BD88 40 82 00 0C */ bne lbl_80380134
/* 8038012C 0037BD8C 38 60 00 00 */ li r3, 0
@@ -95,7 +95,7 @@ lbl_80380134:
/* 80380140 0037BDA0 7F 83 E3 78 */ mr r3, r28
/* 80380144 0037BDA4 98 9C 03 1C */ stb r4, 0x31c(r28)
/* 80380148 0037BDA8 98 1C 03 1D */ stb r0, 0x31d(r28)
-/* 8038014C 0037BDAC 4B EF 1D FD */ bl func_80271F48
+/* 8038014C 0037BDAC 4B EF 1D FD */ bl OSResumeThread
/* 80380150 0037BDB0 38 60 00 01 */ li r3, 1
lbl_80380154:
/* 80380154 0037BDB4 80 01 00 24 */ lwz r0, 0x24(r1)
diff --git a/asm/nw4r/snd/detail/snd_WaveSound.s b/asm/nw4r/snd/detail/snd_WaveSound.s
index 475f97d..df88fb7 100644
--- a/asm/nw4r/snd/detail/snd_WaveSound.s
+++ b/asm/nw4r/snd/detail/snd_WaveSound.s
@@ -106,12 +106,12 @@ Shutdown__Q44nw4r3snd6detail9WaveSoundFv:
/* 803837A8 0037F408 83 DD 01 CC */ lwz r30, 0x1cc(r29)
/* 803837AC 0037F40C 3B FE 00 10 */ addi r31, r30, 0x10
/* 803837B0 0037F410 7F E3 FB 78 */ mr r3, r31
-/* 803837B4 0037F414 4B EE C1 95 */ bl func_8026F948
+/* 803837B4 0037F414 4B EE C1 95 */ bl OSLockMutex
/* 803837B8 0037F418 80 1E 00 04 */ lwz r0, 4(r30)
/* 803837BC 0037F41C 2C 00 00 00 */ cmpwi r0, 0
/* 803837C0 0037F420 40 82 00 10 */ bne lbl_803837D0
/* 803837C4 0037F424 7F E3 FB 78 */ mr r3, r31
-/* 803837C8 0037F428 4B EE C2 5D */ bl func_8026FA24
+/* 803837C8 0037F428 4B EE C2 5D */ bl OSUnlockMutex
/* 803837CC 0037F42C 48 00 00 3C */ b lbl_80383808
lbl_803837D0:
/* 803837D0 0037F430 38 7E 00 04 */ addi r3, r30, 4
@@ -127,7 +127,7 @@ lbl_803837D0:
/* 803837F8 0037F458 7F A4 EB 78 */ mr r4, r29
/* 803837FC 0037F45C 4B FE E3 B9 */ bl FreeImpl__Q44nw4r3snd6detail8PoolImplFPv
/* 80383800 0037F460 7F E3 FB 78 */ mr r3, r31
-/* 80383804 0037F464 4B EE C2 21 */ bl func_8026FA24
+/* 80383804 0037F464 4B EE C2 21 */ bl OSUnlockMutex
lbl_80383808:
/* 80383808 0037F468 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8038380C 0037F46C 83 E1 00 1C */ lwz r31, 0x1c(r1)
@@ -192,7 +192,7 @@ lbl_803838BC:
/* 803838BC 0037F51C 83 DC 01 CC */ lwz r30, 0x1cc(r28)
/* 803838C0 0037F520 3B FE 00 10 */ addi r31, r30, 0x10
/* 803838C4 0037F524 7F E3 FB 78 */ mr r3, r31
-/* 803838C8 0037F528 4B EE C0 81 */ bl func_8026F948
+/* 803838C8 0037F528 4B EE C0 81 */ bl OSLockMutex
/* 803838CC 0037F52C 3B 9C 00 B8 */ addi r28, r28, 0xb8
/* 803838D0 0037F530 38 7E 00 04 */ addi r3, r30, 4
/* 803838D4 0037F534 7F 84 E3 78 */ mr r4, r28
@@ -225,7 +225,7 @@ lbl_80383920:
/* 8038392C 0037F58C 38 81 00 08 */ addi r4, r1, 8
/* 80383930 0037F590 4B FD F3 19 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 80383934 0037F594 7F E3 FB 78 */ mr r3, r31
-/* 80383938 0037F598 4B EE C0 ED */ bl func_8026FA24
+/* 80383938 0037F598 4B EE C0 ED */ bl OSUnlockMutex
/* 8038393C 0037F59C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80383940 0037F5A0 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80383944 0037F5A4 83 C1 00 18 */ lwz r30, 0x18(r1)
diff --git a/asm/nw4r/snd/detail/snd_WsdPlayer.s b/asm/nw4r/snd/detail/snd_WsdPlayer.s
index a70aa8f..827298a 100644
--- a/asm/nw4r/snd/detail/snd_WsdPlayer.s
+++ b/asm/nw4r/snd/detail/snd_WsdPlayer.s
@@ -26,7 +26,7 @@ __ct__Q44nw4r3snd6detail9WsdPlayerFv:
/* 80383D70 0037F9D0 98 DF 00 8C */ stb r6, 0x8c(r31)
/* 80383D74 0037F9D4 4B FE DE 89 */ bl Init__Q44nw4r3snd6detail8LfoParamFv
/* 80383D78 0037F9D8 38 7F 00 A8 */ addi r3, r31, 0xa8
-/* 80383D7C 0037F9DC 4B EE BB 95 */ bl func_8026F910
+/* 80383D7C 0037F9DC 4B EE BB 95 */ bl OSInitMutex
/* 80383D80 0037F9E0 7F E3 FB 78 */ mr r3, r31
/* 80383D84 0037F9E4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80383D88 0037F9E8 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -96,13 +96,13 @@ Prepare__Q44nw4r3snd6detail9WsdPlayerFPCviQ54nw4r3snd6detail9WsdPlayer15StartOff
/* 80383E70 0037FAD0 7D 3D 4B 78 */ mr r29, r9
/* 80383E74 0037FAD4 7D 5E 53 78 */ mr r30, r10
/* 80383E78 0037FAD8 7F E3 FB 78 */ mr r3, r31
-/* 80383E7C 0037FADC 4B EE BA CD */ bl func_8026F948
+/* 80383E7C 0037FADC 4B EE BA CD */ bl OSLockMutex
/* 80383E80 0037FAE0 88 17 00 8C */ lbz r0, 0x8c(r23)
/* 80383E84 0037FAE4 2C 00 00 00 */ cmpwi r0, 0
/* 80383E88 0037FAE8 41 82 00 C8 */ beq lbl_80383F50
/* 80383E8C 0037FAEC 7F F6 FB 78 */ mr r22, r31
/* 80383E90 0037FAF0 7E C3 B3 78 */ mr r3, r22
-/* 80383E94 0037FAF4 4B EE BA B5 */ bl func_8026F948
+/* 80383E94 0037FAF4 4B EE BA B5 */ bl OSLockMutex
/* 80383E98 0037FAF8 88 17 00 8D */ lbz r0, 0x8d(r23)
/* 80383E9C 0037FAFC 2C 00 00 00 */ cmpwi r0, 0
/* 80383EA0 0037FB00 41 82 00 28 */ beq lbl_80383EC8
@@ -155,7 +155,7 @@ lbl_80383F40:
/* 80383F40 0037FBA0 38 00 00 00 */ li r0, 0
/* 80383F44 0037FBA4 7E C3 B3 78 */ mr r3, r22
/* 80383F48 0037FBA8 90 17 00 EC */ stw r0, 0xec(r23)
-/* 80383F4C 0037FBAC 4B EE BA D9 */ bl func_8026FA24
+/* 80383F4C 0037FBAC 4B EE BA D9 */ bl OSUnlockMutex
lbl_80383F50:
/* 80383F50 0037FBB0 7E E3 BB 78 */ mr r3, r23
/* 80383F54 0037FBB4 7F 84 E3 78 */ mr r4, r28
@@ -177,7 +177,7 @@ lbl_80383F84:
/* 80383F90 0037FBF0 38 00 00 01 */ li r0, 1
/* 80383F94 0037FBF4 7F E3 FB 78 */ mr r3, r31
/* 80383F98 0037FBF8 98 17 00 8C */ stb r0, 0x8c(r23)
-/* 80383F9C 0037FBFC 4B EE BA 89 */ bl func_8026FA24
+/* 80383F9C 0037FBFC 4B EE BA 89 */ bl OSUnlockMutex
/* 80383FA0 0037FC00 39 61 00 40 */ addi r11, r1, 0x40
/* 80383FA4 0037FC04 38 60 00 01 */ li r3, 1
/* 80383FA8 0037FC08 4B E4 31 B5 */ bl _restgpr_21
@@ -197,7 +197,7 @@ Start__Q44nw4r3snd6detail9WsdPlayerFv:
/* 80383FD4 0037FC34 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80383FD8 0037FC38 7C 7D 1B 78 */ mr r29, r3
/* 80383FDC 0037FC3C 7F E3 FB 78 */ mr r3, r31
-/* 80383FE0 0037FC40 4B EE B9 69 */ bl func_8026F948
+/* 80383FE0 0037FC40 4B EE B9 69 */ bl OSLockMutex
/* 80383FE4 0037FC44 2C 1D 00 00 */ cmpwi r29, 0
/* 80383FE8 0037FC48 7F BE EB 78 */ mr r30, r29
/* 80383FEC 0037FC4C 41 82 00 08 */ beq lbl_80383FF4
@@ -209,7 +209,7 @@ lbl_80383FF4:
/* 80384000 0037FC60 38 00 00 01 */ li r0, 1
/* 80384004 0037FC64 7F E3 FB 78 */ mr r3, r31
/* 80384008 0037FC68 98 1D 00 8D */ stb r0, 0x8d(r29)
-/* 8038400C 0037FC6C 4B EE BA 19 */ bl func_8026FA24
+/* 8038400C 0037FC6C 4B EE BA 19 */ bl OSUnlockMutex
/* 80384010 0037FC70 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80384014 0037FC74 38 60 00 01 */ li r3, 1
/* 80384018 0037FC78 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -230,7 +230,7 @@ Stop__Q44nw4r3snd6detail9WsdPlayerFv:
/* 80384048 0037FCA8 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8038404C 0037FCAC 7C 7D 1B 78 */ mr r29, r3
/* 80384050 0037FCB0 7F E3 FB 78 */ mr r3, r31
-/* 80384054 0037FCB4 4B EE B8 F5 */ bl func_8026F948
+/* 80384054 0037FCB4 4B EE B8 F5 */ bl OSLockMutex
/* 80384058 0037FCB8 88 1D 00 8D */ lbz r0, 0x8d(r29)
/* 8038405C 0037FCBC 2C 00 00 00 */ cmpwi r0, 0
/* 80384060 0037FCC0 41 82 00 28 */ beq lbl_80384088
@@ -283,7 +283,7 @@ lbl_80384100:
/* 80384100 0037FD60 38 00 00 00 */ li r0, 0
/* 80384104 0037FD64 7F E3 FB 78 */ mr r3, r31
/* 80384108 0037FD68 90 1D 00 EC */ stw r0, 0xec(r29)
-/* 8038410C 0037FD6C 4B EE B9 19 */ bl func_8026FA24
+/* 8038410C 0037FD6C 4B EE B9 19 */ bl OSUnlockMutex
/* 80384110 0037FD70 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80384114 0037FD74 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80384118 0037FD78 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -301,7 +301,7 @@ lbl_80384100:
/* 80384148 0037FDA8 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8038414C 0037FDAC 7C 7D 1B 78 */ mr r29, r3
/* 80384150 0037FDB0 7F E3 FB 78 */ mr r3, r31
-/* 80384154 0037FDB4 4B EE B7 F5 */ bl func_8026F948
+/* 80384154 0037FDB4 4B EE B7 F5 */ bl OSLockMutex
/* 80384158 0037FDB8 57 C3 06 3E */ clrlwi r3, r30, 0x18
/* 8038415C 0037FDBC 80 BD 00 EC */ lwz r5, 0xec(r29)
/* 80384160 0037FDC0 7C 03 00 D0 */ neg r0, r3
@@ -331,7 +331,7 @@ lbl_8038418C:
/* 803841BC 0037FE1C 4B FF CE 85 */ bl Pause__Q44nw4r3snd6detail5VoiceFb
lbl_803841C0:
/* 803841C0 0037FE20 7F E3 FB 78 */ mr r3, r31
-/* 803841C4 0037FE24 4B EE B8 61 */ bl func_8026FA24
+/* 803841C4 0037FE24 4B EE B8 61 */ bl OSUnlockMutex
/* 803841C8 0037FE28 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803841CC 0037FE2C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803841D0 0037FE30 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -352,10 +352,10 @@ SetChannelPriority__Q44nw4r3snd6detail9WsdPlayerFi:
/* 80384200 0037FE60 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80384204 0037FE64 7C 7D 1B 78 */ mr r29, r3
/* 80384208 0037FE68 7F E3 FB 78 */ mr r3, r31
-/* 8038420C 0037FE6C 4B EE B7 3D */ bl func_8026F948
+/* 8038420C 0037FE6C 4B EE B7 3D */ bl OSLockMutex
/* 80384210 0037FE70 9B DD 00 9C */ stb r30, 0x9c(r29)
/* 80384214 0037FE74 7F E3 FB 78 */ mr r3, r31
-/* 80384218 0037FE78 4B EE B8 0D */ bl func_8026FA24
+/* 80384218 0037FE78 4B EE B8 0D */ bl OSUnlockMutex
/* 8038421C 0037FE7C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80384220 0037FE80 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80384224 0037FE84 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -376,10 +376,10 @@ SetReleasePriorityFix__Q44nw4r3snd6detail9WsdPlayerFb:
/* 80384254 0037FEB4 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80384258 0037FEB8 7C 7D 1B 78 */ mr r29, r3
/* 8038425C 0037FEBC 7F E3 FB 78 */ mr r3, r31
-/* 80384260 0037FEC0 4B EE B6 E9 */ bl func_8026F948
+/* 80384260 0037FEC0 4B EE B6 E9 */ bl OSLockMutex
/* 80384264 0037FEC4 9B DD 00 90 */ stb r30, 0x90(r29)
/* 80384268 0037FEC8 7F E3 FB 78 */ mr r3, r31
-/* 8038426C 0037FECC 4B EE B7 B9 */ bl func_8026FA24
+/* 8038426C 0037FECC 4B EE B7 B9 */ bl OSUnlockMutex
/* 80384270 0037FED0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80384274 0037FED4 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80384278 0037FED8 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -402,7 +402,7 @@ InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv:
/* 803842B0 0037FF10 93 81 00 10 */ stw r28, 0x10(r1)
/* 803842B4 0037FF14 7C 7C 1B 78 */ mr r28, r3
/* 803842B8 0037FF18 7F C3 F3 78 */ mr r3, r30
-/* 803842BC 0037FF1C 4B EE B6 8D */ bl func_8026F948
+/* 803842BC 0037FF1C 4B EE B6 8D */ bl OSLockMutex
/* 803842C0 0037FF20 88 1C 00 8C */ lbz r0, 0x8c(r28)
/* 803842C4 0037FF24 2C 00 00 00 */ cmpwi r0, 0
/* 803842C8 0037FF28 41 82 00 DC */ beq lbl_803843A4
@@ -413,7 +413,7 @@ InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv:
/* 803842DC 0037FF3C 41 81 00 C8 */ bgt lbl_803843A4
/* 803842E0 0037FF40 7F DF F3 78 */ mr r31, r30
/* 803842E4 0037FF44 7F E3 FB 78 */ mr r3, r31
-/* 803842E8 0037FF48 4B EE B6 61 */ bl func_8026F948
+/* 803842E8 0037FF48 4B EE B6 61 */ bl OSLockMutex
/* 803842EC 0037FF4C 88 1C 00 8D */ lbz r0, 0x8d(r28)
/* 803842F0 0037FF50 2C 00 00 00 */ cmpwi r0, 0
/* 803842F4 0037FF54 41 82 00 28 */ beq lbl_8038431C
@@ -466,10 +466,10 @@ lbl_80384394:
/* 80384394 0037FFF4 38 00 00 00 */ li r0, 0
/* 80384398 0037FFF8 7F E3 FB 78 */ mr r3, r31
/* 8038439C 0037FFFC 90 1C 00 EC */ stw r0, 0xec(r28)
-/* 803843A0 00380000 4B EE B6 85 */ bl func_8026FA24
+/* 803843A0 00380000 4B EE B6 85 */ bl OSUnlockMutex
lbl_803843A4:
/* 803843A4 00380004 7F C3 F3 78 */ mr r3, r30
-/* 803843A8 00380008 4B EE B6 7D */ bl func_8026FA24
+/* 803843A8 00380008 4B EE B6 7D */ bl OSUnlockMutex
/* 803843AC 0038000C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 803843B0 00380010 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 803843B4 00380014 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -505,7 +505,7 @@ Update__Q44nw4r3snd6detail9WsdPlayerFv:
/* 80384420 00380080 40 82 00 CC */ bne lbl_803844EC
/* 80384424 00380084 3B C3 00 A8 */ addi r30, r3, 0xa8
/* 80384428 00380088 7F C3 F3 78 */ mr r3, r30
-/* 8038442C 0038008C 4B EE B5 1D */ bl func_8026F948
+/* 8038442C 0038008C 4B EE B5 1D */ bl OSLockMutex
/* 80384430 00380090 88 1F 00 8D */ lbz r0, 0x8d(r31)
/* 80384434 00380094 2C 00 00 00 */ cmpwi r0, 0
/* 80384438 00380098 41 82 00 28 */ beq lbl_80384460
@@ -558,7 +558,7 @@ lbl_803844D8:
/* 803844D8 00380138 38 00 00 00 */ li r0, 0
/* 803844DC 0038013C 7F C3 F3 78 */ mr r3, r30
/* 803844E0 00380140 90 1F 00 EC */ stw r0, 0xec(r31)
-/* 803844E4 00380144 4B EE B5 41 */ bl func_8026FA24
+/* 803844E4 00380144 4B EE B5 41 */ bl OSUnlockMutex
/* 803844E8 00380148 48 00 00 F4 */ b lbl_803845DC
lbl_803844EC:
/* 803844EC 0038014C 2C 04 00 00 */ cmpwi r4, 0
@@ -571,7 +571,7 @@ lbl_803844EC:
/* 80384508 00380168 40 82 00 CC */ bne lbl_803845D4
/* 8038450C 0038016C 3B DF 00 A8 */ addi r30, r31, 0xa8
/* 80384510 00380170 7F C3 F3 78 */ mr r3, r30
-/* 80384514 00380174 4B EE B4 35 */ bl func_8026F948
+/* 80384514 00380174 4B EE B4 35 */ bl OSLockMutex
/* 80384518 00380178 88 1F 00 8D */ lbz r0, 0x8d(r31)
/* 8038451C 0038017C 2C 00 00 00 */ cmpwi r0, 0
/* 80384520 00380180 41 82 00 28 */ beq lbl_80384548
@@ -624,7 +624,7 @@ lbl_803845C0:
/* 803845C0 00380220 38 00 00 00 */ li r0, 0
/* 803845C4 00380224 7F C3 F3 78 */ mr r3, r30
/* 803845C8 00380228 90 1F 00 EC */ stw r0, 0xec(r31)
-/* 803845CC 0038022C 4B EE B4 59 */ bl func_8026FA24
+/* 803845CC 0038022C 4B EE B4 59 */ bl OSUnlockMutex
/* 803845D0 00380230 48 00 00 0C */ b lbl_803845DC
lbl_803845D4:
/* 803845D4 00380234 7F E3 FB 78 */ mr r3, r31
diff --git a/asm/nw4r/snd/snd_SoundArchivePlayer.s b/asm/nw4r/snd/snd_SoundArchivePlayer.s
index fac36be..de5bace 100644
--- a/asm/nw4r/snd/snd_SoundArchivePlayer.s
+++ b/asm/nw4r/snd/snd_SoundArchivePlayer.s
@@ -41,7 +41,7 @@ __ct__Q34nw4r3snd18SoundArchivePlayerFv:
/* 80378A28 00374688 91 03 00 40 */ stw r8, 0x40(r3)
/* 80378A2C 0037468C 91 03 00 44 */ stw r8, 0x44(r3)
/* 80378A30 00374690 38 63 00 48 */ addi r3, r3, 0x48
-/* 80378A34 00374694 4B EF 6E DD */ bl func_8026F910
+/* 80378A34 00374694 4B EF 6E DD */ bl OSInitMutex
/* 80378A38 00374698 93 FE 00 68 */ stw r31, 0x68(r30)
/* 80378A3C 0037469C 38 9E 00 68 */ addi r4, r30, 0x68
/* 80378A40 003746A0 38 7E 00 70 */ addi r3, r30, 0x70
@@ -50,7 +50,7 @@ __ct__Q34nw4r3snd18SoundArchivePlayerFv:
/* 80378A4C 003746AC 93 FE 00 64 */ stw r31, 0x64(r30)
/* 80378A50 003746B0 90 9E 00 68 */ stw r4, 0x68(r30)
/* 80378A54 003746B4 90 9E 00 6C */ stw r4, 0x6c(r30)
-/* 80378A58 003746B8 4B EF 6E B9 */ bl func_8026F910
+/* 80378A58 003746B8 4B EF 6E B9 */ bl OSInitMutex
/* 80378A5C 003746BC 93 FE 00 90 */ stw r31, 0x90(r30)
/* 80378A60 003746C0 38 9E 00 90 */ addi r4, r30, 0x90
/* 80378A64 003746C4 38 7E 00 98 */ addi r3, r30, 0x98
@@ -59,7 +59,7 @@ __ct__Q34nw4r3snd18SoundArchivePlayerFv:
/* 80378A70 003746D0 93 FE 00 8C */ stw r31, 0x8c(r30)
/* 80378A74 003746D4 90 9E 00 90 */ stw r4, 0x90(r30)
/* 80378A78 003746D8 90 9E 00 94 */ stw r4, 0x94(r30)
-/* 80378A7C 003746DC 4B EF 6E 95 */ bl func_8026F910
+/* 80378A7C 003746DC 4B EF 6E 95 */ bl OSInitMutex
/* 80378A80 003746E0 3C 80 80 45 */ lis r4, lbl_8044CD08@ha
/* 80378A84 003746E4 3C 60 80 45 */ lis r3, lbl_8044CCE8@ha
/* 80378A88 003746E8 38 84 CD 08 */ addi r4, r4, lbl_8044CD08@l
@@ -382,35 +382,35 @@ lbl_80378E94:
/* 80378EB0 00374B10 83 9B 00 DC */ lwz r28, 0xdc(r27)
/* 80378EB4 00374B14 93 DB 00 34 */ stw r30, 0x34(r27)
/* 80378EB8 00374B18 83 BB 00 D8 */ lwz r29, 0xd8(r27)
-/* 80378EBC 00374B1C 4B EF 6A 8D */ bl func_8026F948
+/* 80378EBC 00374B1C 4B EF 6A 8D */ bl OSLockMutex
/* 80378EC0 00374B20 7F A4 EB 78 */ mr r4, r29
/* 80378EC4 00374B24 7F 85 E3 78 */ mr r5, r28
/* 80378EC8 00374B28 38 7B 00 38 */ addi r3, r27, 0x38
/* 80378ECC 00374B2C 4B FF 8B BD */ bl DestroyImpl__Q44nw4r3snd6detail8PoolImplFPvUl
/* 80378ED0 00374B30 7F E3 FB 78 */ mr r3, r31
-/* 80378ED4 00374B34 4B EF 6B 51 */ bl func_8026FA24
+/* 80378ED4 00374B34 4B EF 6B 51 */ bl OSUnlockMutex
/* 80378ED8 00374B38 3B FB 00 70 */ addi r31, r27, 0x70
/* 80378EDC 00374B3C 83 BB 00 DC */ lwz r29, 0xdc(r27)
/* 80378EE0 00374B40 83 9B 00 D8 */ lwz r28, 0xd8(r27)
/* 80378EE4 00374B44 7F E3 FB 78 */ mr r3, r31
-/* 80378EE8 00374B48 4B EF 6A 61 */ bl func_8026F948
+/* 80378EE8 00374B48 4B EF 6A 61 */ bl OSLockMutex
/* 80378EEC 00374B4C 7F 84 E3 78 */ mr r4, r28
/* 80378EF0 00374B50 7F A5 EB 78 */ mr r5, r29
/* 80378EF4 00374B54 38 7B 00 60 */ addi r3, r27, 0x60
/* 80378EF8 00374B58 4B FF 8B 91 */ bl DestroyImpl__Q44nw4r3snd6detail8PoolImplFPvUl
/* 80378EFC 00374B5C 7F E3 FB 78 */ mr r3, r31
-/* 80378F00 00374B60 4B EF 6B 25 */ bl func_8026FA24
+/* 80378F00 00374B60 4B EF 6B 25 */ bl OSUnlockMutex
/* 80378F04 00374B64 3B FB 00 98 */ addi r31, r27, 0x98
/* 80378F08 00374B68 83 BB 00 DC */ lwz r29, 0xdc(r27)
/* 80378F0C 00374B6C 83 9B 00 D8 */ lwz r28, 0xd8(r27)
/* 80378F10 00374B70 7F E3 FB 78 */ mr r3, r31
-/* 80378F14 00374B74 4B EF 6A 35 */ bl func_8026F948
+/* 80378F14 00374B74 4B EF 6A 35 */ bl OSLockMutex
/* 80378F18 00374B78 7F 84 E3 78 */ mr r4, r28
/* 80378F1C 00374B7C 7F A5 EB 78 */ mr r5, r29
/* 80378F20 00374B80 38 7B 00 88 */ addi r3, r27, 0x88
/* 80378F24 00374B84 4B FF 8B 65 */ bl DestroyImpl__Q44nw4r3snd6detail8PoolImplFPvUl
/* 80378F28 00374B88 7F E3 FB 78 */ mr r3, r31
-/* 80378F2C 00374B8C 4B EF 6A F9 */ bl func_8026FA24
+/* 80378F2C 00374B8C 4B EF 6A F9 */ bl OSUnlockMutex
/* 80378F30 00374B90 80 9B 00 D8 */ lwz r4, 0xd8(r27)
/* 80378F34 00374B94 38 7B 00 B0 */ addi r3, r27, 0xb0
/* 80378F38 00374B98 80 BB 00 DC */ lwz r5, 0xdc(r27)
@@ -616,14 +616,14 @@ lbl_803791C4:
lbl_80379200:
/* 80379200 00374E60 3B 5B 00 48 */ addi r26, r27, 0x48
/* 80379204 00374E64 7F 43 D3 78 */ mr r3, r26
-/* 80379208 00374E68 4B EF 67 41 */ bl func_8026F948
+/* 80379208 00374E68 4B EF 67 41 */ bl OSLockMutex
/* 8037920C 00374E6C 7E E4 BB 78 */ mr r4, r23
/* 80379210 00374E70 7F 25 CB 78 */ mr r5, r25
/* 80379214 00374E74 38 7B 00 38 */ addi r3, r27, 0x38
/* 80379218 00374E78 38 C0 04 64 */ li r6, 0x464
/* 8037921C 00374E7C 4B FF 87 29 */ bl CreateImpl__Q44nw4r3snd6detail8PoolImplFPvUlUl
/* 80379220 00374E80 7F 43 D3 78 */ mr r3, r26
-/* 80379224 00374E84 4B EF 68 01 */ bl func_8026FA24
+/* 80379224 00374E84 4B EF 68 01 */ bl OSUnlockMutex
/* 80379228 00374E88 93 01 00 08 */ stw r24, 8(r1)
/* 8037922C 00374E8C 38 00 00 01 */ li r0, 1
lbl_80379230:
@@ -645,14 +645,14 @@ lbl_80379240:
lbl_80379268:
/* 80379268 00374EC8 3B 5B 00 70 */ addi r26, r27, 0x70
/* 8037926C 00374ECC 7F 43 D3 78 */ mr r3, r26
-/* 80379270 00374ED0 4B EF 66 D9 */ bl func_8026F948
+/* 80379270 00374ED0 4B EF 66 D9 */ bl OSLockMutex
/* 80379274 00374ED4 7E E4 BB 78 */ mr r4, r23
/* 80379278 00374ED8 7F 25 CB 78 */ mr r5, r25
/* 8037927C 00374EDC 38 7B 00 60 */ addi r3, r27, 0x60
/* 80379280 00374EE0 38 C0 0B 54 */ li r6, 0xb54
/* 80379284 00374EE4 4B FF 86 C1 */ bl CreateImpl__Q44nw4r3snd6detail8PoolImplFPvUlUl
/* 80379288 00374EE8 7F 43 D3 78 */ mr r3, r26
-/* 8037928C 00374EEC 4B EF 67 99 */ bl func_8026FA24
+/* 8037928C 00374EEC 4B EF 67 99 */ bl OSUnlockMutex
/* 80379290 00374EF0 93 01 00 08 */ stw r24, 8(r1)
/* 80379294 00374EF4 38 00 00 01 */ li r0, 1
lbl_80379298:
@@ -674,14 +674,14 @@ lbl_803792A8:
lbl_803792D0:
/* 803792D0 00374F30 3B 5B 00 98 */ addi r26, r27, 0x98
/* 803792D4 00374F34 7F 43 D3 78 */ mr r3, r26
-/* 803792D8 00374F38 4B EF 66 71 */ bl func_8026F948
+/* 803792D8 00374F38 4B EF 66 71 */ bl OSLockMutex
/* 803792DC 00374F3C 7E E4 BB 78 */ mr r4, r23
/* 803792E0 00374F40 7F 25 CB 78 */ mr r5, r25
/* 803792E4 00374F44 38 7B 00 88 */ addi r3, r27, 0x88
/* 803792E8 00374F48 38 C0 01 D4 */ li r6, 0x1d4
/* 803792EC 00374F4C 4B FF 86 59 */ bl CreateImpl__Q44nw4r3snd6detail8PoolImplFPvUlUl
/* 803792F0 00374F50 7F 43 D3 78 */ mr r3, r26
-/* 803792F4 00374F54 4B EF 67 31 */ bl func_8026FA24
+/* 803792F4 00374F54 4B EF 67 31 */ bl OSUnlockMutex
/* 803792F8 00374F58 93 01 00 08 */ stw r24, 8(r1)
/* 803792FC 00374F5C 38 00 00 01 */ li r0, 1
lbl_80379300:
@@ -871,7 +871,7 @@ lbl_8037954C:
/* 80379574 003751D4 4B E4 D8 F5 */ bl __construct_array
/* 80379578 003751D8 3B BF 00 48 */ addi r29, r31, 0x48
/* 8037957C 003751DC 7F A3 EB 78 */ mr r3, r29
-/* 80379580 003751E0 4B EF 63 C9 */ bl func_8026F948
+/* 80379580 003751E0 4B EF 63 C9 */ bl OSLockMutex
/* 80379584 003751E4 48 00 00 5C */ b lbl_803795E0
lbl_80379588:
/* 80379588 003751E8 83 7F 00 40 */ lwz r27, 0x40(r31)
@@ -931,7 +931,7 @@ lbl_8037963C:
/* 80379644 003752A4 2C 1C 00 80 */ cmpwi r28, 0x80
/* 80379648 003752A8 41 80 FF B0 */ blt lbl_803795F8
/* 8037964C 003752AC 7F A3 EB 78 */ mr r3, r29
-/* 80379650 003752B0 4B EF 63 D5 */ bl func_8026FA24
+/* 80379650 003752B0 4B EF 63 D5 */ bl OSUnlockMutex
/* 80379654 003752B4 3C 80 80 38 */ lis r4, __dt__Q34nw4r2ut41LinkList$0Q44nw4r3snd6detail8SeqSound$4184$1Fv@ha
/* 80379658 003752B8 38 61 0C 38 */ addi r3, r1, 0xc38
/* 8037965C 003752BC 38 84 8B 74 */ addi r4, r4, __dt__Q34nw4r2ut41LinkList$0Q44nw4r3snd6detail8SeqSound$4184$1Fv@l
@@ -948,7 +948,7 @@ lbl_8037963C:
/* 80379688 003752E8 4B E4 D7 E1 */ bl __construct_array
/* 8037968C 003752EC 3B BF 00 70 */ addi r29, r31, 0x70
/* 80379690 003752F0 7F A3 EB 78 */ mr r3, r29
-/* 80379694 003752F4 4B EF 62 B5 */ bl func_8026F948
+/* 80379694 003752F4 4B EF 62 B5 */ bl OSLockMutex
/* 80379698 003752F8 48 00 00 5C */ b lbl_803796F4
lbl_8037969C:
/* 8037969C 003752FC 83 5F 00 68 */ lwz r26, 0x68(r31)
@@ -1008,7 +1008,7 @@ lbl_80379750:
/* 80379758 003753B8 2C 1C 00 80 */ cmpwi r28, 0x80
/* 8037975C 003753BC 41 80 FF B0 */ blt lbl_8037970C
/* 80379760 003753C0 7F A3 EB 78 */ mr r3, r29
-/* 80379764 003753C4 4B EF 62 C1 */ bl func_8026FA24
+/* 80379764 003753C4 4B EF 62 C1 */ bl OSUnlockMutex
/* 80379768 003753C8 3C 80 80 38 */ lis r4, __dt__Q34nw4r2ut42LinkList$0Q44nw4r3snd6detail9StrmSound$4184$1Fv@ha
/* 8037976C 003753CC 38 61 06 38 */ addi r3, r1, 0x638
/* 80379770 003753D0 38 84 8B EC */ addi r4, r4, __dt__Q34nw4r2ut42LinkList$0Q44nw4r3snd6detail9StrmSound$4184$1Fv@l
@@ -1025,7 +1025,7 @@ lbl_80379750:
/* 8037979C 003753FC 4B E4 D6 CD */ bl __construct_array
/* 803797A0 00375400 3B BF 00 98 */ addi r29, r31, 0x98
/* 803797A4 00375404 7F A3 EB 78 */ mr r3, r29
-/* 803797A8 00375408 4B EF 61 A1 */ bl func_8026F948
+/* 803797A8 00375408 4B EF 61 A1 */ bl OSLockMutex
/* 803797AC 0037540C 48 00 00 5C */ b lbl_80379808
lbl_803797B0:
/* 803797B0 00375410 83 5F 00 90 */ lwz r26, 0x90(r31)
@@ -1085,7 +1085,7 @@ lbl_80379864:
/* 8037986C 003754CC 2C 1C 00 80 */ cmpwi r28, 0x80
/* 80379870 003754D0 41 80 FF B0 */ blt lbl_80379820
/* 80379874 003754D4 7F A3 EB 78 */ mr r3, r29
-/* 80379878 003754D8 4B EF 61 AD */ bl func_8026FA24
+/* 80379878 003754D8 4B EF 61 AD */ bl OSUnlockMutex
/* 8037987C 003754DC 3C 80 80 38 */ lis r4, __dt__Q34nw4r2ut42LinkList$0Q44nw4r3snd6detail9WaveSound$4184$1Fv@ha
/* 80379880 003754E0 38 61 00 38 */ addi r3, r1, 0x38
/* 80379884 003754E4 38 84 8C 64 */ addi r4, r4, __dt__Q34nw4r2ut42LinkList$0Q44nw4r3snd6detail9WaveSound$4184$1Fv@l
@@ -1572,12 +1572,12 @@ lbl_80379EF8:
lbl_80379F20:
/* 80379F20 00375B80 3B DF 00 04 */ addi r30, r31, 4
/* 80379F24 00375B84 7F C3 F3 78 */ mr r3, r30
-/* 80379F28 00375B88 4B EF 5A 21 */ bl func_8026F948
+/* 80379F28 00375B88 4B EF 5A 21 */ bl OSLockMutex
/* 80379F2C 00375B8C 38 7F 00 1C */ addi r3, r31, 0x1c
/* 80379F30 00375B90 4B FF 66 D1 */ bl GetFreeSize__Q44nw4r3snd6detail9FrameHeapCFv
/* 80379F34 00375B94 7C 7F 1B 78 */ mr r31, r3
/* 80379F38 00375B98 7F C3 F3 78 */ mr r3, r30
-/* 80379F3C 00375B9C 4B EF 5A E9 */ bl func_8026FA24
+/* 80379F3C 00375B9C 4B EF 5A E9 */ bl OSUnlockMutex
/* 80379F40 00375BA0 81 9C 00 00 */ lwz r12, 0(r28)
/* 80379F44 00375BA4 7F 83 E3 78 */ mr r3, r28
/* 80379F48 00375BA8 81 8C 00 40 */ lwz r12, 0x40(r12)
diff --git a/asm/nw4r/snd/snd_SoundHeap.s b/asm/nw4r/snd/snd_SoundHeap.s
index ff95769..b2b783c 100644
--- a/asm/nw4r/snd/snd_SoundHeap.s
+++ b/asm/nw4r/snd/snd_SoundHeap.s
@@ -15,7 +15,7 @@ __ct__Q34nw4r3snd9SoundHeapFv:
/* 8037AA5C 003766BC 38 63 00 1C */ addi r3, r3, 0x1c
/* 8037AA60 003766C0 4B FF 55 FD */ bl __ct__Q44nw4r3snd6detail9FrameHeapFv
/* 8037AA64 003766C4 38 7F 00 04 */ addi r3, r31, 4
-/* 8037AA68 003766C8 4B EF 4E A9 */ bl func_8026F910
+/* 8037AA68 003766C8 4B EF 4E A9 */ bl OSInitMutex
/* 8037AA6C 003766CC 7F E3 FB 78 */ mr r3, r31
/* 8037AA70 003766D0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8037AA74 003766D4 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -77,7 +77,7 @@ Alloc__Q34nw4r3snd9SoundHeapFUl:
/* 8037AB20 00376780 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8037AB24 00376784 7C 7D 1B 78 */ mr r29, r3
/* 8037AB28 00376788 7F E3 FB 78 */ mr r3, r31
-/* 8037AB2C 0037678C 4B EF 4E 1D */ bl func_8026F948
+/* 8037AB2C 0037678C 4B EF 4E 1D */ bl OSLockMutex
/* 8037AB30 00376790 3C A0 80 38 */ lis r5, DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv@ha
/* 8037AB34 00376794 7F C4 F3 78 */ mr r4, r30
/* 8037AB38 00376798 38 7D 00 1C */ addi r3, r29, 0x1c
@@ -86,7 +86,7 @@ Alloc__Q34nw4r3snd9SoundHeapFUl:
/* 8037AB44 003767A4 4B FF 5A 09 */ bl Alloc__Q44nw4r3snd6detail9FrameHeapFUlPFPvUlPv_vPv
/* 8037AB48 003767A8 7C 7E 1B 78 */ mr r30, r3
/* 8037AB4C 003767AC 7F E3 FB 78 */ mr r3, r31
-/* 8037AB50 003767B0 4B EF 4E D5 */ bl func_8026FA24
+/* 8037AB50 003767B0 4B EF 4E D5 */ bl OSUnlockMutex
/* 8037AB54 003767B4 7F C3 F3 78 */ mr r3, r30
/* 8037AB58 003767B8 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037AB5C 003767BC 83 C1 00 18 */ lwz r30, 0x18(r1)
diff --git a/asm/nw4r/snd/snd_SoundPlayer.s b/asm/nw4r/snd/snd_SoundPlayer.s
index f01f737..b82cb0d 100644
--- a/asm/nw4r/snd/snd_SoundPlayer.s
+++ b/asm/nw4r/snd/snd_SoundPlayer.s
@@ -35,7 +35,7 @@ __ct__Q34nw4r3snd11SoundPlayerFv:
/* 8037AC4C 003768AC B3 E3 00 26 */ sth r31, 0x26(r3)
/* 8037AC50 003768B0 9B C3 00 2D */ stb r30, 0x2d(r3)
/* 8037AC54 003768B4 38 63 00 48 */ addi r3, r3, 0x48
-/* 8037AC58 003768B8 4B EF 4C B9 */ bl func_8026F910
+/* 8037AC58 003768B8 4B EF 4C B9 */ bl OSInitMutex
/* 8037AC5C 003768BC C0 02 A7 60 */ lfs f0, lbl_80642D60-_SDA2_BASE_(r2)
/* 8037AC60 003768C0 7F A3 EB 78 */ mr r3, r29
/* 8037AC64 003768C4 93 FD 00 30 */ stw r31, 0x30(r29)
@@ -104,7 +104,7 @@ __dt__Q34nw4r3snd11SoundPlayerFv:
/* 8037AD38 00376998 41 82 00 8C */ beq lbl_8037ADC4
/* 8037AD3C 0037699C 3B A3 00 48 */ addi r29, r3, 0x48
/* 8037AD40 003769A0 7F A3 EB 78 */ mr r3, r29
-/* 8037AD44 003769A4 4B EF 4C 05 */ bl func_8026F948
+/* 8037AD44 003769A4 4B EF 4C 05 */ bl OSLockMutex
/* 8037AD48 003769A8 83 FB 00 04 */ lwz r31, 4(r27)
/* 8037AD4C 003769AC 3B DB 00 04 */ addi r30, r27, 4
/* 8037AD50 003769B0 48 00 00 20 */ b lbl_8037AD70
@@ -120,7 +120,7 @@ lbl_8037AD70:
/* 8037AD70 003769D0 7C 1F F0 40 */ cmplw r31, r30
/* 8037AD74 003769D4 40 82 FF E0 */ bne lbl_8037AD54
/* 8037AD78 003769D8 7F A3 EB 78 */ mr r3, r29
-/* 8037AD7C 003769DC 4B EF 4C A9 */ bl func_8026FA24
+/* 8037AD7C 003769DC 4B EF 4C A9 */ bl OSUnlockMutex
/* 8037AD80 003769E0 34 7B 00 18 */ addic. r3, r27, 0x18
/* 8037AD84 003769E4 41 82 00 0C */ beq lbl_8037AD90
/* 8037AD88 003769E8 38 80 00 00 */ li r4, 0
@@ -162,7 +162,7 @@ Update__Q34nw4r3snd11SoundPlayerFv:
/* 8037ADFC 00376A5C 93 81 00 10 */ stw r28, 0x10(r1)
/* 8037AE00 00376A60 7C 7C 1B 78 */ mr r28, r3
/* 8037AE04 00376A64 7F A3 EB 78 */ mr r3, r29
-/* 8037AE08 00376A68 4B EF 4B 41 */ bl func_8026F948
+/* 8037AE08 00376A68 4B EF 4B 41 */ bl OSLockMutex
/* 8037AE0C 00376A6C 83 FC 00 04 */ lwz r31, 4(r28)
/* 8037AE10 00376A70 3B DC 00 04 */ addi r30, r28, 4
/* 8037AE14 00376A74 48 00 00 1C */ b lbl_8037AE30
@@ -179,7 +179,7 @@ lbl_8037AE30:
/* 8037AE38 00376A98 7F 83 E3 78 */ mr r3, r28
/* 8037AE3C 00376A9C 48 00 03 05 */ bl detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFv
/* 8037AE40 00376AA0 7F A3 EB 78 */ mr r3, r29
-/* 8037AE44 00376AA4 4B EF 4B E1 */ bl func_8026FA24
+/* 8037AE44 00376AA4 4B EF 4B E1 */ bl OSUnlockMutex
/* 8037AE48 00376AA8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037AE4C 00376AAC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037AE50 00376AB0 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -202,7 +202,7 @@ StopAllSound__Q34nw4r3snd11SoundPlayerFi:
/* 8037AE88 00376AE8 7F A3 EB 78 */ mr r3, r29
/* 8037AE8C 00376AEC 93 81 00 10 */ stw r28, 0x10(r1)
/* 8037AE90 00376AF0 7C 9C 23 78 */ mr r28, r4
-/* 8037AE94 00376AF4 4B EF 4A B5 */ bl func_8026F948
+/* 8037AE94 00376AF4 4B EF 4A B5 */ bl OSLockMutex
/* 8037AE98 00376AF8 87 DF 00 04 */ lwzu r30, 4(r31)
/* 8037AE9C 00376AFC 48 00 00 20 */ b lbl_8037AEBC
lbl_8037AEA0:
@@ -217,7 +217,7 @@ lbl_8037AEBC:
/* 8037AEBC 00376B1C 7C 1E F8 40 */ cmplw r30, r31
/* 8037AEC0 00376B20 40 82 FF E0 */ bne lbl_8037AEA0
/* 8037AEC4 00376B24 7F A3 EB 78 */ mr r3, r29
-/* 8037AEC8 00376B28 4B EF 4B 5D */ bl func_8026FA24
+/* 8037AEC8 00376B28 4B EF 4B 5D */ bl OSUnlockMutex
/* 8037AECC 00376B2C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037AED0 00376B30 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037AED4 00376B34 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -239,7 +239,7 @@ PauseAllSound__Q34nw4r3snd11SoundPlayerFbi:
/* 8037AF08 00376B68 7C 9B 23 78 */ mr r27, r4
/* 8037AF0C 00376B6C 7C BC 2B 78 */ mr r28, r5
/* 8037AF10 00376B70 7F A3 EB 78 */ mr r3, r29
-/* 8037AF14 00376B74 4B EF 4A 35 */ bl func_8026F948
+/* 8037AF14 00376B74 4B EF 4A 35 */ bl OSLockMutex
/* 8037AF18 00376B78 87 DF 00 04 */ lwzu r30, 4(r31)
/* 8037AF1C 00376B7C 48 00 00 24 */ b lbl_8037AF40
lbl_8037AF20:
@@ -255,7 +255,7 @@ lbl_8037AF40:
/* 8037AF40 00376BA0 7C 1E F8 40 */ cmplw r30, r31
/* 8037AF44 00376BA4 40 82 FF DC */ bne lbl_8037AF20
/* 8037AF48 00376BA8 7F A3 EB 78 */ mr r3, r29
-/* 8037AF4C 00376BAC 4B EF 4A D9 */ bl func_8026FA24
+/* 8037AF4C 00376BAC 4B EF 4A D9 */ bl OSUnlockMutex
/* 8037AF50 00376BB0 39 61 00 20 */ addi r11, r1, 0x20
/* 8037AF54 00376BB4 4B E4 C2 21 */ bl _restgpr_27
/* 8037AF58 00376BB8 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -309,14 +309,14 @@ detail_RemoveSoundList__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound
/* 8037AFD0 00376C30 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8037AFD4 00376C34 7C 7D 1B 78 */ mr r29, r3
/* 8037AFD8 00376C38 7F E3 FB 78 */ mr r3, r31
-/* 8037AFDC 00376C3C 4B EF 49 6D */ bl func_8026F948
+/* 8037AFDC 00376C3C 4B EF 49 6D */ bl OSLockMutex
/* 8037AFE0 00376C40 7F A3 EB 78 */ mr r3, r29
/* 8037AFE4 00376C44 38 9E 00 C0 */ addi r4, r30, 0xc0
/* 8037AFE8 00376C48 4B FE 7C 8D */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
/* 8037AFEC 00376C4C 38 00 00 00 */ li r0, 0
/* 8037AFF0 00376C50 7F E3 FB 78 */ mr r3, r31
/* 8037AFF4 00376C54 90 1E 00 10 */ stw r0, 0x10(r30)
-/* 8037AFF8 00376C58 4B EF 4A 2D */ bl func_8026FA24
+/* 8037AFF8 00376C58 4B EF 4A 2D */ bl OSUnlockMutex
/* 8037AFFC 00376C5C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037B000 00376C60 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037B004 00376C64 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -337,7 +337,7 @@ detail_InsertPriorityList__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSo
/* 8037B034 00376C94 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8037B038 00376C98 7C 7D 1B 78 */ mr r29, r3
/* 8037B03C 00376C9C 7F E3 FB 78 */ mr r3, r31
-/* 8037B040 00376CA0 4B EF 49 09 */ bl func_8026F948
+/* 8037B040 00376CA0 4B EF 49 09 */ bl OSLockMutex
/* 8037B044 00376CA4 80 7D 00 10 */ lwz r3, 0x10(r29)
/* 8037B048 00376CA8 38 1D 00 10 */ addi r0, r29, 0x10
/* 8037B04C 00376CAC 48 00 00 58 */ b lbl_8037B0A4
@@ -377,7 +377,7 @@ lbl_8037B0AC:
/* 8037B0B8 00376D18 38 BE 00 C8 */ addi r5, r30, 0xc8
/* 8037B0BC 00376D1C 4B FE 7B 8D */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037B0C0 00376D20 7F E3 FB 78 */ mr r3, r31
-/* 8037B0C4 00376D24 4B EF 49 61 */ bl func_8026FA24
+/* 8037B0C4 00376D24 4B EF 49 61 */ bl OSUnlockMutex
/* 8037B0C8 00376D28 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037B0CC 00376D2C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037B0D0 00376D30 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -398,12 +398,12 @@ detail_RemovePriorityList__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSo
/* 8037B100 00376D60 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8037B104 00376D64 7C 7D 1B 78 */ mr r29, r3
/* 8037B108 00376D68 7F E3 FB 78 */ mr r3, r31
-/* 8037B10C 00376D6C 4B EF 48 3D */ bl func_8026F948
+/* 8037B10C 00376D6C 4B EF 48 3D */ bl OSLockMutex
/* 8037B110 00376D70 38 7D 00 0C */ addi r3, r29, 0xc
/* 8037B114 00376D74 38 9E 00 C8 */ addi r4, r30, 0xc8
/* 8037B118 00376D78 4B FE 7B 5D */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode
/* 8037B11C 00376D7C 7F E3 FB 78 */ mr r3, r31
-/* 8037B120 00376D80 4B EF 49 05 */ bl func_8026FA24
+/* 8037B120 00376D80 4B EF 49 05 */ bl OSUnlockMutex
/* 8037B124 00376D84 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037B128 00376D88 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037B12C 00376D8C 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -422,7 +422,7 @@ detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFv:
/* 8037B154 00376DB4 3B C3 00 48 */ addi r30, r3, 0x48
/* 8037B158 00376DB8 7C 7A 1B 78 */ mr r26, r3
/* 8037B15C 00376DBC 7F C3 F3 78 */ mr r3, r30
-/* 8037B160 00376DC0 4B EF 47 E9 */ bl func_8026F948
+/* 8037B160 00376DC0 4B EF 47 E9 */ bl OSLockMutex
/* 8037B164 00376DC4 3C 80 80 38 */ lis r4, __ct__Q34nw4r2ut44LinkList$0Q44nw4r3snd6detail10BasicSound$4200$1Fv@ha
/* 8037B168 00376DC8 3C A0 80 38 */ lis r5, __dt__Q34nw4r2ut44LinkList$0Q44nw4r3snd6detail10BasicSound$4200$1Fv@ha
/* 8037B16C 00376DCC 38 61 00 18 */ addi r3, r1, 0x18
@@ -496,7 +496,7 @@ lbl_8037B23C:
/* 8037B25C 00376EBC 38 C0 00 80 */ li r6, 0x80
/* 8037B260 00376EC0 4B E4 BD 01 */ bl __destroy_arr
/* 8037B264 00376EC4 7F C3 F3 78 */ mr r3, r30
-/* 8037B268 00376EC8 4B EF 47 BD */ bl func_8026FA24
+/* 8037B268 00376EC8 4B EF 47 BD */ bl OSUnlockMutex
/* 8037B26C 00376ECC 39 61 06 30 */ addi r11, r1, 0x630
/* 8037B270 00376ED0 4B E4 BF 01 */ bl _restgpr_26
/* 8037B274 00376ED4 80 01 06 34 */ lwz r0, 0x634(r1)
@@ -520,11 +520,11 @@ detail_AllocSeqSound__Q34nw4r3snd11SoundPlayerFiiPQ54nw4r3snd6detail10BasicSound
/* 8037B2B0 00376F10 7D 1B 43 78 */ mr r27, r8
/* 8037B2B4 00376F14 7D 3A 4B 78 */ mr r26, r9
/* 8037B2B8 00376F18 7F C3 F3 78 */ mr r3, r30
-/* 8037B2BC 00376F1C 4B EF 46 8D */ bl func_8026F948
+/* 8037B2BC 00376F1C 4B EF 46 8D */ bl OSLockMutex
/* 8037B2C0 00376F20 2C 1A 00 00 */ cmpwi r26, 0
/* 8037B2C4 00376F24 40 82 00 14 */ bne lbl_8037B2D8
/* 8037B2C8 00376F28 7F C3 F3 78 */ mr r3, r30
-/* 8037B2CC 00376F2C 4B EF 47 59 */ bl func_8026FA24
+/* 8037B2CC 00376F2C 4B EF 47 59 */ bl OSUnlockMutex
/* 8037B2D0 00376F30 38 60 00 00 */ li r3, 0
/* 8037B2D4 00376F34 48 00 03 5C */ b lbl_8037B630
lbl_8037B2D8:
@@ -559,13 +559,13 @@ lbl_8037B32C:
/* 8037B33C 00376F9C 2C 03 00 00 */ cmpwi r3, 0
/* 8037B340 00376FA0 40 82 00 14 */ bne lbl_8037B354
/* 8037B344 00376FA4 7F C3 F3 78 */ mr r3, r30
-/* 8037B348 00376FA8 4B EF 46 DD */ bl func_8026FA24
+/* 8037B348 00376FA8 4B EF 46 DD */ bl OSUnlockMutex
/* 8037B34C 00376FAC 38 60 00 00 */ li r3, 0
/* 8037B350 00376FB0 48 00 02 E0 */ b lbl_8037B630
lbl_8037B354:
/* 8037B354 00376FB4 3B FA 00 10 */ addi r31, r26, 0x10
/* 8037B358 00376FB8 7F E3 FB 78 */ mr r3, r31
-/* 8037B35C 00376FBC 4B EF 45 ED */ bl func_8026F948
+/* 8037B35C 00376FBC 4B EF 45 ED */ bl OSLockMutex
/* 8037B360 00376FC0 7F 43 D3 78 */ mr r3, r26
/* 8037B364 00376FC4 4B FF 67 F5 */ bl AllocImpl__Q44nw4r3snd6detail8PoolImplFv
/* 8037B368 00376FC8 2C 03 00 00 */ cmpwi r3, 0
@@ -589,7 +589,7 @@ lbl_8037B3A4:
/* 8037B3A4 00377004 2C 03 00 00 */ cmpwi r3, 0
/* 8037B3A8 00377008 40 82 00 14 */ bne lbl_8037B3BC
/* 8037B3AC 0037700C 7F E3 FB 78 */ mr r3, r31
-/* 8037B3B0 00377010 4B EF 46 75 */ bl func_8026FA24
+/* 8037B3B0 00377010 4B EF 46 75 */ bl OSUnlockMutex
/* 8037B3B4 00377014 3B 60 00 00 */ li r27, 0
/* 8037B3B8 00377018 48 00 00 D0 */ b lbl_8037B488
lbl_8037B3BC:
@@ -607,7 +607,7 @@ lbl_8037B3E0:
/* 8037B3E0 00377040 7C 1C 00 00 */ cmpw r28, r0
/* 8037B3E4 00377044 40 80 00 14 */ bge lbl_8037B3F8
/* 8037B3E8 00377048 7F E3 FB 78 */ mr r3, r31
-/* 8037B3EC 0037704C 4B EF 46 39 */ bl func_8026FA24
+/* 8037B3EC 0037704C 4B EF 46 39 */ bl OSUnlockMutex
/* 8037B3F0 00377050 3B 60 00 00 */ li r27, 0
/* 8037B3F4 00377054 48 00 00 94 */ b lbl_8037B488
lbl_8037B3F8:
@@ -653,23 +653,23 @@ lbl_8037B46C:
/* 8037B478 003770D8 38 BB 00 B8 */ addi r5, r27, 0xb8
/* 8037B47C 003770DC 4B FE 77 CD */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037B480 003770E0 7F E3 FB 78 */ mr r3, r31
-/* 8037B484 003770E4 4B EF 45 A1 */ bl func_8026FA24
+/* 8037B484 003770E4 4B EF 45 A1 */ bl OSUnlockMutex
lbl_8037B488:
/* 8037B488 003770E8 2C 1B 00 00 */ cmpwi r27, 0
/* 8037B48C 003770EC 40 82 00 14 */ bne lbl_8037B4A0
/* 8037B490 003770F0 7F C3 F3 78 */ mr r3, r30
-/* 8037B494 003770F4 4B EF 45 91 */ bl func_8026FA24
+/* 8037B494 003770F4 4B EF 45 91 */ bl OSUnlockMutex
/* 8037B498 003770F8 38 60 00 00 */ li r3, 0
/* 8037B49C 003770FC 48 00 01 94 */ b lbl_8037B630
lbl_8037B4A0:
/* 8037B4A0 00377100 3B 96 00 48 */ addi r28, r22, 0x48
/* 8037B4A4 00377104 7F 83 E3 78 */ mr r3, r28
-/* 8037B4A8 00377108 4B EF 44 A1 */ bl func_8026F948
+/* 8037B4A8 00377108 4B EF 44 A1 */ bl OSLockMutex
/* 8037B4AC 0037710C 80 16 00 18 */ lwz r0, 0x18(r22)
/* 8037B4B0 00377110 2C 00 00 00 */ cmpwi r0, 0
/* 8037B4B4 00377114 40 82 00 10 */ bne lbl_8037B4C4
/* 8037B4B8 00377118 7F 83 E3 78 */ mr r3, r28
-/* 8037B4BC 0037711C 4B EF 45 69 */ bl func_8026FA24
+/* 8037B4BC 0037711C 4B EF 45 69 */ bl OSUnlockMutex
/* 8037B4C0 00377120 48 00 00 48 */ b lbl_8037B508
lbl_8037B4C4:
/* 8037B4C4 00377124 80 B6 00 1C */ lwz r5, 0x1c(r22)
@@ -682,13 +682,13 @@ lbl_8037B4C4:
/* 8037B4E0 00377140 3B 5F 00 04 */ addi r26, r31, 4
/* 8037B4E4 00377144 7F 43 D3 78 */ mr r3, r26
/* 8037B4E8 00377148 93 FB 00 04 */ stw r31, 4(r27)
-/* 8037B4EC 0037714C 4B EF 44 5D */ bl func_8026F948
+/* 8037B4EC 0037714C 4B EF 44 5D */ bl OSLockMutex
/* 8037B4F0 00377150 38 7F 00 1C */ addi r3, r31, 0x1c
/* 8037B4F4 00377154 4B FF 4F 2D */ bl Clear__Q44nw4r3snd6detail9FrameHeapFv
/* 8037B4F8 00377158 7F 43 D3 78 */ mr r3, r26
-/* 8037B4FC 0037715C 4B EF 45 29 */ bl func_8026FA24
+/* 8037B4FC 0037715C 4B EF 45 29 */ bl OSUnlockMutex
/* 8037B500 00377160 7F 83 E3 78 */ mr r3, r28
-/* 8037B504 00377164 4B EF 45 21 */ bl func_8026FA24
+/* 8037B504 00377164 4B EF 45 21 */ bl OSUnlockMutex
lbl_8037B508:
/* 8037B508 00377168 2C 18 00 00 */ cmpwi r24, 0
/* 8037B50C 0037716C 41 82 00 50 */ beq lbl_8037B55C
@@ -729,7 +729,7 @@ lbl_8037B55C:
lbl_8037B594:
/* 8037B594 003771F4 3A F6 00 48 */ addi r23, r22, 0x48
/* 8037B598 003771F8 7E E3 BB 78 */ mr r3, r23
-/* 8037B59C 003771FC 4B EF 43 AD */ bl func_8026F948
+/* 8037B59C 003771FC 4B EF 43 AD */ bl OSLockMutex
/* 8037B5A0 00377200 80 76 00 10 */ lwz r3, 0x10(r22)
/* 8037B5A4 00377204 38 16 00 10 */ addi r0, r22, 0x10
/* 8037B5A8 00377208 48 00 00 58 */ b lbl_8037B600
@@ -769,9 +769,9 @@ lbl_8037B608:
/* 8037B614 00377274 38 BB 00 C8 */ addi r5, r27, 0xc8
/* 8037B618 00377278 4B FE 76 31 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037B61C 0037727C 7E E3 BB 78 */ mr r3, r23
-/* 8037B620 00377280 4B EF 44 05 */ bl func_8026FA24
+/* 8037B620 00377280 4B EF 44 05 */ bl OSUnlockMutex
/* 8037B624 00377284 7F C3 F3 78 */ mr r3, r30
-/* 8037B628 00377288 4B EF 43 FD */ bl func_8026FA24
+/* 8037B628 00377288 4B EF 43 FD */ bl OSUnlockMutex
/* 8037B62C 0037728C 7F 63 DB 78 */ mr r3, r27
lbl_8037B630:
/* 8037B630 00377290 39 61 00 60 */ addi r11, r1, 0x60
@@ -797,11 +797,11 @@ detail_AllocStrmSound__Q34nw4r3snd11SoundPlayerFiiPQ54nw4r3snd6detail10BasicSoun
/* 8037B674 003772D4 7D 1B 43 78 */ mr r27, r8
/* 8037B678 003772D8 7D 3A 4B 78 */ mr r26, r9
/* 8037B67C 003772DC 7F C3 F3 78 */ mr r3, r30
-/* 8037B680 003772E0 4B EF 42 C9 */ bl func_8026F948
+/* 8037B680 003772E0 4B EF 42 C9 */ bl OSLockMutex
/* 8037B684 003772E4 2C 1A 00 00 */ cmpwi r26, 0
/* 8037B688 003772E8 40 82 00 14 */ bne lbl_8037B69C
/* 8037B68C 003772EC 7F C3 F3 78 */ mr r3, r30
-/* 8037B690 003772F0 4B EF 43 95 */ bl func_8026FA24
+/* 8037B690 003772F0 4B EF 43 95 */ bl OSUnlockMutex
/* 8037B694 003772F4 38 60 00 00 */ li r3, 0
/* 8037B698 003772F8 48 00 03 5C */ b lbl_8037B9F4
lbl_8037B69C:
@@ -836,13 +836,13 @@ lbl_8037B6F0:
/* 8037B700 00377360 2C 03 00 00 */ cmpwi r3, 0
/* 8037B704 00377364 40 82 00 14 */ bne lbl_8037B718
/* 8037B708 00377368 7F C3 F3 78 */ mr r3, r30
-/* 8037B70C 0037736C 4B EF 43 19 */ bl func_8026FA24
+/* 8037B70C 0037736C 4B EF 43 19 */ bl OSUnlockMutex
/* 8037B710 00377370 38 60 00 00 */ li r3, 0
/* 8037B714 00377374 48 00 02 E0 */ b lbl_8037B9F4
lbl_8037B718:
/* 8037B718 00377378 3B FA 00 10 */ addi r31, r26, 0x10
/* 8037B71C 0037737C 7F E3 FB 78 */ mr r3, r31
-/* 8037B720 00377380 4B EF 42 29 */ bl func_8026F948
+/* 8037B720 00377380 4B EF 42 29 */ bl OSLockMutex
/* 8037B724 00377384 7F 43 D3 78 */ mr r3, r26
/* 8037B728 00377388 4B FF 64 31 */ bl AllocImpl__Q44nw4r3snd6detail8PoolImplFv
/* 8037B72C 0037738C 2C 03 00 00 */ cmpwi r3, 0
@@ -866,7 +866,7 @@ lbl_8037B768:
/* 8037B768 003773C8 2C 03 00 00 */ cmpwi r3, 0
/* 8037B76C 003773CC 40 82 00 14 */ bne lbl_8037B780
/* 8037B770 003773D0 7F E3 FB 78 */ mr r3, r31
-/* 8037B774 003773D4 4B EF 42 B1 */ bl func_8026FA24
+/* 8037B774 003773D4 4B EF 42 B1 */ bl OSUnlockMutex
/* 8037B778 003773D8 3B 60 00 00 */ li r27, 0
/* 8037B77C 003773DC 48 00 00 D0 */ b lbl_8037B84C
lbl_8037B780:
@@ -884,7 +884,7 @@ lbl_8037B7A4:
/* 8037B7A4 00377404 7C 1C 00 00 */ cmpw r28, r0
/* 8037B7A8 00377408 40 80 00 14 */ bge lbl_8037B7BC
/* 8037B7AC 0037740C 7F E3 FB 78 */ mr r3, r31
-/* 8037B7B0 00377410 4B EF 42 75 */ bl func_8026FA24
+/* 8037B7B0 00377410 4B EF 42 75 */ bl OSUnlockMutex
/* 8037B7B4 00377414 3B 60 00 00 */ li r27, 0
/* 8037B7B8 00377418 48 00 00 94 */ b lbl_8037B84C
lbl_8037B7BC:
@@ -930,23 +930,23 @@ lbl_8037B830:
/* 8037B83C 0037749C 38 BB 00 B8 */ addi r5, r27, 0xb8
/* 8037B840 003774A0 4B FE 74 09 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037B844 003774A4 7F E3 FB 78 */ mr r3, r31
-/* 8037B848 003774A8 4B EF 41 DD */ bl func_8026FA24
+/* 8037B848 003774A8 4B EF 41 DD */ bl OSUnlockMutex
lbl_8037B84C:
/* 8037B84C 003774AC 2C 1B 00 00 */ cmpwi r27, 0
/* 8037B850 003774B0 40 82 00 14 */ bne lbl_8037B864
/* 8037B854 003774B4 7F C3 F3 78 */ mr r3, r30
-/* 8037B858 003774B8 4B EF 41 CD */ bl func_8026FA24
+/* 8037B858 003774B8 4B EF 41 CD */ bl OSUnlockMutex
/* 8037B85C 003774BC 38 60 00 00 */ li r3, 0
/* 8037B860 003774C0 48 00 01 94 */ b lbl_8037B9F4
lbl_8037B864:
/* 8037B864 003774C4 3B 96 00 48 */ addi r28, r22, 0x48
/* 8037B868 003774C8 7F 83 E3 78 */ mr r3, r28
-/* 8037B86C 003774CC 4B EF 40 DD */ bl func_8026F948
+/* 8037B86C 003774CC 4B EF 40 DD */ bl OSLockMutex
/* 8037B870 003774D0 80 16 00 18 */ lwz r0, 0x18(r22)
/* 8037B874 003774D4 2C 00 00 00 */ cmpwi r0, 0
/* 8037B878 003774D8 40 82 00 10 */ bne lbl_8037B888
/* 8037B87C 003774DC 7F 83 E3 78 */ mr r3, r28
-/* 8037B880 003774E0 4B EF 41 A5 */ bl func_8026FA24
+/* 8037B880 003774E0 4B EF 41 A5 */ bl OSUnlockMutex
/* 8037B884 003774E4 48 00 00 48 */ b lbl_8037B8CC
lbl_8037B888:
/* 8037B888 003774E8 80 B6 00 1C */ lwz r5, 0x1c(r22)
@@ -959,13 +959,13 @@ lbl_8037B888:
/* 8037B8A4 00377504 3B 5F 00 04 */ addi r26, r31, 4
/* 8037B8A8 00377508 7F 43 D3 78 */ mr r3, r26
/* 8037B8AC 0037750C 93 FB 00 04 */ stw r31, 4(r27)
-/* 8037B8B0 00377510 4B EF 40 99 */ bl func_8026F948
+/* 8037B8B0 00377510 4B EF 40 99 */ bl OSLockMutex
/* 8037B8B4 00377514 38 7F 00 1C */ addi r3, r31, 0x1c
/* 8037B8B8 00377518 4B FF 4B 69 */ bl Clear__Q44nw4r3snd6detail9FrameHeapFv
/* 8037B8BC 0037751C 7F 43 D3 78 */ mr r3, r26
-/* 8037B8C0 00377520 4B EF 41 65 */ bl func_8026FA24
+/* 8037B8C0 00377520 4B EF 41 65 */ bl OSUnlockMutex
/* 8037B8C4 00377524 7F 83 E3 78 */ mr r3, r28
-/* 8037B8C8 00377528 4B EF 41 5D */ bl func_8026FA24
+/* 8037B8C8 00377528 4B EF 41 5D */ bl OSUnlockMutex
lbl_8037B8CC:
/* 8037B8CC 0037752C 2C 18 00 00 */ cmpwi r24, 0
/* 8037B8D0 00377530 41 82 00 50 */ beq lbl_8037B920
@@ -1006,7 +1006,7 @@ lbl_8037B920:
lbl_8037B958:
/* 8037B958 003775B8 3A F6 00 48 */ addi r23, r22, 0x48
/* 8037B95C 003775BC 7E E3 BB 78 */ mr r3, r23
-/* 8037B960 003775C0 4B EF 3F E9 */ bl func_8026F948
+/* 8037B960 003775C0 4B EF 3F E9 */ bl OSLockMutex
/* 8037B964 003775C4 80 76 00 10 */ lwz r3, 0x10(r22)
/* 8037B968 003775C8 38 16 00 10 */ addi r0, r22, 0x10
/* 8037B96C 003775CC 48 00 00 58 */ b lbl_8037B9C4
@@ -1046,9 +1046,9 @@ lbl_8037B9CC:
/* 8037B9D8 00377638 38 BB 00 C8 */ addi r5, r27, 0xc8
/* 8037B9DC 0037763C 4B FE 72 6D */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037B9E0 00377640 7E E3 BB 78 */ mr r3, r23
-/* 8037B9E4 00377644 4B EF 40 41 */ bl func_8026FA24
+/* 8037B9E4 00377644 4B EF 40 41 */ bl OSUnlockMutex
/* 8037B9E8 00377648 7F C3 F3 78 */ mr r3, r30
-/* 8037B9EC 0037764C 4B EF 40 39 */ bl func_8026FA24
+/* 8037B9EC 0037764C 4B EF 40 39 */ bl OSUnlockMutex
/* 8037B9F0 00377650 7F 63 DB 78 */ mr r3, r27
lbl_8037B9F4:
/* 8037B9F4 00377654 39 61 00 60 */ addi r11, r1, 0x60
@@ -1074,11 +1074,11 @@ detail_AllocWaveSound__Q34nw4r3snd11SoundPlayerFiiPQ54nw4r3snd6detail10BasicSoun
/* 8037BA38 00377698 7D 1B 43 78 */ mr r27, r8
/* 8037BA3C 0037769C 7D 3A 4B 78 */ mr r26, r9
/* 8037BA40 003776A0 7F C3 F3 78 */ mr r3, r30
-/* 8037BA44 003776A4 4B EF 3F 05 */ bl func_8026F948
+/* 8037BA44 003776A4 4B EF 3F 05 */ bl OSLockMutex
/* 8037BA48 003776A8 2C 1A 00 00 */ cmpwi r26, 0
/* 8037BA4C 003776AC 40 82 00 14 */ bne lbl_8037BA60
/* 8037BA50 003776B0 7F C3 F3 78 */ mr r3, r30
-/* 8037BA54 003776B4 4B EF 3F D1 */ bl func_8026FA24
+/* 8037BA54 003776B4 4B EF 3F D1 */ bl OSUnlockMutex
/* 8037BA58 003776B8 38 60 00 00 */ li r3, 0
/* 8037BA5C 003776BC 48 00 03 5C */ b lbl_8037BDB8
lbl_8037BA60:
@@ -1113,13 +1113,13 @@ lbl_8037BAB4:
/* 8037BAC4 00377724 2C 03 00 00 */ cmpwi r3, 0
/* 8037BAC8 00377728 40 82 00 14 */ bne lbl_8037BADC
/* 8037BACC 0037772C 7F C3 F3 78 */ mr r3, r30
-/* 8037BAD0 00377730 4B EF 3F 55 */ bl func_8026FA24
+/* 8037BAD0 00377730 4B EF 3F 55 */ bl OSUnlockMutex
/* 8037BAD4 00377734 38 60 00 00 */ li r3, 0
/* 8037BAD8 00377738 48 00 02 E0 */ b lbl_8037BDB8
lbl_8037BADC:
/* 8037BADC 0037773C 3B FA 00 10 */ addi r31, r26, 0x10
/* 8037BAE0 00377740 7F E3 FB 78 */ mr r3, r31
-/* 8037BAE4 00377744 4B EF 3E 65 */ bl func_8026F948
+/* 8037BAE4 00377744 4B EF 3E 65 */ bl OSLockMutex
/* 8037BAE8 00377748 7F 43 D3 78 */ mr r3, r26
/* 8037BAEC 0037774C 4B FF 60 6D */ bl AllocImpl__Q44nw4r3snd6detail8PoolImplFv
/* 8037BAF0 00377750 2C 03 00 00 */ cmpwi r3, 0
@@ -1143,7 +1143,7 @@ lbl_8037BB2C:
/* 8037BB2C 0037778C 2C 03 00 00 */ cmpwi r3, 0
/* 8037BB30 00377790 40 82 00 14 */ bne lbl_8037BB44
/* 8037BB34 00377794 7F E3 FB 78 */ mr r3, r31
-/* 8037BB38 00377798 4B EF 3E ED */ bl func_8026FA24
+/* 8037BB38 00377798 4B EF 3E ED */ bl OSUnlockMutex
/* 8037BB3C 0037779C 3B 60 00 00 */ li r27, 0
/* 8037BB40 003777A0 48 00 00 D0 */ b lbl_8037BC10
lbl_8037BB44:
@@ -1161,7 +1161,7 @@ lbl_8037BB68:
/* 8037BB68 003777C8 7C 1C 00 00 */ cmpw r28, r0
/* 8037BB6C 003777CC 40 80 00 14 */ bge lbl_8037BB80
/* 8037BB70 003777D0 7F E3 FB 78 */ mr r3, r31
-/* 8037BB74 003777D4 4B EF 3E B1 */ bl func_8026FA24
+/* 8037BB74 003777D4 4B EF 3E B1 */ bl OSUnlockMutex
/* 8037BB78 003777D8 3B 60 00 00 */ li r27, 0
/* 8037BB7C 003777DC 48 00 00 94 */ b lbl_8037BC10
lbl_8037BB80:
@@ -1207,23 +1207,23 @@ lbl_8037BBF4:
/* 8037BC00 00377860 38 BB 00 B8 */ addi r5, r27, 0xb8
/* 8037BC04 00377864 4B FE 70 45 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037BC08 00377868 7F E3 FB 78 */ mr r3, r31
-/* 8037BC0C 0037786C 4B EF 3E 19 */ bl func_8026FA24
+/* 8037BC0C 0037786C 4B EF 3E 19 */ bl OSUnlockMutex
lbl_8037BC10:
/* 8037BC10 00377870 2C 1B 00 00 */ cmpwi r27, 0
/* 8037BC14 00377874 40 82 00 14 */ bne lbl_8037BC28
/* 8037BC18 00377878 7F C3 F3 78 */ mr r3, r30
-/* 8037BC1C 0037787C 4B EF 3E 09 */ bl func_8026FA24
+/* 8037BC1C 0037787C 4B EF 3E 09 */ bl OSUnlockMutex
/* 8037BC20 00377880 38 60 00 00 */ li r3, 0
/* 8037BC24 00377884 48 00 01 94 */ b lbl_8037BDB8
lbl_8037BC28:
/* 8037BC28 00377888 3B 96 00 48 */ addi r28, r22, 0x48
/* 8037BC2C 0037788C 7F 83 E3 78 */ mr r3, r28
-/* 8037BC30 00377890 4B EF 3D 19 */ bl func_8026F948
+/* 8037BC30 00377890 4B EF 3D 19 */ bl OSLockMutex
/* 8037BC34 00377894 80 16 00 18 */ lwz r0, 0x18(r22)
/* 8037BC38 00377898 2C 00 00 00 */ cmpwi r0, 0
/* 8037BC3C 0037789C 40 82 00 10 */ bne lbl_8037BC4C
/* 8037BC40 003778A0 7F 83 E3 78 */ mr r3, r28
-/* 8037BC44 003778A4 4B EF 3D E1 */ bl func_8026FA24
+/* 8037BC44 003778A4 4B EF 3D E1 */ bl OSUnlockMutex
/* 8037BC48 003778A8 48 00 00 48 */ b lbl_8037BC90
lbl_8037BC4C:
/* 8037BC4C 003778AC 80 B6 00 1C */ lwz r5, 0x1c(r22)
@@ -1236,13 +1236,13 @@ lbl_8037BC4C:
/* 8037BC68 003778C8 3B 5F 00 04 */ addi r26, r31, 4
/* 8037BC6C 003778CC 7F 43 D3 78 */ mr r3, r26
/* 8037BC70 003778D0 93 FB 00 04 */ stw r31, 4(r27)
-/* 8037BC74 003778D4 4B EF 3C D5 */ bl func_8026F948
+/* 8037BC74 003778D4 4B EF 3C D5 */ bl OSLockMutex
/* 8037BC78 003778D8 38 7F 00 1C */ addi r3, r31, 0x1c
/* 8037BC7C 003778DC 4B FF 47 A5 */ bl Clear__Q44nw4r3snd6detail9FrameHeapFv
/* 8037BC80 003778E0 7F 43 D3 78 */ mr r3, r26
-/* 8037BC84 003778E4 4B EF 3D A1 */ bl func_8026FA24
+/* 8037BC84 003778E4 4B EF 3D A1 */ bl OSUnlockMutex
/* 8037BC88 003778E8 7F 83 E3 78 */ mr r3, r28
-/* 8037BC8C 003778EC 4B EF 3D 99 */ bl func_8026FA24
+/* 8037BC8C 003778EC 4B EF 3D 99 */ bl OSUnlockMutex
lbl_8037BC90:
/* 8037BC90 003778F0 2C 18 00 00 */ cmpwi r24, 0
/* 8037BC94 003778F4 41 82 00 50 */ beq lbl_8037BCE4
@@ -1283,7 +1283,7 @@ lbl_8037BCE4:
lbl_8037BD1C:
/* 8037BD1C 0037797C 3A F6 00 48 */ addi r23, r22, 0x48
/* 8037BD20 00377980 7E E3 BB 78 */ mr r3, r23
-/* 8037BD24 00377984 4B EF 3C 25 */ bl func_8026F948
+/* 8037BD24 00377984 4B EF 3C 25 */ bl OSLockMutex
/* 8037BD28 00377988 80 76 00 10 */ lwz r3, 0x10(r22)
/* 8037BD2C 0037798C 38 16 00 10 */ addi r0, r22, 0x10
/* 8037BD30 00377990 48 00 00 58 */ b lbl_8037BD88
@@ -1323,9 +1323,9 @@ lbl_8037BD90:
/* 8037BD9C 003779FC 38 BB 00 C8 */ addi r5, r27, 0xc8
/* 8037BDA0 00377A00 4B FE 6E A9 */ bl Insert__Q44nw4r2ut6detail12LinkListImplFQ54nw4r2ut6detail12LinkListImpl8IteratorPQ34nw4r2ut12LinkListNode
/* 8037BDA4 00377A04 7E E3 BB 78 */ mr r3, r23
-/* 8037BDA8 00377A08 4B EF 3C 7D */ bl func_8026FA24
+/* 8037BDA8 00377A08 4B EF 3C 7D */ bl OSUnlockMutex
/* 8037BDAC 00377A0C 7F C3 F3 78 */ mr r3, r30
-/* 8037BDB0 00377A10 4B EF 3C 75 */ bl func_8026FA24
+/* 8037BDB0 00377A10 4B EF 3C 75 */ bl OSUnlockMutex
/* 8037BDB4 00377A14 7F 63 DB 78 */ mr r3, r27
lbl_8037BDB8:
/* 8037BDB8 00377A18 39 61 00 60 */ addi r11, r1, 0x60
@@ -1347,7 +1347,7 @@ SetPlayableSoundCount__Q34nw4r3snd11SoundPlayerFi:
/* 8037BDEC 00377A4C 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8037BDF0 00377A50 7C 7D 1B 78 */ mr r29, r3
/* 8037BDF4 00377A54 7F E3 FB 78 */ mr r3, r31
-/* 8037BDF8 00377A58 4B EF 3B 51 */ bl func_8026F948
+/* 8037BDF8 00377A58 4B EF 3B 51 */ bl OSLockMutex
/* 8037BDFC 00377A5C 88 1D 00 2D */ lbz r0, 0x2d(r29)
/* 8037BE00 00377A60 B3 DD 00 24 */ sth r30, 0x24(r29)
/* 8037BE04 00377A64 2C 00 00 00 */ cmpwi r0, 0
@@ -1372,7 +1372,7 @@ lbl_8037BE3C:
/* 8037BE44 00377AA4 7C 03 00 00 */ cmpw r3, r0
/* 8037BE48 00377AA8 41 81 FF E0 */ bgt lbl_8037BE28
/* 8037BE4C 00377AAC 7F E3 FB 78 */ mr r3, r31
-/* 8037BE50 00377AB0 4B EF 3B D5 */ bl func_8026FA24
+/* 8037BE50 00377AB0 4B EF 3B D5 */ bl OSUnlockMutex
/* 8037BE54 00377AB4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037BE58 00377AB8 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037BE5C 00377ABC 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -1400,12 +1400,12 @@ CheckPlayableSoundCount__Q34nw4r3snd11SoundPlayerFiPQ44nw4r3snd6detail19External
/* 8037BE9C 00377AFC 93 81 00 10 */ stw r28, 0x10(r1)
/* 8037BEA0 00377B00 7C 7C 1B 78 */ mr r28, r3
/* 8037BEA4 00377B04 7F E3 FB 78 */ mr r3, r31
-/* 8037BEA8 00377B08 4B EF 3A A1 */ bl func_8026F948
+/* 8037BEA8 00377B08 4B EF 3A A1 */ bl OSLockMutex
/* 8037BEAC 00377B0C A0 1C 00 24 */ lhz r0, 0x24(r28)
/* 8037BEB0 00377B10 2C 00 00 00 */ cmpwi r0, 0
/* 8037BEB4 00377B14 40 82 00 80 */ bne lbl_8037BF34
/* 8037BEB8 00377B18 7F E3 FB 78 */ mr r3, r31
-/* 8037BEBC 00377B1C 4B EF 3B 69 */ bl func_8026FA24
+/* 8037BEBC 00377B1C 4B EF 3B 69 */ bl OSUnlockMutex
/* 8037BEC0 00377B20 38 60 00 00 */ li r3, 0
/* 8037BEC4 00377B24 48 00 01 30 */ b lbl_8037BFF4
/* 8037BEC8 00377B28 48 00 00 6C */ b lbl_8037BF34
@@ -1414,7 +1414,7 @@ lbl_8037BECC:
/* 8037BED0 00377B30 34 60 FF 38 */ addic. r3, r0, -200
/* 8037BED4 00377B34 40 82 00 14 */ bne lbl_8037BEE8
/* 8037BED8 00377B38 7F E3 FB 78 */ mr r3, r31
-/* 8037BEDC 00377B3C 4B EF 3B 49 */ bl func_8026FA24
+/* 8037BEDC 00377B3C 4B EF 3B 49 */ bl OSUnlockMutex
/* 8037BEE0 00377B40 38 60 00 00 */ li r3, 0
/* 8037BEE4 00377B44 48 00 01 10 */ b lbl_8037BFF4
lbl_8037BEE8:
@@ -1432,7 +1432,7 @@ lbl_8037BF0C:
/* 8037BF0C 00377B6C 7C 1D 00 00 */ cmpw r29, r0
/* 8037BF10 00377B70 40 80 00 14 */ bge lbl_8037BF24
/* 8037BF14 00377B74 7F E3 FB 78 */ mr r3, r31
-/* 8037BF18 00377B78 4B EF 3B 0D */ bl func_8026FA24
+/* 8037BF18 00377B78 4B EF 3B 0D */ bl OSUnlockMutex
/* 8037BF1C 00377B7C 38 60 00 00 */ li r3, 0
/* 8037BF20 00377B80 48 00 00 D4 */ b lbl_8037BFF4
lbl_8037BF24:
@@ -1451,7 +1451,7 @@ lbl_8037BF34:
/* 8037BF50 00377BB0 2C 00 00 00 */ cmpwi r0, 0
/* 8037BF54 00377BB4 40 82 00 84 */ bne lbl_8037BFD8
/* 8037BF58 00377BB8 7F E3 FB 78 */ mr r3, r31
-/* 8037BF5C 00377BBC 4B EF 3A C9 */ bl func_8026FA24
+/* 8037BF5C 00377BBC 4B EF 3A C9 */ bl OSUnlockMutex
/* 8037BF60 00377BC0 38 60 00 00 */ li r3, 0
/* 8037BF64 00377BC4 48 00 00 90 */ b lbl_8037BFF4
/* 8037BF68 00377BC8 48 00 00 70 */ b lbl_8037BFD8
@@ -1461,7 +1461,7 @@ lbl_8037BF6C:
/* 8037BF74 00377BD4 2C 03 00 00 */ cmpwi r3, 0
/* 8037BF78 00377BD8 40 82 00 14 */ bne lbl_8037BF8C
/* 8037BF7C 00377BDC 7F E3 FB 78 */ mr r3, r31
-/* 8037BF80 00377BE0 4B EF 3A A5 */ bl func_8026FA24
+/* 8037BF80 00377BE0 4B EF 3A A5 */ bl OSUnlockMutex
/* 8037BF84 00377BE4 38 60 00 00 */ li r3, 0
/* 8037BF88 00377BE8 48 00 00 6C */ b lbl_8037BFF4
lbl_8037BF8C:
@@ -1479,7 +1479,7 @@ lbl_8037BFB0:
/* 8037BFB0 00377C10 7C 1D 00 00 */ cmpw r29, r0
/* 8037BFB4 00377C14 40 80 00 14 */ bge lbl_8037BFC8
/* 8037BFB8 00377C18 7F E3 FB 78 */ mr r3, r31
-/* 8037BFBC 00377C1C 4B EF 3A 69 */ bl func_8026FA24
+/* 8037BFBC 00377C1C 4B EF 3A 69 */ bl OSUnlockMutex
/* 8037BFC0 00377C20 38 60 00 00 */ li r3, 0
/* 8037BFC4 00377C24 48 00 00 30 */ b lbl_8037BFF4
lbl_8037BFC8:
@@ -1494,7 +1494,7 @@ lbl_8037BFD8:
/* 8037BFE4 00377C44 40 80 FF 88 */ bge lbl_8037BF6C
lbl_8037BFE8:
/* 8037BFE8 00377C48 7F E3 FB 78 */ mr r3, r31
-/* 8037BFEC 00377C4C 4B EF 3A 39 */ bl func_8026FA24
+/* 8037BFEC 00377C4C 4B EF 3A 39 */ bl OSUnlockMutex
/* 8037BFF0 00377C50 38 60 00 01 */ li r3, 1
lbl_8037BFF4:
/* 8037BFF4 00377C54 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -1518,7 +1518,7 @@ detail_AppendPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10PlayerHea
/* 8037C030 00377C90 93 A1 00 14 */ stw r29, 0x14(r1)
/* 8037C034 00377C94 7C 7D 1B 78 */ mr r29, r3
/* 8037C038 00377C98 7F E3 FB 78 */ mr r3, r31
-/* 8037C03C 00377C9C 4B EF 39 0D */ bl func_8026F948
+/* 8037C03C 00377C9C 4B EF 39 0D */ bl OSLockMutex
/* 8037C040 00377CA0 93 BE 00 38 */ stw r29, 0x38(r30)
/* 8037C044 00377CA4 38 1D 00 1C */ addi r0, r29, 0x1c
/* 8037C048 00377CA8 38 7D 00 18 */ addi r3, r29, 0x18
@@ -1529,7 +1529,7 @@ detail_AppendPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10PlayerHea
/* 8037C05C 00377CBC 38 00 00 01 */ li r0, 1
/* 8037C060 00377CC0 7F E3 FB 78 */ mr r3, r31
/* 8037C064 00377CC4 98 1D 00 2D */ stb r0, 0x2d(r29)
-/* 8037C068 00377CC8 4B EF 39 BD */ bl func_8026FA24
+/* 8037C068 00377CC8 4B EF 39 BD */ bl OSUnlockMutex
/* 8037C06C 00377CCC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037C070 00377CD0 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037C074 00377CD4 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -1551,7 +1551,7 @@ detail_FreePlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound:
/* 8037C0A8 00377D08 93 81 00 10 */ stw r28, 0x10(r1)
/* 8037C0AC 00377D0C 7C 7C 1B 78 */ mr r28, r3
/* 8037C0B0 00377D10 7F E3 FB 78 */ mr r3, r31
-/* 8037C0B4 00377D14 4B EF 38 95 */ bl func_8026F948
+/* 8037C0B4 00377D14 4B EF 38 95 */ bl OSLockMutex
/* 8037C0B8 00377D18 83 DD 00 04 */ lwz r30, 4(r29)
/* 8037C0BC 00377D1C 2C 1E 00 00 */ cmpwi r30, 0
/* 8037C0C0 00377D20 41 82 00 1C */ beq lbl_8037C0DC
@@ -1570,7 +1570,7 @@ lbl_8037C0EC:
/* 8037C0EC 00377D4C 38 00 00 00 */ li r0, 0
/* 8037C0F0 00377D50 7F E3 FB 78 */ mr r3, r31
/* 8037C0F4 00377D54 90 1D 00 04 */ stw r0, 4(r29)
-/* 8037C0F8 00377D58 4B EF 39 2D */ bl func_8026FA24
+/* 8037C0F8 00377D58 4B EF 39 2D */ bl OSUnlockMutex
/* 8037C0FC 00377D5C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8037C100 00377D60 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8037C104 00377D64 83 C1 00 18 */ lwz r30, 0x18(r1)
diff --git a/asm/nw4r/ut/ut_DvdLockedFileStream.s b/asm/nw4r/ut/ut_DvdLockedFileStream.s
index be72500..b91cdba 100644
--- a/asm/nw4r/ut/ut_DvdLockedFileStream.s
+++ b/asm/nw4r/ut/ut_DvdLockedFileStream.s
@@ -21,7 +21,7 @@ __ct__Q34nw4r2ut19DvdLockedFileStreamFl:
/* 80363C68 0035F8C8 40 82 00 18 */ bne lbl_80363C80
/* 80363C6C 0035F8CC 3C 60 80 62 */ lis r3, lbl_806216F0@ha
/* 80363C70 0035F8D0 38 63 16 F0 */ addi r3, r3, lbl_806216F0@l
-/* 80363C74 0035F8D4 4B F0 BC 9D */ bl func_8026F910
+/* 80363C74 0035F8D4 4B F0 BC 9D */ bl OSInitMutex
/* 80363C78 0035F8D8 38 00 00 01 */ li r0, 1
/* 80363C7C 0035F8DC 98 0D B1 BC */ stb r0, lbl_8064047C-_SDA_BASE_(r13)
lbl_80363C80:
@@ -54,7 +54,7 @@ __ct__Q34nw4r2ut19DvdLockedFileStreamFPC11DVDFileInfob:
/* 80363CDC 0035F93C 40 82 00 18 */ bne lbl_80363CF4
/* 80363CE0 0035F940 3C 60 80 62 */ lis r3, lbl_806216F0@ha
/* 80363CE4 0035F944 38 63 16 F0 */ addi r3, r3, lbl_806216F0@l
-/* 80363CE8 0035F948 4B F0 BC 29 */ bl func_8026F910
+/* 80363CE8 0035F948 4B F0 BC 29 */ bl OSInitMutex
/* 80363CEC 0035F94C 38 00 00 01 */ li r0, 1
/* 80363CF0 0035F950 98 0D B1 BC */ stb r0, lbl_8064047C-_SDA_BASE_(r13)
lbl_80363CF4:
@@ -108,14 +108,14 @@ Read__Q34nw4r2ut19DvdLockedFileStreamFPvUl:
/* 80363D94 0035F9F4 93 81 00 10 */ stw r28, 0x10(r1)
/* 80363D98 0035F9F8 7C 7C 1B 78 */ mr r28, r3
/* 80363D9C 0035F9FC 38 7F 16 F0 */ addi r3, r31, lbl_806216F0@l
-/* 80363DA0 0035FA00 4B F0 BB A9 */ bl func_8026F948
+/* 80363DA0 0035FA00 4B F0 BB A9 */ bl OSLockMutex
/* 80363DA4 0035FA04 7F 83 E3 78 */ mr r3, r28
/* 80363DA8 0035FA08 7F A4 EB 78 */ mr r4, r29
/* 80363DAC 0035FA0C 7F C5 F3 78 */ mr r5, r30
/* 80363DB0 0035FA10 4B FF FB 71 */ bl Read__Q34nw4r2ut13DvdFileStreamFPvUl
/* 80363DB4 0035FA14 7C 7E 1B 78 */ mr r30, r3
/* 80363DB8 0035FA18 38 7F 16 F0 */ addi r3, r31, 0x16f0
-/* 80363DBC 0035FA1C 4B F0 BC 69 */ bl func_8026FA24
+/* 80363DBC 0035FA1C 4B F0 BC 69 */ bl OSUnlockMutex
/* 80363DC0 0035FA20 7F C3 F3 78 */ mr r3, r30
/* 80363DC4 0035FA24 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80363DC8 0035FA28 83 C1 00 18 */ lwz r30, 0x18(r1)
@@ -140,14 +140,14 @@ Peek__Q34nw4r2ut19DvdLockedFileStreamFPvUl:
/* 80363E08 0035FA68 93 81 00 10 */ stw r28, 0x10(r1)
/* 80363E0C 0035FA6C 7C 7C 1B 78 */ mr r28, r3
/* 80363E10 0035FA70 38 7F 16 F0 */ addi r3, r31, lbl_806216F0@l
-/* 80363E14 0035FA74 4B F0 BB 35 */ bl func_8026F948
+/* 80363E14 0035FA74 4B F0 BB 35 */ bl OSLockMutex
/* 80363E18 0035FA78 7F 83 E3 78 */ mr r3, r28
/* 80363E1C 0035FA7C 7F A4 EB 78 */ mr r4, r29
/* 80363E20 0035FA80 7F C5 F3 78 */ mr r5, r30
/* 80363E24 0035FA84 4B FF FC 79 */ bl Peek__Q34nw4r2ut13DvdFileStreamFPvUl
/* 80363E28 0035FA88 7C 7E 1B 78 */ mr r30, r3
/* 80363E2C 0035FA8C 38 7F 16 F0 */ addi r3, r31, 0x16f0
-/* 80363E30 0035FA90 4B F0 BB F5 */ bl func_8026FA24
+/* 80363E30 0035FA90 4B F0 BB F5 */ bl OSUnlockMutex
/* 80363E34 0035FA94 7F C3 F3 78 */ mr r3, r30
/* 80363E38 0035FA98 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80363E3C 0035FA9C 83 C1 00 18 */ lwz r30, 0x18(r1)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-10 18:36:12 +0000