Merge pull request #114 from mparisi20/master

More OS splits

1 files changed, 51 insertions, 51 deletions

diff --git a/asm/text_8.s b/asm/text_8.s
index ed889df..8782627 100644
--- a/asm/text_8.s
+++ b/asm/text_8.s
@@ -4719,7 +4719,7 @@ func_8027D9D8:
 /* 8027DA78 002796D8  40 82 00 14 */	bne lbl_8027DA8C
 /* 8027DA7C 002796DC  3C 60 80 43 */	lis r3, lbl_80434CD0@ha
 /* 8027DA80 002796E0  38 63 4C D0 */	addi r3, r3, lbl_80434CD0@l
-/* 8027DA84 002796E4  4B FF 22 0D */	bl func_8026FC90
+/* 8027DA84 002796E4  4B FF 22 0D */	bl OSRegisterShutdownFunction
 /* 8027DA88 002796E8  93 AD A9 B4 */	stw r29, lbl_8063FC74-_SDA_BASE_(r13)
 lbl_8027DA8C:
 /* 8027DA8C 002796EC  48 00 33 E1 */	bl func_80280E6C
@@ -5617,7 +5617,7 @@ lbl_8027E7EC:
 /* 8027E824 0027A484  54 00 FF FF */	rlwinm. r0, r0, 0x1f, 0x1f, 0x1f
 /* 8027E828 0027A488  41 82 00 44 */	beq lbl_8027E86C
 /* 8027E82C 0027A48C  80 6D A9 CC */	lwz r3, lbl_8063FC8C-_SDA_BASE_(r13)
-/* 8027E830 0027A490  4B FF 37 19 */	bl func_80271F48
+/* 8027E830 0027A490  4B FF 37 19 */	bl OSResumeThread
 /* 8027E834 0027A494  38 00 00 00 */	li r0, 0
 /* 8027E838 0027A498  80 62 A0 D0 */	lwz r3, lbl_806426D0-_SDA2_BASE_(r2)
 /* 8027E83C 0027A49C  90 0D A9 C8 */	stw r0, lbl_8063FC88-_SDA_BASE_(r13)
@@ -5658,7 +5658,7 @@ lbl_8027E86C:
 /* 8027E8C4 0027A524  B0 83 00 04 */	sth r4, 4(r3)
 /* 8027E8C8 0027A528  90 0D A9 C8 */	stw r0, lbl_8063FC88-_SDA_BASE_(r13)
 /* 8027E8CC 0027A52C  80 6D A9 CC */	lwz r3, lbl_8063FC8C-_SDA_BASE_(r13)
-/* 8027E8D0 0027A530  4B FF 39 11 */	bl func_802721E0
+/* 8027E8D0 0027A530  4B FF 39 11 */	bl OSSuspendThread
 lbl_8027E8D4:
 /* 8027E8D4 0027A534  80 7F 00 08 */	lwz r3, 8(r31)
 /* 8027E8D8 0027A538  54 60 DF FF */	rlwinm. r0, r3, 0x1b, 0x1f, 0x1f
@@ -6313,10 +6313,10 @@ func_8027F1D8:
 /* 8027F1E8 0027AE48  90 01 00 14 */	stw r0, 0x14(r1)
 /* 8027F1EC 0027AE4C  38 84 E7 EC */	addi r4, r4, lbl_8027E7EC@l
 /* 8027F1F0 0027AE50  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8027F1F4 0027AE54  4B FE F5 B5 */	bl func_8026E7A8
+/* 8027F1F4 0027AE54  4B FE F5 B5 */	bl __OSSetInterruptHandler
 /* 8027F1F8 0027AE58  38 60 40 00 */	li r3, 0x4000
-/* 8027F1FC 0027AE5C  4B FE F9 71 */	bl func_8026EB6C
-/* 8027F200 0027AE60  4B FF 20 F9 */	bl func_802712F8
+/* 8027F1FC 0027AE5C  4B FE F9 71 */	bl __OSUnmaskInterrupts
+/* 8027F200 0027AE60  4B FF 20 F9 */	bl OSGetCurrentThread
 /* 8027F204 0027AE64  3B E0 00 00 */	li r31, 0
 /* 8027F208 0027AE68  90 6D A9 CC */	stw r3, lbl_8063FC8C-_SDA_BASE_(r13)
 /* 8027F20C 0027AE6C  3C 60 80 51 */	lis r3, lbl_80515FD4@ha
@@ -8323,7 +8323,7 @@ lbl_80280DEC:
 /* 80280E4C 0027CAAC  4B FE A0 1D */	bl OSSetCurrentContext
 lbl_80280E50:
 /* 80280E50 0027CAB0  38 6D A9 D8 */	addi r3, r13, lbl_8063FC98-_SDA_BASE_
-/* 80280E54 0027CAB4  4B FF 16 0D */	bl func_80272460
+/* 80280E54 0027CAB4  4B FF 16 0D */	bl OSWakeupThread
 /* 80280E58 0027CAB8  80 01 02 E4 */	lwz r0, 0x2e4(r1)
 /* 80280E5C 0027CABC  83 E1 02 DC */	lwz r31, 0x2dc(r1)
 /* 80280E60 0027CAC0  7C 08 03 A6 */	mtlr r0
@@ -8338,17 +8338,17 @@ func_80280E6C:
 /* 80280E78 0027CAD8  38 60 00 12 */	li r3, 0x12
 /* 80280E7C 0027CADC  90 01 00 14 */	stw r0, 0x14(r1)
 /* 80280E80 0027CAE0  38 84 0D 24 */	addi r4, r4, lbl_80280D24@l
-/* 80280E84 0027CAE4  4B FE D9 25 */	bl func_8026E7A8
+/* 80280E84 0027CAE4  4B FE D9 25 */	bl __OSSetInterruptHandler
 /* 80280E88 0027CAE8  3C 80 80 28 */	lis r4, lbl_80280DEC@ha
 /* 80280E8C 0027CAEC  38 60 00 13 */	li r3, 0x13
 /* 80280E90 0027CAF0  38 84 0D EC */	addi r4, r4, lbl_80280DEC@l
-/* 80280E94 0027CAF4  4B FE D9 15 */	bl func_8026E7A8
+/* 80280E94 0027CAF4  4B FE D9 15 */	bl __OSSetInterruptHandler
 /* 80280E98 0027CAF8  38 6D A9 D8 */	addi r3, r13, lbl_8063FC98-_SDA_BASE_
-/* 80280E9C 0027CAFC  4B FF 04 4D */	bl func_802712E8
+/* 80280E9C 0027CAFC  4B FF 04 4D */	bl OSInitThreadQueue
 /* 80280EA0 0027CB00  38 60 20 00 */	li r3, 0x2000
-/* 80280EA4 0027CB04  4B FE DC C9 */	bl func_8026EB6C
+/* 80280EA4 0027CB04  4B FE DC C9 */	bl __OSUnmaskInterrupts
 /* 80280EA8 0027CB08  38 60 10 00 */	li r3, 0x1000
-/* 80280EAC 0027CB0C  4B FE DC C1 */	bl func_8026EB6C
+/* 80280EAC 0027CB0C  4B FE DC C1 */	bl __OSUnmaskInterrupts
 /* 80280EB0 0027CB10  80 6D A9 98 */	lwz r3, lbl_8063FC58-_SDA_BASE_(r13)
 /* 80280EB4 0027CB14  A0 03 00 0A */	lhz r0, 0xa(r3)
 /* 80280EB8 0027CB18  60 00 00 0F */	ori r0, r0, 0xf
@@ -16487,7 +16487,7 @@ lbl_8028808C:
 /* 80288098 00283CF8  48 00 00 10 */	b lbl_802880A8
 lbl_8028809C:
 /* 8028809C 00283CFC  38 6D A9 F8 */	addi r3, r13, lbl_8063FCB8-_SDA_BASE_
-/* 802880A0 00283D00  4B FE A2 D5 */	bl func_80272374
+/* 802880A0 00283D00  4B FE A2 D5 */	bl OSSleepThread
 /* 802880A4 00283D04  4B FF FF C4 */	b lbl_80288068
 lbl_802880A8:
 /* 802880A8 00283D08  7F E3 FB 78 */	mr r3, r31
@@ -16502,7 +16502,7 @@ lbl_802880B4:
 /* 802880C8 00283D28  4E 80 00 20 */	blr
 lbl_802880CC:
 /* 802880CC 00283D2C  38 6D A9 F8 */	addi r3, r13, lbl_8063FCB8-_SDA_BASE_
-/* 802880D0 00283D30  4B FE A3 90 */	b func_80272460
+/* 802880D0 00283D30  4B FE A3 90 */	b OSWakeupThread
 
 .global func_802880D4
 func_802880D4:
@@ -16628,7 +16628,7 @@ func_80288244:
 /* 80288288 00283EE8  38 6D A9 F8 */	addi r3, r13, lbl_8063FCB8-_SDA_BASE_
 /* 8028828C 00283EEC  90 0D AA 88 */	stw r0, lbl_8063FD48-_SDA_BASE_(r13)
 /* 80288290 00283EF0  90 0D AA 8C */	stw r0, lbl_8063FD4C-_SDA_BASE_(r13)
-/* 80288294 00283EF4  4B FE 90 55 */	bl func_802712E8
+/* 80288294 00283EF4  4B FE 90 55 */	bl OSInitThreadQueue
 /* 80288298 00283EF8  48 00 66 F1 */	bl func_8028E988
 /* 8028829C 00283EFC  48 00 66 F5 */	bl func_8028E990
 /* 802882A0 00283F00  80 6D AA 88 */	lwz r3, lbl_8063FD48-_SDA_BASE_(r13)
@@ -21198,7 +21198,7 @@ lbl_8028C358:
 /* 8028C3B4 00288014  41 82 00 10 */	beq lbl_8028C3C4
 lbl_8028C3B8:
 /* 8028C3B8 00288018  38 6D A9 F8 */	addi r3, r13, lbl_8063FCB8-_SDA_BASE_
-/* 8028C3BC 0028801C  4B FE 5F B9 */	bl func_80272374
+/* 8028C3BC 0028801C  4B FE 5F B9 */	bl OSSleepThread
 /* 8028C3C0 00288020  4B FF FF 98 */	b lbl_8028C358
 lbl_8028C3C4:
 /* 8028C3C4 00288024  7F E3 FB 78 */	mr r3, r31
@@ -21213,7 +21213,7 @@ lbl_8028C3D0:
 /* 8028C3E4 00288044  4E 80 00 20 */	blr
 lbl_8028C3E8:
 /* 8028C3E8 00288048  38 6D A9 F8 */	addi r3, r13, lbl_8063FCB8-_SDA_BASE_
-/* 8028C3EC 0028804C  4B FE 60 74 */	b func_80272460
+/* 8028C3EC 0028804C  4B FE 60 74 */	b OSWakeupThread
 
 .global func_8028C3F0
 func_8028C3F0:
@@ -24219,9 +24219,9 @@ lbl_8028ED20:
 /* 8028ED2C 0028A98C  38 84 ED 68 */	addi r4, r4, lbl_8028ED68@l
 /* 8028ED30 0028A990  38 60 00 05 */	li r3, 5
 /* 8028ED34 0028A994  93 ED AB 04 */	stw r31, lbl_8063FDC4-_SDA_BASE_(r13)
-/* 8028ED38 0028A998  4B FD FA 71 */	bl func_8026E7A8
+/* 8028ED38 0028A998  4B FD FA 71 */	bl __OSSetInterruptHandler
 /* 8028ED3C 0028A99C  3C 60 04 00 */	lis r3, 0x400
-/* 8028ED40 0028A9A0  4B FD FE 2D */	bl func_8026EB6C
+/* 8028ED40 0028A9A0  4B FD FE 2D */	bl __OSUnmaskInterrupts
 /* 8028ED44 0028A9A4  38 00 00 01 */	li r0, 1
 /* 8028ED48 0028A9A8  90 0D AA D0 */	stw r0, lbl_8063FD90-_SDA_BASE_(r13)
 lbl_8028ED4C:
@@ -26380,7 +26380,7 @@ lbl_80290B54:
 /* 80290B54 0028C7B4  38 00 00 01 */	li r0, 1
 /* 80290B58 0028C7B8  38 6D AB A0 */	addi r3, r13, lbl_8063FE60-_SDA_BASE_
 /* 80290B5C 0028C7BC  90 0D AB AC */	stw r0, lbl_8063FE6C-_SDA_BASE_(r13)
-/* 80290B60 0028C7C0  4B FE 19 00 */	b func_80272460
+/* 80290B60 0028C7C0  4B FE 19 00 */	b OSWakeupThread
 lbl_80290B64:
 /* 80290B64 0028C7C4  4E 80 00 20 */	blr
 
@@ -26428,7 +26428,7 @@ func_80290B68:
 /* 80290C04 0028C864  90 BE 00 30 */	stw r5, 0x30(r30)
 /* 80290C08 0028C868  90 9E 00 34 */	stw r4, 0x34(r30)
 /* 80290C0C 0028C86C  91 8D AB AC */	stw r12, lbl_8063FE6C-_SDA_BASE_(r13)
-/* 80290C10 0028C870  4B FE 06 D9 */	bl func_802712E8
+/* 80290C10 0028C870  4B FE 06 D9 */	bl OSInitThreadQueue
 /* 80290C14 0028C874  48 00 A2 ED */	bl func_8029AF00
 /* 80290C18 0028C878  2C 03 00 00 */	cmpwi r3, 0
 /* 80290C1C 0028C87C  40 82 00 08 */	bne lbl_80290C24
@@ -32905,15 +32905,15 @@ func_8029660C:
 /* 80296660 002922C0  48 00 11 1D */	bl func_8029777C
 /* 80296664 002922C4  3C 60 80 53 */	lis r3, lbl_805311D0@ha
 /* 80296668 002922C8  38 63 11 D0 */	addi r3, r3, lbl_805311D0@l
-/* 8029666C 002922CC  4B FD 92 A5 */	bl func_8026F910
+/* 8029666C 002922CC  4B FD 92 A5 */	bl OSInitMutex
 /* 80296670 002922D0  38 00 00 01 */	li r0, 1
 /* 80296674 002922D4  90 0D AC 48 */	stw r0, lbl_8063FF08-_SDA_BASE_(r13)
 lbl_80296678:
 /* 80296678 002922D8  38 7B 00 20 */	addi r3, r27, 0x20
-/* 8029667C 002922DC  4B FD 92 95 */	bl func_8026F910
+/* 8029667C 002922DC  4B FD 92 95 */	bl OSInitMutex
 /* 80296680 002922E0  3C 60 80 53 */	lis r3, lbl_805311D0@ha
 /* 80296684 002922E4  38 63 11 D0 */	addi r3, r3, lbl_805311D0@l
-/* 80296688 002922E8  4B FD 92 C1 */	bl func_8026F948
+/* 80296688 002922E8  4B FD 92 C1 */	bl OSLockMutex
 /* 8029668C 002922EC  3F E0 80 53 */	lis r31, lbl_805311C0@ha
 /* 80296690 002922F0  3B C0 00 00 */	li r30, 0
 /* 80296694 002922F4  3B 9F 11 C0 */	addi r28, r31, lbl_805311C0@l
@@ -33000,7 +33000,7 @@ lbl_8029679C:
 /* 802967A4 00292404  48 00 0F F1 */	bl func_80297794
 /* 802967A8 00292408  3C 60 80 53 */	lis r3, lbl_805311D0@ha
 /* 802967AC 0029240C  38 63 11 D0 */	addi r3, r3, lbl_805311D0@l
-/* 802967B0 00292410  4B FD 92 75 */	bl func_8026FA24
+/* 802967B0 00292410  4B FD 92 75 */	bl OSUnlockMutex
 /* 802967B4 00292414  39 61 00 20 */	addi r11, r1, 0x20
 /* 802967B8 00292418  4B F3 09 BD */	bl _restgpr_27
 /* 802967BC 0029241C  80 01 00 24 */	lwz r0, 0x24(r1)
@@ -33018,7 +33018,7 @@ func_802967CC:
 /* 802967E0 00292440  3C 80 80 53 */	lis r4, lbl_805311D0@ha
 /* 802967E4 00292444  7C 7B 1B 78 */	mr r27, r3
 /* 802967E8 00292448  38 64 11 D0 */	addi r3, r4, lbl_805311D0@l
-/* 802967EC 0029244C  4B FD 91 5D */	bl func_8026F948
+/* 802967EC 0029244C  4B FD 91 5D */	bl OSLockMutex
 /* 802967F0 00292450  3F E0 80 53 */	lis r31, lbl_805311C0@ha
 /* 802967F4 00292454  3B C0 00 00 */	li r30, 0
 /* 802967F8 00292458  3B 9F 11 C0 */	addi r28, r31, lbl_805311C0@l
@@ -33105,7 +33105,7 @@ lbl_80296900:
 /* 80296908 00292568  48 00 0E FD */	bl func_80297804
 /* 8029690C 0029256C  3C 60 80 53 */	lis r3, lbl_805311D0@ha
 /* 80296910 00292570  38 63 11 D0 */	addi r3, r3, lbl_805311D0@l
-/* 80296914 00292574  4B FD 91 11 */	bl func_8026FA24
+/* 80296914 00292574  4B FD 91 11 */	bl OSUnlockMutex
 /* 80296918 00292578  38 00 00 00 */	li r0, 0
 /* 8029691C 0029257C  39 61 00 20 */	addi r11, r1, 0x20
 /* 80296920 00292580  90 1B 00 00 */	stw r0, 0(r27)
@@ -33588,7 +33588,7 @@ lbl_80296F58:
 /* 80296F64 00292BC4  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 80296F68 00292BC8  41 82 00 0C */	beq lbl_80296F74
 /* 80296F6C 00292BCC  38 63 00 20 */	addi r3, r3, 0x20
-/* 80296F70 00292BD0  4B FD 89 D9 */	bl func_8026F948
+/* 80296F70 00292BD0  4B FD 89 D9 */	bl OSLockMutex
 lbl_80296F74:
 /* 80296F74 00292BD4  2C 1F 00 00 */	cmpwi r31, 0
 /* 80296F78 00292BD8  41 80 00 18 */	blt lbl_80296F90
@@ -33608,7 +33608,7 @@ lbl_80296FA0:
 /* 80296FA8 00292C08  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 80296FAC 00292C0C  41 82 00 0C */	beq lbl_80296FB8
 /* 80296FB0 00292C10  38 7D 00 20 */	addi r3, r29, 0x20
-/* 80296FB4 00292C14  4B FD 8A 71 */	bl func_8026FA24
+/* 80296FB4 00292C14  4B FD 8A 71 */	bl OSUnlockMutex
 lbl_80296FB8:
 /* 80296FB8 00292C18  7F E3 FB 78 */	mr r3, r31
 /* 80296FBC 00292C1C  83 E1 00 1C */	lwz r31, 0x1c(r1)
@@ -33642,7 +33642,7 @@ lbl_80297018:
 /* 8029701C 00292C7C  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 80297020 00292C80  41 82 00 0C */	beq lbl_8029702C
 /* 80297024 00292C84  38 63 00 20 */	addi r3, r3, 0x20
-/* 80297028 00292C88  4B FD 89 21 */	bl func_8026F948
+/* 80297028 00292C88  4B FD 89 21 */	bl OSLockMutex
 lbl_8029702C:
 /* 8029702C 00292C8C  83 5E 00 04 */	lwz r26, 4(r30)
 /* 80297030 00292C90  7C 1D D0 40 */	cmplw r29, r26
@@ -33754,7 +33754,7 @@ lbl_80297194:
 /* 80297198 00292DF8  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 8029719C 00292DFC  41 82 00 0C */	beq lbl_802971A8
 /* 802971A0 00292E00  38 7B 00 20 */	addi r3, r27, 0x20
-/* 802971A4 00292E04  4B FD 88 81 */	bl func_8026FA24
+/* 802971A4 00292E04  4B FD 88 81 */	bl OSUnlockMutex
 lbl_802971A8:
 /* 802971A8 00292E08  80 7E 00 04 */	lwz r3, 4(r30)
 lbl_802971AC:
@@ -33782,7 +33782,7 @@ func_802971C4:
 /* 802971F4 00292E54  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 802971F8 00292E58  41 82 00 0C */	beq lbl_80297204
 /* 802971FC 00292E5C  38 63 00 20 */	addi r3, r3, 0x20
-/* 80297200 00292E60  4B FD 87 49 */	bl func_8026F948
+/* 80297200 00292E60  4B FD 87 49 */	bl OSLockMutex
 lbl_80297204:
 /* 80297204 00292E64  A0 1E 00 02 */	lhz r0, 2(r30)
 /* 80297208 00292E68  54 00 C6 7E */	rlwinm r0, r0, 0x18, 0x19, 0x1f
@@ -33815,7 +33815,7 @@ lbl_80297254:
 /* 80297264 00292EC4  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 80297268 00292EC8  41 82 00 0C */	beq lbl_80297274
 /* 8029726C 00292ECC  38 7D 00 20 */	addi r3, r29, 0x20
-/* 80297270 00292ED0  4B FD 87 B5 */	bl func_8026FA24
+/* 80297270 00292ED0  4B FD 87 B5 */	bl OSUnlockMutex
 lbl_80297274:
 /* 80297274 00292ED4  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 80297278 00292ED8  83 E1 00 1C */	lwz r31, 0x1c(r1)
@@ -33838,7 +33838,7 @@ func_80297290:
 /* 802972B0 00292F10  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 802972B4 00292F14  41 82 00 0C */	beq lbl_802972C0
 /* 802972B8 00292F18  38 63 00 20 */	addi r3, r3, 0x20
-/* 802972BC 00292F1C  4B FD 86 8D */	bl func_8026F948
+/* 802972BC 00292F1C  4B FD 86 8D */	bl OSLockMutex
 lbl_802972C0:
 /* 802972C0 00292F20  80 7E 00 3C */	lwz r3, 0x3c(r30)
 /* 802972C4 00292F24  48 00 00 10 */	b lbl_802972D4
@@ -33853,7 +33853,7 @@ lbl_802972D4:
 /* 802972E0 00292F40  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 802972E4 00292F44  41 82 00 0C */	beq lbl_802972F0
 /* 802972E8 00292F48  38 7E 00 20 */	addi r3, r30, 0x20
-/* 802972EC 00292F4C  4B FD 87 39 */	bl func_8026FA24
+/* 802972EC 00292F4C  4B FD 87 39 */	bl OSUnlockMutex
 lbl_802972F0:
 /* 802972F0 00292F50  7F E3 FB 78 */	mr r3, r31
 /* 802972F4 00292F54  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -33902,7 +33902,7 @@ func_8029735C:
 /* 80297388 00292FE8  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 8029738C 00292FEC  41 82 00 0C */	beq lbl_80297398
 /* 80297390 00292FF0  38 63 00 20 */	addi r3, r3, 0x20
-/* 80297394 00292FF4  4B FD 85 B5 */	bl func_8026F948
+/* 80297394 00292FF4  4B FD 85 B5 */	bl OSLockMutex
 lbl_80297398:
 /* 80297398 00292FF8  83 FC 00 44 */	lwz r31, 0x44(r28)
 /* 8029739C 00292FFC  48 00 00 20 */	b lbl_802973BC
@@ -33921,7 +33921,7 @@ lbl_802973BC:
 /* 802973C8 00293028  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 802973CC 0029302C  41 82 00 0C */	beq lbl_802973D8
 /* 802973D0 00293030  38 7C 00 20 */	addi r3, r28, 0x20
-/* 802973D4 00293034  4B FD 86 51 */	bl func_8026FA24
+/* 802973D4 00293034  4B FD 86 51 */	bl OSUnlockMutex
 lbl_802973D8:
 /* 802973D8 00293038  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 802973DC 0029303C  83 E1 00 1C */	lwz r31, 0x1c(r1)
@@ -34018,7 +34018,7 @@ lbl_802974F0:
 /* 802974FC 0029315C  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 80297500 00293160  41 82 00 0C */	beq lbl_8029750C
 /* 80297504 00293164  38 63 00 20 */	addi r3, r3, 0x20
-/* 80297508 00293168  4B FD 84 41 */	bl func_8026F948
+/* 80297508 00293168  4B FD 84 41 */	bl OSLockMutex
 lbl_8029750C:
 /* 8029750C 0029316C  2C 1D 00 00 */	cmpwi r29, 0
 /* 80297510 00293170  41 80 00 54 */	blt lbl_80297564
@@ -34070,7 +34070,7 @@ lbl_802975AC:
 /* 802975B0 00293210  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 802975B4 00293214  41 82 00 0C */	beq lbl_802975C0
 /* 802975B8 00293218  38 7F 00 20 */	addi r3, r31, 0x20
-/* 802975BC 0029321C  4B FD 84 69 */	bl func_8026FA24
+/* 802975BC 0029321C  4B FD 84 69 */	bl OSUnlockMutex
 lbl_802975C0:
 /* 802975C0 00293220  83 E1 00 1C */	lwz r31, 0x1c(r1)
 /* 802975C4 00293224  7F A3 EB 78 */	mr r3, r29
@@ -34094,7 +34094,7 @@ func_802975E0:
 /* 80297600 00293260  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 80297604 00293264  41 82 00 0C */	beq lbl_80297610
 /* 80297608 00293268  38 63 00 20 */	addi r3, r3, 0x20
-/* 8029760C 0029326C  4B FD 83 3D */	bl func_8026F948
+/* 8029760C 0029326C  4B FD 83 3D */	bl OSLockMutex
 lbl_80297610:
 /* 80297610 00293270  57 E0 07 FF */	clrlwi. r0, r31, 0x1f
 /* 80297614 00293274  41 82 00 14 */	beq lbl_80297628
@@ -34121,7 +34121,7 @@ lbl_80297654:
 /* 80297658 002932B8  54 00 07 7B */	rlwinm. r0, r0, 0, 0x1d, 0x1d
 /* 8029765C 002932BC  41 82 00 0C */	beq lbl_80297668
 /* 80297660 002932C0  38 7E 00 20 */	addi r3, r30, 0x20
-/* 80297664 002932C4  4B FD 83 C1 */	bl func_8026FA24
+/* 80297664 002932C4  4B FD 83 C1 */	bl OSUnlockMutex
 lbl_80297668:
 /* 80297668 002932C8  80 01 00 14 */	lwz r0, 0x14(r1)
 /* 8029766C 002932CC  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -38308,9 +38308,9 @@ func_8029AE40:
 /* 8029AE88 00296AE8  7C 7F 1B 78 */	mr r31, r3
 /* 8029AE8C 00296AEC  38 84 B0 84 */	addi r4, r4, lbl_8029B084@l
 /* 8029AE90 00296AF0  38 60 00 07 */	li r3, 7
-/* 8029AE94 00296AF4  4B FD 39 15 */	bl func_8026E7A8
+/* 8029AE94 00296AF4  4B FD 39 15 */	bl __OSSetInterruptHandler
 /* 8029AE98 00296AF8  3C 60 01 00 */	lis r3, 0x100
-/* 8029AE9C 00296AFC  4B FD 3C D1 */	bl func_8026EB6C
+/* 8029AE9C 00296AFC  4B FD 3C D1 */	bl __OSUnmaskInterrupts
 /* 8029AEA0 00296B00  3C E0 CC 00 */	lis r7, 0xCC00500A@ha
 /* 8029AEA4 00296B04  38 60 FF 57 */	li r3, -169
 /* 8029AEA8 00296B08  A0 C7 50 0A */	lhz r6, 0xCC00500A@l(r7)
@@ -47132,7 +47132,7 @@ lbl_802A2AEC:
 /* 802A2B38 0029E798  48 00 00 0C */	b lbl_802A2B44
 lbl_802A2B3C:
 /* 802A2B3C 0029E79C  38 7F 00 2C */	addi r3, r31, 0x2c
-/* 802A2B40 0029E7A0  4B FC F9 21 */	bl func_80272460
+/* 802A2B40 0029E7A0  4B FC F9 21 */	bl OSWakeupThread
 lbl_802A2B44:
 /* 802A2B44 0029E7A4  38 60 00 01 */	li r3, 1
 /* 802A2B48 0029E7A8  4B FF FD 85 */	bl func_802A28CC
@@ -47201,7 +47201,7 @@ lbl_802A2C14:
 /* 802A2C34 0029E894  80 6D AE 04 */	lwz r3, lbl_806400C4-_SDA_BASE_(r13)
 /* 802A2C38 0029E898  90 0D AE 00 */	stw r0, lbl_806400C0-_SDA_BASE_(r13)
 /* 802A2C3C 0029E89C  38 63 00 2C */	addi r3, r3, 0x2c
-/* 802A2C40 0029E8A0  4B FC F8 21 */	bl func_80272460
+/* 802A2C40 0029E8A0  4B FC F8 21 */	bl OSWakeupThread
 /* 802A2C44 0029E8A4  38 60 00 01 */	li r3, 1
 /* 802A2C48 0029E8A8  4B FF FC 85 */	bl func_802A28CC
 /* 802A2C4C 0029E8AC  54 60 06 B6 */	rlwinm r0, r3, 0, 0x1a, 0x1b
@@ -47304,9 +47304,9 @@ lbl_802A2D94:
 /* 802A2DAC 0029EA0C  3C 80 80 2A */	lis r4, lbl_802A2B88@ha
 /* 802A2DB0 0029EA10  38 60 00 1B */	li r3, 0x1b
 /* 802A2DB4 0029EA14  38 84 2B 88 */	addi r4, r4, lbl_802A2B88@l
-/* 802A2DB8 0029EA18  4B FC B9 F1 */	bl func_8026E7A8
+/* 802A2DB8 0029EA18  4B FC B9 F1 */	bl __OSSetInterruptHandler
 /* 802A2DBC 0029EA1C  38 60 00 10 */	li r3, 0x10
-/* 802A2DC0 0029EA20  4B FC BD AD */	bl func_8026EB6C
+/* 802A2DC0 0029EA20  4B FC BD AD */	bl __OSUnmaskInterrupts
 /* 802A2DC4 0029EA24  38 60 00 01 */	li r3, 1
 /* 802A2DC8 0029EA28  38 80 00 38 */	li r4, 0x38
 /* 802A2DCC 0029EA2C  4B FF FB 11 */	bl func_802A28DC
@@ -47340,7 +47340,7 @@ lbl_802A2E28:
 /* 802A2E28 0029EA88  2C 04 00 00 */	cmpwi r4, 0
 /* 802A2E2C 0029EA8C  40 82 00 0C */	bne lbl_802A2E38
 /* 802A2E30 0029EA90  38 63 00 2C */	addi r3, r3, 0x2c
-/* 802A2E34 0029EA94  4B FC E4 B5 */	bl func_802712E8
+/* 802A2E34 0029EA94  4B FC E4 B5 */	bl OSInitThreadQueue
 lbl_802A2E38:
 /* 802A2E38 0029EA98  7F 83 E3 78 */	mr r3, r28
 /* 802A2E3C 0029EA9C  38 80 00 20 */	li r4, 0x20
@@ -47459,7 +47459,7 @@ lbl_802A2FDC:
 /* 802A2FDC 0029EC3C  2C 1D 00 00 */	cmpwi r29, 0
 /* 802A2FE0 0029EC40  40 82 00 0C */	bne lbl_802A2FEC
 /* 802A2FE4 0029EC44  38 7C 00 2C */	addi r3, r28, 0x2c
-/* 802A2FE8 0029EC48  4B FC F3 8D */	bl func_80272374
+/* 802A2FE8 0029EC48  4B FC F3 8D */	bl OSSleepThread
 lbl_802A2FEC:
 /* 802A2FEC 0029EC4C  7F C3 F3 78 */	mr r3, r30
 /* 802A2FF0 0029EC50  4B FC B7 95 */	bl OSRestoreInterrupts
@@ -52716,7 +52716,7 @@ lbl_802A7924:
 /* 802A7934 002A3594  93 C4 08 A4 */	stw r30, 0x8a4(r4)
 /* 802A7938 002A3598  4B FF FC D5 */	bl func_802A760C
 /* 802A793C 002A359C  38 7D 08 E4 */	addi r3, r29, 0x8e4
-/* 802A7940 002A35A0  4B FC 99 A9 */	bl func_802712E8
+/* 802A7940 002A35A0  4B FC 99 A9 */	bl OSInitThreadQueue
 /* 802A7944 002A35A4  3B 18 00 01 */	addi r24, r24, 1
 /* 802A7948 002A35A8  9B DA 00 00 */	stb r30, 0(r26)
 /* 802A794C 002A35AC  2C 18 00 04 */	cmpwi r24, 4
@@ -52814,7 +52814,7 @@ func_802A7A8C:
 /* 802A7AA0 002A3700  40 82 00 18 */	bne lbl_802A7AB8
 /* 802A7AA4 002A3704  3C 60 80 44 */	lis r3, lbl_8043C070@ha
 /* 802A7AA8 002A3708  38 63 C0 70 */	addi r3, r3, lbl_8043C070@l
-/* 802A7AAC 002A370C  4B FC 81 E5 */	bl func_8026FC90
+/* 802A7AAC 002A370C  4B FC 81 E5 */	bl OSRegisterShutdownFunction
 /* 802A7AB0 002A3710  38 00 00 01 */	li r0, 1
 /* 802A7AB4 002A3714  98 0D AE 38 */	stb r0, lbl_806400F8-_SDA_BASE_(r13)
 lbl_802A7AB8: