Merge pull request #114 from mparisi20/master

More OS splits

1 files changed, 20 insertions, 20 deletions

diff --git a/asm/SDK/OS/OSExec.s b/asm/SDK/OS/OSExec.s
index 35e59dd..99f1b84 100644
--- a/asm/SDK/OS/OSExec.s
+++ b/asm/SDK/OS/OSExec.s
@@ -191,7 +191,7 @@ lbl_8026BD9C:
 /* 8026BDBC 00267A1C  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026BDC0 00267A20  4C C6 31 82 */	crclr 6
 /* 8026BDC4 00267A24  4B D9 BD 01 */	bl func_80007AC4
-/* 8026BDC8 00267A28  48 00 45 5D */	bl func_80270324
+/* 8026BDC8 00267A28  48 00 45 5D */	bl __OSReturnToMenuForError
 lbl_8026BDCC:
 /* 8026BDCC 00267A2C  38 7F BD 00 */	addi r3, r31, -17152
 /* 8026BDD0 00267A30  38 00 00 00 */	li r0, 0
@@ -214,7 +214,7 @@ lbl_8026BDF0:
 /* 8026BE10 00267A70  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026BE14 00267A74  4C C6 31 82 */	crclr 6
 /* 8026BE18 00267A78  4B D9 BC AD */	bl func_80007AC4
-/* 8026BE1C 00267A7C  48 00 45 09 */	bl func_80270324
+/* 8026BE1C 00267A7C  48 00 45 09 */	bl __OSReturnToMenuForError
 lbl_8026BE20:
 /* 8026BE20 00267A80  38 7F BD 20 */	addi r3, r31, -17120
 /* 8026BE24 00267A84  38 00 00 00 */	li r0, 0
@@ -238,7 +238,7 @@ lbl_8026BE48:
 /* 8026BE68 00267AC8  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026BE6C 00267ACC  4C C6 31 82 */	crclr 6
 /* 8026BE70 00267AD0  4B D9 BC 55 */	bl func_80007AC4
-/* 8026BE74 00267AD4  48 00 44 B1 */	bl func_80270324
+/* 8026BE74 00267AD4  48 00 44 B1 */	bl __OSReturnToMenuForError
 lbl_8026BE78:
 /* 8026BE78 00267AD8  38 60 00 00 */	li r3, 0
 /* 8026BE7C 00267ADC  80 CD A7 DC */	lwz r6, lbl_8063FA9C-_SDA_BASE_(r13)
@@ -283,7 +283,7 @@ lbl_8026BEE8:
 /* 8026BF08 00267B68  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026BF0C 00267B6C  4C C6 31 82 */	crclr 6
 /* 8026BF10 00267B70  4B D9 BB B5 */	bl func_80007AC4
-/* 8026BF14 00267B74  48 00 44 11 */	bl func_80270324
+/* 8026BF14 00267B74  48 00 44 11 */	bl __OSReturnToMenuForError
 lbl_8026BF18:
 /* 8026BF18 00267B78  38 00 00 00 */	li r0, 0
 /* 8026BF1C 00267B7C  3C 60 80 27 */	lis r3, callback@ha
@@ -302,7 +302,7 @@ lbl_8026BF2C:
 /* 8026BF4C 00267BAC  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026BF50 00267BB0  4C C6 31 82 */	crclr 6
 /* 8026BF54 00267BB4  4B D9 BB 71 */	bl func_80007AC4
-/* 8026BF58 00267BB8  48 00 43 CD */	bl func_80270324
+/* 8026BF58 00267BB8  48 00 43 CD */	bl __OSReturnToMenuForError
 lbl_8026BF5C:
 /* 8026BF5C 00267BBC  38 BF BD 40 */	addi r5, r31, -17088
 /* 8026BF60 00267BC0  3B A0 00 00 */	li r29, 0
@@ -402,7 +402,7 @@ lbl_8026C098:
 /* 8026C0B8 00267D18  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026C0BC 00267D1C  4C C6 31 82 */	crclr 6
 /* 8026C0C0 00267D20  4B D9 BA 05 */	bl func_80007AC4
-/* 8026C0C4 00267D24  48 00 42 61 */	bl func_80270324
+/* 8026C0C4 00267D24  48 00 42 61 */	bl __OSReturnToMenuForError
 lbl_8026C0C8:
 /* 8026C0C8 00267D28  38 7F BD 00 */	addi r3, r31, -17152
 /* 8026C0CC 00267D2C  38 00 00 00 */	li r0, 0
@@ -425,7 +425,7 @@ lbl_8026C0EC:
 /* 8026C10C 00267D6C  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026C110 00267D70  4C C6 31 82 */	crclr 6
 /* 8026C114 00267D74  4B D9 B9 B1 */	bl func_80007AC4
-/* 8026C118 00267D78  48 00 42 0D */	bl func_80270324
+/* 8026C118 00267D78  48 00 42 0D */	bl __OSReturnToMenuForError
 lbl_8026C11C:
 /* 8026C11C 00267D7C  38 7F BD 20 */	addi r3, r31, -17120
 /* 8026C120 00267D80  38 00 00 00 */	li r0, 0
@@ -449,7 +449,7 @@ lbl_8026C144:
 /* 8026C164 00267DC4  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026C168 00267DC8  4C C6 31 82 */	crclr 6
 /* 8026C16C 00267DCC  4B D9 B9 59 */	bl func_80007AC4
-/* 8026C170 00267DD0  48 00 41 B5 */	bl func_80270324
+/* 8026C170 00267DD0  48 00 41 B5 */	bl __OSReturnToMenuForError
 lbl_8026C174:
 /* 8026C174 00267DD4  38 60 00 00 */	li r3, 0
 /* 8026C178 00267DD8  80 CD A7 DC */	lwz r6, lbl_8063FA9C-_SDA_BASE_(r13)
@@ -494,7 +494,7 @@ lbl_8026C1E4:
 /* 8026C204 00267E64  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026C208 00267E68  4C C6 31 82 */	crclr 6
 /* 8026C20C 00267E6C  4B D9 B8 B9 */	bl func_80007AC4
-/* 8026C210 00267E70  48 00 41 15 */	bl func_80270324
+/* 8026C210 00267E70  48 00 41 15 */	bl __OSReturnToMenuForError
 lbl_8026C214:
 /* 8026C214 00267E74  39 61 00 30 */	addi r11, r1, 0x30
 /* 8026C218 00267E78  4B F5 AF 5D */	bl _restgpr_27
@@ -711,9 +711,9 @@ lbl_8026C4F4:
 /* 8026C510 00268170  38 63 BC FC */	addi r3, r3, Callback@l
 /* 8026C514 00268174  48 02 01 F1 */	bl func_8028C704
 /* 8026C518 00268178  38 60 FF F0 */	li r3, -16
-/* 8026C51C 0026817C  48 00 25 D1 */	bl func_8026EAEC
+/* 8026C51C 0026817C  48 00 25 D1 */	bl __OSMaskInterrupts
 /* 8026C520 00268180  38 60 00 10 */	li r3, 0x10
-/* 8026C524 00268184  48 00 26 49 */	bl func_8026EB6C
+/* 8026C524 00268184  48 00 26 49 */	bl __OSUnmaskInterrupts
 /* 8026C528 00268188  48 00 22 49 */	bl OSEnableInterrupts
 lbl_8026C52C:
 /* 8026C52C 0026818C  80 0D A7 E4 */	lwz r0, lbl_8063FAA4-_SDA_BASE_(r13)
@@ -756,7 +756,7 @@ lbl_8026C5A0:
 /* 8026C5B8 00268218  2C 03 00 00 */	cmpwi r3, 0
 /* 8026C5BC 0026821C  40 80 00 08 */	bge lbl_8026C5C4
 lbl_8026C5C0:
-/* 8026C5C0 00268220  48 00 3D 65 */	bl func_80270324
+/* 8026C5C0 00268220  48 00 3D 65 */	bl __OSReturnToMenuForError
 lbl_8026C5C4:
 /* 8026C5C4 00268224  38 61 00 E0 */	addi r3, r1, 0xe0
 /* 8026C5C8 00268228  48 01 F8 3D */	bl func_8028BE04
@@ -790,7 +790,7 @@ lbl_8026C614:
 /* 8026C62C 0026828C  2C 03 00 00 */	cmpwi r3, 0
 /* 8026C630 00268290  40 80 00 08 */	bge lbl_8026C638
 lbl_8026C634:
-/* 8026C634 00268294  48 00 3C F1 */	bl func_80270324
+/* 8026C634 00268294  48 00 3C F1 */	bl __OSReturnToMenuForError
 lbl_8026C638:
 /* 8026C638 00268298  38 61 01 10 */	addi r3, r1, 0x110
 /* 8026C63C 0026829C  48 01 F7 C9 */	bl func_8028BE04
@@ -828,7 +828,7 @@ lbl_8026C69C:
 /* 8026C6B4 00268314  2C 03 00 00 */	cmpwi r3, 0
 /* 8026C6B8 00268318  40 80 00 08 */	bge lbl_8026C6C0
 lbl_8026C6BC:
-/* 8026C6BC 0026831C  48 00 3C 69 */	bl func_80270324
+/* 8026C6BC 0026831C  48 00 3C 69 */	bl __OSReturnToMenuForError
 lbl_8026C6C0:
 /* 8026C6C0 00268320  38 61 01 40 */	addi r3, r1, 0x140
 /* 8026C6C4 00268324  48 01 F7 41 */	bl func_8028BE04
@@ -865,7 +865,7 @@ lbl_8026C71C:
 /* 8026C734 00268394  2C 03 00 00 */	cmpwi r3, 0
 /* 8026C738 00268398  40 80 00 08 */	bge lbl_8026C740
 lbl_8026C73C:
-/* 8026C73C 0026839C  48 00 3B E9 */	bl func_80270324
+/* 8026C73C 0026839C  48 00 3B E9 */	bl __OSReturnToMenuForError
 lbl_8026C740:
 /* 8026C740 002683A0  38 61 01 70 */	addi r3, r1, 0x170
 /* 8026C744 002683A4  48 01 F6 C1 */	bl func_8028BE04
@@ -920,7 +920,7 @@ lbl_8026C7E8:
 /* 8026C800 00268460  2C 03 00 00 */	cmpwi r3, 0
 /* 8026C804 00268464  40 80 00 08 */	bge lbl_8026C80C
 lbl_8026C808:
-/* 8026C808 00268468  48 00 3B 1D */	bl func_80270324
+/* 8026C808 00268468  48 00 3B 1D */	bl __OSReturnToMenuForError
 lbl_8026C80C:
 /* 8026C80C 0026846C  38 61 00 B0 */	addi r3, r1, 0xb0
 /* 8026C810 00268470  48 01 F5 F5 */	bl func_8028BE04
@@ -987,7 +987,7 @@ lbl_8026C8D8:
 /* 8026C8F0 00268550  2C 03 00 00 */	cmpwi r3, 0
 /* 8026C8F4 00268554  40 80 00 08 */	bge lbl_8026C8FC
 lbl_8026C8F8:
-/* 8026C8F8 00268558  48 00 3A 2D */	bl func_80270324
+/* 8026C8F8 00268558  48 00 3A 2D */	bl __OSReturnToMenuForError
 lbl_8026C8FC:
 /* 8026C8FC 0026855C  38 61 00 80 */	addi r3, r1, 0x80
 /* 8026C900 00268560  48 01 F5 05 */	bl func_8028BE04
@@ -1060,7 +1060,7 @@ lbl_8026C9E4:
 /* 8026C9FC 0026865C  2C 03 00 00 */	cmpwi r3, 0
 /* 8026CA00 00268660  40 80 00 08 */	bge lbl_8026CA08
 lbl_8026CA04:
-/* 8026CA04 00268664  48 00 39 21 */	bl func_80270324
+/* 8026CA04 00268664  48 00 39 21 */	bl __OSReturnToMenuForError
 lbl_8026CA08:
 /* 8026CA08 00268668  38 61 00 50 */	addi r3, r1, 0x50
 /* 8026CA0C 0026866C  48 01 F3 F9 */	bl func_8028BE04
@@ -1100,7 +1100,7 @@ lbl_8026CA70:
 /* 8026CA88 002686E8  2C 03 00 00 */	cmpwi r3, 0
 /* 8026CA8C 002686EC  40 80 00 08 */	bge lbl_8026CA94
 lbl_8026CA90:
-/* 8026CA90 002686F0  48 00 38 95 */	bl func_80270324
+/* 8026CA90 002686F0  48 00 38 95 */	bl __OSReturnToMenuForError
 lbl_8026CA94:
 /* 8026CA94 002686F4  38 61 00 20 */	addi r3, r1, 0x20
 /* 8026CA98 002686F8  48 01 F3 6D */	bl func_8028BE04
@@ -1136,7 +1136,7 @@ __OSBootDol:
 /* 8026CB00 00268760  93 A1 00 34 */	stw r29, 0x34(r1)
 /* 8026CB04 00268764  7C 9D 23 78 */	mr r29, r4
 /* 8026CB08 00268768  38 81 00 08 */	addi r4, r1, 8
-/* 8026CB0C 0026876C  48 00 31 71 */	bl func_8026FC7C
+/* 8026CB0C 0026876C  48 00 31 71 */	bl OSGetSaveRegion
 /* 8026CB10 00268770  7F E5 FB 78 */	mr r5, r31
 /* 8026CB14 00268774  38 61 00 10 */	addi r3, r1, 0x10
 /* 8026CB18 00268778  38 8D 87 C8 */	addi r4, r13, lbl_8063DA88-_SDA_BASE_