JSystem Font classes, SComponent cBgW (#14)

* c_bg_w.cpp OK

* JUTFont and JUTResFont partially implemented

Co-authored-by: notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com>
Co-authored-by: Pheenoh <pheenoh@gmail.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/asm/J2DGraph/J2DMatBlock.s b/asm/J2DGraph/J2DMatBlock.s
index 699cefd37a..88d86c1c25 100644
--- a/asm/J2DGraph/J2DMatBlock.s
+++ b/asm/J2DGraph/J2DMatBlock.s
@@ -986,7 +986,7 @@ lbl_802EC14C:
 /* 802EC158 002E9098  41 82 00 14 */	beq lbl_802EC16C
 /* 802EC15C 002E909C  7F C4 F3 78 */	mr r4, r30
 /* 802EC160 002E90A0  38 A0 00 00 */	li r5, 0
-/* 802EC164 002E90A4  4B FF 2E 31 */	bl JUTResFont_X1_
+/* 802EC164 002E90A4  4B FF 2E 31 */	bl __ct__10JUTResFontFPCcP7JKRHeap
 /* 802EC168 002E90A8  7C 7F 1B 78 */	mr r31, r3
 lbl_802EC16C:
 /* 802EC16C 002E90AC  28 1F 00 00 */	cmplwi r31, 0
@@ -2232,7 +2232,7 @@ lbl_802ED318:
 /* 802ED324 002EA264  41 82 00 14 */	beq lbl_802ED338
 /* 802ED328 002EA268  7F C4 F3 78 */	mr r4, r30
 /* 802ED32C 002EA26C  38 A0 00 00 */	li r5, 0
-/* 802ED330 002EA270  4B FF 1C 65 */	bl JUTResFont_X1_
+/* 802ED330 002EA270  4B FF 1C 65 */	bl __ct__10JUTResFontFPCcP7JKRHeap
 /* 802ED334 002EA274  7C 7F 1B 78 */	mr r31, r3
 lbl_802ED338:
 /* 802ED338 002EA278  28 1F 00 00 */	cmplwi r31, 0
@@ -3693,7 +3693,7 @@ lbl_802EE7C0:
 /* 802EE7CC 002EB70C  41 82 00 14 */	beq lbl_802EE7E0
 /* 802EE7D0 002EB710  7F C4 F3 78 */	mr r4, r30
 /* 802EE7D4 002EB714  38 A0 00 00 */	li r5, 0
-/* 802EE7D8 002EB718  4B FF 07 BD */	bl JUTResFont_X1_
+/* 802EE7D8 002EB718  4B FF 07 BD */	bl __ct__10JUTResFontFPCcP7JKRHeap
 /* 802EE7DC 002EB71C  7C 7F 1B 78 */	mr r31, r3
 lbl_802EE7E0:
 /* 802EE7E0 002EB720  28 1F 00 00 */	cmplwi r31, 0
@@ -5154,7 +5154,7 @@ lbl_802EFC68:
 /* 802EFC74 002ECBB4  41 82 00 14 */	beq lbl_802EFC88
 /* 802EFC78 002ECBB8  7F C4 F3 78 */	mr r4, r30
 /* 802EFC7C 002ECBBC  38 A0 00 00 */	li r5, 0
-/* 802EFC80 002ECBC0  4B FE F3 15 */	bl JUTResFont_X1_
+/* 802EFC80 002ECBC0  4B FE F3 15 */	bl __ct__10JUTResFontFPCcP7JKRHeap
 /* 802EFC84 002ECBC4  7C 7F 1B 78 */	mr r31, r3
 lbl_802EFC88:
 /* 802EFC88 002ECBC8  28 1F 00 00 */	cmplwi r31, 0
@@ -6604,7 +6604,7 @@ lbl_802F10E8:
 /* 802F10F4 002EE034  41 82 00 14 */	beq lbl_802F1108
 /* 802F10F8 002EE038  7F C4 F3 78 */	mr r4, r30
 /* 802F10FC 002EE03C  38 A0 00 00 */	li r5, 0
-/* 802F1100 002EE040  4B FE DE 95 */	bl JUTResFont_X1_
+/* 802F1100 002EE040  4B FE DE 95 */	bl __ct__10JUTResFontFPCcP7JKRHeap
 /* 802F1104 002EE044  7C 7F 1B 78 */	mr r31, r3
 lbl_802F1108:
 /* 802F1108 002EE048  28 1F 00 00 */	cmplwi r31, 0
diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s
index 4f70c59051..623b7e8ca5 100644
--- a/asm/J2DGraph/J2DPrint.s
+++ b/asm/J2DGraph/J2DPrint.s
@@ -673,7 +673,7 @@ lbl_802F4C6C:
 /* 802F4C7C 002F1BBC  80 74 00 04 */	lwz r3, 4(r20)
 /* 802F4C80 002F1BC0  38 81 00 14 */	addi r4, r1, 0x14
 /* 802F4C84 002F1BC4  38 A1 00 10 */	addi r5, r1, 0x10
-/* 802F4C88 002F1BC8  4B FE A1 3D */	bl JUTFont_NS_setGradColor
+/* 802F4C88 002F1BC8  4B FE A1 3D */	bl setGradColor__7JUTFontF6TColor6TColor
 lbl_802F4C8C:
 /* 802F4C8C 002F1BCC  3B 80 00 00 */	li r28, 0
 /* 802F4C90 002F1BD0  80 74 00 04 */	lwz r3, 4(r20)
@@ -1415,7 +1415,7 @@ lbl_802F571C:
 /* 802F572C 002F266C  80 7A 00 04 */	lwz r3, 4(r26)
 /* 802F5730 002F2670  38 81 00 20 */	addi r4, r1, 0x20
 /* 802F5734 002F2674  38 A1 00 1C */	addi r5, r1, 0x1c
-/* 802F5738 002F2678  4B FE 96 8D */	bl JUTFont_NS_setGradColor
+/* 802F5738 002F2678  4B FE 96 8D */	bl setGradColor__7JUTFontF6TColor6TColor
 /* 802F573C 002F267C  48 00 01 F4 */	b lbl_802F5930
 lbl_802F5740:
 /* 802F5740 002F2680  7F 43 D3 78 */	mr r3, r26
@@ -1463,7 +1463,7 @@ lbl_802F57D4:
 /* 802F57E4 002F2724  80 7A 00 04 */	lwz r3, 4(r26)
 /* 802F57E8 002F2728  38 81 00 14 */	addi r4, r1, 0x14
 /* 802F57EC 002F272C  38 A1 00 10 */	addi r5, r1, 0x10
-/* 802F57F0 002F2730  4B FE 95 D5 */	bl JUTFont_NS_setGradColor
+/* 802F57F0 002F2730  4B FE 95 D5 */	bl setGradColor__7JUTFontF6TColor6TColor
 /* 802F57F4 002F2734  48 00 01 3C */	b lbl_802F5930
 lbl_802F57F8:
 /* 802F57F8 002F2738  7F 43 D3 78 */	mr r3, r26
@@ -1545,7 +1545,7 @@ lbl_802F5904:
 /* 802F5914 002F2854  80 7A 00 04 */	lwz r3, 4(r26)
 /* 802F5918 002F2858  38 81 00 0C */	addi r4, r1, 0xc
 /* 802F591C 002F285C  38 A1 00 08 */	addi r5, r1, 8
-/* 802F5920 002F2860  4B FE 94 A5 */	bl JUTFont_NS_setGradColor
+/* 802F5920 002F2860  4B FE 94 A5 */	bl setGradColor__7JUTFontF6TColor6TColor
 /* 802F5924 002F2864  48 00 00 0C */	b lbl_802F5930
 lbl_802F5928:
 /* 802F5928 002F2868  93 FB 00 00 */	stw r31, 0(r27)
diff --git a/asm/J2DGraph/J2DTextBox.s b/asm/J2DGraph/J2DTextBox.s
index 9c626ae3cb..c4a4365d24 100644
--- a/asm/J2DGraph/J2DTextBox.s
+++ b/asm/J2DGraph/J2DTextBox.s
@@ -424,7 +424,7 @@ J2DTextBox_NS_initiate:
 /* 802FFC94 002FCBD4  41 82 00 14 */	beq lbl_802FFCA8
 /* 802FFC98 002FCBD8  7F 44 D3 78 */	mr r4, r26
 /* 802FFC9C 002FCBDC  38 A0 00 00 */	li r5, 0
-/* 802FFCA0 002FCBE0  4B FD F2 F5 */	bl JUTResFont_X1_
+/* 802FFCA0 002FCBE0  4B FD F2 F5 */	bl __ct__10JUTResFontFPCcP7JKRHeap
 /* 802FFCA4 002FCBE4  7C 60 1B 78 */	mr r0, r3
 lbl_802FFCA8:
 /* 802FFCA8 002FCBE8  90 1B 01 00 */	stw r0, 0x100(r27)
@@ -600,7 +600,7 @@ J2DTextBox_NS_private_readStream:
 /* 802FFF2C 002FCE6C  41 82 00 14 */	beq lbl_802FFF40
 /* 802FFF30 002FCE70  7F 64 DB 78 */	mr r4, r27
 /* 802FFF34 002FCE74  38 A0 00 00 */	li r5, 0
-/* 802FFF38 002FCE78  4B FD F0 5D */	bl JUTResFont_X1_
+/* 802FFF38 002FCE78  4B FD F0 5D */	bl __ct__10JUTResFontFPCcP7JKRHeap
 /* 802FFF3C 002FCE7C  7C 60 1B 78 */	mr r0, r3
 lbl_802FFF40:
 /* 802FFF40 002FCE80  90 1C 01 00 */	stw r0, 0x100(r28)