Merge pull request #142 from mparisi20/master

split db_assert and db_console, label OSReport and OSVReport, and label the rest of text_10_2

1 files changed, 15 insertions, 15 deletions

diff --git a/asm/SDK/OS/OSExec.s b/asm/SDK/OS/OSExec.s
index 5cfdf06..31828c4 100644
--- a/asm/SDK/OS/OSExec.s
+++ b/asm/SDK/OS/OSExec.s
@@ -190,7 +190,7 @@ lbl_8026BD9C:
 /* 8026BDB8 00267A18  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026BDC4 00267A24  4B D9 BD 01 */	bl OSReport
 /* 8026BDC8 00267A28  48 00 45 5D */	bl __OSReturnToMenuForError
 lbl_8026BDCC:
 /* 8026BDCC 00267A2C  38 7F BD 00 */	addi r3, r31, -17152
@@ -213,7 +213,7 @@ lbl_8026BDF0:
 /* 8026BE0C 00267A6C  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026BE18 00267A78  4B D9 BC AD */	bl OSReport
 /* 8026BE1C 00267A7C  48 00 45 09 */	bl __OSReturnToMenuForError
 lbl_8026BE20:
 /* 8026BE20 00267A80  38 7F BD 20 */	addi r3, r31, -17120
@@ -237,7 +237,7 @@ lbl_8026BE48:
 /* 8026BE64 00267AC4  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026BE70 00267AD0  4B D9 BC 55 */	bl OSReport
 /* 8026BE74 00267AD4  48 00 44 B1 */	bl __OSReturnToMenuForError
 lbl_8026BE78:
 /* 8026BE78 00267AD8  38 60 00 00 */	li r3, 0
@@ -282,7 +282,7 @@ lbl_8026BEE8:
 /* 8026BF04 00267B64  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026BF10 00267B70  4B D9 BB B5 */	bl OSReport
 /* 8026BF14 00267B74  48 00 44 11 */	bl __OSReturnToMenuForError
 lbl_8026BF18:
 /* 8026BF18 00267B78  38 00 00 00 */	li r0, 0
@@ -301,7 +301,7 @@ lbl_8026BF2C:
 /* 8026BF48 00267BA8  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026BF54 00267BB4  4B D9 BB 71 */	bl OSReport
 /* 8026BF58 00267BB8  48 00 43 CD */	bl __OSReturnToMenuForError
 lbl_8026BF5C:
 /* 8026BF5C 00267BBC  38 BF BD 40 */	addi r5, r31, -17088
@@ -323,7 +323,7 @@ lbl_8026BF8C:
 /* 8026BF98 00267BF8  7F A4 EB 78 */	mr r4, r29
 /* 8026BF9C 00267BFC  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026BFA0 00267C00  4C C6 31 82 */	crclr 6
-/* 8026BFA4 00267C04  4B D9 BB 21 */	bl func_80007AC4
+/* 8026BFA4 00267C04  4B D9 BB 21 */	bl OSReport
 /* 8026BFA8 00267C08  48 00 74 DD */	bl __OSHotReset
 lbl_8026BFAC:
 /* 8026BFAC 00267C0C  7F 66 DB 78 */	mr r6, r27
@@ -342,7 +342,7 @@ lbl_8026BFDC:
 /* 8026BFDC 00267C3C  3C 60 80 42 */	lis r3, lbl_80427198@ha
 /* 8026BFE0 00267C40  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026BFE4 00267C44  4C C6 31 82 */	crclr 6
-/* 8026BFE8 00267C48  4B D9 BA DD */	bl func_80007AC4
+/* 8026BFE8 00267C48  4B D9 BA DD */	bl OSReport
 /* 8026BFEC 00267C4C  48 00 74 99 */	bl __OSHotReset
 lbl_8026BFF0:
 /* 8026BFF0 00267C50  7F 66 DB 78 */	mr r6, r27
@@ -357,7 +357,7 @@ lbl_8026BFF0:
 /* 8026C014 00267C74  3C 60 80 42 */	lis r3, lbl_80427198@ha
 /* 8026C018 00267C78  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026C01C 00267C7C  4C C6 31 82 */	crclr 6
-/* 8026C020 00267C80  4B D9 BA A5 */	bl func_80007AC4
+/* 8026C020 00267C80  4B D9 BA A5 */	bl OSReport
 /* 8026C024 00267C84  48 00 74 61 */	bl __OSHotReset
 lbl_8026C028:
 /* 8026C028 00267C88  7F 66 DB 78 */	mr r6, r27
@@ -371,7 +371,7 @@ lbl_8026C028:
 /* 8026C048 00267CA8  3C 60 80 42 */	lis r3, lbl_80427198@ha
 /* 8026C04C 00267CAC  38 63 71 98 */	addi r3, r3, lbl_80427198@l
 /* 8026C050 00267CB0  4C C6 31 82 */	crclr 6
-/* 8026C054 00267CB4  4B D9 BA 71 */	bl func_80007AC4
+/* 8026C054 00267CB4  4B D9 BA 71 */	bl OSReport
 /* 8026C058 00267CB8  48 00 74 2D */	bl __OSHotReset
 lbl_8026C05C:
 /* 8026C05C 00267CBC  80 61 00 0C */	lwz r3, 0xc(r1)
@@ -401,7 +401,7 @@ lbl_8026C098:
 /* 8026C0B4 00267D14  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026C0C0 00267D20  4B D9 BA 05 */	bl OSReport
 /* 8026C0C4 00267D24  48 00 42 61 */	bl __OSReturnToMenuForError
 lbl_8026C0C8:
 /* 8026C0C8 00267D28  38 7F BD 00 */	addi r3, r31, -17152
@@ -424,7 +424,7 @@ lbl_8026C0EC:
 /* 8026C108 00267D68  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026C114 00267D74  4B D9 B9 B1 */	bl OSReport
 /* 8026C118 00267D78  48 00 42 0D */	bl __OSReturnToMenuForError
 lbl_8026C11C:
 /* 8026C11C 00267D7C  38 7F BD 20 */	addi r3, r31, -17120
@@ -448,7 +448,7 @@ lbl_8026C144:
 /* 8026C160 00267DC0  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026C16C 00267DCC  4B D9 B9 59 */	bl OSReport
 /* 8026C170 00267DD0  48 00 41 B5 */	bl __OSReturnToMenuForError
 lbl_8026C174:
 /* 8026C174 00267DD4  38 60 00 00 */	li r3, 0
@@ -493,7 +493,7 @@ lbl_8026C1E4:
 /* 8026C200 00267E60  80 8D A7 CC */	lwz r4, lbl_8063FA8C-_SDA_BASE_(r13)
 /* 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
+/* 8026C20C 00267E6C  4B D9 B8 B9 */	bl OSReport
 /* 8026C210 00267E70  48 00 41 15 */	bl __OSReturnToMenuForError
 lbl_8026C214:
 /* 8026C214 00267E74  39 61 00 30 */	addi r11, r1, 0x30
@@ -957,9 +957,9 @@ lbl_8026C850:
 /* 8026C880 002684E0  38 A0 00 1C */	li r5, 0x1c
 /* 8026C884 002684E4  4B D9 77 7D */	bl memcpy
 /* 8026C888 002684E8  3C 80 80 00 */	lis r4, 0x800030F0@ha
-/* 8026C88C 002684EC  3C 60 80 00 */	lis r3, func_80007AC4@ha
+/* 8026C88C 002684EC  3C 60 80 00 */	lis r3, OSReport@ha
 /* 8026C890 002684F0  93 44 30 F0 */	stw r26, 0x800030F0@l(r4)
-/* 8026C894 002684F4  38 63 7A C4 */	addi r3, r3, func_80007AC4@l
+/* 8026C894 002684F4  38 63 7A C4 */	addi r3, r3, OSReport@l
 /* 8026C898 002684F8  81 81 00 08 */	lwz r12, 8(r1)
 /* 8026C89C 002684FC  7D 89 03 A6 */	mtctr r12
 /* 8026C8A0 00268500  4E 80 04 21 */	bctrl